Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions doc/manual/source/SUMMARY.md.in
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,12 @@
- [Quick Start](quick-start.md)
- [Installation](installation/index.md)
- [Supported Platforms](installation/supported-platforms.md)
- [Installing a Binary Distribution](installation/installing-binary.md)
- [Installing Nix from Source](installation/installing-source.md)
- [Prerequisites](installation/prerequisites-source.md)
- [Obtaining a Source Distribution](installation/obtaining-source.md)
- [Building Nix from Source](installation/building-source.md)
- [Using Nix within Docker](installation/installing-docker.md)
- [Security](installation/nix-security.md)
- [Environment Variables](installation/env-variables.md)
- [Upgrading Nix](installation/upgrading.md)
- [Uninstalling Nix](installation/uninstall.md)
- [Nix Store](store/index.md)
Expand Down
2 changes: 1 addition & 1 deletion doc/manual/source/command-ref/files/profiles.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ By default, this symlink points to:
- `$NIX_STATE_DIR/profiles/per-user/root/profile` for `root`

The `PATH` environment variable should include `/bin` subdirectory of the profile link (e.g. `~/.nix-profile/bin`) for the user environment to be visible to the user.
The [installer](@docroot@/installation/installing-binary.md) sets this up by default, unless you enable [`use-xdg-base-directories`].
The installer sets this up by default, unless you enable [`use-xdg-base-directories`].

[`nix-env`]: @docroot@/command-ref/nix-env.md
[`nix profile`]: @docroot@/command-ref/new-cli/nix3-profile.md
Expand Down
62 changes: 0 additions & 62 deletions doc/manual/source/installation/env-variables.md

This file was deleted.

18 changes: 6 additions & 12 deletions doc/manual/source/installation/index.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,17 @@
# Installation

This section describes how to install and configure Nix for first-time use.
Nix follows a [multi-user](./nix-security.md#multi-user-model) model on both Linux
and macOS.
We recommend that macOS users install Determinate Nix using [Determinate.pkg][pkg].
For Linux and Windows Subsystem for Linux (WSL) users:

```console
$ curl -L https://nixos.org/nix/install | sh -s -- --daemon
$ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \
sh -s -- install --determinate
```

> **Updating to macOS 15 Sequoia**
>
> If you recently updated to macOS 15 Sequoia and are getting
> ```console
> error: the user '_nixbld1' in the group 'nixbld' does not exist
> ```
> when running Nix commands, refer to GitHub issue [NixOS/nix#10892](https://github.com/NixOS/nix/issues/10892) for instructions to fix your installation without reinstalling.

## Distributions

The Nix community maintains installers for several distributions.

They can be found in the [`nix-community/nix-installers`](https://github.com/nix-community/nix-installers) repository.

[pkg]: https://install.determinate.systems/determinate-pkg/stable/Universal
135 changes: 0 additions & 135 deletions doc/manual/source/installation/installing-binary.md

This file was deleted.

10 changes: 1 addition & 9 deletions doc/manual/source/installation/uninstall.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Multi User

Removing a [multi-user installation](./installing-binary.md#multi-user-installation) depends on the operating system.
Removing a multi-user installation depends on the operating system.

### Linux

Expand Down Expand Up @@ -43,14 +43,6 @@ which you may remove.

### macOS

> **Updating to macOS 15 Sequoia**
>
> If you recently updated to macOS 15 Sequoia and are getting
> ```console
> error: the user '_nixbld1' in the group 'nixbld' does not exist
> ```
> when running Nix commands, refer to GitHub issue [NixOS/nix#10892](https://github.com/NixOS/nix/issues/10892) for instructions to fix your installation without reinstalling.

1. If system-wide shell initialisation files haven't been altered since installing Nix, use the backups made by the installer:

```console
Expand Down
9 changes: 7 additions & 2 deletions doc/manual/source/quick-start.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,13 @@
This chapter is for impatient people who don't like reading documentation.
For more in-depth information you are kindly referred to subsequent chapters.

1. Install Nix:
1. Install Nix.
We recommend that macOS users install Determinate Nix using [Determinate.pkg][pkg].
For Linux and Windows Subsystem for Linux (WSL) users:

```console
$ curl -L https://nixos.org/nix/install | sh
$ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \
sh -s -- install --determinate
```

The install script will use `sudo`, so make sure you have sufficient rights.
Expand Down Expand Up @@ -41,3 +44,5 @@ For more in-depth information you are kindly referred to subsequent chapters.
```console
$ nix-collect-garbage
```

[pkg]: https://install.determinate.systems/determinate-pkg/stable/Universal
2 changes: 1 addition & 1 deletion doc/manual/source/release-notes/rl-2.19.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@

This makes it match `nix derivation show`, which also maps store paths to information.

- When Nix is installed using the [binary installer](@docroot@/installation/installing-binary.md), in supported shells (Bash, Zsh, Fish)
- When Nix is installed using the binary installer, in supported shells (Bash, Zsh, Fish)
[`XDG_DATA_DIRS`](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html#variables) is now populated with the path to the `/share` subdirectory of the current profile.
This means that command completion scripts, `.desktop` files, and similar artifacts installed via [`nix-env`](@docroot@/command-ref/nix-env.md) or [`nix profile`](@docroot@/command-ref/new-cli/nix3-profile.md)
(experimental) can be found by any program that follows the [XDG Base Directory Specification](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html).
Expand Down
2 changes: 1 addition & 1 deletion src/libexpr/eval-settings.hh
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ struct EvalSettings : Config

The current state of all channels for the `root` user.

These files are set up by the [Nix installer](@docroot@/installation/installing-binary.md).
These files are set up by the Nix installer.
See [`NIX_STATE_DIR`](@docroot@/command-ref/env-common.md#env-NIX_STATE_DIR) for details on the environment variable.

> **Note**
Expand Down