diff --git a/doc/manual/redirects.js b/doc/manual/redirects.js index 36f53cbc8..3a86ae407 100644 --- a/doc/manual/redirects.js +++ b/doc/manual/redirects.js @@ -275,7 +275,6 @@ const redirects = { "ssec-multi-user": "installation/multi-user.html", "sec-obtaining-source": "installation/obtaining-source.html", "sec-prerequisites-source": "installation/prerequisites-source.html", - "ch-supported-platforms": "installation/supported-platforms.html", "ch-upgrading-nix": "installation/upgrading.html", "ch-about-nix": "introduction.html", "chap-introduction": "introduction.html", diff --git a/doc/manual/source/SUMMARY.md.in b/doc/manual/source/SUMMARY.md.in index 612867c25..9acd79077 100644 --- a/doc/manual/source/SUMMARY.md.in +++ b/doc/manual/source/SUMMARY.md.in @@ -3,7 +3,6 @@ - [Introduction](introduction.md) - [Quick Start](quick-start.md) - [Installation](installation/index.md) - - [Supported Platforms](installation/supported-platforms.md) - [Installing Nix from Source](installation/installing-source.md) - [Prerequisites](installation/prerequisites-source.md) - [Obtaining a Source Distribution](installation/obtaining-source.md) diff --git a/doc/manual/source/installation/index.md b/doc/manual/source/installation/index.md index 1a1d4efdc..21aca146f 100644 --- a/doc/manual/source/installation/index.md +++ b/doc/manual/source/installation/index.md @@ -1,10 +1,10 @@ # Installation -We recommend that macOS users install Determinate Nix using [Determinate.pkg][pkg]. +We recommend that macOS users install Determinate Nix using our graphical installer, [Determinate.pkg][pkg]. For Linux and Windows Subsystem for Linux (WSL) users: ```console -$ curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \ +curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \ sh -s -- install --determinate ``` diff --git a/doc/manual/source/installation/supported-platforms.md b/doc/manual/source/installation/supported-platforms.md deleted file mode 100644 index 8ca3ce8d4..000000000 --- a/doc/manual/source/installation/supported-platforms.md +++ /dev/null @@ -1,7 +0,0 @@ -# Supported Platforms - -Nix is currently supported on the following platforms: - - - Linux (i686, x86\_64, aarch64). - - - macOS (x86\_64, aarch64). diff --git a/doc/manual/source/introduction.md b/doc/manual/source/introduction.md index 89cb61d3c..a95e82740 100644 --- a/doc/manual/source/introduction.md +++ b/doc/manual/source/introduction.md @@ -1,7 +1,17 @@ # Determinate Nix -**Determinate Nix** is a downstream distribution of [Nix], a purely -functional language, CLI tool, and package management system. +**Determinate Nix** is a downstream distribution of [Nix], a purely functional language, CLI tool, and package management system. +It's available on Linux, macOS, and Windows Subsystem for Linux (WSL). + +## Installing + +We recommend that macOS users install Determinate Nix using our graphical installer, [Determinate.pkg][pkg]. +For Linux and Windows Subsystem for Linux (WSL) users: + +```console +curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix | \ + sh -s -- install --determinate +``` ## How Nix works @@ -188,7 +198,7 @@ to build configuration files in `/etc`). This means, among other things, that it is easy to roll back the entire configuration of the system to an earlier state. Also, users can install software without root privileges. For more information and downloads, see the [NixOS -homepage][site]. +homepage][nix]. ## License @@ -197,5 +207,5 @@ option) any later version][license]. [license]: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html -[nix]: https://nixos.org +[pkg]: https://install.determinate.systems/determinate-pkg/stable/Universal [site]: https://nixos.org diff --git a/doc/manual/source/quick-start.md b/doc/manual/source/quick-start.md index 428063f97..ffb87aa72 100644 --- a/doc/manual/source/quick-start.md +++ b/doc/manual/source/quick-start.md @@ -4,7 +4,7 @@ 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. - We recommend that macOS users install Determinate Nix using [Determinate.pkg][pkg]. + We recommend that macOS users install Determinate Nix using our graphical installer, [Determinate.pkg][pkg]. For Linux and Windows Subsystem for Linux (WSL) users: ```console