From 7130f0a3a6455cf27863f0bbccf0974cfcc82fa2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 17 Jun 2020 04:04:41 +0000
Subject: [PATCH 001/176] Don't need abstract `struct Derivation` in
 local-store

---
 src/libstore/local-store.hh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index e17cc45ae..872500957 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -23,9 +23,6 @@ namespace nix {
 const int nixSchemaVersion = 10;
 
 
-struct Derivation;
-
-
 struct OptimiseStats
 {
     unsigned long filesLinked = 0;

From 18493fd9c48676ab26854739db67ac5d76ff9347 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 17 Jun 2020 03:56:48 +0000
Subject: [PATCH 002/176] Move some Store functions from derivations.cc to
 store-api.cc

This further continues with the dependency inverstion. Also I just went
ahead and exposed `parseDerivation`: it seems like the more proper
building block, and not a bad thing to expose if we are trying to be
less wedded to drv files on disk anywas.
---
 src/libexpr/primops.cc      |  2 +-
 src/libstore/derivations.cc | 31 +------------------------------
 src/libstore/derivations.hh |  2 +-
 src/libstore/store-api.cc   | 20 +++++++++++++++++++-
 src/nix/repl.cc             | 28 ++++++++++++++++------------
 5 files changed, 38 insertions(+), 45 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 907f15246..0c2371c43 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -103,7 +103,7 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
 
     // FIXME
     if (state.store->isStorePath(path) && state.store->isValidPath(state.store->parseStorePath(path)) && isDerivation(path)) {
-        Derivation drv = readDerivation(*state.store, realPath);
+        Derivation drv = state.store->readDerivation(state.store->parseStorePath(path));
         Value & w = *state.allocValue();
         state.mkAttrs(w, 3 + drv.outputs.size());
         Value * v2 = state.allocAttr(w, state.sDrvPath);
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index b95f7bfdc..ea30813fa 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -3,7 +3,6 @@
 #include "globals.hh"
 #include "util.hh"
 #include "worker-protocol.hh"
-#include "fs-accessor.hh"
 #include "istringstream_nocopy.hh"
 
 namespace nix {
@@ -120,7 +119,7 @@ static StringSet parseStrings(std::istream & str, bool arePaths)
 }
 
 
-static Derivation parseDerivation(const Store & store, const string & s)
+Derivation parseDerivation(const Store & store, const string & s)
 {
     Derivation drv;
     istringstream_nocopy str(s);
@@ -173,34 +172,6 @@ static Derivation parseDerivation(const Store & store, const string & s)
 }
 
 
-Derivation readDerivation(const Store & store, const Path & drvPath)
-{
-    try {
-        return parseDerivation(store, readFile(drvPath));
-    } catch (FormatError & e) {
-        throw Error("error parsing derivation '%1%': %2%", drvPath, e.msg());
-    }
-}
-
-
-Derivation Store::derivationFromPath(const StorePath & drvPath)
-{
-    ensurePath(drvPath);
-    return readDerivation(drvPath);
-}
-
-
-Derivation Store::readDerivation(const StorePath & drvPath)
-{
-    auto accessor = getFSAccessor();
-    try {
-        return parseDerivation(*this, accessor->readFile(printStorePath(drvPath)));
-    } catch (FormatError & e) {
-        throw Error("error parsing derivation '%s': %s", printStorePath(drvPath), e.msg());
-    }
-}
-
-
 static void printString(string & res, std::string_view s)
 {
     char buf[s.size() * 2 + 2];
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 856aae59f..2adbf6b94 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -77,7 +77,7 @@ StorePath writeDerivation(ref<Store> store,
     const Derivation & drv, std::string_view name, RepairFlag repair = NoRepair);
 
 /* Read a derivation from a file. */
-Derivation readDerivation(const Store & store, const Path & drvPath);
+Derivation parseDerivation(const Store & store, const string & s);
 
 // FIXME: remove
 bool isDerivation(const string & fileName);
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index aae227bae..0147445ff 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1,11 +1,11 @@
 #include "crypto.hh"
+#include "fs-accessor.hh"
 #include "globals.hh"
 #include "store-api.hh"
 #include "util.hh"
 #include "nar-info-disk-cache.hh"
 #include "thread-pool.hh"
 #include "json.hh"
-#include "derivations.hh"
 #include "url.hh"
 
 #include <future>
@@ -821,6 +821,24 @@ std::string makeFixedOutputCA(FileIngestionMethod recursive, const Hash & hash)
 }
 
 
+Derivation Store::derivationFromPath(const StorePath & drvPath)
+{
+    ensurePath(drvPath);
+    return readDerivation(drvPath);
+}
+
+
+Derivation Store::readDerivation(const StorePath & drvPath)
+{
+    auto accessor = getFSAccessor();
+    try {
+        return parseDerivation(*this, accessor->readFile(printStorePath(drvPath)));
+    } catch (FormatError & e) {
+        throw Error("error parsing derivation '%s': %s", printStorePath(drvPath), e.msg());
+    }
+}
+
+
 }
 
 
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 4bcaaeebf..b46f7015f 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -66,7 +66,7 @@ struct NixRepl : gc
     void mainLoop(const std::vector<std::string> & files);
     StringSet completePrefix(string prefix);
     bool getLine(string & input, const std::string &prompt);
-    Path getDerivationPath(Value & v);
+    StorePath getDerivationPath(Value & v);
     bool processLine(string line);
     void loadFile(const Path & path);
     void initEnv();
@@ -377,13 +377,16 @@ bool isVarName(const string & s)
 }
 
 
-Path NixRepl::getDerivationPath(Value & v) {
+StorePath NixRepl::getDerivationPath(Value & v) {
     auto drvInfo = getDerivation(*state, v, false);
     if (!drvInfo)
         throw Error("expression does not evaluate to a derivation, so I can't build it");
-    Path drvPath = drvInfo->queryDrvPath();
-    if (drvPath == "" || !state->store->isValidPath(state->store->parseStorePath(drvPath)))
-        throw Error("expression did not evaluate to a valid derivation");
+    Path drvPathRaw = drvInfo->queryDrvPath();
+    if (drvPathRaw == "")
+        throw Error("expression did not evaluate to a valid derivation (no drv path)");
+    StorePath drvPath = state->store->parseStorePath(drvPathRaw);
+    if (!state->store->isValidPath(drvPath))
+        throw Error("expression did not evaluate to a valid derivation (invalid drv path)");
     return drvPath;
 }
 
@@ -476,29 +479,30 @@ bool NixRepl::processLine(string line)
         evalString("drv: (import <nixpkgs> {}).runCommand \"shell\" { buildInputs = [ drv ]; } \"\"", f);
         state->callFunction(f, v, result, Pos());
 
-        Path drvPath = getDerivationPath(result);
-        runProgram(settings.nixBinDir + "/nix-shell", Strings{drvPath});
+        StorePath drvPath = getDerivationPath(result);
+        runProgram(settings.nixBinDir + "/nix-shell", Strings{state->store->printStorePath(drvPath)});
     }
 
     else if (command == ":b" || command == ":i" || command == ":s") {
         Value v;
         evalString(arg, v);
-        Path drvPath = getDerivationPath(v);
+        StorePath drvPath = getDerivationPath(v);
+        Path drvPathRaw = state->store->printStorePath(drvPath);
 
         if (command == ":b") {
             /* We could do the build in this process using buildPaths(),
                but doing it in a child makes it easier to recover from
                problems / SIGINT. */
-            if (runProgram(settings.nixBinDir + "/nix", Strings{"build", "--no-link", drvPath}) == 0) {
-                auto drv = readDerivation(*state->store, drvPath);
+            if (runProgram(settings.nixBinDir + "/nix", Strings{"build", "--no-link", drvPathRaw}) == 0) {
+                auto drv = state->store->readDerivation(drvPath);
                 std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
                 for (auto & i : drv.outputs)
                     std::cout << fmt("  %s -> %s\n", i.first, state->store->printStorePath(i.second.path));
             }
         } else if (command == ":i") {
-            runProgram(settings.nixBinDir + "/nix-env", Strings{"-i", drvPath});
+            runProgram(settings.nixBinDir + "/nix-env", Strings{"-i", drvPathRaw});
         } else {
-            runProgram(settings.nixBinDir + "/nix-shell", Strings{drvPath});
+            runProgram(settings.nixBinDir + "/nix-shell", Strings{drvPathRaw});
         }
     }
 

From f1c7746eb407258d77b2f7fffec0e5d4facf516a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 5 Jul 2020 21:39:04 +0000
Subject: [PATCH 003/176] See if setting -std=c++17 for perl bindings helps

---
 perl/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/perl/Makefile b/perl/Makefile
index 7ddb0cf69..259ed7dc3 100644
--- a/perl/Makefile
+++ b/perl/Makefile
@@ -1,6 +1,6 @@
 makefiles = local.mk
 
-GLOBAL_CXXFLAGS += -g -Wall
+GLOBAL_CXXFLAGS += -g -Wall -std=c++17
 
 -include Makefile.config
 

From e3b394b6e8420795c1976195184921df2c2b3e83 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Thu, 16 Jul 2020 09:36:02 -0400
Subject: [PATCH 004/176] Small namespace fix

---
 src/libstore/derivations.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index d32793b6a..d170d7223 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -76,7 +76,7 @@ StorePath writeDerivation(ref<Store> store,
     const Derivation & drv, std::string_view name, RepairFlag repair = NoRepair);
 
 /* Read a derivation from a file. */
-Derivation parseDerivation(const Store & store, string && s);
+Derivation parseDerivation(const Store & store, std::string && s);
 
 // FIXME: remove
 bool isDerivation(const string & fileName);

From 0aa79dcc6f4e67891cdd9500ae4ce85e4189a951 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Fri, 17 Jul 2020 17:24:02 -0400
Subject: [PATCH 005/176] Remove StoreType abstraction and delegate regStore

to each Store implementation. The generic regStore implementation will
only be for the ambiguous shorthands, like "" and "auto".

This also could get us close to simplifying the daemon command.
---
 src/libstore/local-store.cc  | 16 ++++++++++++
 src/libstore/remote-store.cc | 10 +++++---
 src/libstore/store-api.cc    | 47 ++++++++++--------------------------
 src/libstore/store-api.hh    | 10 --------
 src/nix-daemon/nix-daemon.cc |  5 +++-
 src/nix/doctor.cc            |  4 +--
 6 files changed, 41 insertions(+), 51 deletions(-)

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index d49d00d6d..9752f3c5f 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -1580,4 +1580,20 @@ void LocalStore::createUser(const std::string & userName, uid_t userId)
 }
 
 
+static RegisterStoreImplementation regStore([](
+    const std::string & uri, const Store::Params & params)
+    -> std::shared_ptr<Store>
+{
+    Store::Params params2 = params;
+    if (uri == "local") {
+    } else if (hasPrefix(uri, "/")) {
+        params2["root"] = uri;
+    } else if (hasPrefix(uri, "./")) {
+        params2["root"] = absPath(uri);
+    } else {
+        return nullptr;
+    }
+    return std::shared_ptr<Store>(std::make_shared<LocalStore>(params2));
+});
+
 }
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 9af4364b7..a9fbf9f82 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -843,14 +843,18 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
     return nullptr;
 }
 
-static std::string uriScheme = "unix://";
+static std::string_view uriScheme = "unix://";
 
 static RegisterStoreImplementation regStore([](
     const std::string & uri, const Store::Params & params)
     -> std::shared_ptr<Store>
 {
-    if (std::string(uri, 0, uriScheme.size()) != uriScheme) return 0;
-    return std::make_shared<UDSRemoteStore>(std::string(uri, uriScheme.size()), params);
+    if (hasPrefix(uri, uriScheme))
+        return std::make_shared<UDSRemoteStore>(std::string(uri, uriScheme.size()), params);
+    else if (uri == "daemon")
+        return std::make_shared<UDSRemoteStore>(params);
+    else
+        return nullptr;
 });
 
 }
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index d37e970df..7a380f127 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -915,44 +915,23 @@ ref<Store> openStore(const std::string & uri_,
 }
 
 
-StoreType getStoreType(const std::string & uri, const std::string & stateDir)
-{
-    if (uri == "daemon") {
-        return tDaemon;
-    } else if (uri == "local" || hasPrefix(uri, "/") || hasPrefix(uri, "./")) {
-        return tLocal;
-    } else if (uri == "" || uri == "auto") {
-        if (access(stateDir.c_str(), R_OK | W_OK) == 0)
-            return tLocal;
-        else if (pathExists(settings.nixDaemonSocketFile))
-            return tDaemon;
-        else
-            return tLocal;
-    } else {
-        return tOther;
-    }
-}
-
-
+// Specific prefixes are handled by the specific types of store, while here we
+// handle the general cases not covered by the other ones.
 static RegisterStoreImplementation regStore([](
     const std::string & uri, const Store::Params & params)
     -> std::shared_ptr<Store>
 {
-    switch (getStoreType(uri, get(params, "state").value_or(settings.nixStateDir))) {
-        case tDaemon:
-            return std::shared_ptr<Store>(std::make_shared<UDSRemoteStore>(params));
-        case tLocal: {
-            Store::Params params2 = params;
-            if (hasPrefix(uri, "/")) {
-                params2["root"] = uri;
-            } else if (hasPrefix(uri, "./")) {
-                params2["root"] = absPath(uri);
-            }
-            return std::shared_ptr<Store>(std::make_shared<LocalStore>(params2));
-        }
-        default:
-            return nullptr;
-    }
+     auto stateDir = get(params, "state").value_or(settings.nixStateDir);
+     if (uri == "" || uri == "auto") {
+        if (access(stateDir.c_str(), R_OK | W_OK) == 0)
+            return std::make_shared<LocalStore>(params);
+        else if (pathExists(settings.nixDaemonSocketFile))
+            return std::make_shared<UDSRemoteStore>(params);
+        else
+            return std::make_shared<LocalStore>(params);
+     } else {
+         return nullptr;
+     }
 });
 
 
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index a4be0411e..c38290add 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -796,16 +796,6 @@ ref<Store> openStore(const std::string & uri = settings.storeUri.get(),
     const Store::Params & extraParams = Store::Params());
 
 
-enum StoreType {
-    tDaemon,
-    tLocal,
-    tOther
-};
-
-
-StoreType getStoreType(const std::string & uri = settings.storeUri.get(),
-    const std::string & stateDir = settings.nixStateDir);
-
 /* Return the default substituter stores, defined by the
    ‘substituters’ option and various legacy options. */
 std::list<ref<Store>> getDefaultSubstituters();
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index bcb86cbce..b52cd7989 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -1,5 +1,6 @@
 #include "shared.hh"
 #include "local-store.hh"
+#include "remote-store.hh"
 #include "util.hh"
 #include "serialise.hh"
 #include "archive.hh"
@@ -277,7 +278,9 @@ static int _main(int argc, char * * argv)
         initPlugins();
 
         if (stdio) {
-            if (getStoreType() == tDaemon) {
+            if (openUncachedStore().dynamic_pointer_cast<UDSRemoteStore>()) {
+                // FIXME Use the connection the UDSRemoteStore opened
+
                 //  Forward on this connection to the real daemon
                 auto socketPath = settings.nixDaemonSocketFile;
                 auto s = socket(PF_UNIX, SOCK_STREAM, 0);
diff --git a/src/nix/doctor.cc b/src/nix/doctor.cc
index 82e92cdd0..683e91446 100644
--- a/src/nix/doctor.cc
+++ b/src/nix/doctor.cc
@@ -49,9 +49,7 @@ struct CmdDoctor : StoreCommand
     {
         logger->log("Running checks against store uri: " + store->getUri());
 
-        auto type = getStoreType();
-
-        if (type < tOther) {
+        if (store.dynamic_pointer_cast<LocalFSStore>()) {
             success &= checkNixInPath();
             success &= checkProfileRoots(store);
         }

From 650ae14ceda72dcb294bde4d08988a7ed26ab0ff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 13:51:11 +0200
Subject: [PATCH 006/176] Markdown test

---
 doc/manual/command-ref/nix-copy-closure.md |  78 +++++++++
 doc/manual/introduction/about-nix.md       | 181 +++++++++++++++++++++
 doc/manual/introduction/quick-start.md     |  79 +++++++++
 doc/manual/manual.md                       |   8 +
 flake.nix                                  |  21 +++
 5 files changed, 367 insertions(+)
 create mode 100644 doc/manual/command-ref/nix-copy-closure.md
 create mode 100644 doc/manual/introduction/about-nix.md
 create mode 100644 doc/manual/introduction/quick-start.md
 create mode 100644 doc/manual/manual.md

diff --git a/doc/manual/command-ref/nix-copy-closure.md b/doc/manual/command-ref/nix-copy-closure.md
new file mode 100644
index 000000000..037334c4d
--- /dev/null
+++ b/doc/manual/command-ref/nix-copy-closure.md
@@ -0,0 +1,78 @@
+Title: nix-copy-closure
+
+# Name
+
+`nix-copy-closure` - copy a closure to or from a remote machine via SSH
+
+# Synopsis
+
+`nix-copy-closure` [`--to` | `--from`] [`--gzip`] [`--include-outputs`] [`--use-substitutes` | `-s`] [`-v`] _user@machine_ _paths_
+
+# Description
+
+`nix-copy-closure` gives you an easy and efficient way to exchange
+software between machines.  Given one or more Nix store _paths_ on the
+local machine, `nix-copy-closure` computes the closure of those paths
+(i.e. all their dependencies in the Nix store), and copies all paths
+in the closure to the remote machine via the `ssh` (Secure Shell)
+command.  With the `--from` option, the direction is reversed: the
+closure of _paths_ on a remote machine is copied to the Nix store on
+the local machine.
+
+This command is efficient because it only sends the store paths
+that are missing on the target machine.
+
+Since `nix-copy-closure` calls `ssh`, you may be asked to type in the
+appropriate password or passphrase.  In fact, you may be asked _twice_
+because `nix-copy-closure` currently connects twice to the remote
+machine, first to get the set of paths missing on the target machine,
+and second to send the dump of those paths.  If this bothers you, use
+`ssh-agent`.
+
+# Options
+
+*`--to`*
+: Copy the closure of _paths_ from the local Nix store to the Nix
+  store on _machine_. This is the default.
+
+*`--from`*
+: Copy the closure of _paths_ from the Nix store on _machine_ to the
+  local Nix store.
+
+*`--gzip`*
+: Enable compression of the SSH connection.
+
+*`--include-outputs`*
+: Also copy the outputs of store derivations included in the closure.
+
+*`--use-substitutes` / `-s`*
+: Attempt to download missing paths on the target machine using Nix’s
+  substitute mechanism.  Any paths that cannot be substituted on the
+  target are still copied normally from the source.  This is useful,
+  for instance, if the connection between the source and target
+  machine is slow, but the connection between the target machine and
+  `nixos.org` (the default binary cache server) is
+  fast.
+
+*`-v`*
+: Show verbose output.
+
+# Environment variables
+
+*`NIX_SSHOPTS`*
+: Additional options to be passed to `ssh` on the command
+  line.
+
+# Examples
+
+Copy Firefox with all its dependencies to a remote machine:
+
+    $ nix-copy-closure --to alice@itchy.labs $(type -tP firefox)
+
+Copy Subversion from a remote machine and then install it into a user
+environment:
+
+    $ nix-copy-closure --from alice@itchy.labs \
+        /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
+    $ nix-env -i /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
+
diff --git a/doc/manual/introduction/about-nix.md b/doc/manual/introduction/about-nix.md
new file mode 100644
index 000000000..b3cd00bd3
--- /dev/null
+++ b/doc/manual/introduction/about-nix.md
@@ -0,0 +1,181 @@
+# About Nix
+
+Nix is a _purely functional package manager_.  This means that it
+treats packages like values in purely functional programming languages
+such as Haskell — they are built by functions that don’t have
+side-effects, and they never change after they have been built.  Nix
+stores packages in the _Nix store_, usually the directory
+`/nix/store`, where each package has its own unique subdirectory such
+as
+
+    /nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/
+
+where `b6gvzjyb2pg0…` is a unique identifier for the package that
+captures all its dependencies (it’s a cryptographic hash of the
+package’s build dependency graph).  This enables many powerful
+features.
+
+## Multiple versions
+
+You can have multiple versions or variants of a package
+installed at the same time.  This is especially important when
+different applications have dependencies on different versions of the
+same package — it prevents the “DLL hell”.  Because of the hashing
+scheme, different versions of a package end up in different paths in
+the Nix store, so they don’t interfere with each other.
+
+An important consequence is that operations like upgrading or
+uninstalling an application cannot break other applications, since
+these operations never “destructively” update or delete files that are
+used by other packages.
+
+## Complete dependencies
+
+Nix helps you make sure that package dependency specifications are
+complete.  In general, when you’re making a package for a package
+management system like RPM, you have to specify for each package what
+its dependencies are, but there are no guarantees that this
+specification is complete.  If you forget a dependency, then the
+package will build and work correctly on _your_ machine if you have
+the dependency installed, but not on the end user's machine if it's
+not there.
+
+Since Nix on the other hand doesn’t install packages in “global”
+locations like `/usr/bin` but in package-specific directories, the
+risk of incomplete dependencies is greatly reduced.  This is because
+tools such as compilers don’t search in per-packages directories such
+as `/nix/store/5lbfaxb722zp…-openssl-0.9.8d/include`, so if a package
+builds correctly on your system, this is because you specified the
+dependency explicitly. This takes care of the build-time dependencies.
+
+Once a package is built, runtime dependencies are found by scanning
+binaries for the hash parts of Nix store paths (such as `r8vvq9kq…`).
+This sounds risky, but it works extremely well.
+
+## Multi-user support
+
+Nix has multi-user support.  This means that non-privileged users can
+securely install software.  Each user can have a different _profile_,
+a set of packages in the Nix store that appear in the user’s `PATH`.
+If a user installs a package that another user has already installed
+previously, the package won’t be built or downloaded a second time.
+At the same time, it is not possible for one user to inject a Trojan
+horse into a package that might be used by another user.
+
+## Atomic upgrades and rollbacks
+
+Since package management operations never overwrite packages in the
+Nix store but just add new versions in different paths, they are
+_atomic_.  So during a package upgrade, there is no time window in
+which the package has some files from the old version and some files
+from the new version — which would be bad because a program might well
+crash if it’s started during that period.
+
+And since packages aren’t overwritten, the old versions are still
+there after an upgrade.  This means that you can _roll back_ to the
+old version:
+
+    $ nix-env --upgrade some-packages
+    $ nix-env --rollback
+
+## Garbage collection
+
+When you uninstall a package like this…
+
+    $ nix-env --uninstall firefox
+
+the package isn’t deleted from the system right away (after all, you
+might want to do a rollback, or it might be in the profiles of other
+users).  Instead, unused packages can be deleted safely by running the
+_garbage collector_:
+
+    $ nix-collect-garbage
+
+This deletes all packages that aren’t in use by any user profile or by
+a currently running program.
+
+## Functional package language
+
+Packages are built from _Nix expressions_, which is a simple
+functional language.  A Nix expression describes everything that goes
+into a package build action (a “derivation”): other packages, sources,
+the build script, environment variables for the build script, etc.
+Nix tries very hard to ensure that Nix expressions are
+_deterministic_: building a Nix expression twice should yield the same
+result.
+
+Because it’s a functional language, it’s easy to support
+building variants of a package: turn the Nix expression into a
+function and call it any number of times with the appropriate
+arguments.  Due to the hashing scheme, variants don’t conflict with
+each other in the Nix store.
+
+## Transparent source/binary deployment
+
+Nix expressions generally describe how to build a package from
+source, so an installation action like
+
+    $ nix-env --install firefox
+
+_could_ cause quite a bit of build activity, as not only Firefox but
+also all its dependencies (all the way up to the C library and the
+compiler) would have to built, at least if they are not already in the
+Nix store.  This is a _source deployment model_.  For most users,
+building from source is not very pleasant as it takes far too long.
+However, Nix can automatically skip building from source and instead
+use a _binary cache_, a web server that provides pre-built
+binaries. For instance, when asked to build
+`/nix/store/b6gvzjyb2pg0…-firefox-33.1` from source, Nix would first
+check if the file `https://cache.nixos.org/b6gvzjyb2pg0….narinfo`
+exists, and if so, fetch the pre-built binary referenced from there;
+otherwise, it would fall back to building from source.
+
+## Nix Packages collection
+
+We provide a large set of Nix expressions containing hundreds of
+existing Unix packages, the _Nix Packages collection_ (Nixpkgs).
+
+## Managing build environments
+
+Nix is extremely useful for developers as it makes it easy to
+automatically set up the build environment for a package. Given a Nix
+expression that describes the dependencies of your package, the
+command `nix-shell` will build or download those dependencies if
+they’re not already in your Nix store, and then start a Bash shell in
+which all necessary environment variables (such as compiler search
+paths) are set.
+
+For example, the following command gets all dependencies of the
+Pan newsreader, as described by [its
+Nix expression](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix):
+
+    $ nix-shell '<nixpkgs>' -A pan
+
+You’re then dropped into a shell where you can edit, build and test
+the package:
+
+    [nix-shell]$ tar xf $src
+    [nix-shell]$ cd pan-*
+    [nix-shell]$ ./configure
+    [nix-shell]$ make
+    [nix-shell]$ ./pan/gui/pan
+
+## Portability
+
+Nix runs on Linux and macOS.
+
+## NixOS
+
+NixOS is a Linux distribution based on Nix.  It uses Nix not just for
+package management but also to manage the system configuration (e.g.,
+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](https://nixos.org/).
+
+## License
+
+Nix is released under the terms of the [GNU LGPLv2.1 or (at your
+option) any later
+version](http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html).
diff --git a/doc/manual/introduction/quick-start.md b/doc/manual/introduction/quick-start.md
new file mode 100644
index 000000000..21c03e3cf
--- /dev/null
+++ b/doc/manual/introduction/quick-start.md
@@ -0,0 +1,79 @@
+# Quick Start
+
+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 single-user Nix by running the following:
+
+        $ bash <(curl -L https://nixos.org/nix/install)
+
+   This will install Nix in `/nix`. The install script will create
+   `/nix` using `sudo`, so make sure you have sufficient rights.  (For
+   other installation methods, see
+   [here](../installation/installation.md).)
+
+1. See what installable packages are currently available in the
+   channel:
+
+        $ nix-env -qa
+        docbook-xml-4.3
+        docbook-xml-4.5
+        firefox-33.0.2
+        hello-2.9
+        libxslt-1.1.28
+        …
+
+1. Install some packages from the channel:
+
+        $ nix-env -i hello
+
+   This should download pre-built packages; it should not build them
+   locally (if it does, something went wrong).
+
+1. Test that they work:
+
+        $ which hello
+        /home/eelco/.nix-profile/bin/hello
+        $ hello
+        Hello, world!
+
+1. Uninstall a package:
+
+        $ nix-env -e hello
+
+1. You can also test a package without installing it:
+
+        $ nix-shell -p hello
+
+   This builds or downloads GNU Hello and its dependencies, then drops
+   you into a Bash shell where the `hello` command is present, all
+   without affecting your normal environment:
+
+        [nix-shell:~]$ hello
+        Hello, world!
+
+        [nix-shell:~]$ exit
+
+        $ hello
+        hello: command not found
+
+1. To keep up-to-date with the channel, do:
+
+        $ nix-channel --update nixpkgs
+        $ nix-env -u '*'
+
+   The latter command will upgrade each installed package for which
+   there is a “newer” version (as determined by comparing the version
+   numbers).
+
+1. If you're unhappy with the result of a `nix-env` action (e.g., an
+   upgraded package turned out not to work properly), you can go back:
+
+        $ nix-env --rollback
+
+1. You should periodically run the Nix garbage collector to get rid of
+   unused packages, since uninstalls or upgrades don't actually delete
+   them:
+
+        $ nix-collect-garbage -d
diff --git a/doc/manual/manual.md b/doc/manual/manual.md
new file mode 100644
index 000000000..58e37436f
--- /dev/null
+++ b/doc/manual/manual.md
@@ -0,0 +1,8 @@
+Title: Nix Package Manager Guide
+
+1. Introduction
+   1. [About Nix](./introduction/about-nix.md)
+   1. [Quick Start](./introduction/quick-start.md)
+1. Command Reference
+   1. Utilities
+      1. [nix-copy-closure](./command-ref/nix-copy-closure.md)
diff --git a/flake.nix b/flake.nix
index a707e90e7..dfe4ecd49 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,6 +66,7 @@
             libxslt
             docbook5
             docbook_xsl_ns
+            lowdown
             autoconf-archive
             autoreconfHook
 
@@ -187,6 +188,26 @@
 
         };
 
+        lowdown = with final; stdenv.mkDerivation {
+          name = "lowdown-0.7.1";
+
+          src = fetchurl {
+            url = https://kristaps.bsd.lv/lowdown/snapshots/lowdown-0.7.1.tar.gz;
+            hash = "sha512-1daoAQfYD0LdhK6aFhrSQvadjc5GsSPBZw0fJDb+BEHYMBLjqiUl2A7H8N+l0W4YfGKqbsPYSrCy4vct+7U6FQ==";
+          };
+
+          outputs = [ "out" "dev" ];
+
+          buildInputs = [ which ];
+
+          configurePhase =
+            ''
+              ./configure \
+                PREFIX=${placeholder "dev"} \
+                BINDIR=${placeholder "out"}/bin
+            '';
+        };
+
       };
 
       hydraJobs = {

From e0ea3c82ca9e46359c55c9f716fec016f8d483ea Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 20:27:23 +0200
Subject: [PATCH 007/176] Use mdbook

---
 configure.ac                                  |  2 -
 doc/manual/local.mk                           | 81 +++++--------------
 doc/manual/src/SUMMARY.md                     |  7 ++
 doc/manual/src/command-ref/command-ref.md     |  2 +
 .../{ => src}/command-ref/nix-copy-closure.md |  0
 doc/manual/src/command-ref/utilities.md       |  3 +
 .../about-nix.md => src/introduction.md}      |  2 +-
 .../{introduction => src}/quick-start.md      |  0
 flake.nix                                     |  5 +-
 9 files changed, 32 insertions(+), 70 deletions(-)
 create mode 100644 doc/manual/src/SUMMARY.md
 create mode 100644 doc/manual/src/command-ref/command-ref.md
 rename doc/manual/{ => src}/command-ref/nix-copy-closure.md (100%)
 create mode 100644 doc/manual/src/command-ref/utilities.md
 rename doc/manual/{introduction/about-nix.md => src/introduction.md} (99%)
 rename doc/manual/{introduction => src}/quick-start.md (100%)

diff --git a/configure.ac b/configure.ac
index 2f29cf864..eecb107d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -117,8 +117,6 @@ fi
 ])
 
 NEED_PROG(bash, bash)
-AC_PATH_PROG(xmllint, xmllint, false)
-AC_PATH_PROG(xsltproc, xsltproc, false)
 AC_PATH_PROG(flex, flex, false)
 AC_PATH_PROG(bison, bison, false)
 AC_PATH_PROG(dot, dot)
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index ce05c6234..a91d497ce 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -1,84 +1,39 @@
-
 ifeq ($(doc_generate),yes)
 
-XSLTPROC = $(xsltproc) --nonet $(xmlflags) \
-  --param section.autolabel 1 \
-  --param section.label.includes.component.label 1 \
-  --param xref.with.number.and.title 1 \
-  --param toc.section.depth 3 \
-  --param admon.style \'\' \
-  --param callout.graphics 0 \
-  --param contrib.inline.enabled 0 \
-  --stringparam generate.toc "book toc" \
-  --param keep.relative.image.uris 0
+MANUAL_SRCS := $(call rwildcard, $(d)/src, *.md)
 
-docbookxsl = http://docbook.sourceforge.net/release/xsl-ns/current
-docbookrng = http://docbook.org/xml/5.0/rng/docbook.rng
+#$(d)/version.txt:
+#	$(trace-gen) echo -n $(PACKAGE_VERSION) > $@
 
-MANUAL_SRCS := $(call rwildcard, $(d), *.xml)
+clean-files += $(d)/version.txt
 
-
-# Do XInclude processing / RelaxNG validation
-$(d)/manual.xmli: $(d)/manual.xml $(MANUAL_SRCS) $(d)/version.txt
-	$(trace-gen) $(xmllint) --nonet --xinclude $< -o $@.tmp
-	@mv $@.tmp $@
-
-$(d)/version.txt:
-	$(trace-gen) echo -n $(PACKAGE_VERSION) > $@
-
-# Note: RelaxNG validation requires xmllint >= 2.7.4.
-$(d)/manual.is-valid: $(d)/manual.xmli
-	$(trace-gen) $(XSLTPROC) --novalid --stringparam profile.condition manual \
-	  $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \
-	  $(xmllint) --nonet --noout --relaxng $(docbookrng) -
-	@touch $@
-
-clean-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
-
-dist-files += $(d)/manual.xmli $(d)/version.txt $(d)/manual.is-valid
+dist-files += $(d)/version.txt
 
 
 # Generate man pages.
 man-pages := $(foreach n, \
-  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
-  nix-collect-garbage.1 \
-  nix-prefetch-url.1 nix-channel.1 \
-  nix-hash.1 nix-copy-closure.1 \
-  nix.conf.5 nix-daemon.8, \
+  nix-copy-closure.1, \
   $(d)/$(n))
-
-$(firstword $(man-pages)): $(d)/manual.xmli $(d)/manual.is-valid
-	$(trace-gen) $(XSLTPROC) --novalid --stringparam profile.condition manpage \
-	  $(docbookxsl)/profiling/profile.xsl $< 2> /dev/null | \
-	  (cd doc/manual && $(XSLTPROC) $(docbookxsl)/manpages/docbook.xsl -)
-
-$(wordlist 2, $(words $(man-pages)), $(man-pages)): $(firstword $(man-pages))
+#  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
+#  nix-collect-garbage.1, \
+#  nix-prefetch-url.1 nix-channel.1 \
+#  nix-hash.1 nix-copy-closure.1 \
+#  nix.conf.5 nix-daemon.8, \
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
 dist-files += $(man-pages)
 
+$(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md
+
+%.1: %.md
+	$(trace-gen) lowdown -sT man $^ -o $@
 
 # Generate the HTML manual.
-$(d)/manual.html: $(d)/manual.xml $(MANUAL_SRCS) $(d)/manual.is-valid
-	$(trace-gen) $(XSLTPROC) --xinclude --stringparam profile.condition manual \
-	  $(docbookxsl)/profiling/profile.xsl $< | \
-	  $(XSLTPROC) --output $@ $(docbookxsl)/xhtml/docbook.xsl -
+install: $(docdir)/manual/index.html
 
-$(foreach file, $(d)/manual.html, $(eval $(call install-data-in, $(file), $(docdir)/manual)))
-
-$(foreach file, $(wildcard $(d)/figures/*.png), $(eval $(call install-data-in, $(file), $(docdir)/manual/figures)))
-
-$(eval $(call install-symlink, manual.html, $(docdir)/manual/index.html))
-
-
-all: $(d)/manual.html
-
-
-
-clean-files += $(d)/manual.html
-
-dist-files += $(d)/manual.html
+$(docdir)/manual/index.html: $(MANUAL_SRCS)
+	$(trace-gen) mdbook build doc/manual -d $(docdir)/manual
 
 
 endif
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
new file mode 100644
index 000000000..6897f70d9
--- /dev/null
+++ b/doc/manual/src/SUMMARY.md
@@ -0,0 +1,7 @@
+# Table of Contents
+
+- [Introduction](./introduction.md)
+- [Quick Start](./quick-start.md)
+- [Command Reference](./command-ref/command-ref.md)
+  - [Utilities](./command-ref/utilities.md)
+    - [nix-copy-closure](./command-ref/nix-copy-closure.md)
diff --git a/doc/manual/src/command-ref/command-ref.md b/doc/manual/src/command-ref/command-ref.md
new file mode 100644
index 000000000..b15a50a3b
--- /dev/null
+++ b/doc/manual/src/command-ref/command-ref.md
@@ -0,0 +1,2 @@
+This section lists commands and options that you can use when you
+work with Nix.
diff --git a/doc/manual/command-ref/nix-copy-closure.md b/doc/manual/src/command-ref/nix-copy-closure.md
similarity index 100%
rename from doc/manual/command-ref/nix-copy-closure.md
rename to doc/manual/src/command-ref/nix-copy-closure.md
diff --git a/doc/manual/src/command-ref/utilities.md b/doc/manual/src/command-ref/utilities.md
new file mode 100644
index 000000000..5ba8a02a3
--- /dev/null
+++ b/doc/manual/src/command-ref/utilities.md
@@ -0,0 +1,3 @@
+# Utilities
+
+This section lists utilities that you can use when you work with Nix.
diff --git a/doc/manual/introduction/about-nix.md b/doc/manual/src/introduction.md
similarity index 99%
rename from doc/manual/introduction/about-nix.md
rename to doc/manual/src/introduction.md
index b3cd00bd3..b54b0d02d 100644
--- a/doc/manual/introduction/about-nix.md
+++ b/doc/manual/src/introduction.md
@@ -1,4 +1,4 @@
-# About Nix
+# Introduction
 
 Nix is a _purely functional package manager_.  This means that it
 treats packages like values in purely functional programming languages
diff --git a/doc/manual/introduction/quick-start.md b/doc/manual/src/quick-start.md
similarity index 100%
rename from doc/manual/introduction/quick-start.md
rename to doc/manual/src/quick-start.md
diff --git a/flake.nix b/flake.nix
index dfe4ecd49..cebbdf9d9 100644
--- a/flake.nix
+++ b/flake.nix
@@ -62,10 +62,7 @@
         buildDeps =
           [ bison
             flex
-            libxml2
-            libxslt
-            docbook5
-            docbook_xsl_ns
+            mdbook
             lowdown
             autoconf-archive
             autoreconfHook

From 8e41c388679aedc12eb1a7a7aff1b4818040ff4a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 20:46:12 +0200
Subject: [PATCH 008/176] Remove references to xmllint

---
 Makefile.config.in   | 2 --
 doc/manual/local.mk  | 2 --
 tests/common.sh.in   | 1 -
 tests/nix-channel.sh | 6 ------
 4 files changed, 11 deletions(-)

diff --git a/Makefile.config.in b/Makefile.config.in
index 5c245b8e9..3845b3be0 100644
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -41,5 +41,3 @@ sandbox_shell = @sandbox_shell@
 storedir = @storedir@
 sysconfdir = @sysconfdir@
 system = @system@
-xmllint = @xmllint@
-xsltproc = @xsltproc@
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index a91d497ce..65acd658c 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -25,8 +25,6 @@ clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 dist-files += $(man-pages)
 
 $(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md
-
-%.1: %.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
 # Generate the HTML manual.
diff --git a/tests/common.sh.in b/tests/common.sh.in
index 308126094..5e00d64f1 100644
--- a/tests/common.sh.in
+++ b/tests/common.sh.in
@@ -32,7 +32,6 @@ export PATH=@bindir@:$PATH
 coreutils=@coreutils@
 
 export dot=@dot@
-export xmllint="@xmllint@"
 export SHELL="@bash@"
 export PAGER=cat
 export HAVE_SODIUM="@HAVE_SODIUM@"
diff --git a/tests/nix-channel.sh b/tests/nix-channel.sh
index 49c68981a..63c0f97ba 100644
--- a/tests/nix-channel.sh
+++ b/tests/nix-channel.sh
@@ -28,9 +28,6 @@ nix-channel --update
 
 # Do a query.
 nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml
-if [ "$xmllint" != false ]; then
-    $xmllint --noout $TEST_ROOT/meta.xml || fail "malformed XML"
-fi
 grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml
 grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml
 
@@ -47,9 +44,6 @@ nix-channel --update
 
 # Do a query.
 nix-env -qa \* --meta --xml --out-path > $TEST_ROOT/meta.xml
-if [ "$xmllint" != false ]; then
-    $xmllint --noout $TEST_ROOT/meta.xml || fail "malformed XML"
-fi
 grep -q 'meta.*description.*Random test package' $TEST_ROOT/meta.xml
 grep -q 'item.*attrPath="foo".*name="dependencies-top"' $TEST_ROOT/meta.xml
 

From ebdc1f6dfbc4998dd974ee58bd66b51130b5abde Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 23:03:13 +0200
Subject: [PATCH 009/176] Typo

---
 doc/manual/hacking.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/hacking.xml b/doc/manual/hacking.xml
index d25d4b84a..5d9f08d38 100644
--- a/doc/manual/hacking.xml
+++ b/doc/manual/hacking.xml
@@ -32,7 +32,7 @@ i686-linux, x86_64-darwin, x86_64-linux.
 i.e.
 
 <screen>
-nix-build -A defaultPackage.x86_64-linux
+$ nix-build -A defaultPackage.x86_64-linux
 </screen>
 
 </para>

From 315407c16f16c3f1d6c5edc087b198c3b68d1dff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 23:03:28 +0200
Subject: [PATCH 010/176] Remove subtitles

---
 doc/manual/advanced-topics/diff-hook.xml       | 5 +----
 doc/manual/advanced-topics/post-build-hook.xml | 2 --
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/doc/manual/advanced-topics/diff-hook.xml b/doc/manual/advanced-topics/diff-hook.xml
index f01ab71b3..85cfdfc02 100644
--- a/doc/manual/advanced-topics/diff-hook.xml
+++ b/doc/manual/advanced-topics/diff-hook.xml
@@ -5,10 +5,7 @@
       version="5.0"
       >
 
-<title>Verifying Build Reproducibility with <option linkend="conf-diff-hook">diff-hook</option></title>
-
-<subtitle>Check build reproducibility by running builds multiple times
-and comparing their results.</subtitle>
+<title>Verifying Build Reproducibility</title>
 
 <para>Specify a program with Nix's <xref linkend="conf-diff-hook" /> to
 compare build results when two builds produce different results. Note:
diff --git a/doc/manual/advanced-topics/post-build-hook.xml b/doc/manual/advanced-topics/post-build-hook.xml
index 6cc286ee1..1480ab86a 100644
--- a/doc/manual/advanced-topics/post-build-hook.xml
+++ b/doc/manual/advanced-topics/post-build-hook.xml
@@ -6,8 +6,6 @@
       >
 
 <title>Using the <option linkend="conf-post-build-hook">post-build-hook</option></title>
-<subtitle>Uploading to an S3-compatible binary cache after each build</subtitle>
-
 
 <section xml:id="chap-post-build-hook-caveats">
   <title>Implementation Caveats</title>

From d004715665046ff424f267deccccb78c9d5cabb7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 23:03:53 +0200
Subject: [PATCH 011/176] Fix link

---
 doc/manual/src/quick-start.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/src/quick-start.md b/doc/manual/src/quick-start.md
index 21c03e3cf..3c519217b 100644
--- a/doc/manual/src/quick-start.md
+++ b/doc/manual/src/quick-start.md
@@ -11,7 +11,7 @@ to subsequent chapters.
    This will install Nix in `/nix`. The install script will create
    `/nix` using `sudo`, so make sure you have sufficient rights.  (For
    other installation methods, see
-   [here](../installation/installation.md).)
+   [here](installation/installation.md).)
 
 1. See what installable packages are currently available in the
    channel:

From ef606760abd87c98371fbc08c1f25ad897823a2a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 23:17:48 +0200
Subject: [PATCH 012/176] Pandoc conversion

---
 doc/manual/manual.md                          |   8 -
 doc/manual/src/SUMMARY.md                     |  90 +-
 .../src/advanced-topics/advanced-topics.md    |   1 +
 .../src/advanced-topics/cores-vs-jobs.md      |  42 +
 doc/manual/src/advanced-topics/diff-hook.md   | 141 +++
 .../src/advanced-topics/distributed-builds.md | 141 +++
 .../src/advanced-topics/post-build-hook.md    | 113 +++
 .../src/expressions/advanced-attributes.md    | 233 +++++
 .../src/expressions/arguments-variables.md    |  72 ++
 doc/manual/src/expressions/build-script.md    |  72 ++
 doc/manual/src/expressions/builder-syntax.md  |  72 ++
 doc/manual/src/expressions/builtins.md        | 839 ++++++++++++++++++
 doc/manual/src/expressions/derivations.md     | 154 ++++
 .../src/expressions/expression-language.md    |  12 +
 .../src/expressions/expression-syntax.md      |  91 ++
 doc/manual/src/expressions/generic-builder.md |  61 ++
 .../src/expressions/language-constructs.md    | 291 ++++++
 .../src/expressions/language-operators.md     |  32 +
 doc/manual/src/expressions/language-values.md | 209 +++++
 .../expressions/simple-building-testing.md    |  57 ++
 .../src/expressions/simple-expression.md      |  27 +
 .../expressions/writing-nix-expressions.md    |  12 +
 doc/manual/src/glossary.md                    | 102 +++
 doc/manual/src/hacking.md                     |  47 +
 .../src/installation/building-source.md       |  34 +
 doc/manual/src/installation/env-variables.md  |  56 ++
 doc/manual/src/installation/installation.md   |   2 +
 .../src/installation/installing-binary.md     | 273 ++++++
 .../src/installation/installing-source.md     |   4 +
 doc/manual/src/installation/multi-user.md     |  63 ++
 doc/manual/src/installation/nix-security.md   |  15 +
 .../src/installation/obtaining-source.md      |  16 +
 .../src/installation/prerequisites-source.md  |  80 ++
 doc/manual/src/installation/single-user.md    |   9 +
 .../src/installation/supported-platforms.md   |   7 +
 doc/manual/src/installation/upgrading.md      |  14 +
 .../package-management/basic-package-mgmt.md  | 148 +++
 .../binary-cache-substituter.md               |  42 +
 doc/manual/src/package-management/channels.md |  42 +
 .../src/package-management/copy-closure.md    |  34 +
 .../package-management/garbage-collection.md  |  61 ++
 .../garbage-collector-roots.md                |  16 +
 .../package-management/package-management.md  |   4 +
 doc/manual/src/package-management/profiles.md | 119 +++
 .../src/package-management/s3-substituter.md  | 133 +++
 .../package-management/sharing-packages.md    |   6 +
 .../src/package-management/ssh-substituter.md |  52 ++
 doc/manual/src/release-notes/release-notes.md |   1 +
 doc/manual/src/release-notes/rl-0.10.1.md     |   5 +
 doc/manual/src/release-notes/rl-0.10.md       | 212 +++++
 doc/manual/src/release-notes/rl-0.11.md       | 167 ++++
 doc/manual/src/release-notes/rl-0.12.md       | 123 +++
 doc/manual/src/release-notes/rl-0.13.md       |  55 ++
 doc/manual/src/release-notes/rl-0.14.md       |  21 +
 doc/manual/src/release-notes/rl-0.15.md       |   5 +
 doc/manual/src/release-notes/rl-0.16.md       |  25 +
 doc/manual/src/release-notes/rl-0.5.md        |   3 +
 doc/manual/src/release-notes/rl-0.6.md        |  64 ++
 doc/manual/src/release-notes/rl-0.7.md        |  21 +
 doc/manual/src/release-notes/rl-0.8.1.md      |   8 +
 doc/manual/src/release-notes/rl-0.8.md        | 166 ++++
 doc/manual/src/release-notes/rl-0.9.1.md      |   4 +
 doc/manual/src/release-notes/rl-0.9.2.md      |  11 +
 doc/manual/src/release-notes/rl-0.9.md        |  72 ++
 doc/manual/src/release-notes/rl-1.0.md        |  68 ++
 doc/manual/src/release-notes/rl-1.1.md        |  61 ++
 doc/manual/src/release-notes/rl-1.10.md       |  31 +
 doc/manual/src/release-notes/rl-1.11.10.md    |  21 +
 doc/manual/src/release-notes/rl-1.11.md       |  87 ++
 doc/manual/src/release-notes/rl-1.2.md        |  97 ++
 doc/manual/src/release-notes/rl-1.3.md        |  10 +
 doc/manual/src/release-notes/rl-1.4.md        |  22 +
 doc/manual/src/release-notes/rl-1.5.1.md      |   4 +
 doc/manual/src/release-notes/rl-1.5.2.md      |   4 +
 doc/manual/src/release-notes/rl-1.5.md        |   4 +
 doc/manual/src/release-notes/rl-1.6.1.md      |  32 +
 doc/manual/src/release-notes/rl-1.6.md        |  72 ++
 doc/manual/src/release-notes/rl-1.7.md        | 140 +++
 doc/manual/src/release-notes/rl-1.8.md        |  88 ++
 doc/manual/src/release-notes/rl-1.9.md        | 143 +++
 doc/manual/src/release-notes/rl-2.0.md        | 557 ++++++++++++
 doc/manual/src/release-notes/rl-2.1.md        |  49 +
 doc/manual/src/release-notes/rl-2.2.md        |  82 ++
 doc/manual/src/release-notes/rl-2.3.md        |  44 +
 84 files changed, 6715 insertions(+), 13 deletions(-)
 delete mode 100644 doc/manual/manual.md
 create mode 100644 doc/manual/src/advanced-topics/advanced-topics.md
 create mode 100644 doc/manual/src/advanced-topics/cores-vs-jobs.md
 create mode 100644 doc/manual/src/advanced-topics/diff-hook.md
 create mode 100644 doc/manual/src/advanced-topics/distributed-builds.md
 create mode 100644 doc/manual/src/advanced-topics/post-build-hook.md
 create mode 100644 doc/manual/src/expressions/advanced-attributes.md
 create mode 100644 doc/manual/src/expressions/arguments-variables.md
 create mode 100644 doc/manual/src/expressions/build-script.md
 create mode 100644 doc/manual/src/expressions/builder-syntax.md
 create mode 100644 doc/manual/src/expressions/builtins.md
 create mode 100644 doc/manual/src/expressions/derivations.md
 create mode 100644 doc/manual/src/expressions/expression-language.md
 create mode 100644 doc/manual/src/expressions/expression-syntax.md
 create mode 100644 doc/manual/src/expressions/generic-builder.md
 create mode 100644 doc/manual/src/expressions/language-constructs.md
 create mode 100644 doc/manual/src/expressions/language-operators.md
 create mode 100644 doc/manual/src/expressions/language-values.md
 create mode 100644 doc/manual/src/expressions/simple-building-testing.md
 create mode 100644 doc/manual/src/expressions/simple-expression.md
 create mode 100644 doc/manual/src/expressions/writing-nix-expressions.md
 create mode 100644 doc/manual/src/glossary.md
 create mode 100644 doc/manual/src/hacking.md
 create mode 100644 doc/manual/src/installation/building-source.md
 create mode 100644 doc/manual/src/installation/env-variables.md
 create mode 100644 doc/manual/src/installation/installation.md
 create mode 100644 doc/manual/src/installation/installing-binary.md
 create mode 100644 doc/manual/src/installation/installing-source.md
 create mode 100644 doc/manual/src/installation/multi-user.md
 create mode 100644 doc/manual/src/installation/nix-security.md
 create mode 100644 doc/manual/src/installation/obtaining-source.md
 create mode 100644 doc/manual/src/installation/prerequisites-source.md
 create mode 100644 doc/manual/src/installation/single-user.md
 create mode 100644 doc/manual/src/installation/supported-platforms.md
 create mode 100644 doc/manual/src/installation/upgrading.md
 create mode 100644 doc/manual/src/package-management/basic-package-mgmt.md
 create mode 100644 doc/manual/src/package-management/binary-cache-substituter.md
 create mode 100644 doc/manual/src/package-management/channels.md
 create mode 100644 doc/manual/src/package-management/copy-closure.md
 create mode 100644 doc/manual/src/package-management/garbage-collection.md
 create mode 100644 doc/manual/src/package-management/garbage-collector-roots.md
 create mode 100644 doc/manual/src/package-management/package-management.md
 create mode 100644 doc/manual/src/package-management/profiles.md
 create mode 100644 doc/manual/src/package-management/s3-substituter.md
 create mode 100644 doc/manual/src/package-management/sharing-packages.md
 create mode 100644 doc/manual/src/package-management/ssh-substituter.md
 create mode 100644 doc/manual/src/release-notes/release-notes.md
 create mode 100644 doc/manual/src/release-notes/rl-0.10.1.md
 create mode 100644 doc/manual/src/release-notes/rl-0.10.md
 create mode 100644 doc/manual/src/release-notes/rl-0.11.md
 create mode 100644 doc/manual/src/release-notes/rl-0.12.md
 create mode 100644 doc/manual/src/release-notes/rl-0.13.md
 create mode 100644 doc/manual/src/release-notes/rl-0.14.md
 create mode 100644 doc/manual/src/release-notes/rl-0.15.md
 create mode 100644 doc/manual/src/release-notes/rl-0.16.md
 create mode 100644 doc/manual/src/release-notes/rl-0.5.md
 create mode 100644 doc/manual/src/release-notes/rl-0.6.md
 create mode 100644 doc/manual/src/release-notes/rl-0.7.md
 create mode 100644 doc/manual/src/release-notes/rl-0.8.1.md
 create mode 100644 doc/manual/src/release-notes/rl-0.8.md
 create mode 100644 doc/manual/src/release-notes/rl-0.9.1.md
 create mode 100644 doc/manual/src/release-notes/rl-0.9.2.md
 create mode 100644 doc/manual/src/release-notes/rl-0.9.md
 create mode 100644 doc/manual/src/release-notes/rl-1.0.md
 create mode 100644 doc/manual/src/release-notes/rl-1.1.md
 create mode 100644 doc/manual/src/release-notes/rl-1.10.md
 create mode 100644 doc/manual/src/release-notes/rl-1.11.10.md
 create mode 100644 doc/manual/src/release-notes/rl-1.11.md
 create mode 100644 doc/manual/src/release-notes/rl-1.2.md
 create mode 100644 doc/manual/src/release-notes/rl-1.3.md
 create mode 100644 doc/manual/src/release-notes/rl-1.4.md
 create mode 100644 doc/manual/src/release-notes/rl-1.5.1.md
 create mode 100644 doc/manual/src/release-notes/rl-1.5.2.md
 create mode 100644 doc/manual/src/release-notes/rl-1.5.md
 create mode 100644 doc/manual/src/release-notes/rl-1.6.1.md
 create mode 100644 doc/manual/src/release-notes/rl-1.6.md
 create mode 100644 doc/manual/src/release-notes/rl-1.7.md
 create mode 100644 doc/manual/src/release-notes/rl-1.8.md
 create mode 100644 doc/manual/src/release-notes/rl-1.9.md
 create mode 100644 doc/manual/src/release-notes/rl-2.0.md
 create mode 100644 doc/manual/src/release-notes/rl-2.1.md
 create mode 100644 doc/manual/src/release-notes/rl-2.2.md
 create mode 100644 doc/manual/src/release-notes/rl-2.3.md

diff --git a/doc/manual/manual.md b/doc/manual/manual.md
deleted file mode 100644
index 58e37436f..000000000
--- a/doc/manual/manual.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Title: Nix Package Manager Guide
-
-1. Introduction
-   1. [About Nix](./introduction/about-nix.md)
-   1. [Quick Start](./introduction/quick-start.md)
-1. Command Reference
-   1. Utilities
-      1. [nix-copy-closure](./command-ref/nix-copy-closure.md)
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 6897f70d9..f562d1db4 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -1,7 +1,87 @@
 # Table of Contents
 
-- [Introduction](./introduction.md)
-- [Quick Start](./quick-start.md)
-- [Command Reference](./command-ref/command-ref.md)
-  - [Utilities](./command-ref/utilities.md)
-    - [nix-copy-closure](./command-ref/nix-copy-closure.md)
+- [Introduction](introduction.md)
+- [Quick Start](quick-start.md)
+- [Installation](installation/installation.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)
+  - [Security](installation/nix-security.md)
+    - [Single-User Mode](installation/single-user.md)
+    - [Multi-User Mode](installation/multi-user.md)
+  - [Environment Variables](installation/env-variables.md)
+  - [Upgrading Nix](installation/upgrading.md)
+- [Package Management](package-management/package-management.md)
+  - [Basic Package Management](package-management/basic-package-mgmt.md)
+  - [Profiles](package-management/profiles.md)
+  - [Garbage Collection](package-management/garbage-collection.md)
+    - [Garbage Collector Roots](package-management/garbage-collector-roots.md)
+  - [Channels](package-management/channels.md)
+  - [Sharing Packages Between Machines](package-management/sharing-packages.md)
+    - [Serving a Nix store via HTTP](package-management/binary-cache-substituter.md)
+    - [Copying Closures Via SSH](package-management/copy-closure.md)
+    - [Serving a Nix store via SSH](package-management/ssh-substituter.md)
+    - [Serving a Nix store via AWS S3 or S3-compatible Service](package-management/s3-substituter.md)
+- [Writing Nix Expressions](expressions/writing-nix-expressions.md)
+  - [A Simple Nix Expression](expressions/simple-expression.md)
+    - [Expression Syntax](expressions/expression-syntax.md)
+    - [Build Script](expressions/build-script.md)
+    - [Arguments and Variables](expressions/arguments-variables.md)
+    - [Building and Testing](expressions/simple-building-testing.md)
+    - [Generic Builder Syntax](expressions/generic-builder.md)
+  - [Writing Nix Expressions](expressions/expression-language.md)
+    - [Values](expressions/language-values.md)
+    - [Language Constructs](expressions/language-constructs.md)
+    - [Operators](expressions/language-operators.md)
+    - [Derivations](expressions/derivations.md)
+      - [Advanced Attributes](expressions/advanced-attributes.md)
+    - [Built-in Functions](expressions/builtins.md)
+- [Advanced Topics](advanced-topics/advanced-topics.md)
+  - [Remote Builds](advanced-topics/distributed-builds.md)
+  - [Tuning Cores and Jobs](advanced-topics/cores-vs-jobs.md)
+  - [Verifying Build Reproducibility](advanced-topics/diff-hook.md)
+  - [Using the `post-build-hook`](advanced-topics/post-build-hook.md)
+- [Command Reference](command-ref/command-ref.md)
+  - [Utilities](command-ref/utilities.md)
+    - [nix-copy-closure](command-ref/nix-copy-closure.md)
+- [Glossary](glossary.md)
+- [Hacking](hacking.md)
+- [Release Notes](release-notes/release-notes.md)
+  - [Release 2.3 (2019-09-04)](release-notes/rl-2.3.md)
+  - [Release 2.2 (2019-01-11)](release-notes/rl-2.2.md)
+  - [Release 2.1 (2018-09-02)](release-notes/rl-2.1.md)
+  - [Release 2.0 (2018-02-22)](release-notes/rl-2.0.md)
+  - [Release 1.11.10 (2017-06-12)](release-notes/rl-1.11.10.md)
+  - [Release 1.11 (2016-01-19)](release-notes/rl-1.11.md)
+  - [Release 1.10 (2015-09-03)](release-notes/rl-1.10.md)
+  - [Release 1.9 (2015-06-12)](release-notes/rl-1.9.md)
+  - [Release 1.8 (2014-12-14)](release-notes/rl-1.8.md)
+  - [Release 1.7 (2014-04-11)](release-notes/rl-1.7.md)
+  - [Release 1.6.1 (2013-10-28)](release-notes/rl-1.6.1.md)
+  - [Release 1.6 (2013-09-10)](release-notes/rl-1.6.md)
+  - [Release 1.5.2 (2013-05-13)](release-notes/rl-1.5.2.md)
+  - [Release 1.5 (2013-02-27)](release-notes/rl-1.5.md)
+  - [Release 1.4 (2013-02-26)](release-notes/rl-1.4.md)
+  - [Release 1.3 (2013-01-04)](release-notes/rl-1.3.md)
+  - [Release 1.2 (2012-12-06)](release-notes/rl-1.2.md)
+  - [Release 1.1 (2012-07-18)](release-notes/rl-1.1.md)
+  - [Release 1.0 (2012-05-11)](release-notes/rl-1.0.md)
+  - [Release 0.16 (2010-08-17)](release-notes/rl-0.16.md)
+  - [Release 0.15 (2010-03-17)](release-notes/rl-0.15.md)
+  - [Release 0.14 (2010-02-04)](release-notes/rl-0.14.md)
+  - [Release 0.13 (2009-11-05)](release-notes/rl-0.13.md)
+  - [Release 0.12 (2008-11-20)](release-notes/rl-0.12.md)
+  - [Release 0.11 (2007-12-31)](release-notes/rl-0.11.md)
+  - [Release 0.10.1 (2006-10-11)](release-notes/rl-0.10.1.md)
+  - [Release 0.10 (2006-10-06)](release-notes/rl-0.10.md)
+  - [Release 0.9.2 (2005-09-21)](release-notes/rl-0.9.2.md)
+  - [Release 0.9.1 (2005-09-20)](release-notes/rl-0.9.1.md)
+  - [Release 0.9 (2005-09-16)](release-notes/rl-0.9.md)
+  - [Release 0.8.1 (2005-04-13)](release-notes/rl-0.8.1.md)
+  - [Release 0.8 (2005-04-11)](release-notes/rl-0.8.md)
+  - [Release 0.7 (2005-01-12)](release-notes/rl-0.7.md)
+  - [Release 0.6 (2004-11-14)](release-notes/rl-0.6.md)
+  - [Release 0.5 and earlier](release-notes/rl-0.5.md)
diff --git a/doc/manual/src/advanced-topics/advanced-topics.md b/doc/manual/src/advanced-topics/advanced-topics.md
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/doc/manual/src/advanced-topics/advanced-topics.md
@@ -0,0 +1 @@
+
diff --git a/doc/manual/src/advanced-topics/cores-vs-jobs.md b/doc/manual/src/advanced-topics/cores-vs-jobs.md
new file mode 100644
index 000000000..846b6356e
--- /dev/null
+++ b/doc/manual/src/advanced-topics/cores-vs-jobs.md
@@ -0,0 +1,42 @@
+# Tuning Cores and Jobs
+
+Nix has two relevant settings with regards to how your CPU cores will be
+utilized: [???](#conf-cores) and [???](#conf-max-jobs). This chapter
+will talk about what they are, how they interact, and their
+configuration trade-offs.
+
+  - [???](#conf-max-jobs)  
+    Dictates how many separate derivations will be built at the same
+    time. If you set this to zero, the local machine will do no builds.
+    Nix will still substitute from binary caches, and build remotely if
+    remote builders are configured.
+
+  - [???](#conf-cores)  
+    Suggests how many cores each derivation should use. Similar to `make
+    -j`.
+
+The [???](#conf-cores) setting determines the value of
+NIX\_BUILD\_CORES. NIX\_BUILD\_CORES is equal to [???](#conf-cores),
+unless [???](#conf-cores) equals `0`, in which case NIX\_BUILD\_CORES
+will be the total number of cores in the system.
+
+The maximum number of consumed cores is a simple multiplication,
+[???](#conf-max-jobs) \* NIX\_BUILD\_CORES.
+
+The balance on how to set these two independent variables depends upon
+each builder's workload and hardware. Here are a few example scenarios
+on a machine with 24 cores:
+
+| [???](#conf-max-jobs) | [???](#conf-cores) | NIX\_BUILD\_CORES | Maximum Processes | Result                                                                                                                                                                                                                                                                                 |
+| --------------------- | ------------------ | ----------------- | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| 1                     | 24                 | 24                | 24                | One derivation will be built at a time, each one can use 24 cores. Undersold if a job can’t use 24 cores.                                                                                                                                                                              |
+| 4                     | 6                  | 6                 | 24                | Four derivations will be built at once, each given access to six cores.                                                                                                                                                                                                                |
+| 12                    | 6                  | 6                 | 72                | 12 derivations will be built at once, each given access to six cores. This configuration is over-sold. If all 12 derivations being built simultaneously try to use all six cores, the machine's performance will be degraded due to extensive context switching between the 12 builds. |
+| 24                    | 1                  | 1                 | 24                | 24 derivations can build at the same time, each using a single core. Never oversold, but derivations which require many cores will be very slow to compile.                                                                                                                            |
+| 24                    | 0                  | 24                | 576               | 24 derivations can build at the same time, each using all the available cores of the machine. Very likely to be oversold, and very likely to suffer context switches.                                                                                                                  |
+
+Balancing 24 Build Cores
+
+It is up to the derivations' build script to respect host's requested
+cores-per-build by following the value of the NIX\_BUILD\_CORES
+environment variable.
diff --git a/doc/manual/src/advanced-topics/diff-hook.md b/doc/manual/src/advanced-topics/diff-hook.md
new file mode 100644
index 000000000..2c9896fa5
--- /dev/null
+++ b/doc/manual/src/advanced-topics/diff-hook.md
@@ -0,0 +1,141 @@
+# Verifying Build Reproducibility
+
+Specify a program with Nix's [???](#conf-diff-hook) to compare build
+results when two builds produce different results. Note: this hook is
+only executed if the results are not the same, this hook is not used for
+determining if the results are the same.
+
+For purposes of demonstration, we'll use the following Nix file,
+`deterministic.nix` for testing:
+
+    let
+      inherit (import <nixpkgs> {}) runCommand;
+    in {
+      stable = runCommand "stable" {} ''
+        touch $out
+      '';
+    
+      unstable = runCommand "unstable" {} ''
+        echo $RANDOM > $out
+      '';
+    }
+
+Additionally, `nix.conf` contains:
+
+    diff-hook = /etc/nix/my-diff-hook
+    run-diff-hook = true
+
+where `/etc/nix/my-diff-hook` is an executable file containing:
+
+    #!/bin/sh
+    exec >&2
+    echo "For derivation $3:"
+    /run/current-system/sw/bin/diff -r "$1" "$2"
+
+The diff hook is executed by the same user and group who ran the build.
+However, the diff hook does not have write access to the store path just
+built.
+
+# Spot-Checking Build Determinism
+
+Verify a path which already exists in the Nix store by passing `--check`
+to the build command.
+
+If the build passes and is deterministic, Nix will exit with a status
+code of 0:
+
+    $ nix-build ./deterministic.nix -A stable
+    this derivation will be built:
+      /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv
+    building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
+    /nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
+    
+    $ nix-build ./deterministic.nix -A stable --check
+    checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
+    /nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
+
+If the build is not deterministic, Nix will exit with a status code of
+1:
+
+    $ nix-build ./deterministic.nix -A unstable
+    this derivation will be built:
+      /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv
+    building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+    /nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable
+    
+    $ nix-build ./deterministic.nix -A unstable --check
+    checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+    error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
+
+In the Nix daemon's log, we will now see:
+
+    For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
+    1c1
+    < 8108
+    ---
+    > 30204
+
+Using `--check` with `--keep-failed` will cause Nix to keep the second
+build's output in a special, `.check` path:
+
+    $ nix-build ./deterministic.nix -A unstable --check --keep-failed
+    checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+    note: keeping build directory '/tmp/nix-build-unstable.drv-0'
+    error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check'
+
+In particular, notice the
+`/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check` output. Nix
+has copied the build results to that directory where you can examine it.
+
+> **Note**
+> 
+> Check paths are not protected against garbage collection, and this
+> path will be deleted on the next garbage collection.
+> 
+> The path is guaranteed to be alive for the duration of
+> [???](#conf-diff-hook)'s execution, but may be deleted any time after.
+> 
+> If the comparison is performed as part of automated tooling, please
+> use the diff-hook or author your tooling to handle the case where the
+> build was not deterministic and also a check path does not exist.
+
+`--check` is only usable if the derivation has been built on the system
+already. If the derivation has not been built Nix will fail with the
+error:
+
+    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' are not valid, so checking is not possible
+
+Run the build without `--check`, and then try with `--check` again.
+
+# Automatic and Optionally Enforced Determinism Verification
+
+Automatically verify every build at build time by executing the build
+multiple times.
+
+Setting [???](#conf-repeat) and [???](#conf-enforce-determinism) in your
+`nix.conf` permits the automated verification of every build Nix
+performs.
+
+The following configuration will run each build three times, and will
+require the build to be deterministic:
+
+    enforce-determinism = true
+    repeat = 2
+
+Setting [???](#conf-enforce-determinism) to false as in the following
+configuration will run the build multiple times, execute the build hook,
+but will allow the build to succeed even if it does not build
+reproducibly:
+
+    enforce-determinism = false
+    repeat = 1
+
+An example output of this configuration:
+
+    $ nix-build ./test.nix -A unstable
+    this derivation will be built:
+      /nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv
+    building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 1/2)...
+    building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 2/2)...
+    output '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable' of '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' differs from '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable.check' from previous round
+    /nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable
diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md
new file mode 100644
index 000000000..197708ee5
--- /dev/null
+++ b/doc/manual/src/advanced-topics/distributed-builds.md
@@ -0,0 +1,141 @@
+# Remote Builds
+
+Nix supports remote builds, where a local Nix installation can forward
+Nix builds to other machines. This allows multiple builds to be
+performed in parallel and allows Nix to perform multi-platform builds in
+a semi-transparent way. For instance, if you perform a build for a
+`x86_64-darwin` on an `i686-linux` machine, Nix can automatically
+forward the build to a `x86_64-darwin` machine, if available.
+
+To forward a build to a remote machine, it’s required that the remote
+machine is accessible via SSH and that it has Nix installed. You can
+test whether connecting to the remote Nix instance works, e.g.
+
+    $ nix ping-store --store ssh://mac
+
+will try to connect to the machine named `mac`. It is possible to
+specify an SSH identity file as part of the remote store URI, e.g.
+
+    $ nix ping-store --store ssh://mac?ssh-key=/home/alice/my-key
+
+Since builds should be non-interactive, the key should not have a
+passphrase. Alternatively, you can load identities ahead of time into
+`ssh-agent` or `gpg-agent`.
+
+If you get the error
+
+    bash: nix-store: command not found
+    error: cannot connect to 'mac'
+
+then you need to ensure that the PATH of non-interactive login shells
+contains Nix.
+
+> **Warning**
+> 
+> If you are building via the Nix daemon, it is the Nix daemon user
+> account (that is, `root`) that should have SSH access to the remote
+> machine. If you can’t or don’t want to configure `root` to be able to
+> access to remote machine, you can use a private Nix store instead by
+> passing e.g. `--store ~/my-nix`.
+
+The list of remote machines can be specified on the command line or in
+the Nix configuration file. The former is convenient for testing. For
+example, the following command allows you to build a derivation for
+`x86_64-darwin` on a Linux machine:
+
+    $ uname
+    Linux
+    
+    $ nix build \
+      '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
+      --builders 'ssh://mac x86_64-darwin'
+    [1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
+    
+    $ cat ./result
+    Darwin
+
+It is possible to specify multiple builders separated by a semicolon or
+a newline, e.g.
+
+``` 
+  --builders 'ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd'
+```
+
+Each machine specification consists of the following elements, separated
+by spaces. Only the first element is required. To leave a field at its
+default, set it to `-`.
+
+1.  The URI of the remote store in the format
+    `ssh://[username@]hostname`, e.g. `ssh://nix@mac` or `ssh://mac`.
+    For backward compatibility, `ssh://` may be omitted. The hostname
+    may be an alias defined in your `~/.ssh/config`.
+
+2.  A comma-separated list of Nix platform type identifiers, such as
+    `x86_64-darwin`. It is possible for a machine to support multiple
+    platform types, e.g., `i686-linux,x86_64-linux`. If omitted, this
+    defaults to the local platform type.
+
+3.  The SSH identity file to be used to log in to the remote machine. If
+    omitted, SSH will use its regular identities.
+
+4.  The maximum number of builds that Nix will execute in parallel on
+    the machine. Typically this should be equal to the number of CPU
+    cores. For instance, the machine `itchy` in the example will execute
+    up to 8 builds in parallel.
+
+5.  The “speed factor”, indicating the relative speed of the machine. If
+    there are multiple machines of the right type, Nix will prefer the
+    fastest, taking load into account.
+
+6.  A comma-separated list of *supported features*. If a derivation has
+    the `requiredSystemFeatures` attribute, then Nix will only perform
+    the derivation on a machine that has the specified features. For
+    instance, the attribute
+    
+        requiredSystemFeatures = [ "kvm" ];
+    
+    will cause the build to be performed on a machine that has the `kvm`
+    feature.
+
+7.  A comma-separated list of *mandatory features*. A machine will only
+    be used to build a derivation if all of the machine’s mandatory
+    features appear in the derivation’s `requiredSystemFeatures`
+    attribute..
+
+For example, the machine specification
+
+    nix@scratchy.labs.cs.uu.nl  i686-linux      /home/nix/.ssh/id_scratchy_auto        8 1 kvm
+    nix@itchy.labs.cs.uu.nl     i686-linux      /home/nix/.ssh/id_scratchy_auto        8 2
+    nix@poochie.labs.cs.uu.nl   i686-linux      /home/nix/.ssh/id_scratchy_auto        1 2 kvm benchmark
+
+specifies several machines that can perform `i686-linux` builds.
+However, `poochie` will only do builds that have the attribute
+
+    requiredSystemFeatures = [ "benchmark" ];
+
+or
+
+    requiredSystemFeatures = [ "benchmark" "kvm" ];
+
+`itchy` cannot do builds that require `kvm`, but `scratchy` does support
+such builds. For regular builds, `itchy` will be preferred over
+`scratchy` because it has a higher speed factor.
+
+Remote builders can also be configured in `nix.conf`, e.g.
+
+    builders = ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd
+
+Finally, remote builders can be configured in a separate configuration
+file included in `builders` via the syntax `@file`. For example,
+
+    builders = @/etc/nix/machines
+
+causes the list of machines in `/etc/nix/machines` to be included. (This
+is the default.)
+
+If you want the builders to use caches, you likely want to set the
+option [`builders-use-substitutes`](#conf-builders-use-substitutes) in
+your local `nix.conf`.
+
+To build only on remote builders and disable building on the local
+machine, you can use the option `--max-jobs 0`.
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/src/advanced-topics/post-build-hook.md
new file mode 100644
index 000000000..166b57da6
--- /dev/null
+++ b/doc/manual/src/advanced-topics/post-build-hook.md
@@ -0,0 +1,113 @@
+# Using the `post-build-hook`
+
+# Implementation Caveats
+
+Here we use the post-build hook to upload to a binary cache. This is a
+simple and working example, but it is not suitable for all use cases.
+
+The post build hook program runs after each executed build, and blocks
+the build loop. The build loop exits if the hook program fails.
+
+Concretely, this implementation will make Nix slow or unusable when the
+internet is slow or unreliable.
+
+A more advanced implementation might pass the store paths to a
+user-supplied daemon or queue for processing the store paths outside of
+the build loop.
+
+# Prerequisites
+
+This tutorial assumes you have configured an S3-compatible binary cache
+according to the instructions at
+[???](#ssec-s3-substituter-authenticated-writes), and that the `root`
+user's default AWS profile can upload to the bucket.
+
+# Set up a Signing Key
+
+Use `nix-store --generate-binary-cache-key` to create our public and
+private signing keys. We will sign paths with the private key, and
+distribute the public key for verifying the authenticity of the paths.
+
+    # nix-store --generate-binary-cache-key example-nix-cache-1 /etc/nix/key.private /etc/nix/key.public
+    # cat /etc/nix/key.public
+    example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
+
+Then, add the public key and the cache URL to your `nix.conf`'s
+[???](#conf-trusted-public-keys) and [???](#conf-substituters) like:
+
+    substituters = https://cache.nixos.org/ s3://example-nix-cache
+    trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
+
+We will restart the Nix daemon in a later step.
+
+# Implementing the build hook
+
+Write the following script to `/etc/nix/upload-to-cache.sh`:
+
+    #!/bin/sh
+    
+    set -eu
+    set -f # disable globbing
+    export IFS=' '
+    
+    echo "Signing paths" $OUT_PATHS
+    nix sign-paths --key-file /etc/nix/key.private $OUT_PATHS
+    echo "Uploading paths" $OUT_PATHS
+    exec nix copy --to 's3://example-nix-cache' $OUT_PATHS
+
+> **Note**
+> 
+> The `$OUT_PATHS` variable is a space-separated list of Nix store
+> paths. In this case, we expect and want the shell to perform word
+> splitting to make each output path its own argument to `nix
+> sign-paths`. Nix guarantees the paths will not contain any spaces,
+> however a store path might contain glob characters. The `set -f`
+> disables globbing in the shell.
+
+Then make sure the hook program is executable by the `root` user:
+
+    # chmod +x /etc/nix/upload-to-cache.sh
+
+# Updating Nix Configuration
+
+Edit `/etc/nix/nix.conf` to run our hook, by adding the following
+configuration snippet at the end:
+
+    post-build-hook = /etc/nix/upload-to-cache.sh
+
+Then, restart the `nix-daemon`.
+
+# Testing
+
+Build any derivation, for example:
+
+    $ nix-build -E '(import <nixpkgs> {}).writeText "example" (builtins.toString builtins.currentTime)'
+    this derivation will be built:
+      /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv
+    building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv'...
+    running post-build-hook '/home/grahamc/projects/github.com/NixOS/nix/post-hook.sh'...
+    post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+    post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+    /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+
+Then delete the path from the store, and try substituting it from the
+binary cache:
+
+    $ rm ./result
+    $ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+
+Now, copy the path back from the cache:
+
+    $ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+    copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example from 's3://example-nix-cache'...
+    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
+    /nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example
+
+# Conclusion
+
+We now have a Nix installation configured to automatically sign and
+upload every local build to a remote binary cache.
+
+Before deploying this to production, be sure to consider the
+implementation caveats in [Implementation
+Caveats](#chap-post-build-hook-caveats).
diff --git a/doc/manual/src/expressions/advanced-attributes.md b/doc/manual/src/expressions/advanced-attributes.md
new file mode 100644
index 000000000..683b504a7
--- /dev/null
+++ b/doc/manual/src/expressions/advanced-attributes.md
@@ -0,0 +1,233 @@
+# Advanced Attributes
+
+Derivations can declare some infrequently used optional attributes.
+
+  - `allowedReferences`  
+    The optional attribute `allowedReferences` specifies a list of legal
+    references (dependencies) of the output of the builder. For example,
+    
+        allowedReferences = [];
+    
+    enforces that the output of a derivation cannot have any runtime
+    dependencies on its inputs. To allow an output to have a runtime
+    dependency on itself, use `"out"` as a list item. This is used in
+    NixOS to check that generated files such as initial ramdisks for
+    booting Linux don’t have accidental dependencies on other paths in
+    the Nix store.
+
+  - `allowedRequisites`  
+    This attribute is similar to `allowedReferences`, but it specifies
+    the legal requisites of the whole closure, so all the dependencies
+    recursively. For example,
+    
+        allowedRequisites = [ foobar ];
+    
+    enforces that the output of a derivation cannot have any other
+    runtime dependency than `foobar`, and in addition it enforces that
+    `foobar` itself doesn't introduce any other dependency itself.
+
+  - `disallowedReferences`  
+    The optional attribute `disallowedReferences` specifies a list of
+    illegal references (dependencies) of the output of the builder. For
+    example,
+    
+        disallowedReferences = [ foo ];
+    
+    enforces that the output of a derivation cannot have a direct
+    runtime dependencies on the derivation `foo`.
+
+  - `disallowedRequisites`  
+    This attribute is similar to `disallowedReferences`, but it
+    specifies illegal requisites for the whole closure, so all the
+    dependencies recursively. For example,
+    
+        disallowedRequisites = [ foobar ];
+    
+    enforces that the output of a derivation cannot have any runtime
+    dependency on `foobar` or any other derivation depending recursively
+    on `foobar`.
+
+  - `exportReferencesGraph`  
+    This attribute allows builders access to the references graph of
+    their inputs. The attribute is a list of inputs in the Nix store
+    whose references graph the builder needs to know. The value of this
+    attribute should be a list of pairs `[ name1
+                    path1 name2
+                    path2 ...
+                    ]`. The references graph of each pathN will be stored in a text file
+    nameN in the temporary build directory. The text files have the
+    format used by `nix-store
+                    --register-validity` (with the deriver fields left empty). For
+    example, when the following derivation is built:
+    
+        derivation {
+          ...
+          exportReferencesGraph = [ "libfoo-graph" libfoo ];
+        };
+    
+    the references graph of `libfoo` is placed in the file
+    `libfoo-graph` in the temporary build directory.
+    
+    `exportReferencesGraph` is useful for builders that want to do
+    something with the closure of a store path. Examples include the
+    builders in NixOS that generate the initial ramdisk for booting
+    Linux (a `cpio` archive containing the closure of the boot script)
+    and the ISO-9660 image for the installation CD (which is populated
+    with a Nix store containing the closure of a bootable NixOS
+    configuration).
+
+  - `impureEnvVars`  
+    This attribute allows you to specify a list of environment variables
+    that should be passed from the environment of the calling user to
+    the builder. Usually, the environment is cleared completely when the
+    builder is executed, but with this attribute you can allow specific
+    environment variables to be passed unmodified. For example,
+    `fetchurl` in Nixpkgs has the line
+    
+        impureEnvVars = [ "http_proxy" "https_proxy" ... ];
+    
+    to make it use the proxy server configuration specified by the user
+    in the environment variables http\_proxy and friends.
+    
+    This attribute is only allowed in [fixed-output
+    derivations](#fixed-output-drvs), where impurities such as these are
+    okay since (the hash of) the output is known in advance. It is
+    ignored for all other derivations.
+    
+    > **Warning**
+    > 
+    > `impureEnvVars` implementation takes environment variables from
+    > the current builder process. When a daemon is building its
+    > environmental variables are used. Without the daemon, the
+    > environmental variables come from the environment of the
+    > `nix-build`.
+
+  - `outputHash`; `outputHashAlgo`; `outputHashMode`  
+    These attributes declare that the derivation is a so-called
+    *fixed-output derivation*, which means that a cryptographic hash of
+    the output is already known in advance. When the build of a
+    fixed-output derivation finishes, Nix computes the cryptographic
+    hash of the output and compares it to the hash declared with these
+    attributes. If there is a mismatch, the build fails.
+    
+    The rationale for fixed-output derivations is derivations such as
+    those produced by the `fetchurl` function. This function downloads a
+    file from a given URL. To ensure that the downloaded file has not
+    been modified, the caller must also specify a cryptographic hash of
+    the file. For example,
+    
+        fetchurl {
+          url = "http://ftp.gnu.org/pub/gnu/hello/hello-2.1.1.tar.gz";
+          sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+        }
+    
+    It sometimes happens that the URL of the file changes, e.g., because
+    servers are reorganised or no longer available. We then must update
+    the call to `fetchurl`, e.g.,
+    
+        fetchurl {
+          url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+          sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+        }
+    
+    If a `fetchurl` derivation was treated like a normal derivation, the
+    output paths of the derivation and *all derivations depending on it*
+    would change. For instance, if we were to change the URL of the
+    Glibc source distribution in Nixpkgs (a package on which almost all
+    other packages depend) massive rebuilds would be needed. This is
+    unfortunate for a change which we know cannot have a real effect as
+    it propagates upwards through the dependency graph.
+    
+    For fixed-output derivations, on the other hand, the name of the
+    output path only depends on the `outputHash*` and `name` attributes,
+    while all other attributes are ignored for the purpose of computing
+    the output path. (The `name` attribute is included because it is
+    part of the path.)
+    
+    As an example, here is the (simplified) Nix expression for
+    `fetchurl`:
+    
+        { stdenv, curl }: # The curl program is used for downloading.
+        
+        { url, sha256 }:
+        
+        stdenv.mkDerivation {
+          name = baseNameOf (toString url);
+          builder = ./builder.sh;
+          buildInputs = [ curl ];
+        
+          # This is a fixed-output derivation; the output must be a regular
+          # file with SHA256 hash sha256.
+          outputHashMode = "flat";
+          outputHashAlgo = "sha256";
+          outputHash = sha256;
+        
+          inherit url;
+        }
+    
+    The `outputHashAlgo` attribute specifies the hash algorithm used to
+    compute the hash. It can currently be `"sha1"`, `"sha256"` or
+    `"sha512"`.
+    
+    The `outputHashMode` attribute determines how the hash is computed.
+    It must be one of the following two values:
+    
+      - `"flat"`  
+        The output must be a non-executable regular file. If it isn’t,
+        the build fails. The hash is simply computed over the contents
+        of that file (so it’s equal to what Unix commands like
+        `sha256sum` or `sha1sum` produce).
+        
+        This is the default.
+    
+      - `"recursive"`  
+        The hash is computed over the NAR archive dump of the output
+        (i.e., the result of [`nix-store
+                                                                        --dump`](#refsec-nix-store-dump)). In this case, the output can
+        be anything, including a directory tree.
+    
+    The `outputHash` attribute, finally, must be a string containing the
+    hash in either hexadecimal or base-32 notation. (See the [`nix-hash`
+    command](#sec-nix-hash) for information about converting to and from
+    base-32 notation.)
+
+  - `passAsFile`  
+    A list of names of attributes that should be passed via files rather
+    than environment variables. For example, if you have
+    
+    ``` 
+    passAsFile = ["big"];
+    big = "a very long string";
+        
+    ```
+    
+    then when the builder runs, the environment variable bigPath will
+    contain the absolute path to a temporary file containing `a very
+    long
+                    string`. That is, for any attribute x listed in `passAsFile`, Nix
+    will pass an environment variable xPath holding the path of the file
+    containing the value of attribute x. This is useful when you need to
+    pass large strings to a builder, since most operating systems impose
+    a limit on the size of the environment (typically, a few hundred
+    kilobyte).
+
+  - `preferLocalBuild`  
+    If this attribute is set to `true` and [distributed building is
+    enabled](#chap-distributed-builds), then, if possible, the derivaton
+    will be built locally instead of forwarded to a remote machine. This
+    is appropriate for trivial builders where the cost of doing a
+    download or remote build would exceed the cost of building locally.
+
+  - `allowSubstitutes`  
+    If this attribute is set to `false`, then Nix will always build this
+    derivation; it will not try to substitute its outputs. This is
+    useful for very trivial derivations (such as `writeText` in Nixpkgs)
+    that are cheaper to build than to substitute from a binary cache.
+    
+    > **Note**
+    > 
+    > You need to have a builder configured which satisfies the
+    > derivation’s `system` attribute, since the derivation cannot be
+    > substituted. Thus it is usually a good idea to align `system` with
+    > `builtins.currentSystem` when setting `allowSubstitutes` to
+    > `false`. For most trivial derivations this should be the case.
diff --git a/doc/manual/src/expressions/arguments-variables.md b/doc/manual/src/expressions/arguments-variables.md
new file mode 100644
index 000000000..9a373d94d
--- /dev/null
+++ b/doc/manual/src/expressions/arguments-variables.md
@@ -0,0 +1,72 @@
+# Arguments and Variables
+
+    ...
+    
+    rec { 
+    
+      hello = import ../applications/misc/hello/ex-1  { 
+        inherit fetchurl stdenv perl;
+      };
+    
+      perl = import ../development/interpreters/perl { 
+        inherit fetchurl stdenv;
+      };
+    
+      fetchurl = import ../build-support/fetchurl {
+        inherit stdenv; ...
+      };
+    
+      stdenv = ...;
+    
+    }
+
+The Nix expression in [???](#ex-hello-nix) is a function; it is missing
+some arguments that have to be filled in somewhere. In the Nix Packages
+collection this is done in the file `pkgs/top-level/all-packages.nix`,
+where all Nix expressions for packages are imported and called with the
+appropriate arguments. [example\_title](#ex-hello-composition) shows
+some fragments of `all-packages.nix`.
+
+  - This file defines a set of attributes, all of which are concrete
+    derivations (i.e., not functions). In fact, we define a *mutually
+    recursive* set of attributes. That is, the attributes can refer to
+    each other. This is precisely what we want since we want to “plug”
+    the various packages into each other.
+
+  - Here we *import* the Nix expression for GNU Hello. The import
+    operation just loads and returns the specified Nix expression. In
+    fact, we could just have put the contents of [???](#ex-hello-nix) in
+    `all-packages.nix` at this point. That would be completely
+    equivalent, but it would make the file rather bulky.
+    
+    Note that we refer to `../applications/misc/hello/ex-1`, not
+    `../applications/misc/hello/ex-1/default.nix`. When you try to
+    import a directory, Nix automatically appends `/default.nix` to the
+    file name.
+
+  - This is where the actual composition takes place. Here we *call* the
+    function imported from `../applications/misc/hello/ex-1` with a set
+    containing the things that the function expects, namely `fetchurl`,
+    `stdenv`, and `perl`. We use inherit again to use the attributes
+    defined in the surrounding scope (we could also have written
+    `fetchurl = fetchurl;`, etc.).
+    
+    The result of this function call is an actual derivation that can be
+    built by Nix (since when we fill in the arguments of the function,
+    what we get is its body, which is the call to `stdenv.mkDerivation`
+    in [???](#ex-hello-nix)).
+    
+    > **Note**
+    > 
+    > Nixpkgs has a convenience function `callPackage` that imports and
+    > calls a function, filling in any missing arguments by passing the
+    > corresponding attribute from the Nixpkgs set, like this:
+    > 
+    >     hello = callPackage ../applications/misc/hello/ex-1 { };
+    > 
+    > If necessary, you can set or override arguments:
+    > 
+    >     hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
+
+  - Likewise, we have to instantiate Perl, `fetchurl`, and the standard
+    environment.
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
new file mode 100644
index 000000000..256a5cd44
--- /dev/null
+++ b/doc/manual/src/expressions/build-script.md
@@ -0,0 +1,72 @@
+# Build Script
+
+    source $stdenv/setup 
+    
+    PATH=$perl/bin:$PATH 
+    
+    tar xvfz $src 
+    cd hello-*
+    ./configure --prefix=$out 
+    make 
+    make install
+
+[example\_title](#ex-hello-builder) shows the builder referenced from
+Hello's Nix expression (stored in
+`pkgs/applications/misc/hello/ex-1/builder.sh`). The builder can
+actually be made a lot shorter by using the *generic builder* functions
+provided by `stdenv`, but here we write out the build steps to elucidate
+what a builder does. It performs the following steps:
+
+  - When Nix runs a builder, it initially completely clears the
+    environment (except for the attributes declared in the derivation).
+    For instance, the PATH variable is empty\[1\]. This is done to
+    prevent undeclared inputs from being used in the build process. If
+    for example the PATH contained `/usr/bin`, then you might
+    accidentally use `/usr/bin/gcc`.
+    
+    So the first step is to set up the environment. This is done by
+    calling the `setup` script of the standard environment. The
+    environment variable stdenv points to the location of the standard
+    environment being used. (It wasn't specified explicitly as an
+    attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
+    automatically.)
+
+  - Since Hello needs Perl, we have to make sure that Perl is in the
+    PATH. The perl environment variable points to the location of the
+    Perl package (since it was passed in as an attribute to the
+    derivation), so `$perl/bin` is the directory containing the Perl
+    interpreter.
+
+  - Now we have to unpack the sources. The `src` attribute was bound to
+    the result of fetching the Hello source tarball from the network, so
+    the src environment variable points to the location in the Nix store
+    to which the tarball was downloaded. After unpacking, we `cd` to the
+    resulting source directory.
+    
+    The whole build is performed in a temporary directory created in
+    `/tmp`, by the way. This directory is removed after the builder
+    finishes, so there is no need to clean up the sources afterwards.
+    Also, the temporary directory is always newly created, so you don't
+    have to worry about files from previous builds interfering with the
+    current build.
+
+  - GNU Hello is a typical Autoconf-based package, so we first have to
+    run its `configure` script. In Nix every package is stored in a
+    separate location in the Nix store, for instance
+    `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
+    computes this path by cryptographically hashing all attributes of
+    the derivation. The path is passed to the builder through the out
+    environment variable. So here we give `configure` the parameter
+    `--prefix=$out` to cause Hello to be installed in the expected
+    location.
+
+  - Finally we build Hello (`make`) and install it into the location
+    specified by out (`make install`).
+
+If you are wondering about the absence of error checking on the result
+of various commands called in the builder: this is because the shell
+script is evaluated with Bash's `-e` option, which causes the script to
+be aborted if any command fails without an error check.
+
+1.  Actually, it's initialised to `/path-not-set` to prevent Bash from
+    setting it to a default value.
diff --git a/doc/manual/src/expressions/builder-syntax.md b/doc/manual/src/expressions/builder-syntax.md
new file mode 100644
index 000000000..c92acf106
--- /dev/null
+++ b/doc/manual/src/expressions/builder-syntax.md
@@ -0,0 +1,72 @@
+# Builder Syntax
+
+    source $stdenv/setup 
+    
+    PATH=$perl/bin:$PATH 
+    
+    tar xvfz $src 
+    cd hello-*
+    ./configure --prefix=$out 
+    make 
+    make install
+
+[example\_title](#ex-hello-builder) shows the builder referenced from
+Hello's Nix expression (stored in
+`pkgs/applications/misc/hello/ex-1/builder.sh`). The builder can
+actually be made a lot shorter by using the *generic builder* functions
+provided by `stdenv`, but here we write out the build steps to elucidate
+what a builder does. It performs the following steps:
+
+  - When Nix runs a builder, it initially completely clears the
+    environment (except for the attributes declared in the derivation).
+    For instance, the PATH variable is empty\[1\]. This is done to
+    prevent undeclared inputs from being used in the build process. If
+    for example the PATH contained `/usr/bin`, then you might
+    accidentally use `/usr/bin/gcc`.
+    
+    So the first step is to set up the environment. This is done by
+    calling the `setup` script of the standard environment. The
+    environment variable stdenv points to the location of the standard
+    environment being used. (It wasn't specified explicitly as an
+    attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
+    automatically.)
+
+  - Since Hello needs Perl, we have to make sure that Perl is in the
+    PATH. The perl environment variable points to the location of the
+    Perl package (since it was passed in as an attribute to the
+    derivation), so `$perl/bin` is the directory containing the Perl
+    interpreter.
+
+  - Now we have to unpack the sources. The `src` attribute was bound to
+    the result of fetching the Hello source tarball from the network, so
+    the src environment variable points to the location in the Nix store
+    to which the tarball was downloaded. After unpacking, we `cd` to the
+    resulting source directory.
+    
+    The whole build is performed in a temporary directory created in
+    `/tmp`, by the way. This directory is removed after the builder
+    finishes, so there is no need to clean up the sources afterwards.
+    Also, the temporary directory is always newly created, so you don't
+    have to worry about files from previous builds interfering with the
+    current build.
+
+  - GNU Hello is a typical Autoconf-based package, so we first have to
+    run its `configure` script. In Nix every package is stored in a
+    separate location in the Nix store, for instance
+    `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
+    computes this path by cryptographically hashing all attributes of
+    the derivation. The path is passed to the builder through the out
+    environment variable. So here we give `configure` the parameter
+    `--prefix=$out` to cause Hello to be installed in the expected
+    location.
+
+  - Finally we build Hello (`make`) and install it into the location
+    specified by out (`make install`).
+
+If you are wondering about the absence of error checking on the result
+of various commands called in the builder: this is because the shell
+script is evaluated with Bash's `-e` option, which causes the script to
+be aborted if any command fails without an error check.
+
+1.  Actually, it's initialised to `/path-not-set` to prevent Bash from
+    setting it to a default value.
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
new file mode 100644
index 000000000..a378fe8e4
--- /dev/null
+++ b/doc/manual/src/expressions/builtins.md
@@ -0,0 +1,839 @@
+# Built-in Functions
+
+This section lists the functions and constants built into the Nix
+expression evaluator. (The built-in function `derivation` is discussed
+above.) Some built-ins, such as `derivation`, are always in scope of
+every Nix expression; you can just access them right away. But to
+prevent polluting the namespace too much, most built-ins are not in
+scope. Instead, you can access them through the `builtins` built-in
+value, which is a set that contains all built-in functions and values.
+For instance, `derivation` is also available as `builtins.derivation`.
+
+  - `abort` s; `builtins.abort` s  
+    Abort Nix expression evaluation, print error message s.
+
+  - `builtins.add` e1 e2  
+    Return the sum of the numbers e1 and e2.
+
+  - `builtins.all` pred list  
+    Return `true` if the function pred returns `true` for all elements
+    of list, and `false` otherwise.
+
+  - `builtins.any` pred list  
+    Return `true` if the function pred returns `true` for at least one
+    element of list, and `false` otherwise.
+
+  - `builtins.attrNames` set  
+    Return the names of the attributes in the set set in an
+    alphabetically sorted list. For instance, `builtins.attrNames { y
+    = 1; x = "foo"; }` evaluates to `[ "x" "y" ]`.
+
+  - `builtins.attrValues` set  
+    Return the values of the attributes in the set set in the order
+    corresponding to the sorted attribute names.
+
+  - `baseNameOf` s  
+    Return the *base name* of the string s, that is, everything
+    following the final slash in the string. This is similar to the GNU
+    `basename` command.
+
+  - `builtins.bitAnd` e1 e2  
+    Return the bitwise AND of the integers e1 and e2.
+
+  - `builtins.bitOr` e1 e2  
+    Return the bitwise OR of the integers e1 and e2.
+
+  - `builtins.bitXor` e1 e2  
+    Return the bitwise XOR of the integers e1 and e2.
+
+  - `builtins`  
+    The set `builtins` contains all the built-in functions and values.
+    You can use `builtins` to test for the availability of features in
+    the Nix installation, e.g.,
+    
+        if builtins ? getEnv then builtins.getEnv "PATH" else ""
+    
+    This allows a Nix expression to fall back gracefully on older Nix
+    installations that don’t have the desired built-in function.
+
+  - `builtins.compareVersions` s1 s2  
+    Compare two strings representing versions and return `-1` if version
+    s1 is older than version s2, `0` if they are the same, and `1` if s1
+    is newer than s2. The version comparison algorithm is the same as
+    the one used by [`nix-env
+                    -u`](#ssec-version-comparisons).
+
+  - `builtins.concatLists` lists  
+    Concatenate a list of lists into a single list.
+
+  - `builtins.concatStringsSep` separator list  
+    Concatenate a list of strings with a separator between each element,
+    e.g. `concatStringsSep "/"
+                    ["usr" "local" "bin"] == "usr/local/bin"`
+
+  - `builtins.currentSystem`  
+    The built-in value `currentSystem` evaluates to the Nix platform
+    identifier for the Nix installation on which the expression is being
+    evaluated, such as `"i686-linux"` or `"x86_64-darwin"`.
+
+  - `builtins.deepSeq` e1 e2  
+    This is like `seq
+                    e1
+                    e2`, except that e1 is evaluated *deeply*: if it’s a list or set,
+    its elements or attributes are also evaluated recursively.
+
+  - `derivation` attrs; `builtins.derivation` attrs  
+    `derivation` is described in [???](#ssec-derivation).
+
+  - `dirOf` s; `builtins.dirOf` s  
+    Return the directory part of the string s, that is, everything
+    before the final slash in the string. This is similar to the GNU
+    `dirname` command.
+
+  - `builtins.div` e1 e2  
+    Return the quotient of the numbers e1 and e2.
+
+  - `builtins.elem` x xs  
+    Return `true` if a value equal to x occurs in the list xs, and
+    `false` otherwise.
+
+  - `builtins.elemAt` xs n  
+    Return element n from the list xs. Elements are counted starting
+    from 0. A fatal error occurs if the index is out of bounds.
+
+  - `builtins.fetchurl` url  
+    Download the specified URL and return the path of the downloaded
+    file. This function is not available if [restricted evaluation
+    mode](#conf-restrict-eval) is enabled.
+
+  - `fetchTarball` url; `builtins.fetchTarball` url  
+    Download the specified URL, unpack it and return the path of the
+    unpacked tree. The file must be a tape archive (`.tar`) compressed
+    with `gzip`, `bzip2` or `xz`. The top-level path component of the
+    files in the tarball is removed, so it is best if the tarball
+    contains a single directory at top level. The typical use of the
+    function is to obtain external Nix expression dependencies, such as
+    a particular version of Nixpkgs, e.g.
+    
+        with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
+        
+        stdenv.mkDerivation { … }
+    
+    The fetched tarball is cached for a certain amount of time (1 hour
+    by default) in `~/.cache/nix/tarballs/`. You can change the cache
+    timeout either on the command line with `--option tarball-ttl number
+    of seconds` or in the Nix configuration file with this option: ` 
+    number of seconds to cache `.
+    
+    Note that when obtaining the hash with ` nix-prefetch-url
+                     ` the option `--unpack` is required.
+    
+    This function can also verify the contents against a hash. In that
+    case, the function takes a set instead of a URL. The set requires
+    the attribute `url` and the attribute `sha256`, e.g.
+    
+        with import (fetchTarball {
+          url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
+          sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
+        }) {};
+        
+        stdenv.mkDerivation { … }
+    
+    This function is not available if [restricted evaluation
+    mode](#conf-restrict-eval) is enabled.
+
+  - `builtins.fetchGit` args  
+    Fetch a path from git. args can be a URL, in which case the HEAD of
+    the repo at that URL is fetched. Otherwise, it can be an attribute
+    with the following attributes (all except `url` optional):
+    
+      - url  
+        The URL of the repo.
+    
+      - name  
+        The name of the directory the repo should be exported to in the
+        store. Defaults to the basename of the URL.
+    
+      - rev  
+        The git revision to fetch. Defaults to the tip of `ref`.
+    
+      - ref  
+        The git ref to look for the requested revision under. This is
+        often a branch or tag name. Defaults to `HEAD`.
+        
+        By default, the `ref` value is prefixed with `refs/heads/`. As
+        of Nix 2.3.0 Nix will not prefix `refs/heads/` if `ref` starts
+        with `refs/`.
+    
+      - submodules  
+        A Boolean parameter that specifies whether submodules should be
+        checked out. Defaults to `false`.
+    
+    <!-- end list -->
+    
+        builtins.fetchGit {
+          url = "git@github.com:my-secret/repository.git";
+          ref = "master";
+          rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
+        }
+    
+        builtins.fetchGit {
+          url = "https://github.com/NixOS/nix.git";
+          ref = "refs/heads/0.5-release";
+        }
+    
+    If the revision you're looking for is in the default branch of the
+    git repository you don't strictly need to specify the branch name in
+    the `ref` attribute.
+    
+    However, if the revision you're looking for is in a future branch
+    for the non-default branch you will need to specify the the `ref`
+    attribute as well.
+    
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+          ref = "1.11-maintenance";
+        }
+    
+    > **Note**
+    > 
+    > It is nice to always specify the branch which a revision belongs
+    > to. Without the branch being specified, the fetcher might fail if
+    > the default branch changes. Additionally, it can be confusing to
+    > try a commit from a non-default branch and see the fetch fail. If
+    > the branch is specified the fault is much more obvious.
+    
+    If the revision you're looking for is in the default branch of the
+    git repository you may omit the `ref` attribute.
+    
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+        }
+    
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          ref = "refs/tags/1.9";
+        }
+    
+    `builtins.fetchGit` can behave impurely fetch the latest version of
+    a remote branch.
+    
+    > **Note**
+    > 
+    > Nix will refetch the branch in accordance to
+    > [???](#conf-tarball-ttl).
+    
+    > **Note**
+    > 
+    > This behavior is disabled in *Pure evaluation mode*.
+    
+        builtins.fetchGit {
+          url = "ssh://git@github.com/nixos/nix.git";
+          ref = "master";
+        }
+
+  - `builtins.filter` f xs  
+    Return a list consisting of the elements of xs for which the
+    function f returns `true`.
+
+  - `builtins.filterSource` e1 e2  
+    This function allows you to copy sources into the Nix store while
+    filtering certain files. For instance, suppose that you want to use
+    the directory `source-dir` as an input to a Nix expression, e.g.
+    
+        stdenv.mkDerivation {
+          ...
+          src = ./source-dir;
+        }
+    
+    However, if `source-dir` is a Subversion working copy, then all
+    those annoying `.svn` subdirectories will also be copied to the
+    store. Worse, the contents of those directories may change a lot,
+    causing lots of spurious rebuilds. With `filterSource` you can
+    filter out the `.svn` directories:
+    
+    ``` 
+      src = builtins.filterSource
+        (path: type: type != "directory" || baseNameOf path != ".svn")
+        ./source-dir;
+    ```
+    
+    Thus, the first argument e1 must be a predicate function that is
+    called for each regular file, directory or symlink in the source
+    tree e2. If the function returns `true`, the file is copied to the
+    Nix store, otherwise it is omitted. The function is called with two
+    arguments. The first is the full path of the file. The second is a
+    string that identifies the type of the file, which is either
+    `"regular"`, `"directory"`, `"symlink"` or `"unknown"` (for other
+    kinds of files such as device nodes or fifos — but note that those
+    cannot be copied to the Nix store, so if the predicate returns
+    `true` for them, the copy will fail). If you exclude a directory,
+    the entire corresponding subtree of e2 will be excluded.
+
+  - `builtins.foldl’` op nul list  
+    Reduce a list by applying a binary operator, from left to right,
+    e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op
+                    (op nul x0) x1) x2) ...`. The operator is applied strictly, i.e.,
+    its arguments are evaluated first. For example, `foldl’ (x: y: x +
+    y) 0 [1 2 3]` evaluates to 6.
+
+  - `builtins.functionArgs` f  
+    Return a set containing the names of the formal arguments expected
+    by the function f. The value of each attribute is a Boolean denoting
+    whether the corresponding argument has a default value. For
+    instance, `functionArgs ({ x, y ? 123}: ...) = { x = false; y =
+    true; }`.
+    
+    "Formal argument" here refers to the attributes pattern-matched by
+    the function. Plain lambdas are not included, e.g. `functionArgs (x:
+    ...) = { }`.
+
+  - `builtins.fromJSON` e  
+    Convert a JSON string to a Nix value. For example,
+    
+        builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
+    
+    returns the value `{ x = [ 1 2 3 ]; y = null;
+                    }`.
+
+  - `builtins.genList` generator length  
+    Generate list of size length, with each element i equal to the value
+    returned by generator `i`. For example,
+    
+        builtins.genList (x: x * x) 5
+    
+    returns the list `[ 0 1 4 9 16 ]`.
+
+  - `builtins.getAttr` s set  
+    `getAttr` returns the attribute named s from set. Evaluation aborts
+    if the attribute doesn’t exist. This is a dynamic version of the `.`
+    operator, since s is an expression rather than an identifier.
+
+  - `builtins.getEnv` s  
+    `getEnv` returns the value of the environment variable s, or an
+    empty string if the variable doesn’t exist. This function should be
+    used with care, as it can introduce all sorts of nasty environment
+    dependencies in your Nix expression.
+    
+    `getEnv` is used in Nix Packages to locate the file
+    `~/.nixpkgs/config.nix`, which contains user-local settings for Nix
+    Packages. (That is, it does a `getEnv "HOME"` to locate the user’s
+    home directory.)
+
+  - `builtins.hasAttr` s set  
+    `hasAttr` returns `true` if set has an attribute named s, and
+    `false` otherwise. This is a dynamic version of the `?` operator,
+    since s is an expression rather than an identifier.
+
+  - `builtins.hashString` type s  
+    Return a base-16 representation of the cryptographic hash of string
+    s. The hash algorithm specified by type must be one of `"md5"`,
+    `"sha1"`, `"sha256"` or `"sha512"`.
+
+  - `builtins.hashFile` type p  
+    Return a base-16 representation of the cryptographic hash of the
+    file at path p. The hash algorithm specified by type must be one of
+    `"md5"`, `"sha1"`, `"sha256"` or `"sha512"`.
+
+  - `builtins.head` list  
+    Return the first element of a list; abort evaluation if the argument
+    isn’t a list or is an empty list. You can test whether a list is
+    empty by comparing it with `[]`.
+
+  - `import` path; `builtins.import` path  
+    Load, parse and return the Nix expression in the file path. If path
+    is a directory, the file ` default.nix
+                     ` in that directory is loaded. Evaluation aborts if the file
+    doesn’t exist or contains an incorrect Nix expression. `import`
+    implements Nix’s module system: you can put any Nix expression (such
+    as a set or a function) in a separate file, and use it from Nix
+    expressions in other files.
+    
+    > **Note**
+    > 
+    > Unlike some languages, `import` is a regular function in Nix.
+    > Paths using the angle bracket syntax (e.g., `
+    >     >     >     >     > import` \<foo\>) are normal path values (see [???](#ssec-values)).
+    
+    A Nix expression loaded by `import` must not contain any *free
+    variables* (identifiers that are not defined in the Nix expression
+    itself and are not built-in). Therefore, it cannot refer to
+    variables that are in scope at the call site. For instance, if you
+    have a calling expression
+    
+        rec {
+          x = 123;
+          y = import ./foo.nix;
+        }
+    
+    then the following `foo.nix` will give an error:
+    
+        x + 456
+    
+    since `x` is not in scope in `foo.nix`. If you want `x` to be
+    available in `foo.nix`, you should pass it as a function argument:
+    
+        rec {
+          x = 123;
+          y = import ./foo.nix x;
+        }
+    
+    and
+    
+        x: x + 456
+    
+    (The function argument doesn’t have to be called `x` in `foo.nix`;
+    any name would work.)
+
+  - `builtins.intersectAttrs` e1 e2  
+    Return a set consisting of the attributes in the set e2 that also
+    exist in the set e1.
+
+  - `builtins.isAttrs` e  
+    Return `true` if e evaluates to a set, and `false` otherwise.
+
+  - `builtins.isList` e  
+    Return `true` if e evaluates to a list, and `false` otherwise.
+
+  - `builtins.isFunction` e  
+    Return `true` if e evaluates to a function, and `false` otherwise.
+
+  - `builtins.isString` e  
+    Return `true` if e evaluates to a string, and `false` otherwise.
+
+  - `builtins.isInt` e  
+    Return `true` if e evaluates to an int, and `false` otherwise.
+
+  - `builtins.isFloat` e  
+    Return `true` if e evaluates to a float, and `false` otherwise.
+
+  - `builtins.isBool` e  
+    Return `true` if e evaluates to a bool, and `false` otherwise.
+
+  - `builtins.isPath` e  
+    Return `true` if e evaluates to a path, and `false` otherwise.
+
+  - `isNull` e; `builtins.isNull` e  
+    Return `true` if e evaluates to `null`, and `false` otherwise.
+    
+    > **Warning**
+    > 
+    > This function is *deprecated*; just write `e == null` instead.
+
+  - `builtins.length` e  
+    Return the length of the list e.
+
+  - `builtins.lessThan` e1 e2  
+    Return `true` if the number e1 is less than the number e2, and
+    `false` otherwise. Evaluation aborts if either e1 or e2 does not
+    evaluate to a number.
+
+  - `builtins.listToAttrs` e  
+    Construct a set from a list specifying the names and values of each
+    attribute. Each element of the list should be a set consisting of a
+    string-valued attribute `name` specifying the name of the attribute,
+    and an attribute `value` specifying its value. Example:
+    
+        builtins.listToAttrs
+          [ { name = "foo"; value = 123; }
+            { name = "bar"; value = 456; }
+          ]
+    
+    evaluates to
+    
+        { foo = 123; bar = 456; }
+
+  - `map` f list; `builtins.map` f list  
+    Apply the function f to each element in the list list. For example,
+    
+        map (x: "foo" + x) [ "bar" "bla" "abc" ]
+    
+    evaluates to `[ "foobar" "foobla" "fooabc"
+                    ]`.
+
+  - `builtins.match` regex str  
+    Returns a list if the [extended POSIX regular
+    expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
+    regex matches str precisely, otherwise returns `null`. Each item in
+    the list is a regex group.
+    
+        builtins.match "ab" "abc"
+    
+    Evaluates to `null`.
+    
+        builtins.match "abc" "abc"
+    
+    Evaluates to `[ ]`.
+    
+        builtins.match "a(b)(c)" "abc"
+    
+    Evaluates to `[ "b" "c" ]`.
+    
+        builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
+    
+    Evaluates to `[ "foo" ]`.
+
+  - `builtins.mul` e1 e2  
+    Return the product of the numbers e1 and e2.
+
+  - `builtins.parseDrvName` s  
+    Split the string s into a package name and version. The package name
+    is everything up to but not including the first dash followed by a
+    digit, and the version is everything following that dash. The result
+    is returned in a set `{ name, version }`. Thus,
+    `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name = "nix";
+    version = "0.12pre12876";
+                    }`.
+
+  - `builtins.path` args  
+    An enrichment of the built-in path type, based on the attributes
+    present in args. All are optional except `path`:
+    
+      - path  
+        The underlying path.
+    
+      - name  
+        The name of the path when added to the store. This can used to
+        reference paths that have nix-illegal characters in their names,
+        like `@`.
+    
+      - filter  
+        A function of the type expected by
+        [builtins.filterSource](#builtin-filterSource), with the same
+        semantics.
+    
+      - recursive  
+        When `false`, when `path` is added to the store it is with a
+        flat hash, rather than a hash of the NAR serialization of the
+        file. Thus, `path` must refer to a regular file, not a
+        directory. This allows similar behavior to `fetchurl`. Defaults
+        to `true`.
+    
+      - sha256  
+        When provided, this is the expected hash of the file at the
+        path. Evaluation will fail if the hash is incorrect, and
+        providing a hash allows `builtins.path` to be used even when the
+        `pure-eval` nix config option is on.
+
+  - `builtins.pathExists` path  
+    Return `true` if the path path exists at evaluation time, and
+    `false` otherwise.
+
+  - `builtins.placeholder` output  
+    Return a placeholder string for the specified output that will be
+    substituted by the corresponding output path at build time. Typical
+    outputs would be `"out"`, `"bin"` or `"dev"`.
+
+  - `builtins.readDir` path  
+    Return the contents of the directory path as a set mapping directory
+    entries to the corresponding file type. For instance, if directory
+    `A` contains a regular file `B` and another directory `C`, then
+    `builtins.readDir
+                    ./A` will return the set
+    
+        { B = "regular"; C = "directory"; }
+    
+    The possible values for the file type are `"regular"`,
+    `"directory"`, `"symlink"` and `"unknown"`.
+
+  - `builtins.readFile` path  
+    Return the contents of the file path as a string.
+
+  - `removeAttrs` set list; `builtins.removeAttrs` set list  
+    Remove the attributes listed in list from set. The attributes don’t
+    have to exist in set. For instance,
+    
+        removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
+    
+    evaluates to `{ y = 2; }`.
+
+  - `builtins.replaceStrings` from to s  
+    Given string s, replace every occurrence of the strings in from with
+    the corresponding string in to. For example,
+    
+        builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
+    
+    evaluates to `"fabir"`.
+
+  - `builtins.seq` e1 e2  
+    Evaluate e1, then evaluate and return e2. This ensures that a
+    computation is strict in the value of e1.
+
+  - `builtins.sort` comparator list  
+    Return list in sorted order. It repeatedly calls the function
+    comparator with two elements. The comparator should return `true` if
+    the first element is less than the second, and `false` otherwise.
+    For example,
+    
+        builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
+    
+    produces the list `[ 42 77 147 249 483 526
+                    ]`.
+    
+    This is a stable sort: it preserves the relative order of elements
+    deemed equal by the comparator.
+
+  - `builtins.split` regex str  
+    Returns a list composed of non matched strings interleaved with the
+    lists of the [extended POSIX regular
+    expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
+    regex matches of str. Each item in the lists of matched sequences is
+    a regex group.
+    
+        builtins.split "(a)b" "abc"
+    
+    Evaluates to `[ "" [ "a" ] "c" ]`.
+    
+        builtins.split "([ac])" "abc"
+    
+    Evaluates to `[ "" [ "a" ] "b" [ "c" ] "" ]`.
+    
+        builtins.split "(a)|(c)" "abc"
+    
+    Evaluates to `[ "" [ "a" null ] "b" [ null "c" ] "" ]`.
+    
+        builtins.split "([[:upper:]]+)" "  FOO   "
+    
+    Evaluates to `[ " " [ "FOO" ] " " ]`.
+
+  - `builtins.splitVersion` s  
+    Split a string representing a version into its components, by the
+    same version splitting logic underlying the version comparison in
+    [`nix-env -u`](#ssec-version-comparisons).
+
+  - `builtins.stringLength` e  
+    Return the length of the string e. If e is not a string, evaluation
+    is aborted.
+
+  - `builtins.sub` e1 e2  
+    Return the difference between the numbers e1 and e2.
+
+  - `builtins.substring` start len s  
+    Return the substring of s from character position start (zero-based)
+    up to but not including start + len. If start is greater than the
+    length of the string, an empty string is returned, and if start +
+    len lies beyond the end of the string, only the substring up to the
+    end of the string is returned. start must be non-negative. For
+    example,
+    
+        builtins.substring 0 3 "nixos"
+    
+    evaluates to `"nix"`.
+
+  - `builtins.tail` list  
+    Return the second to last elements of a list; abort evaluation if
+    the argument isn’t a list or is an empty list.
+
+  - `throw` s; `builtins.throw` s  
+    Throw an error message s. This usually aborts Nix expression
+    evaluation, but in `nix-env -qa` and other commands that try to
+    evaluate a set of derivations to get information about those
+    derivations, a derivation that throws an error is silently skipped
+    (which is not the case for `abort`).
+
+  - `builtins.toFile` name s  
+    Store the string s in a file in the Nix store and return its path.
+    The file has suffix name. This file can be used as an input to
+    derivations. One application is to write builders “inline”. For
+    instance, the following Nix expression combines [???](#ex-hello-nix)
+    and [???](#ex-hello-builder) into one file:
+    
+        { stdenv, fetchurl, perl }:
+        
+        stdenv.mkDerivation {
+          name = "hello-2.1.1";
+        
+          builder = builtins.toFile "builder.sh" "
+            source $stdenv/setup
+        
+            PATH=$perl/bin:$PATH
+        
+            tar xvfz $src
+            cd hello-*
+            ./configure --prefix=$out
+            make
+            make install
+          ";
+        
+          src = fetchurl {
+            url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+            sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+          };
+          inherit perl;
+        }
+    
+    It is even possible for one file to refer to another, e.g.,
+    
+    ``` 
+      builder = let
+        configFile = builtins.toFile "foo.conf" "
+          # This is some dummy configuration file.
+          ...
+        ";
+      in builtins.toFile "builder.sh" "
+        source $stdenv/setup
+        ...
+        cp ${configFile} $out/etc/foo.conf
+      ";
+    ```
+    
+    Note that `${configFile}` is an antiquotation (see
+    [???](#ssec-values)), so the result of the expression `configFile`
+    (i.e., a path like `/nix/store/m7p7jfny445k...-foo.conf`) will be
+    spliced into the resulting string.
+    
+    It is however *not* allowed to have files mutually referring to each
+    other, like so:
+    
+        let
+          foo = builtins.toFile "foo" "...${bar}...";
+          bar = builtins.toFile "bar" "...${foo}...";
+        in foo
+    
+    This is not allowed because it would cause a cyclic dependency in
+    the computation of the cryptographic hashes for `foo` and `bar`.
+    
+    It is also not possible to reference the result of a derivation. If
+    you are using Nixpkgs, the `writeTextFile` function is able to do
+    that.
+
+  - `builtins.toJSON` e  
+    Return a string containing a JSON representation of e. Strings,
+    integers, floats, booleans, nulls and lists are mapped to their JSON
+    equivalents. Sets (except derivations) are represented as objects.
+    Derivations are translated to a JSON string containing the
+    derivation’s output path. Paths are copied to the store and
+    represented as a JSON string of the resulting store path.
+
+  - `builtins.toPath` s  
+    DEPRECATED. Use `/. + "/path"` to convert a string into an absolute
+    path. For relative paths, use `./. + "/path"`.
+
+  - `toString` e; `builtins.toString` e  
+    Convert the expression e to a string. e can be:
+    
+      - A string (in which case the string is returned unmodified).
+    
+      - A path (e.g., `toString /foo/bar` yields `"/foo/bar"`.
+    
+      - A set containing `{ __toString = self: ...; }`.
+    
+      - An integer.
+    
+      - A list, in which case the string representations of its elements
+        are joined with spaces.
+    
+      - A Boolean (`false` yields `""`, `true` yields `"1"`).
+    
+      - `null`, which yields the empty string.
+
+  - `builtins.toXML` e  
+    Return a string containing an XML representation of e. The main
+    application for `toXML` is to communicate information with the
+    builder in a more structured format than plain environment
+    variables.
+    
+    [example\_title](#ex-toxml) shows an example where this is the case.
+    The builder is supposed to generate the configuration file for a
+    [Jetty servlet container](http://jetty.mortbay.org/). A servlet
+    container contains a number of servlets (`*.war` files) each
+    exported under a specific URI prefix. So the servlet configuration
+    is a list of sets containing the `path` and `war` of the servlet
+    ([co\_title](#ex-toxml-co-servlets)). This kind of information is
+    difficult to communicate with the normal method of passing
+    information through an environment variable, which just concatenates
+    everything together into a string (which might just work in this
+    case, but wouldn’t work if fields are optional or contain lists
+    themselves). Instead the Nix expression is converted to an XML
+    representation with `toXML`, which is unambiguous and can easily be
+    processed with the appropriate tools. For instance, in the example
+    an XSLT stylesheet ([co\_title](#ex-toxml-co-stylesheet)) is applied
+    to it ([co\_title](#ex-toxml-co-apply)) to generate the XML
+    configuration file for the Jetty server. The XML representation
+    produced from [co\_title](#ex-toxml-co-servlets) by `toXML` is shown
+    in [example\_title](#ex-toxml-result).
+    
+    Note that [example\_title](#ex-toxml) uses the `toFile` built-in to
+    write the builder and the stylesheet “inline” in the Nix expression.
+    The path of the stylesheet is spliced into the builder at `xsltproc
+    ${stylesheet}
+                    ...`.
+    
+        { stdenv, fetchurl, libxslt, jira, uberwiki }:
+        
+        stdenv.mkDerivation (rec {
+          name = "web-server";
+        
+          buildInputs = [ libxslt ];
+        
+          builder = builtins.toFile "builder.sh" "
+            source $stdenv/setup
+            mkdir $out
+            echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml  
+          ";
+        
+          stylesheet = builtins.toFile "stylesheet.xsl"  
+           "<?xml version='1.0' encoding='UTF-8'?>
+            <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+              <xsl:template match='/'>
+                <Configure>
+                  <xsl:for-each select='/expr/list/attrs'>
+                    <Call name='addWebApplication'>
+                      <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
+                      <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
+                    </Call>
+                  </xsl:for-each>
+                </Configure>
+              </xsl:template>
+            </xsl:stylesheet>
+          ";
+        
+          servlets = builtins.toXML [  
+            { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
+            { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
+          ];
+        })
+    
+        <?xml version='1.0' encoding='utf-8'?>
+        <expr>
+          <list>
+            <attrs>
+              <attr name="path">
+                <string value="/bugtracker" />
+              </attr>
+              <attr name="war">
+                <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
+              </attr>
+            </attrs>
+            <attrs>
+              <attr name="path">
+                <string value="/wiki" />
+              </attr>
+              <attr name="war">
+                <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
+              </attr>
+            </attrs>
+          </list>
+        </expr>
+
+  - `builtins.trace` e1 e2  
+    Evaluate e1 and print its abstract syntax representation on standard
+    error. Then return e2. This function is useful for debugging.
+
+  - `builtins.tryEval` e  
+    Try to shallowly evaluate e. Return a set containing the attributes
+    `success` (`true` if e evaluated successfully, `false` if an error
+    was thrown) and `value`, equalling e if successful and `false`
+    otherwise. Note that this doesn't evaluate e deeply, so ` let e = {
+    x = throw ""; }; in (builtins.tryEval e).success
+                     ` will be `true`. Using ` builtins.deepSeq
+                     ` one can get the expected result: `let e = { x = throw "";
+                    }; in (builtins.tryEval (builtins.deepSeq e e)).success` will be
+    `false`.
+
+  - `builtins.typeOf` e  
+    Return a string representing the type of the value e, namely
+    `"int"`, `"bool"`, `"string"`, `"path"`, `"null"`, `"set"`,
+    `"list"`, `"lambda"` or `"float"`.
diff --git a/doc/manual/src/expressions/derivations.md b/doc/manual/src/expressions/derivations.md
new file mode 100644
index 000000000..7ffc6fabe
--- /dev/null
+++ b/doc/manual/src/expressions/derivations.md
@@ -0,0 +1,154 @@
+# Derivations
+
+The most important built-in function is `derivation`, which is used to
+describe a single derivation (a build action). It takes as input a set,
+the attributes of which specify the inputs of the build.
+
+  - There must be an attribute named `system` whose value must be a
+    string specifying a Nix platform identifier, such as `"i686-linux"`
+    or `"x86_64-darwin"`\[1\] The build can only be performed on a
+    machine and operating system matching the platform identifier. (Nix
+    can automatically forward builds for other platforms by forwarding
+    them to other machines; see [???](#chap-distributed-builds).)
+
+  - There must be an attribute named `name` whose value must be a
+    string. This is used as a symbolic name for the package by
+    `nix-env`, and it is appended to the output paths of the derivation.
+
+  - There must be an attribute named `builder` that identifies the
+    program that is executed to perform the build. It can be either a
+    derivation or a source (a local file reference, e.g.,
+    `./builder.sh`).
+
+  - Every attribute is passed as an environment variable to the builder.
+    Attribute values are translated to environment variables as follows:
+    
+      - Strings and numbers are just passed verbatim.
+    
+      - A *path* (e.g., `../foo/sources.tar`) causes the referenced file
+        to be copied to the store; its location in the store is put in
+        the environment variable. The idea is that all sources should
+        reside in the Nix store, since all inputs to a derivation should
+        reside in the Nix store.
+    
+      - A *derivation* causes that derivation to be built prior to the
+        present derivation; its default output path is put in the
+        environment variable.
+    
+      - Lists of the previous types are also allowed. They are simply
+        concatenated, separated by spaces.
+    
+      - `true` is passed as the string `1`, `false` and `null` are
+        passed as an empty string.
+
+  - The optional attribute `args` specifies command-line arguments to be
+    passed to the builder. It should be a list.
+
+  - The optional attribute `outputs` specifies a list of symbolic
+    outputs of the derivation. By default, a derivation produces a
+    single output path, denoted as `out`. However, derivations can
+    produce multiple output paths. This is useful because it allows
+    outputs to be downloaded or garbage-collected separately. For
+    instance, imagine a library package that provides a dynamic library,
+    header files, and documentation. A program that links against the
+    library doesn’t need the header files and documentation at runtime,
+    and it doesn’t need the documentation at build time. Thus, the
+    library package could specify:
+    
+        outputs = [ "lib" "headers" "doc" ];
+    
+    This will cause Nix to pass environment variables `lib`, `headers`
+    and `doc` to the builder containing the intended store paths of each
+    output. The builder would typically do something like
+    
+        ./configure --libdir=$lib/lib --includedir=$headers/include --docdir=$doc/share/doc
+    
+    for an Autoconf-style package. You can refer to each output of a
+    derivation by selecting it as an attribute, e.g.
+    
+        buildInputs = [ pkg.lib pkg.headers ];
+    
+    The first element of `outputs` determines the *default output*.
+    Thus, you could also write
+    
+        buildInputs = [ pkg pkg.headers ];
+    
+    since `pkg` is equivalent to `pkg.lib`.
+
+The function `mkDerivation` in the Nixpkgs standard environment is a
+wrapper around `derivation` that adds a default value for `system` and
+always uses Bash as the builder, to which the supplied builder is passed
+as a command-line argument. See the Nixpkgs manual for details.
+
+The builder is executed as follows:
+
+  - A temporary directory is created under the directory specified by
+    TMPDIR (default `/tmp`) where the build will take place. The current
+    directory is changed to this directory.
+
+  - The environment is cleared and set to the derivation attributes, as
+    specified above.
+
+  - In addition, the following variables are set:
+    
+      - NIX\_BUILD\_TOP contains the path of the temporary directory for
+        this build.
+    
+      - Also, TMPDIR, TEMPDIR, TMP, TEMP are set to point to the
+        temporary directory. This is to prevent the builder from
+        accidentally writing temporary files anywhere else. Doing so
+        might cause interference by other processes.
+    
+      - PATH is set to `/path-not-set` to prevent shells from
+        initialising it to their built-in default value.
+    
+      - HOME is set to `/homeless-shelter` to prevent programs from
+        using `/etc/passwd` or the like to find the user's home
+        directory, which could cause impurity. Usually, when HOME is
+        set, it is used as the location of the home directory, even if
+        it points to a non-existent path.
+    
+      - NIX\_STORE is set to the path of the top-level Nix store
+        directory (typically, `/nix/store`).
+    
+      - For each output declared in `outputs`, the corresponding
+        environment variable is set to point to the intended path in the
+        Nix store for that output. Each output path is a concatenation
+        of the cryptographic hash of all build inputs, the `name`
+        attribute and the output name. (The output name is omitted if
+        it’s `out`.)
+
+  - If an output path already exists, it is removed. Also, locks are
+    acquired to prevent multiple Nix instances from performing the same
+    build at the same time.
+
+  - A log of the combined standard output and error is written to
+    `/nix/var/log/nix`.
+
+  - The builder is executed with the arguments specified by the
+    attribute `args`. If it exits with exit code 0, it is considered to
+    have succeeded.
+
+  - The temporary directory is removed (unless the `-K` option was
+    specified).
+
+  - If the build was successful, Nix scans each output path for
+    references to input paths by looking for the hash parts of the input
+    paths. Since these are potential runtime dependencies, Nix registers
+    them as dependencies of the output paths.
+
+  - After the build, Nix sets the last-modified timestamp on all files
+    in the build result to 1 (00:00:01 1/1/1970 UTC), sets the group to
+    the default group, and sets the mode of the file to 0444 or 0555
+    (i.e., read-only, with execute permission enabled if the file was
+    originally executable). Note that possible `setuid` and `setgid`
+    bits are cleared. Setuid and setgid programs are not currently
+    supported by Nix. This is because the Nix archives used in
+    deployment have no concept of ownership information, and because it
+    makes the build result dependent on the user performing the build.
+
+<!-- end list -->
+
+1.  To figure out your platform identifier, look at the line “Checking
+    for the canonical Nix system name” in the output of Nix's
+    `configure` script.
diff --git a/doc/manual/src/expressions/expression-language.md b/doc/manual/src/expressions/expression-language.md
new file mode 100644
index 000000000..267fcb983
--- /dev/null
+++ b/doc/manual/src/expressions/expression-language.md
@@ -0,0 +1,12 @@
+# Nix Expression Language
+
+The Nix expression language is a pure, lazy, functional language. Purity
+means that operations in the language don't have side-effects (for
+instance, there is no variable assignment). Laziness means that
+arguments to functions are evaluated only when they are needed.
+Functional means that functions are “normal” values that can be passed
+around and manipulated in interesting ways. The language is not a
+full-featured, general purpose language. Its main job is to describe
+packages, compositions of packages, and the variability within packages.
+
+This section presents the various features of the language.
diff --git a/doc/manual/src/expressions/expression-syntax.md b/doc/manual/src/expressions/expression-syntax.md
new file mode 100644
index 000000000..935484c33
--- /dev/null
+++ b/doc/manual/src/expressions/expression-syntax.md
@@ -0,0 +1,91 @@
+# Expression Syntax
+
+    { stdenv, fetchurl, perl }: 
+    
+    stdenv.mkDerivation { 
+      name = "hello-2.1.1"; 
+      builder = ./builder.sh; 
+      src = fetchurl { 
+        url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+        sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+      };
+      inherit perl; 
+    }
+
+[example\_title](#ex-hello-nix) shows a Nix expression for GNU Hello.
+It's actually already in the Nix Packages collection in
+`pkgs/applications/misc/hello/ex-1/default.nix`. It is customary to
+place each package in a separate directory and call the single Nix
+expression in that directory `default.nix`. The file has the following
+elements (referenced from the figure by number):
+
+  - This states that the expression is a *function* that expects to be
+    called with three arguments: `stdenv`, `fetchurl`, and `perl`. They
+    are needed to build Hello, but we don't know how to build them here;
+    that's why they are function arguments. `stdenv` is a package that
+    is used by almost all Nix Packages packages; it provides a
+    “standard” environment consisting of the things you would expect
+    in a basic Unix environment: a C/C++ compiler (GCC, to be precise),
+    the Bash shell, fundamental Unix tools such as `cp`, `grep`, `tar`,
+    etc. `fetchurl` is a function that downloads files. `perl` is the
+    Perl interpreter.
+    
+    Nix functions generally have the form `{ x, y, ...,
+                    z }: e` where `x`, `y`, etc. are the names of the expected
+    arguments, and where e is the body of the function. So here, the
+    entire remainder of the file is the body of the function; when given
+    the required arguments, the body should describe how to build an
+    instance of the Hello package.
+
+  - So we have to build a package. Building something from other stuff
+    is called a *derivation* in Nix (as opposed to sources, which are
+    built by humans instead of computers). We perform a derivation by
+    calling `stdenv.mkDerivation`. `mkDerivation` is a function provided
+    by `stdenv` that builds a package from a set of *attributes*. A set
+    is just a list of key/value pairs where each key is a string and
+    each value is an arbitrary Nix expression. They take the general
+    form `{
+                    name1 =
+                    expr1; ...
+                    nameN =
+                    exprN; }`.
+
+  - The attribute `name` specifies the symbolic name and version of the
+    package. Nix doesn't really care about these things, but they are
+    used by for instance `nix-env
+                    -q` to show a “human-readable” name for packages. This attribute is
+    required by `mkDerivation`.
+
+  - The attribute `builder` specifies the builder. This attribute can
+    sometimes be omitted, in which case `mkDerivation` will fill in a
+    default builder (which does a `configure; make; make install`, in
+    essence). Hello is sufficiently simple that the default builder
+    would suffice, but in this case, we will show an actual builder for
+    educational purposes. The value `./builder.sh` refers to the shell
+    script shown in [???](#ex-hello-builder), discussed below.
+
+  - The builder has to know what the sources of the package are. Here,
+    the attribute `src` is bound to the result of a call to the
+    `fetchurl` function. Given a URL and a SHA-256 hash of the expected
+    contents of the file at that URL, this function builds a derivation
+    that downloads the file and checks its hash. So the sources are a
+    dependency that like all other dependencies is built before Hello
+    itself is built.
+    
+    Instead of `src` any other name could have been used, and in fact
+    there can be any number of sources (bound to different attributes).
+    However, `src` is customary, and it's also expected by the default
+    builder (which we don't use in this example).
+
+  - Since the derivation requires Perl, we have to pass the value of the
+    `perl` function argument to the builder. All attributes in the set
+    are actually passed as environment variables to the builder, so
+    declaring an attribute
+    
+        perl = perl;
+    
+    will do the trick: it binds an attribute `perl` to the function
+    argument which also happens to be called `perl`. However, it looks a
+    bit silly, so there is a shorter syntax. The `inherit` keyword
+    causes the specified attributes to be bound to whatever variables
+    with the same name happen to be in scope.
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
new file mode 100644
index 000000000..cbc484199
--- /dev/null
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -0,0 +1,61 @@
+# Generic Builder Syntax
+
+Recall from [???](#ex-hello-builder) that the builder looked something
+like this:
+
+    PATH=$perl/bin:$PATH
+    tar xvfz $src
+    cd hello-*
+    ./configure --prefix=$out
+    make
+    make install
+
+The builders for almost all Unix packages look like this — set up some
+environment variables, unpack the sources, configure, build, and
+install. For this reason the standard environment provides some Bash
+functions that automate the build process. A builder using the generic
+build facilities in shown in [example\_title](#ex-hello-builder2).
+
+    buildInputs="$perl" 
+    
+    source $stdenv/setup 
+    
+    genericBuild 
+
+  - The buildInputs variable tells `setup` to use the indicated packages
+    as “inputs”. This means that if a package provides a `bin`
+    subdirectory, it's added to PATH; if it has a `include`
+    subdirectory, it's added to GCC's header search path; and so
+    on.\[1\]
+
+  - The function `genericBuild` is defined in the file `$stdenv/setup`.
+
+  - The final step calls the shell function `genericBuild`, which
+    performs the steps that were done explicitly in
+    [???](#ex-hello-builder). The generic builder is smart enough to
+    figure out whether to unpack the sources using `gzip`, `bzip2`, etc.
+    It can be customised in many ways; see the Nixpkgs manual for
+    details.
+
+Discerning readers will note that the buildInputs could just as well
+have been set in the Nix expression, like this:
+
+``` 
+  buildInputs = [ perl ];
+```
+
+The `perl` attribute can then be removed, and the builder becomes even
+shorter:
+
+    source $stdenv/setup
+    genericBuild
+
+In fact, `mkDerivation` provides a default builder that looks exactly
+like that, so it is actually possible to omit the builder for Hello
+entirely.
+
+1.  How does it work? `setup` tries to source the file
+    `pkg/nix-support/setup-hook` of all dependencies. These “setup
+    hooks” can then set up whatever environment variables they want;
+    for instance, the setup hook for Perl sets the PERL5LIB environment
+    variable to contain the `lib/site_perl` directories of all inputs.
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
new file mode 100644
index 000000000..a773c239b
--- /dev/null
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -0,0 +1,291 @@
+# Language Constructs
+
+Recursive sets are just normal sets, but the attributes can refer to
+each other. For example,
+
+    rec {
+      x = y;
+      y = 123;
+    }.x
+
+evaluates to `123`. Note that without `rec` the binding `x = y;` would
+refer to the variable `y` in the surrounding scope, if one exists, and
+would be invalid if no such variable exists. That is, in a normal
+(non-recursive) set, attributes are not added to the lexical scope; in a
+recursive set, they are.
+
+Recursive sets of course introduce the danger of infinite recursion. For
+example,
+
+    rec {
+      x = y;
+      y = x;
+    }.x
+
+does not terminate\[1\].
+
+A let-expression allows you to define local variables for an expression.
+For instance,
+
+    let
+      x = "foo";
+      y = "bar";
+    in x + y
+
+evaluates to `"foobar"`.
+
+When defining a set or in a let-expression it is often convenient to
+copy variables from the surrounding lexical scope (e.g., when you want
+to propagate attributes). This can be shortened using the `inherit`
+keyword. For instance,
+
+    let x = 123; in
+    { inherit x;
+      y = 456;
+    }
+
+is equivalent to
+
+    let x = 123; in
+    { x = x;
+      y = 456;
+    }
+
+and both evaluate to `{ x = 123; y = 456; }`. (Note that this works
+because `x` is added to the lexical scope by the `let` construct.) It is
+also possible to inherit attributes from another set. For instance, in
+this fragment from `all-packages.nix`,
+
+``` 
+  graphviz = (import ../tools/graphics/graphviz) {
+    inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
+    inherit (xlibs) libXaw;
+  };
+
+  xlibs = {
+    libX11 = ...;
+    libXaw = ...;
+    ...
+  }
+
+  libpng = ...;
+  libjpg = ...;
+  ...
+```
+
+the set used in the function call to the function defined in
+`../tools/graphics/graphviz` inherits a number of variables from the
+surrounding scope (`fetchurl` ... `yacc`), but also inherits `libXaw`
+(the X Athena Widgets) from the `xlibs` (X11 client-side libraries) set.
+
+Summarizing the fragment
+
+    ...
+    inherit x y z;
+    inherit (src-set) a b c;
+    ...
+
+is equivalent to
+
+    ...
+    x = x; y = y; z = z;
+    a = src-set.a; b = src-set.b; c = src-set.c;
+    ...
+
+when used while defining local variables in a let-expression or while
+defining a set.
+
+Functions have the following form:
+
+    pattern: body
+
+The pattern specifies what the argument of the function must look like,
+and binds variables in the body to (parts of) the argument. There are
+three kinds of patterns:
+
+  - If a pattern is a single identifier, then the function matches any
+    argument. Example:
+    
+        let negate = x: !x;
+            concat = x: y: x + y;
+        in if negate true then concat "foo" "bar" else ""
+    
+    Note that `concat` is a function that takes one argument and returns
+    a function that takes another argument. This allows partial
+    parameterisation (i.e., only filling some of the arguments of a
+    function); e.g.,
+    
+        map (concat "foo") [ "bar" "bla" "abc" ]
+    
+    evaluates to `[ "foobar" "foobla"
+            "fooabc" ]`.
+
+  - A *set pattern* of the form `{ name1, name2, …, nameN }` matches a
+    set containing the listed attributes, and binds the values of those
+    attributes to variables in the function body. For example, the
+    function
+    
+        { x, y, z }: z + y + x
+    
+    can only be called with a set containing exactly the attributes `x`,
+    `y` and `z`. No other attributes are allowed. If you want to allow
+    additional arguments, you can use an ellipsis (`...`):
+    
+        { x, y, z, ... }: z + y + x
+    
+    This works on any set that contains at least the three named
+    attributes.
+    
+    It is possible to provide *default values* for attributes, in which
+    case they are allowed to be missing. A default value is specified by
+    writing `name ?
+            e`, where e is an arbitrary expression. For example,
+    
+        { x, y ? "foo", z ? "bar" }: z + y + x
+    
+    specifies a function that only requires an attribute named `x`, but
+    optionally accepts `y` and `z`.
+
+  - An `@`-pattern provides a means of referring to the whole value
+    being matched:
+    
+    ``` 
+     args@{ x, y, z, ... }: z + y + x + args.a
+    ```
+    
+    but can also be written as:
+    
+    ``` 
+     { x, y, z, ... } @ args: z + y + x + args.a
+    ```
+    
+    Here `args` is bound to the entire argument, which is further
+    matched against the pattern `{ x, y, z,
+            ... }`. `@`-pattern makes mainly sense with an ellipsis(`...`) as
+    you can access attribute names as `a`, using `args.a`, which was
+    given as an additional attribute to the function.
+    
+    > **Warning**
+    > 
+    > The `args@` expression is bound to the argument passed to the
+    > function which means that attributes with defaults that aren't
+    > explicitly specified in the function call won't cause an
+    > evaluation error, but won't exist in `args`.
+    > 
+    > For instance
+    > 
+    >     let
+    >       function = args@{ a ? 23, ... }: args;
+    >     in
+    >      function {}
+    > 
+    > will evaluate to an empty attribute set.
+
+Note that functions do not have names. If you want to give them a name,
+you can bind them to an attribute, e.g.,
+
+    let concat = { x, y }: x + y;
+    in concat { x = "foo"; y = "bar"; }
+
+Conditionals look like this:
+
+    if e1 then e2 else e3
+
+where e1 is an expression that should evaluate to a Boolean value
+(`true` or `false`).
+
+Assertions are generally used to check that certain requirements on or
+between features and dependencies hold. They look like this:
+
+    assert e1; e2
+
+where e1 is an expression that should evaluate to a Boolean value. If it
+evaluates to `true`, e2 is returned; otherwise expression evaluation is
+aborted and a backtrace is printed.
+
+    { localServer ? false
+    , httpServer ? false
+    , sslSupport ? false
+    , pythonBindings ? false
+    , javaSwigBindings ? false
+    , javahlBindings ? false
+    , stdenv, fetchurl
+    , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
+    }:
+    
+    assert localServer -> db4 != null; 
+    assert httpServer -> httpd != null && httpd.expat == expat; 
+    assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); 
+    assert pythonBindings -> swig != null && swig.pythonSupport;
+    assert javaSwigBindings -> swig != null && swig.javaSupport;
+    assert javahlBindings -> j2sdk != null;
+    
+    stdenv.mkDerivation {
+      name = "subversion-1.1.1";
+      ...
+      openssl = if sslSupport then openssl else null; 
+      ...
+    }
+
+[example\_title](#ex-subversion-nix) show how assertions are used in the
+Nix expression for Subversion.
+
+  - This assertion states that if Subversion is to have support for
+    local repositories, then Berkeley DB is needed. So if the Subversion
+    function is called with the `localServer` argument set to `true` but
+    the `db4` argument set to `null`, then the evaluation fails.
+
+  - This is a more subtle condition: if Subversion is built with Apache
+    (`httpServer`) support, then the Expat library (an XML library) used
+    by Subversion should be same as the one used by Apache. This is
+    because in this configuration Subversion code ends up being linked
+    with Apache code, and if the Expat libraries do not match, a build-
+    or runtime link error or incompatibility might occur.
+
+  - This assertion says that in order for Subversion to have SSL support
+    (so that it can access `https` URLs), an OpenSSL library must be
+    passed. Additionally, it says that *if* Apache support is enabled,
+    then Apache's OpenSSL should match Subversion's. (Note that if
+    Apache support is not enabled, we don't care about Apache's
+    OpenSSL.)
+
+  - The conditional here is not really related to assertions, but is
+    worth pointing out: it ensures that if SSL support is disabled, then
+    the Subversion derivation is not dependent on OpenSSL, even if a
+    non-`null` value was passed. This prevents an unnecessary rebuild of
+    Subversion if OpenSSL changes.
+
+A *with-expression*,
+
+    with e1; e2
+
+introduces the set e1 into the lexical scope of the expression e2. For
+instance,
+
+    let as = { x = "foo"; y = "bar"; };
+    in with as; x + y
+
+evaluates to `"foobar"` since the `with` adds the `x` and `y` attributes
+of `as` to the lexical scope in the expression `x + y`. The most common
+use of `with` is in conjunction with the `import` function. E.g.,
+
+    with (import ./definitions.nix); ...
+
+makes all attributes defined in the file `definitions.nix` available as
+if they were defined locally in a `let`-expression.
+
+The bindings introduced by `with` do not shadow bindings introduced by
+other means, e.g.
+
+    let a = 3; in with { a = 1; }; let a = 4; in with { a = 2; }; ...
+
+establishes the same scope as
+
+    let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...
+
+Comments can be single-line, started with a `#` character, or
+inline/multi-line, enclosed within `/*
+... */`.
+
+1.  Actually, Nix detects infinite recursion in this case and aborts
+    (“infinite recursion encountered”).
diff --git a/doc/manual/src/expressions/language-operators.md b/doc/manual/src/expressions/language-operators.md
new file mode 100644
index 000000000..4fa2eca37
--- /dev/null
+++ b/doc/manual/src/expressions/language-operators.md
@@ -0,0 +1,32 @@
+# Operators
+
+[table\_title](#table-operators) lists the operators in the Nix
+expression language, in order of precedence (from strongest to weakest
+binding).
+
+| Name                     | Syntax                        | Associativity | Description                                                                                                                                                                                                             | Precedence |
+| ------------------------ | ----------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
+| Select                   | e `.` attrpath \[ `or` def \] | none          | Select attribute denoted by the attribute path attrpath from set e. (An attribute path is a dot-separated list of attribute names.) If the attribute doesn’t exist, return def if provided, otherwise abort evaluation. | 1          |
+| Application              | e1 e2                         | left          | Call function e1 with argument e2.                                                                                                                                                                                      | 2          |
+| Arithmetic Negation      | `-` e                         | none          | Arithmetic negation.                                                                                                                                                                                                    | 3          |
+| Has Attribute            | e `?` attrpath                | none          | Test whether set e contains the attribute denoted by attrpath; return `true` or `false`.                                                                                                                                | 4          |
+| List Concatenation       | e1 `++` e2                    | right         | List concatenation.                                                                                                                                                                                                     | 5          |
+| Multiplication           | e1 `*` e2,                    | left          | Arithmetic multiplication.                                                                                                                                                                                              | 6          |
+| Division                 | e1 `/` e2                     | left          | Arithmetic division.                                                                                                                                                                                                    | 6          |
+| Addition                 | e1 `+` e2                     | left          | Arithmetic addition.                                                                                                                                                                                                    | 7          |
+| Subtraction              | e1 `-` e2                     | left          | Arithmetic subtraction.                                                                                                                                                                                                 | 7          |
+| String Concatenation     | string1 `+` string2           | left          | String concatenation.                                                                                                                                                                                                   | 7          |
+| Not                      | `!` e                         | none          | Boolean negation.                                                                                                                                                                                                       | 8          |
+| Update                   | e1 `//` e2                    | right         | Return a set consisting of the attributes in e1 and e2 (with the latter taking precedence over the former in case of equally named attributes).                                                                         | 9          |
+| Less Than                | e1 `<` e2,                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
+| Less Than or Equal To    | e1 `<=` e2                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
+| Greater Than             | e1 `>` e2                     | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
+| Greater Than or Equal To | e1 `>=` e2                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
+| Equality                 | e1 `==` e2                    | none          | Equality.                                                                                                                                                                                                               | 11         |
+| Inequality               | e1 `!=` e2                    | none          | Inequality.                                                                                                                                                                                                             | 11         |
+| Logical AND              | e1 `&&` e2                    | left          | Logical AND.                                                                                                                                                                                                            | 12         |
+| Logical OR               | e1 `\|\|` e2                  | left          | Logical OR.                                                                                                                                                                                                             | 13         |
+| Logical Implication      | e1 `->` e2                    | none          | Logical implication (equivalent to `!e1 \|\|
+        e2`).                                                                                                                                                              | 14         |
+
+Operators
diff --git a/doc/manual/src/expressions/language-values.md b/doc/manual/src/expressions/language-values.md
new file mode 100644
index 000000000..98ad97c97
--- /dev/null
+++ b/doc/manual/src/expressions/language-values.md
@@ -0,0 +1,209 @@
+# Values
+
+Nix has the following basic data types:
+
+  - *Strings* can be written in three ways.
+    
+    The most common way is to enclose the string between double quotes,
+    e.g., `"foo bar"`. Strings can span multiple lines. The special
+    characters `"` and `\` and the character sequence `${` must be
+    escaped by prefixing them with a backslash (`\`). Newlines, carriage
+    returns and tabs can be written as `\n`, `\r` and `\t`,
+    respectively.
+    
+    You can include the result of an expression into a string by
+    enclosing it in `${...}`, a feature known as *antiquotation*. The
+    enclosed expression must evaluate to something that can be coerced
+    into a string (meaning that it must be a string, a path, or a
+    derivation). For instance, rather than writing
+    
+        "--with-freetype2-library=" + freetype + "/lib"
+    
+    (where `freetype` is a derivation), you can instead write the more
+    natural
+    
+        "--with-freetype2-library=${freetype}/lib"
+    
+    The latter is automatically translated to the former. A more
+    complicated example (from the Nix expression for
+    [Qt](http://www.trolltech.com/products/qt)):
+    
+        configureFlags = "
+          -system-zlib -system-libpng -system-libjpeg
+          ${if openglSupport then "-dlopen-opengl
+            -L${mesa}/lib -I${mesa}/include
+            -L${libXmu}/lib -I${libXmu}/include" else ""}
+          ${if threadSupport then "-thread" else "-no-thread"}
+        ";
+    
+    Note that Nix expressions and strings can be arbitrarily nested; in
+    this case the outer string contains various antiquotations that
+    themselves contain strings (e.g., `"-thread"`), some of which in
+    turn contain expressions (e.g., `${mesa}`).
+    
+    The second way to write string literals is as an *indented string*,
+    which is enclosed between pairs of *double single-quotes*, like so:
+    
+        ''
+          This is the first line.
+          This is the second line.
+            This is the third line.
+        ''
+    
+    This kind of string literal intelligently strips indentation from
+    the start of each line. To be precise, it strips from each line a
+    number of spaces equal to the minimal indentation of the string as a
+    whole (disregarding the indentation of empty lines). For instance,
+    the first and second line are indented two space, while the third
+    line is indented four spaces. Thus, two spaces are stripped from
+    each line, so the resulting string is
+    
+        "This is the first line.\nThis is the second line.\n  This is the third line.\n"
+    
+    Note that the whitespace and newline following the opening `''` is
+    ignored if there is no non-whitespace text on the initial line.
+    
+    Antiquotation (`${expr}`) is supported in indented strings.
+    
+    Since `${` and `''` have special meaning in indented strings, you
+    need a way to quote them. `$` can be escaped by prefixing it with
+    `''` (that is, two single quotes), i.e., `''$`. `''` can be escaped
+    by prefixing it with `'`, i.e., `'''`. `$` removes any special
+    meaning from the following `$`. Linefeed, carriage-return and tab
+    characters can be written as `''\n`, `''\r`, `''\t`, and `''\`
+    escapes any other character.
+    
+    Indented strings are primarily useful in that they allow multi-line
+    string literals to follow the indentation of the enclosing Nix
+    expression, and that less escaping is typically necessary for
+    strings representing languages such as shell scripts and
+    configuration files because `''` is much less common than `"`.
+    Example:
+    
+        stdenv.mkDerivation {
+          ...
+          postInstall =
+            ''
+              mkdir $out/bin $out/etc
+              cp foo $out/bin
+              echo "Hello World" > $out/etc/foo.conf
+              ${if enableBar then "cp bar $out/bin" else ""}
+            '';
+          ...
+        }
+    
+    Finally, as a convenience, *URIs* as defined in appendix B of
+    [RFC 2396](http://www.ietf.org/rfc/rfc2396.txt) can be written *as
+    is*, without quotes. For instance, the string
+    `"http://example.org/foo.tar.bz2"` can also be written as
+    `http://example.org/foo.tar.bz2`.
+
+  - Numbers, which can be *integers* (like `123`) or *floating point*
+    (like `123.43` or `.27e13`).
+    
+    Numbers are type-compatible: pure integer operations will always
+    return integers, whereas any operation involving at least one
+    floating point number will have a floating point number as a result.
+
+  - *Paths*, e.g., `/bin/sh` or `./builder.sh`. A path must contain at
+    least one slash to be recognised as such; for instance, `builder.sh`
+    is not a path\[1\]. If the file name is relative, i.e., if it does
+    not begin with a slash, it is made absolute at parse time relative
+    to the directory of the Nix expression that contained it. For
+    instance, if a Nix expression in `/foo/bar/bla.nix` refers to
+    `../xyzzy/fnord.nix`, the absolute path is `/foo/xyzzy/fnord.nix`.
+    
+    If the first component of a path is a `~`, it is interpreted as if
+    the rest of the path were relative to the user's home directory.
+    e.g. `~/foo` would be equivalent to `/home/edolstra/foo` for a user
+    whose home directory is `/home/edolstra`.
+    
+    Paths can also be specified between angle brackets, e.g.
+    `<nixpkgs>`. This means that the directories listed in the
+    environment variable NIX\_PATH will be searched for the given file
+    or directory name.
+
+  - *Booleans* with values `true` and `false`.
+
+  - The null value, denoted as `null`.
+
+Lists are formed by enclosing a whitespace-separated list of values
+between square brackets. For example,
+
+    [ 123 ./foo.nix "abc" (f { x = y; }) ]
+
+defines a list of four elements, the last being the result of a call to
+the function `f`. Note that function calls have to be enclosed in
+parentheses. If they had been omitted, e.g.,
+
+    [ 123 ./foo.nix "abc" f { x = y; } ]
+
+the result would be a list of five elements, the fourth one being a
+function and the fifth being a set.
+
+Note that lists are only lazy in values, and they are strict in length.
+
+Sets are really the core of the language, since ultimately the Nix
+language is all about creating derivations, which are really just sets
+of attributes to be passed to build scripts.
+
+Sets are just a list of name/value pairs (called *attributes*) enclosed
+in curly brackets, where each value is an arbitrary expression
+terminated by a semicolon. For example:
+
+    { x = 123;
+      text = "Hello";
+      y = f { bla = 456; };
+    }
+
+This defines a set with attributes named `x`, `text`, `y`. The order of
+the attributes is irrelevant. An attribute name may only occur once.
+
+Attributes can be selected from a set using the `.` operator. For
+instance,
+
+    { a = "Foo"; b = "Bar"; }.a
+
+evaluates to `"Foo"`. It is possible to provide a default value in an
+attribute selection using the `or` keyword. For example,
+
+    { a = "Foo"; b = "Bar"; }.c or "Xyzzy"
+
+will evaluate to `"Xyzzy"` because there is no `c` attribute in the set.
+
+You can use arbitrary double-quoted strings as attribute names:
+
+    { "foo ${bar}" = 123; "nix-1.0" = 456; }."foo ${bar}"
+
+This will evaluate to `123` (Assuming `bar` is antiquotable). In the
+case where an attribute name is just a single antiquotation, the quotes
+can be dropped:
+
+    { foo = 123; }.${bar} or 456 
+
+This will evaluate to `123` if `bar` evaluates to `"foo"` when coerced
+to a string and `456` otherwise (again assuming `bar` is antiquotable).
+
+In the special case where an attribute name inside of a set declaration
+evaluates to `null` (which is normally an error, as `null` is not
+antiquotable), that attribute is simply not added to the set:
+
+    { ${if foo then "bar" else null} = true; }
+
+This will evaluate to `{}` if `foo` evaluates to `false`.
+
+A set that has a `__functor` attribute whose value is callable (i.e. is
+itself a function or a set with a `__functor` attribute whose value is
+callable) can be applied as if it were a function, with the set itself
+passed in first , e.g.,
+
+    let add = { __functor = self: x: x + self.x; };
+        inc = add // { x = 1; };
+    in inc 1
+
+evaluates to `2`. This can be used to attach metadata to a function
+without the caller needing to treat it specially, or to implement a form
+of object-oriented programming, for example.
+
+1.  It's parsed as an expression that selects the attribute `sh` from
+    the variable `builder`.
diff --git a/doc/manual/src/expressions/simple-building-testing.md b/doc/manual/src/expressions/simple-building-testing.md
new file mode 100644
index 000000000..bc064c733
--- /dev/null
+++ b/doc/manual/src/expressions/simple-building-testing.md
@@ -0,0 +1,57 @@
+# Building and Testing
+
+You can now try to build Hello. Of course, you could do `nix-env -i
+hello`, but you may not want to install a possibly broken package just
+yet. The best way to test the package is by using the command
+`nix-build`, which builds a Nix expression and creates a symlink named
+`result` in the current directory:
+
+    $ nix-build -A hello
+    building path `/nix/store/632d2b22514d...-hello-2.1.1'
+    hello-2.1.1/
+    hello-2.1.1/intl/
+    hello-2.1.1/intl/ChangeLog
+    ...
+    
+    $ ls -l result
+    lrwxrwxrwx ... 2006-09-29 10:43 result -> /nix/store/632d2b22514d...-hello-2.1.1
+    
+    $ ./result/bin/hello
+    Hello, world!
+
+The [`-A`](#opt-attr) option selects the `hello` attribute. This is
+faster than using the symbolic package name specified by the `name`
+attribute (which also happens to be `hello`) and is unambiguous (there
+can be multiple packages with the symbolic name `hello`, but there can
+be only one attribute in a set named `hello`).
+
+`nix-build` registers the `./result` symlink as a garbage collection
+root, so unless and until you delete the `./result` symlink, the output
+of the build will be safely kept on your system. You can use
+`nix-build`’s `-o` switch to give the symlink another name.
+
+Nix has transactional semantics. Once a build finishes successfully, Nix
+makes a note of this in its database: it registers that the path denoted
+by out is now “valid”. If you try to build the derivation again, Nix
+will see that the path is already valid and finish immediately. If a
+build fails, either because it returns a non-zero exit code, because Nix
+or the builder are killed, or because the machine crashes, then the
+output paths will not be registered as valid. If you try to build the
+derivation again, Nix will remove the output paths if they exist (e.g.,
+because the builder died half-way through `make
+install`) and try again. Note that there is no “negative caching”: Nix
+doesn't remember that a build failed, and so a failed build can always
+be repeated. This is because Nix cannot distinguish between permanent
+failures (e.g., a compiler error due to a syntax error in the source)
+and transient failures (e.g., a disk full condition).
+
+Nix also performs locking. If you run multiple Nix builds
+simultaneously, and they try to build the same derivation, the first Nix
+instance that gets there will perform the build, while the others block
+(or perform other derivations if available) until the build finishes:
+
+    $ nix-build -A hello
+    waiting for lock on `/nix/store/0h5b7hp8d4hqfrw8igvx97x1xawrjnac-hello-2.1.1x'
+
+So it is always safe to run multiple instances of Nix in parallel (which
+isn’t the case with, say, `make`).
diff --git a/doc/manual/src/expressions/simple-expression.md b/doc/manual/src/expressions/simple-expression.md
new file mode 100644
index 000000000..9023f97a4
--- /dev/null
+++ b/doc/manual/src/expressions/simple-expression.md
@@ -0,0 +1,27 @@
+# A Simple Nix Expression
+
+This section shows how to add and test the [GNU Hello
+package](http://www.gnu.org/software/hello/hello.html) to the Nix
+Packages collection. Hello is a program that prints out the text “Hello,
+world\!”.
+
+To add a package to the Nix Packages collection, you generally need to
+do three things:
+
+1.  Write a Nix expression for the package. This is a file that
+    describes all the inputs involved in building the package, such as
+    dependencies, sources, and so on.
+
+2.  Write a *builder*. This is a shell script\[1\] that actually builds
+    the package from the inputs.
+
+3.  Add the package to the file `pkgs/top-level/all-packages.nix`. The
+    Nix expression written in the first step is a *function*; it
+    requires other packages in order to build it. In this step you put
+    it all together, i.e., you call the function with the right
+    arguments to build the actual package.
+
+<!-- end list -->
+
+1.  In fact, it can be written in any language, but typically it's a
+    `bash` shell script.
diff --git a/doc/manual/src/expressions/writing-nix-expressions.md b/doc/manual/src/expressions/writing-nix-expressions.md
new file mode 100644
index 000000000..5664108e7
--- /dev/null
+++ b/doc/manual/src/expressions/writing-nix-expressions.md
@@ -0,0 +1,12 @@
+This chapter shows you how to write Nix expressions, which instruct Nix
+how to build packages. It starts with a simple example (a Nix expression
+for GNU Hello), and then moves on to a more in-depth look at the Nix
+expression language.
+
+> **Note**
+> 
+> This chapter is mostly about the Nix expression language. For more
+> extensive information on adding packages to the Nix Packages
+> collection (such as functions in the standard environment and coding
+> conventions), please consult [its
+> manual](http://nixos.org/nixpkgs/manual/).
diff --git a/doc/manual/src/glossary.md b/doc/manual/src/glossary.md
new file mode 100644
index 000000000..c8bdf4fd2
--- /dev/null
+++ b/doc/manual/src/glossary.md
@@ -0,0 +1,102 @@
+# Glossary
+
+  - derivation  
+    A description of a build action. The result of a derivation is a
+    store object. Derivations are typically specified in Nix expressions
+    using the [`derivation` primitive](#ssec-derivation). These are
+    translated into low-level *store derivations* (implicitly by
+    `nix-env` and `nix-build`, or explicitly by `nix-instantiate`).
+
+  - store  
+    The location in the file system where store objects live. Typically
+    `/nix/store`.
+
+  - store path  
+    The location in the file system of a store object, i.e., an
+    immediate child of the Nix store directory.
+
+  - store object  
+    A file that is an immediate child of the Nix store directory. These
+    can be regular files, but also entire directory trees. Store objects
+    can be sources (objects copied from outside of the store),
+    derivation outputs (objects produced by running a build action), or
+    derivations (files describing a build action).
+
+  - substitute  
+    A substitute is a command invocation stored in the Nix database that
+    describes how to build a store object, bypassing the normal build
+    mechanism (i.e., derivations). Typically, the substitute builds the
+    store object by downloading a pre-built version of the store object
+    from some server.
+
+  - purity  
+    The assumption that equal Nix derivations when run always produce
+    the same output. This cannot be guaranteed in general (e.g., a
+    builder can rely on external inputs such as the network or the
+    system time) but the Nix model assumes it.
+
+  - Nix expression  
+    A high-level description of software packages and compositions
+    thereof. Deploying software using Nix entails writing Nix
+    expressions for your packages. Nix expressions are translated to
+    derivations that are stored in the Nix store. These derivations can
+    then be built.
+
+  - reference  
+    A store path `P` is said to have a reference to a store path `Q` if
+    the store object at `P` contains the path `Q` somewhere. The
+    *references* of a store path are the set of store paths to which it
+    has a reference.
+    
+    A derivation can reference other derivations and sources (but not
+    output paths), whereas an output path only references other output
+    paths.
+
+  - reachable  
+    A store path `Q` is reachable from another store path `P` if `Q` is
+    in the [closure](#gloss-closure) of the
+    [references](#gloss-reference) relation.
+
+  - closure  
+    The closure of a store path is the set of store paths that are
+    directly or indirectly “reachable” from that store path; that is,
+    it’s the closure of the path under the
+    [references](#gloss-reference) relation. For a package, the closure
+    of its derivation is equivalent to the build-time dependencies,
+    while the closure of its output path is equivalent to its runtime
+    dependencies. For correct deployment it is necessary to deploy whole
+    closures, since otherwise at runtime files could be missing. The
+    command `nix-store -qR` prints out closures of store paths.
+    
+    As an example, if the store object at path `P` contains a reference
+    to path `Q`, then `Q` is in the closure of `P`. Further, if `Q`
+    references `R` then `R` is also in the closure of `P`.
+
+  - output path  
+    A store path produced by a derivation.
+
+  - deriver  
+    The deriver of an [output path](#gloss-output-path) is the store
+    derivation that built it.
+
+  - validity  
+    A store path is considered *valid* if it exists in the file system,
+    is listed in the Nix database as being valid, and if all paths in
+    its closure are also valid.
+
+  - user environment  
+    An automatically generated store object that consists of a set of
+    symlinks to “active” applications, i.e., other store paths. These
+    are generated automatically by [`nix-env`](#sec-nix-env). See
+    [???](#sec-profiles).
+
+  - profile  
+    A symlink to the current [user environment](#gloss-user-env) of a
+    user, e.g., `/nix/var/nix/profiles/default`.
+
+  - NAR  
+    A *N*ix *AR*chive. This is a serialisation of a path in the Nix
+    store. It can contain regular files, directories and symbolic links.
+    NARs are generated and unpacked using `nix-store --dump` and
+    `nix-store
+            --restore`.
diff --git a/doc/manual/src/hacking.md b/doc/manual/src/hacking.md
new file mode 100644
index 000000000..f8375822d
--- /dev/null
+++ b/doc/manual/src/hacking.md
@@ -0,0 +1,47 @@
+# Hacking
+
+This section provides some notes on how to hack on Nix. To get the
+latest version of Nix from GitHub:
+
+    $ git clone https://github.com/NixOS/nix.git
+    $ cd nix
+
+To build Nix for the current operating system/architecture use
+
+    $ nix-build
+
+or if you have a flakes-enabled nix:
+
+    $ nix build
+
+This will build `defaultPackage` attribute defined in the `flake.nix`
+file. To build for other platforms add one of the following suffixes to
+it: aarch64-linux, i686-linux, x86\_64-darwin, x86\_64-linux. i.e.
+
+    $ nix-build -A defaultPackage.x86_64-linux
+
+To build all dependencies and start a shell in which all environment
+variables are set up so that those dependencies can be found:
+
+    $ nix-shell
+
+To build Nix itself in this shell:
+
+    [nix-shell]$ ./bootstrap.sh
+    [nix-shell]$ ./configure $configureFlags
+    [nix-shell]$ make -j $NIX_BUILD_CORES
+
+To install it in `$(pwd)/inst` and test it:
+
+    [nix-shell]$ make install
+    [nix-shell]$ make installcheck
+    [nix-shell]$ ./inst/bin/nix --version
+    nix (Nix) 2.4
+
+If you have a flakes-enabled nix you can replace:
+
+    $ nix-shell
+
+by:
+
+    $ nix develop
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/src/installation/building-source.md
new file mode 100644
index 000000000..c498713de
--- /dev/null
+++ b/doc/manual/src/installation/building-source.md
@@ -0,0 +1,34 @@
+# Building Nix from Source
+
+After unpacking or checking out the Nix sources, issue the following
+commands:
+
+    $ ./configure options...
+    $ make
+    $ make install
+
+Nix requires GNU Make so you may need to invoke `gmake` instead.
+
+When building from the Git repository, these should be preceded by the
+command:
+
+    $ ./bootstrap.sh
+
+The installation path can be specified by passing the `--prefix=prefix`
+to `configure`. The default installation directory is `/usr/local`. You
+can change this to any location you like. You must have write permission
+to the prefix path.
+
+Nix keeps its *store* (the place where packages are stored) in
+`/nix/store` by default. This can be changed using
+`--with-store-dir=path`.
+
+> **Warning**
+> 
+> It is best *not* to change the Nix store from its default, since doing
+> so makes it impossible to use pre-built binaries from the standard
+> Nixpkgs channels — that is, all packages will need to be built from
+> source.
+
+Nix keeps state (such as its database and log files) in `/nix/var` by
+default. This can be changed using `--localstatedir=path`.
diff --git a/doc/manual/src/installation/env-variables.md b/doc/manual/src/installation/env-variables.md
new file mode 100644
index 000000000..7946ac437
--- /dev/null
+++ b/doc/manual/src/installation/env-variables.md
@@ -0,0 +1,56 @@
+# Environment Variables
+
+To use Nix, some environment variables should be set. In particular,
+PATH should contain the directories `prefix/bin` and
+`~/.nix-profile/bin`. The first directory contains the Nix tools
+themselves, while `~/.nix-profile` is a symbolic link to the current
+*user environment* (an automatically generated package consisting of
+symlinks to installed packages). The simplest way to set the required
+environment variables is to include the file
+`prefix/etc/profile.d/nix.sh` in your `~/.profile` (or similar), like
+this:
+
+    source prefix/etc/profile.d/nix.sh
+
+# NIX\_SSL\_CERT\_FILE
+
+If you need to specify a custom certificate bundle to account for an
+HTTPS-intercepting man in the middle proxy, you must specify the path to
+the certificate bundle in the environment variable NIX\_SSL\_CERT\_FILE.
+
+If you don't specify a NIX\_SSL\_CERT\_FILE manually, Nix will install
+and use its own certificate bundle.
+
+Set the environment variable and install Nix
+
+    $ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
+    $ sh <(curl -L https://nixos.org/nix/install)
+
+In the shell profile and rc files (for example, `/etc/bashrc`,
+`/etc/zshrc`), add the following line:
+
+    export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
+
+> **Note**
+> 
+> You must not add the export and then do the install, as the Nix
+> installer will detect the presense of Nix configuration, and abort.
+
+## NIX\_SSL\_CERT\_FILE with macOS and the Nix daemon
+
+On macOS you must specify the environment variable for the Nix daemon
+service, then restart it:
+
+    $ sudo launchctl setenv NIX_SSL_CERT_FILE /etc/ssl/my-certificate-bundle.crt
+    $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
+
+## Proxy Environment Variables
+
+The Nix installer has special handling for these proxy-related
+environment variables: `http_proxy`, `https_proxy`, `ftp_proxy`,
+`no_proxy`, `HTTP_PROXY`, `HTTPS_PROXY`, `FTP_PROXY`, `NO_PROXY`.
+
+If any of these variables are set when running the Nix installer, then
+the installer will create an override file at
+`/etc/systemd/system/nix-daemon.service.d/override.conf` so `nix-daemon`
+will use them.
diff --git a/doc/manual/src/installation/installation.md b/doc/manual/src/installation/installation.md
new file mode 100644
index 000000000..b40c5b95f
--- /dev/null
+++ b/doc/manual/src/installation/installation.md
@@ -0,0 +1,2 @@
+This section describes how to install and configure Nix for first-time
+use.
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md
new file mode 100644
index 000000000..d4e412e67
--- /dev/null
+++ b/doc/manual/src/installation/installing-binary.md
@@ -0,0 +1,273 @@
+# Installing a Binary Distribution
+
+If you are using Linux or macOS versions up to 10.14 (Mojave), the
+easiest way to install Nix is to run the following command:
+
+``` 
+  $ sh <(curl -L https://nixos.org/nix/install)
+```
+
+If you're using macOS 10.15 (Catalina) or newer, consult [the macOS
+installation instructions](#sect-macos-installation) before installing.
+
+As of Nix 2.1.0, the Nix installer will always default to creating a
+single-user installation, however opting in to the multi-user
+installation is highly recommended.
+
+# Single User Installation
+
+To explicitly select a single-user installation on your system:
+
+``` 
+  sh <(curl -L https://nixos.org/nix/install) --no-daemon
+```
+
+This will perform a single-user installation of Nix, meaning that `/nix`
+is owned by the invoking user. You should run this under your usual user
+account, *not* as root. The script will invoke `sudo` to create `/nix`
+if it doesn’t already exist. If you don’t have `sudo`, you should
+manually create `/nix` first as root, e.g.:
+
+    $ mkdir /nix
+    $ chown alice /nix
+
+The install script will modify the first writable file from amongst
+`.bash_profile`, `.bash_login` and `.profile` to source
+`~/.nix-profile/etc/profile.d/nix.sh`. You can set the
+NIX\_INSTALLER\_NO\_MODIFY\_PROFILE environment variable before
+executing the install script to disable this behaviour.
+
+You can uninstall Nix simply by running:
+
+    $ rm -rf /nix
+
+# Multi User Installation
+
+The multi-user Nix installation creates system users, and a system
+service for the Nix daemon.
+
+  - Linux running systemd, with SELinux disabled
+
+  - macOS
+
+You can instruct the installer to perform a multi-user installation on
+your system:
+
+    sh <(curl -L https://nixos.org/nix/install) --daemon
+
+The multi-user installation of Nix will create build users between the
+user IDs 30001 and 30032, and a group with the group ID 30000. You
+should run this under your usual user account, *not* as root. The script
+will invoke `sudo` as needed.
+
+> **Note**
+> 
+> If you need Nix to use a different group ID or user ID set, you will
+> have to download the tarball manually and [edit the install
+> script](#sect-nix-install-binary-tarball).
+
+The installer will modify `/etc/bashrc`, and `/etc/zshrc` if they exist.
+The installer will first back up these files with a `.backup-before-nix`
+extension. The installer will also create `/etc/profile.d/nix.sh`.
+
+You can uninstall Nix with the following commands:
+
+    sudo rm -rf /etc/profile/nix.sh /etc/nix /nix ~root/.nix-profile ~root/.nix-defexpr ~root/.nix-channels ~/.nix-profile ~/.nix-defexpr ~/.nix-channels
+    
+    # If you are on Linux with systemd, you will need to run:
+    sudo systemctl stop nix-daemon.socket
+    sudo systemctl stop nix-daemon.service
+    sudo systemctl disable nix-daemon.socket
+    sudo systemctl disable nix-daemon.service
+    sudo systemctl daemon-reload
+    
+    # If you are on macOS, you will need to run:
+    sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
+    sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
+
+There may also be references to Nix in `/etc/profile`, `/etc/bashrc`,
+and `/etc/zshrc` which you may remove.
+
+# macOS Installation
+
+Starting with macOS 10.15 (Catalina), the root filesystem is read-only.
+This means `/nix` can no longer live on your system volume, and that
+you'll need a workaround to install Nix.
+
+The recommended approach, which creates an unencrypted APFS volume for
+your Nix store and a "synthetic" empty directory to mount it over at
+`/nix`, is least likely to impair Nix or your system.
+
+> **Note**
+> 
+> With all separate-volume approaches, it's possible something on your
+> system (particularly daemons/services and restored apps) may need
+> access to your Nix store before the volume is mounted. Adding
+> additional encryption makes this more likely.
+
+If you're using a recent Mac with a [T2
+chip](https://www.apple.com/euro/mac/shared/docs/Apple_T2_Security_Chip_Overview.pdf),
+your drive will still be encrypted at rest (in which case "unencrypted"
+is a bit of a misnomer). To use this approach, just install Nix with:
+
+    $ sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume
+
+If you don't like the sound of this, you'll want to weigh the other
+approaches and tradeoffs detailed in this section.
+
+> **Note**
+> 
+> All of the known workarounds have drawbacks, but we hope better
+> solutions will be available in the future. Some that we have our eye
+> on are:
+> 
+> 1.  A true firmlink would enable the Nix store to live on the primary
+>     data volume without the build problems caused by the symlink
+>     approach. End users cannot currently create true firmlinks.
+> 
+> 2.  If the Nix store volume shared FileVault encryption with the
+>     primary data volume (probably by using the same volume group and
+>     role), FileVault encryption could be easily supported by the
+>     installer without requiring manual setup by each user.
+
+## Change the Nix store path prefix
+
+Changing the default prefix for the Nix store is a simple approach which
+enables you to leave it on your root volume, where it can take full
+advantage of FileVault encryption if enabled. Unfortunately, this
+approach also opts your device out of some benefits that are enabled by
+using the same prefix across systems:
+
+  - Your system won't be able to take advantage of the binary cache
+    (unless someone is able to stand up and support duplicate caching
+    infrastructure), which means you'll spend more time waiting for
+    builds.
+
+  - It's harder to build and deploy packages to Linux systems.
+
+It would also possible (and often requested) to just apply this change
+ecosystem-wide, but it's an intrusive process that has side effects we
+want to avoid for now.
+
+## Use a separate encrypted volume
+
+If you like, you can also add encryption to the recommended approach
+taken by the installer. You can do this by pre-creating an encrypted
+volume before you run the installer--or you can run the installer and
+encrypt the volume it creates later.
+
+In either case, adding encryption to a second volume isn't quite as
+simple as enabling FileVault for your boot volume. Before you dive in,
+there are a few things to weigh:
+
+1.  The additional volume won't be encrypted with your existing
+    FileVault key, so you'll need another mechanism to decrypt the
+    volume.
+
+2.  You can store the password in Keychain to automatically decrypt the
+    volume on boot--but it'll have to wait on Keychain and may not mount
+    before your GUI apps restore. If any of your launchd agents or apps
+    depend on Nix-installed software (for example, if you use a
+    Nix-installed login shell), the restore may fail or break.
+    
+    On a case-by-case basis, you may be able to work around this problem
+    by using `wait4path` to block execution until your executable is
+    available.
+    
+    It's also possible to decrypt and mount the volume earlier with a
+    login hook--but this mechanism appears to be deprecated and its
+    future is unclear.
+
+3.  You can hard-code the password in the clear, so that your store
+    volume can be decrypted before Keychain is available.
+
+If you are comfortable navigating these tradeoffs, you can encrypt the
+volume with something along the lines of:
+
+    alice$ diskutil apfs enableFileVault /nix -user disk
+
+## Symlink the Nix store to a custom location
+
+Another simple approach is using `/etc/synthetic.conf` to symlink the
+Nix store to the data volume. This option also enables your store to
+share any configured FileVault encryption. Unfortunately, builds that
+resolve the symlink may leak the canonical path or even fail.
+
+Because of these downsides, we can't recommend this approach.
+
+## Notes on the recommended approach
+
+This section goes into a little more detail on the recommended approach.
+You don't need to understand it to run the installer, but it can serve
+as a helpful reference if you run into trouble.
+
+1.  In order to compose user-writable locations into the new read-only
+    system root, Apple introduced a new concept called `firmlinks`,
+    which it describes as a "bi-directional wormhole" between two
+    filesystems. You can see the current firmlinks in
+    `/usr/share/firmlinks`. Unfortunately, firmlinks aren't (currently?)
+    user-configurable.
+    
+    For special cases like NFS mount points or package manager roots,
+    [synthetic.conf(5)](https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man5/synthetic.conf.5.html)
+    supports limited user-controlled file-creation (of symlinks, and
+    synthetic empty directories) at `/`. To create a synthetic empty
+    directory for mounting at `/nix`, add the following line to
+    `/etc/synthetic.conf` (create it if necessary):
+    
+        nix
+
+2.  This configuration is applied at boot time, but you can use
+    `apfs.util` to trigger creation (not deletion) of new entries
+    without a reboot:
+    
+        alice$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B
+
+3.  Create the new APFS volume with diskutil:
+    
+        alice$ sudo diskutil apfs addVolume diskX APFS 'Nix Store' -mountpoint /nix
+
+4.  Using `vifs`, add the new mount to `/etc/fstab`. If it doesn't
+    already have other entries, it should look something like:
+    
+        #
+        # Warning - this file should only be modified with vifs(8)
+        #
+        # Failure to do so is unsupported and may be destructive.
+        #
+        LABEL=Nix\040Store /nix apfs rw,nobrowse
+    
+    The nobrowse setting will keep Spotlight from indexing this volume,
+    and keep it from showing up on your desktop.
+
+# Installing a pinned Nix version from a URL
+
+NixOS.org hosts version-specific installation URLs for all Nix versions
+since 1.11.16, at `https://releases.nixos.org/nix/nix-version/install`.
+
+These install scripts can be used the same as the main NixOS.org
+installation script:
+
+``` 
+  sh <(curl -L https://nixos.org/nix/install)
+```
+
+In the same directory of the install script are sha256 sums, and gpg
+signature files.
+
+# Installing from a binary tarball
+
+You can also download a binary tarball that contains Nix and all its
+dependencies. (This is what the install script at
+<https://nixos.org/nix/install> does automatically.) You should unpack
+it somewhere (e.g. in `/tmp`), and then run the script named `install`
+inside the binary tarball:
+
+    alice$ cd /tmp
+    alice$ tar xfj nix-1.8-x86_64-darwin.tar.bz2
+    alice$ cd nix-1.8-x86_64-darwin
+    alice$ ./install
+
+If you need to edit the multi-user installation script to use different
+group ID or a different user ID range, modify the variables set in the
+file named `install-multi-user`.
diff --git a/doc/manual/src/installation/installing-source.md b/doc/manual/src/installation/installing-source.md
new file mode 100644
index 000000000..e52d38a03
--- /dev/null
+++ b/doc/manual/src/installation/installing-source.md
@@ -0,0 +1,4 @@
+# Installing Nix from Source
+
+If no binary package is available, you can download and compile a source
+distribution.
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/src/installation/multi-user.md
new file mode 100644
index 000000000..17286fdc5
--- /dev/null
+++ b/doc/manual/src/installation/multi-user.md
@@ -0,0 +1,63 @@
+# Multi-User Mode
+
+To allow a Nix store to be shared safely among multiple users, it is
+important that users are not able to run builders that modify the Nix
+store or database in arbitrary ways, or that interfere with builds
+started by other users. If they could do so, they could install a Trojan
+horse in some package and compromise the accounts of other users.
+
+To prevent this, the Nix store and database are owned by some privileged
+user (usually `root`) and builders are executed under special user
+accounts (usually named `nixbld1`, `nixbld2`, etc.). When a unprivileged
+user runs a Nix command, actions that operate on the Nix store (such as
+builds) are forwarded to a *Nix daemon* running under the owner of the
+Nix store/database that performs the operation.
+
+> **Note**
+> 
+> Multi-user mode has one important limitation: only root and a set of
+> trusted users specified in `nix.conf` can specify arbitrary binary
+> caches. So while unprivileged users may install packages from
+> arbitrary Nix expressions, they may not get pre-built binaries.
+
+The *build users* are the special UIDs under which builds are performed.
+They should all be members of the *build users group* `nixbld`. This
+group should have no other members. The build users should not be
+members of any other group. On Linux, you can create the group and users
+as follows:
+
+    $ groupadd -r nixbld
+    $ for n in $(seq 1 10); do useradd -c "Nix build user $n" \
+        -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
+        nixbld$n; done
+
+This creates 10 build users. There can never be more concurrent builds
+than the number of build users, so you may want to increase this if you
+expect to do many builds at the same time.
+
+The [Nix daemon](#sec-nix-daemon) should be started as follows (as
+`root`):
+
+    $ nix-daemon
+
+You’ll want to put that line somewhere in your system’s boot scripts.
+
+To let unprivileged users use the daemon, they should set the
+[NIX\_REMOTE environment variable](#envar-remote) to `daemon`. So you
+should put a line like
+
+    export NIX_REMOTE=daemon
+
+into the users’ login scripts.
+
+To limit which users can perform Nix operations, you can use the
+permissions on the directory `/nix/var/nix/daemon-socket`. For instance,
+if you want to restrict the use of Nix to the members of a group called
+`nix-users`, do
+
+    $ chgrp nix-users /nix/var/nix/daemon-socket
+    $ chmod ug=rwx,o= /nix/var/nix/daemon-socket
+
+This way, users who are not in the `nix-users` group cannot connect to
+the Unix domain socket `/nix/var/nix/daemon-socket/socket`, so they
+cannot perform Nix operations.
diff --git a/doc/manual/src/installation/nix-security.md b/doc/manual/src/installation/nix-security.md
new file mode 100644
index 000000000..1e9036b68
--- /dev/null
+++ b/doc/manual/src/installation/nix-security.md
@@ -0,0 +1,15 @@
+# Security
+
+Nix has two basic security models. First, it can be used in “single-user
+mode”, which is similar to what most other package management tools do:
+there is a single user (typically root) who performs all package
+management operations. All other users can then use the installed
+packages, but they cannot perform package management operations
+themselves.
+
+Alternatively, you can configure Nix in “multi-user mode”. In this
+model, all users can perform package management operations — for
+instance, every user can install software without requiring root
+privileges. Nix ensures that this is secure. For instance, it’s not
+possible for one user to overwrite a package used by another user with a
+Trojan horse.
diff --git a/doc/manual/src/installation/obtaining-source.md b/doc/manual/src/installation/obtaining-source.md
new file mode 100644
index 000000000..2937130cf
--- /dev/null
+++ b/doc/manual/src/installation/obtaining-source.md
@@ -0,0 +1,16 @@
+# Obtaining a Source Distribution
+
+The source tarball of the most recent stable release can be downloaded
+from the [Nix homepage](http://nixos.org/nix/download.html). You can
+also grab the [most recent development
+release](http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents).
+
+Alternatively, the most recent sources of Nix can be obtained from its
+[Git repository](https://github.com/NixOS/nix). For example, the
+following command will check out the latest revision into a directory
+called `nix`:
+
+    $ git clone https://github.com/NixOS/nix
+
+Likewise, specific releases can be obtained from the
+[tags](https://github.com/NixOS/nix/tags) of the repository.
diff --git a/doc/manual/src/installation/prerequisites-source.md b/doc/manual/src/installation/prerequisites-source.md
new file mode 100644
index 000000000..311961fe9
--- /dev/null
+++ b/doc/manual/src/installation/prerequisites-source.md
@@ -0,0 +1,80 @@
+# Prerequisites
+
+  - GNU Autoconf (<https://www.gnu.org/software/autoconf/>) and the
+    autoconf-archive macro collection
+    (<https://www.gnu.org/software/autoconf-archive/>). These are only
+    needed to run the bootstrap script, and are not necessary if your
+    source distribution came with a pre-built `./configure` script.
+
+  - GNU Make.
+
+  - Bash Shell. The `./configure` script relies on bashisms, so Bash is
+    required.
+
+  - A version of GCC or Clang that supports C++17.
+
+  - `pkg-config` to locate dependencies. If your distribution does not
+    provide it, you can get it from
+    <http://www.freedesktop.org/wiki/Software/pkg-config>.
+
+  - The OpenSSL library to calculate cryptographic hashes. If your
+    distribution does not provide it, you can get it from
+    <https://www.openssl.org>.
+
+  - The `libbrotlienc` and `libbrotlidec` libraries to provide
+    implementation of the Brotli compression algorithm. They are
+    available for download from the official repository
+    <https://github.com/google/brotli>.
+
+  - The bzip2 compressor program and the `libbz2` library. Thus you must
+    have bzip2 installed, including development headers and libraries.
+    If your distribution does not provide these, you can obtain bzip2
+    from
+    <https://web.archive.org/web/20180624184756/http://www.bzip.org/>.
+
+  - `liblzma`, which is provided by XZ Utils. If your distribution does
+    not provide this, you can get it from <https://tukaani.org/xz/>.
+
+  - cURL and its library. If your distribution does not provide it, you
+    can get it from <https://curl.haxx.se/>.
+
+  - The SQLite embedded database library, version 3.6.19 or higher. If
+    your distribution does not provide it, please install it from
+    <http://www.sqlite.org/>.
+
+  - The [Boehm garbage collector](http://www.hboehm.info/gc/) to reduce
+    the evaluator’s memory consumption (optional). To enable it, install
+    `pkgconfig` and the Boehm garbage collector, and pass the flag
+    `--enable-gc` to `configure`.
+
+  - The `boost` library of version 1.66.0 or higher. It can be obtained
+    from the official web site <https://www.boost.org/>.
+
+  - The `editline` library of version 1.14.0 or higher. It can be
+    obtained from the its repository
+    <https://github.com/troglobit/editline>.
+
+  - The `xmllint` and `xsltproc` programs to build this manual and the
+    man-pages. These are part of the `libxml2` and `libxslt` packages,
+    respectively. You also need the [DocBook XSL
+    stylesheets](http://docbook.sourceforge.net/projects/xsl/) and
+    optionally the [DocBook 5.0 RELAX NG
+    schemas](http://www.docbook.org/schemas/5x). Note that these are
+    only required if you modify the manual sources or when you are
+    building from the Git repository.
+
+  - Recent versions of Bison and Flex to build the parser. (This is
+    because Nix needs GLR support in Bison and reentrancy support in
+    Flex.) For Bison, you need version 2.6, which can be obtained from
+    the [GNU FTP server](ftp://alpha.gnu.org/pub/gnu/bison). For Flex,
+    you need version 2.5.35, which is available on
+    [SourceForge](http://lex.sourceforge.net/). Slightly older versions
+    may also work, but ancient versions like the ubiquitous 2.5.4a
+    won't. Note that these are only required if you modify the parser or
+    when you are building from the Git repository.
+
+  - The `libseccomp` is used to provide syscall filtering on Linux. This
+    is an optional dependency and can be disabled passing a
+    `--disable-seccomp-sandboxing` option to the `configure` script (Not
+    recommended unless your system doesn't support `libseccomp`). To get
+    the library, visit <https://github.com/seccomp/libseccomp>.
diff --git a/doc/manual/src/installation/single-user.md b/doc/manual/src/installation/single-user.md
new file mode 100644
index 000000000..f9a3b26ed
--- /dev/null
+++ b/doc/manual/src/installation/single-user.md
@@ -0,0 +1,9 @@
+# Single-User Mode
+
+In single-user mode, all Nix operations that access the database in
+`prefix/var/nix/db` or modify the Nix store in `prefix/store` must be
+performed under the user ID that owns those directories. This is
+typically root. (If you install from RPM packages, that’s in fact the
+default ownership.) However, on single-user machines, it is often
+convenient to `chown` those directories to your normal user account so
+that you don’t have to `su` to root all the time.
diff --git a/doc/manual/src/installation/supported-platforms.md b/doc/manual/src/installation/supported-platforms.md
new file mode 100644
index 000000000..8ef1f0e78
--- /dev/null
+++ b/doc/manual/src/installation/supported-platforms.md
@@ -0,0 +1,7 @@
+# Supported Platforms
+
+Nix is currently supported on the following platforms:
+
+  - Linux (i686, x86\_64, aarch64).
+
+  - macOS (x86\_64).
diff --git a/doc/manual/src/installation/upgrading.md b/doc/manual/src/installation/upgrading.md
new file mode 100644
index 000000000..24efc4681
--- /dev/null
+++ b/doc/manual/src/installation/upgrading.md
@@ -0,0 +1,14 @@
+# Upgrading Nix
+
+Multi-user Nix users on macOS can upgrade Nix by running: `sudo -i sh -c
+'nix-channel --update &&
+nix-env -iA nixpkgs.nix &&
+launchctl remove org.nixos.nix-daemon &&
+launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist'`
+
+Single-user installations of Nix should run this: `nix-channel --update;
+nix-env -iA nixpkgs.nix nixpkgs.cacert`
+
+Multi-user Nix users on Linux should run this with sudo: `nix-channel
+--update; nix-env -iA nixpkgs.nix nixpkgs.cacert; systemctl
+daemon-reload; systemctl restart nix-daemon`
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
new file mode 100644
index 000000000..f5c550fd7
--- /dev/null
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -0,0 +1,148 @@
+# Basic Package Management
+
+The main command for package management is [`nix-env`](#sec-nix-env).
+You can use it to install, upgrade, and erase packages, and to query
+what packages are installed or are available for installation.
+
+In Nix, different users can have different “views” on the set of
+installed applications. That is, there might be lots of applications
+present on the system (possibly in many different versions), but users
+can have a specific selection of those active — where “active” just
+means that it appears in a directory in the user’s PATH. Such a view on
+the set of installed applications is called a *user environment*, which
+is just a directory tree consisting of symlinks to the files of the
+active applications.
+
+Components are installed from a set of *Nix expressions* that tell Nix
+how to build those packages, including, if necessary, their
+dependencies. There is a collection of Nix expressions called the
+Nixpkgs package collection that contains packages ranging from basic
+development stuff such as GCC and Glibc, to end-user applications like
+Mozilla Firefox. (Nix is however not tied to the Nixpkgs package
+collection; you could write your own Nix expressions based on Nixpkgs,
+or completely new ones.)
+
+You can manually download the latest version of Nixpkgs from
+<http://nixos.org/nixpkgs/download.html>. However, it’s much more
+convenient to use the Nixpkgs *channel*, since it makes it easy to stay
+up to date with new versions of Nixpkgs. (Channels are described in more
+detail in [???](#sec-channels).) Nixpkgs is automatically added to your
+list of “subscribed” channels when you install Nix. If this is not the
+case for some reason, you can add it as follows:
+
+    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+    $ nix-channel --update
+
+> **Note**
+> 
+> On NixOS, you’re automatically subscribed to a NixOS channel
+> corresponding to your NixOS major release (e.g.
+> <http://nixos.org/channels/nixos-14.12>). A NixOS channel is identical
+> to the Nixpkgs channel, except that it contains only Linux binaries
+> and is updated only if a set of regression tests succeed.
+
+You can view the set of available packages in Nixpkgs:
+
+    $ nix-env -qa
+    aterm-2.2
+    bash-3.0
+    binutils-2.15
+    bison-1.875d
+    blackdown-1.4.2
+    bzip2-1.0.2
+    …
+
+The flag `-q` specifies a query operation, and `-a` means that you want
+to show the “available” (i.e., installable) packages, as opposed to the
+installed packages. If you downloaded Nixpkgs yourself, or if you
+checked it out from GitHub, then you need to pass the path to your
+Nixpkgs tree using the `-f` flag:
+
+    $ nix-env -qaf /path/to/nixpkgs
+
+where /path/to/nixpkgs is where you’ve unpacked or checked out Nixpkgs.
+
+You can select specific packages by name:
+
+    $ nix-env -qa firefox
+    firefox-34.0.5
+    firefox-with-plugins-34.0.5
+
+and using regular expressions:
+
+    $ nix-env -qa 'firefox.*'
+
+It is also possible to see the *status* of available packages, i.e.,
+whether they are installed into the user environment and/or present in
+the system:
+
+    $ nix-env -qas
+    …
+    -PS bash-3.0
+    --S binutils-2.15
+    IPS bison-1.875d
+    …
+
+The first character (`I`) indicates whether the package is installed in
+your current user environment. The second (`P`) indicates whether it is
+present on your system (in which case installing it into your user
+environment would be a very quick operation). The last one (`S`)
+indicates whether there is a so-called *substitute* for the package,
+which is Nix’s mechanism for doing binary deployment. It just means that
+Nix knows that it can fetch a pre-built package from somewhere
+(typically a network server) instead of building it locally.
+
+You can install a package using `nix-env -i`. For instance,
+
+    $ nix-env -i subversion
+
+will install the package called `subversion` (which is, of course, the
+[Subversion version management system](http://subversion.tigris.org/)).
+
+> **Note**
+> 
+> When you ask Nix to install a package, it will first try to get it in
+> pre-compiled form from a *binary cache*. By default, Nix will use the
+> binary cache <https://cache.nixos.org>; it contains binaries for most
+> packages in Nixpkgs. Only if no binary is available in the binary
+> cache, Nix will build the package from source. So if `nix-env
+> -i subversion` results in Nix building stuff from source, then either
+> the package is not built for your platform by the Nixpkgs build
+> servers, or your version of Nixpkgs is too old or too new. For
+> instance, if you have a very recent checkout of Nixpkgs, then the
+> Nixpkgs build servers may not have had a chance to build everything
+> and upload the resulting binaries to <https://cache.nixos.org>. The
+> Nixpkgs channel is only updated after all binaries have been uploaded
+> to the cache, so if you stick to the Nixpkgs channel (rather than
+> using a Git checkout of the Nixpkgs tree), you will get binaries for
+> most packages.
+
+Naturally, packages can also be uninstalled:
+
+    $ nix-env -e subversion
+
+Upgrading to a new version is just as easy. If you have a new release of
+Nix Packages, you can do:
+
+    $ nix-env -u subversion
+
+This will *only* upgrade Subversion if there is a “newer” version in the
+new set of Nix expressions, as defined by some pretty arbitrary rules
+regarding ordering of version numbers (which generally do what you’d
+expect of them). To just unconditionally replace Subversion with
+whatever version is in the Nix expressions, use `-i` instead of `-u`;
+`-i` will remove whatever version is already installed.
+
+You can also upgrade all packages for which there are newer versions:
+
+    $ nix-env -u
+
+Sometimes it’s useful to be able to ask what `nix-env` would do, without
+actually doing it. For instance, to find out what packages would be
+upgraded by `nix-env -u`, you can do
+
+    $ nix-env -u --dry-run
+    (dry run; not doing anything)
+    upgrading `libxslt-1.1.0' to `libxslt-1.1.10'
+    upgrading `graphviz-1.10' to `graphviz-1.12'
+    upgrading `coreutils-5.0' to `coreutils-5.2.1'
diff --git a/doc/manual/src/package-management/binary-cache-substituter.md b/doc/manual/src/package-management/binary-cache-substituter.md
new file mode 100644
index 000000000..44f0da238
--- /dev/null
+++ b/doc/manual/src/package-management/binary-cache-substituter.md
@@ -0,0 +1,42 @@
+# Serving a Nix store via HTTP
+
+You can easily share the Nix store of a machine via HTTP. This allows
+other machines to fetch store paths from that machine to speed up
+installations. It uses the same *binary cache* mechanism that Nix
+usually uses to fetch pre-built binaries from <https://cache.nixos.org>.
+
+The daemon that handles binary cache requests via HTTP, `nix-serve`, is
+not part of the Nix distribution, but you can install it from Nixpkgs:
+
+    $ nix-env -i nix-serve
+
+You can then start the server, listening for HTTP connections on
+whatever port you like:
+
+    $ nix-serve -p 8080
+
+To check whether it works, try the following on the client:
+
+    $ curl http://avalon:8080/nix-cache-info
+
+which should print something like:
+
+    StoreDir: /nix/store
+    WantMassQuery: 1
+    Priority: 30
+
+On the client side, you can tell Nix to use your binary cache using
+`--option extra-binary-caches`, e.g.:
+
+    $ nix-env -i firefox --option extra-binary-caches http://avalon:8080/
+
+The option `extra-binary-caches` tells Nix to use this binary cache in
+addition to your default caches, such as <https://cache.nixos.org>.
+Thus, for any path in the closure of Firefox, Nix will first check if
+the path is available on the server `avalon` or another binary caches.
+If not, it will fall back to building from source.
+
+You can also tell Nix to always use your binary cache by adding a line
+to the `nix.conf` configuration file like this:
+
+    binary-caches = http://avalon:8080/ https://cache.nixos.org/
diff --git a/doc/manual/src/package-management/channels.md b/doc/manual/src/package-management/channels.md
new file mode 100644
index 000000000..8a3e92d70
--- /dev/null
+++ b/doc/manual/src/package-management/channels.md
@@ -0,0 +1,42 @@
+# Channels
+
+If you want to stay up to date with a set of packages, it’s not very
+convenient to manually download the latest set of Nix expressions for
+those packages and upgrade using `nix-env`. Fortunately, there’s a
+better way: *Nix channels*.
+
+A Nix channel is just a URL that points to a place that contains a set
+of Nix expressions and a manifest. Using the command
+[`nix-channel`](#sec-nix-channel) you can automatically stay up to date
+with whatever is available at that URL.
+
+To see the list of official NixOS channels, visit
+<https://nixos.org/channels>.
+
+You can “subscribe” to a channel using `nix-channel --add`, e.g.,
+
+    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+
+subscribes you to a channel that always contains that latest version of
+the Nix Packages collection. (Subscribing really just means that the URL
+is added to the file `~/.nix-channels`, where it is read by subsequent
+calls to `nix-channel
+--update`.) You can “unsubscribe” using `nix-channel
+--remove`:
+
+    $ nix-channel --remove nixpkgs
+
+To obtain the latest Nix expressions available in a channel, do
+
+    $ nix-channel --update
+
+This downloads and unpacks the Nix expressions in every channel
+(downloaded from `url/nixexprs.tar.bz2`). It also makes the union of
+each channel’s Nix expressions available by default to `nix-env`
+operations (via the symlink `~/.nix-defexpr/channels`). Consequently,
+you can then say
+
+    $ nix-env -u
+
+to upgrade all packages in your profile to the latest versions available
+in the subscribed channels.
diff --git a/doc/manual/src/package-management/copy-closure.md b/doc/manual/src/package-management/copy-closure.md
new file mode 100644
index 000000000..6573862c0
--- /dev/null
+++ b/doc/manual/src/package-management/copy-closure.md
@@ -0,0 +1,34 @@
+# Copying Closures Via SSH
+
+The command `nix-copy-closure` copies a Nix store path along with all
+its dependencies to or from another machine via the SSH protocol. It
+doesn’t copy store paths that are already present on the target machine.
+For example, the following command copies Firefox with all its
+dependencies:
+
+    $ nix-copy-closure --to alice@itchy.example.org $(type -p firefox)
+
+See [???](#sec-nix-copy-closure) for details.
+
+With `nix-store
+--export` and `nix-store --import` you can write the closure of a store
+path (that is, the path and all its dependencies) to a file, and then
+unpack that file into another Nix store. For example,
+
+    $ nix-store --export $(nix-store -qR $(type -p firefox)) > firefox.closure
+
+writes the closure of Firefox to a file. You can then copy this file to
+another machine and install the closure:
+
+    $ nix-store --import < firefox.closure
+
+Any store paths in the closure that are already present in the target
+store are ignored. It is also possible to pipe the export into another
+command, e.g. to copy and install a closure directly to/on another
+machine:
+
+    $ nix-store --export $(nix-store -qR $(type -p firefox)) | bzip2 | \
+        ssh alice@itchy.example.org "bunzip2 | nix-store --import"
+
+However, `nix-copy-closure` is generally more efficient because it only
+copies paths that are not already present in the target Nix store.
diff --git a/doc/manual/src/package-management/garbage-collection.md b/doc/manual/src/package-management/garbage-collection.md
new file mode 100644
index 000000000..4c8799dfe
--- /dev/null
+++ b/doc/manual/src/package-management/garbage-collection.md
@@ -0,0 +1,61 @@
+# Garbage Collection
+
+`nix-env` operations such as upgrades (`-u`) and uninstall (`-e`) never
+actually delete packages from the system. All they do (as shown above)
+is to create a new user environment that no longer contains symlinks to
+the “deleted” packages.
+
+Of course, since disk space is not infinite, unused packages should be
+removed at some point. You can do this by running the Nix garbage
+collector. It will remove from the Nix store any package not used
+(directly or indirectly) by any generation of any profile.
+
+Note however that as long as old generations reference a package, it
+will not be deleted. After all, we wouldn’t be able to do a rollback
+otherwise. So in order for garbage collection to be effective, you
+should also delete (some) old generations. Of course, this should only
+be done if you are certain that you will not need to roll back.
+
+To delete all old (non-current) generations of your current profile:
+
+    $ nix-env --delete-generations old
+
+Instead of `old` you can also specify a list of generations, e.g.,
+
+    $ nix-env --delete-generations 10 11 14
+
+To delete all generations older than a specified number of days (except
+the current generation), use the `d` suffix. For example,
+
+    $ nix-env --delete-generations 14d
+
+deletes all generations older than two weeks.
+
+After removing appropriate old generations you can run the garbage
+collector as follows:
+
+    $ nix-store --gc
+
+The behaviour of the gargage collector is affected by the
+`keep-derivations` (default: true) and `keep-outputs` (default: false)
+options in the Nix configuration file. The defaults will ensure that all
+derivations that are build-time dependencies of garbage collector roots
+will be kept and that all output paths that are runtime dependencies
+will be kept as well. All other derivations or paths will be collected.
+(This is usually what you want, but while you are developing it may make
+sense to keep outputs to ensure that rebuild times are quick.) If you
+are feeling uncertain, you can also first view what files would be
+deleted:
+
+    $ nix-store --gc --print-dead
+
+Likewise, the option `--print-live` will show the paths that *won’t* be
+deleted.
+
+There is also a convenient little utility `nix-collect-garbage`, which
+when invoked with the `-d` (`--delete-old`) switch deletes all old
+generations of all profiles in `/nix/var/nix/profiles`. So
+
+    $ nix-collect-garbage -d
+
+is a quick and easy way to clean up your system.
diff --git a/doc/manual/src/package-management/garbage-collector-roots.md b/doc/manual/src/package-management/garbage-collector-roots.md
new file mode 100644
index 000000000..6f4d48e80
--- /dev/null
+++ b/doc/manual/src/package-management/garbage-collector-roots.md
@@ -0,0 +1,16 @@
+# Garbage Collector Roots
+
+The roots of the garbage collector are all store paths to which there
+are symlinks in the directory `prefix/nix/var/nix/gcroots`. For
+instance, the following command makes the path
+`/nix/store/d718ef...-foo` a root of the collector:
+
+    $ ln -s /nix/store/d718ef...-foo /nix/var/nix/gcroots/bar
+
+That is, after this command, the garbage collector will not remove
+`/nix/store/d718ef...-foo` or any of its dependencies.
+
+Subdirectories of `prefix/nix/var/nix/gcroots` are also searched for
+symlinks. Symlinks to non-store paths are followed and searched for
+roots, but symlinks to non-store paths *inside* the paths reached in
+that way are not followed to prevent infinite recursion.
diff --git a/doc/manual/src/package-management/package-management.md b/doc/manual/src/package-management/package-management.md
new file mode 100644
index 000000000..a2d078c16
--- /dev/null
+++ b/doc/manual/src/package-management/package-management.md
@@ -0,0 +1,4 @@
+This chapter discusses how to do package management with Nix, i.e., how
+to obtain, install, upgrade, and erase packages. This is the “user’s”
+perspective of the Nix system — people who want to *create* packages
+should consult [???](#chap-writing-nix-expressions).
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
new file mode 100644
index 000000000..c46adf538
--- /dev/null
+++ b/doc/manual/src/package-management/profiles.md
@@ -0,0 +1,119 @@
+# Profiles
+
+Profiles and user environments are Nix’s mechanism for implementing the
+ability to allow different users to have different configurations, and
+to do atomic upgrades and rollbacks. To understand how they work, it’s
+useful to know a bit about how Nix works. In Nix, packages are stored in
+unique locations in the *Nix store* (typically, `/nix/store`). For
+instance, a particular version of the Subversion package might be stored
+in a directory
+`/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3/`, while
+another version might be stored in
+`/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5s-subversion-1.1.2`. The long
+strings prefixed to the directory names are cryptographic hashes\[1\] of
+*all* inputs involved in building the package — sources, dependencies,
+compiler flags, and so on. So if two packages differ in any way, they
+end up in different locations in the file system, so they don’t
+interfere with each other. [figure\_title](#fig-user-environments) shows
+a part of a typical Nix store.
+
+![User environments](../figures/user-environments.png)
+
+Of course, you wouldn’t want to type
+
+    $ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn
+
+every time you want to run Subversion. Of course we could set up the
+PATH environment variable to include the `bin` directory of every
+package we want to use, but this is not very convenient since changing
+PATH doesn’t take effect for already existing processes. The solution
+Nix uses is to create directory trees of symlinks to *activated*
+packages. These are called *user environments* and they are packages
+themselves (though automatically generated by `nix-env`), so they too
+reside in the Nix store. For instance, in
+[figure\_title](#fig-user-environments) the user environment
+`/nix/store/0c1p5z4kda11...-user-env` contains a symlink to just
+Subversion 1.1.2 (arrows in the figure indicate symlinks). This would be
+what we would obtain if we had done
+
+    $ nix-env -i subversion
+
+on a set of Nix expressions that contained Subversion 1.1.2.
+
+This doesn’t in itself solve the problem, of course; you wouldn’t want
+to type `/nix/store/0c1p5z4kda11...-user-env/bin/svn` either. That’s why
+there are symlinks outside of the store that point to the user
+environments in the store; for instance, the symlinks `default-42-link`
+and `default-43-link` in the example. These are called *generations*
+since every time you perform a `nix-env` operation, a new user
+environment is generated based on the current one. For instance,
+generation 43 was created from generation 42 when we did
+
+    $ nix-env -i subversion firefox
+
+on a set of Nix expressions that contained Firefox and a new version of
+Subversion.
+
+Generations are grouped together into *profiles* so that different users
+don’t interfere with each other if they don’t want to. For example:
+
+    $ ls -l /nix/var/nix/profiles/
+    ...
+    lrwxrwxrwx  1 eelco ... default-42-link -> /nix/store/0c1p5z4kda11...-user-env
+    lrwxrwxrwx  1 eelco ... default-43-link -> /nix/store/3aw2pdyx2jfc...-user-env
+    lrwxrwxrwx  1 eelco ... default -> default-43-link
+
+This shows a profile called `default`. The file `default` itself is
+actually a symlink that points to the current generation. When we do a
+`nix-env` operation, a new user environment and generation link are
+created based on the current one, and finally the `default` symlink is
+made to point at the new generation. This last step is atomic on Unix,
+which explains how we can do atomic upgrades. (Note that the
+building/installing of new packages doesn’t interfere in any way with
+old packages, since they are stored in different locations in the Nix
+store.)
+
+If you find that you want to undo a `nix-env` operation, you can just do
+
+    $ nix-env --rollback
+
+which will just make the current generation link point at the previous
+link. E.g., `default` would be made to point at `default-42-link`. You
+can also switch to a specific generation:
+
+    $ nix-env --switch-generation 43
+
+which in this example would roll forward to generation 43 again. You can
+also see all available generations:
+
+    $ nix-env --list-generations
+
+You generally wouldn’t have `/nix/var/nix/profiles/some-profile/bin` in
+your PATH. Rather, there is a symlink `~/.nix-profile` that points to
+your current profile. This means that you should put
+`~/.nix-profile/bin` in your PATH (and indeed, that’s what the
+initialisation script `/nix/etc/profile.d/nix.sh` does). This makes it
+easier to switch to a different profile. You can do that using the
+command `nix-env --switch-profile`:
+
+    $ nix-env --switch-profile /nix/var/nix/profiles/my-profile
+    
+    $ nix-env --switch-profile /nix/var/nix/profiles/default
+
+These commands switch to the `my-profile` and default profile,
+respectively. If the profile doesn’t exist, it will be created
+automatically. You should be careful about storing a profile in another
+location than the `profiles` directory, since otherwise it might not be
+used as a root of the garbage collector (see
+[???](#sec-garbage-collection)).
+
+All `nix-env` operations work on the profile pointed to by
+`~/.nix-profile`, but you can override this using the `--profile` option
+(abbreviation `-p`):
+
+    $ nix-env -p /nix/var/nix/profiles/other-profile -i subversion
+
+This will *not* change the `~/.nix-profile` symlink.
+
+1.  160-bit truncations of SHA-256 hashes encoded in a base-32 notation,
+    to be precise.
diff --git a/doc/manual/src/package-management/s3-substituter.md b/doc/manual/src/package-management/s3-substituter.md
new file mode 100644
index 000000000..4740b8b1c
--- /dev/null
+++ b/doc/manual/src/package-management/s3-substituter.md
@@ -0,0 +1,133 @@
+# Serving a Nix store via AWS S3 or S3-compatible Service
+
+Nix has built-in support for storing and fetching store paths from
+Amazon S3 and S3 compatible services. This uses the same *binary* cache
+mechanism that Nix usually uses to fetch prebuilt binaries from
+[cache.nixos.org](cache.nixos.org).
+
+The following options can be specified as URL parameters to the S3 URL:
+
+  - `profile`  
+    The name of the AWS configuration profile to use. By default Nix
+    will use the `default` profile.
+
+  - `region`  
+    The region of the S3 bucket. `us–east-1` by default.
+    
+    If your bucket is not in `us–east-1`, you should always explicitly
+    specify the region parameter.
+
+  - `endpoint`  
+    The URL to your S3-compatible service, for when not using Amazon S3.
+    Do not specify this value if you're using Amazon S3.
+    
+    > **Note**
+    > 
+    > This endpoint must support HTTPS and will use path-based
+    > addressing instead of virtual host based addressing.
+
+  - `scheme`  
+    The scheme used for S3 requests, `https` (default) or `http`. This
+    option allows you to disable HTTPS for binary caches which don't
+    support it.
+    
+    > **Note**
+    > 
+    > HTTPS should be used if the cache might contain sensitive
+    > information.
+
+In this example we will use the bucket named `example-nix-cache`.
+
+## Anonymous Reads to your S3-compatible binary cache
+
+If your binary cache is publicly accessible and does not require
+authentication, the simplest and easiest way to use Nix with your S3
+compatible binary cache is to use the HTTP URL for that cache.
+
+For AWS S3 the binary cache URL for example bucket will be exactly
+<https://example-nix-cache.s3.amazonaws.com> or
+<s3://example-nix-cache>. For S3 compatible binary caches, consult that
+cache's documentation.
+
+Your bucket will need the following bucket policy:
+
+    {
+        "Id": "DirectReads",
+        "Version": "2012-10-17",
+        "Statement": [
+            {
+                "Sid": "AllowDirectReads",
+                "Action": [
+                    "s3:GetObject",
+                    "s3:GetBucketLocation"
+                ],
+                "Effect": "Allow",
+                "Resource": [
+                    "arn:aws:s3:::example-nix-cache",
+                    "arn:aws:s3:::example-nix-cache/*"
+                ],
+                "Principal": "*"
+            }
+        ]
+    }
+
+## Authenticated Reads to your S3 binary cache
+
+For AWS S3 the binary cache URL for example bucket will be exactly
+<s3://example-nix-cache>.
+
+Nix will use the [default credential provider
+chain](https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html)
+for authenticating requests to Amazon S3.
+
+Nix supports authenticated reads from Amazon S3 and S3 compatible binary
+caches.
+
+Your bucket will need a bucket policy allowing the desired users to
+perform the `s3:GetObject` and `s3:GetBucketLocation` action on all
+objects in the bucket. The anonymous policy in [Anonymous Reads to your
+S3-compatible binary cache](#ssec-s3-substituter-anonymous-reads) can be
+updated to have a restricted `Principal` to support this.
+
+## Authenticated Writes to your S3-compatible binary cache
+
+Nix support fully supports writing to Amazon S3 and S3 compatible
+buckets. The binary cache URL for our example bucket will be
+<s3://example-nix-cache>.
+
+Nix will use the [default credential provider
+chain](https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html)
+for authenticating requests to Amazon S3.
+
+Your account will need the following IAM policy to upload to the cache:
+
+    {
+      "Version": "2012-10-17",
+      "Statement": [
+        {
+          "Sid": "UploadToCache",
+          "Effect": "Allow",
+          "Action": [
+            "s3:AbortMultipartUpload",
+            "s3:GetBucketLocation",
+            "s3:GetObject",
+            "s3:ListBucket",
+            "s3:ListBucketMultipartUploads",
+            "s3:ListMultipartUploadParts",
+            "s3:PutObject"
+          ],
+          "Resource": [
+            "arn:aws:s3:::example-nix-cache",
+            "arn:aws:s3:::example-nix-cache/*"
+          ]
+        }
+      ]
+    }
+
+`nix copy --to
+'s3://example-nix-cache?profile=cache-upload&region=eu-west-2'
+nixpkgs.hello`
+
+`nix copy --to
+'s3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com'
+nixpkgs.hello`
diff --git a/doc/manual/src/package-management/sharing-packages.md b/doc/manual/src/package-management/sharing-packages.md
new file mode 100644
index 000000000..846ca6934
--- /dev/null
+++ b/doc/manual/src/package-management/sharing-packages.md
@@ -0,0 +1,6 @@
+# Sharing Packages Between Machines
+
+Sometimes you want to copy a package from one machine to another. Or,
+you want to install some packages and you know that another machine
+already has some or all of those packages or their dependencies. In that
+case there are mechanisms to quickly copy packages between machines.
diff --git a/doc/manual/src/package-management/ssh-substituter.md b/doc/manual/src/package-management/ssh-substituter.md
new file mode 100644
index 000000000..482844c7c
--- /dev/null
+++ b/doc/manual/src/package-management/ssh-substituter.md
@@ -0,0 +1,52 @@
+# Serving a Nix store via SSH
+
+You can tell Nix to automatically fetch needed binaries from a remote
+Nix store via SSH. For example, the following installs Firefox,
+automatically fetching any store paths in Firefox’s closure if they are
+available on the server `avalon`:
+
+    $ nix-env -i firefox --substituters ssh://alice@avalon
+
+This works similar to the binary cache substituter that Nix usually
+uses, only using SSH instead of HTTP: if a store path `P` is needed, Nix
+will first check if it’s available in the Nix store on `avalon`. If not,
+it will fall back to using the binary cache substituter, and then to
+building from source.
+
+> **Note**
+> 
+> The SSH substituter currently does not allow you to enter an SSH
+> passphrase interactively. Therefore, you should use `ssh-add` to load
+> the decrypted private key into `ssh-agent`.
+
+You can also copy the closure of some store path, without installing it
+into your profile, e.g.
+
+    $ nix-store -r /nix/store/m85bxg…-firefox-34.0.5 --substituters ssh://alice@avalon
+
+This is essentially equivalent to doing
+
+    $ nix-copy-closure --from alice@avalon /nix/store/m85bxg…-firefox-34.0.5
+
+You can use SSH’s *forced command* feature to set up a restricted user
+account for SSH substituter access, allowing read-only access to the
+local Nix store, but nothing more. For example, add the following lines
+to `sshd_config` to restrict the user `nix-ssh`:
+
+    Match User nix-ssh
+      AllowAgentForwarding no
+      AllowTcpForwarding no
+      PermitTTY no
+      PermitTunnel no
+      X11Forwarding no
+      ForceCommand nix-store --serve
+    Match All
+
+On NixOS, you can accomplish the same by adding the following to your
+`configuration.nix`:
+
+    nix.sshServe.enable = true;
+    nix.sshServe.keys = [ "ssh-dss AAAAB3NzaC1k... bob@example.org" ];
+
+where the latter line lists the public keys of users that are allowed to
+connect.
diff --git a/doc/manual/src/release-notes/release-notes.md b/doc/manual/src/release-notes/release-notes.md
new file mode 100644
index 000000000..b05d5ee0a
--- /dev/null
+++ b/doc/manual/src/release-notes/release-notes.md
@@ -0,0 +1 @@
+# Nix Release Notes
diff --git a/doc/manual/src/release-notes/rl-0.10.1.md b/doc/manual/src/release-notes/rl-0.10.1.md
new file mode 100644
index 000000000..e1ed6558a
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.10.1.md
@@ -0,0 +1,5 @@
+# Release 0.10.1 (2006-10-11)
+
+This release fixes two somewhat obscure bugs that occur when evaluating
+Nix expressions that are stored inside the Nix store (`NIX-67`). These
+do not affect most users.
diff --git a/doc/manual/src/release-notes/rl-0.10.md b/doc/manual/src/release-notes/rl-0.10.md
new file mode 100644
index 000000000..bf0e59fad
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.10.md
@@ -0,0 +1,212 @@
+# Release 0.10 (2006-10-06)
+
+> **Note**
+> 
+> This version of Nix uses Berkeley DB 4.4 instead of 4.3. The database
+> is upgraded automatically, but you should be careful not to use old
+> versions of Nix that still use Berkeley DB 4.3. In particular, if you
+> use a Nix installed through Nix, you should run
+> 
+>     $ nix-store --clear-substitutes
+> 
+> first.
+
+> **Warning**
+> 
+> Also, the database schema has changed slighted to fix a performance
+> issue (see below). When you run any Nix 0.10 command for the first
+> time, the database will be upgraded automatically. This is
+> irreversible.
+
+  - `nix-env` usability improvements:
+    
+      - An option `--compare-versions` (or `-c`) has been added to
+        `nix-env
+                                                        --query` to allow you to compare installed versions of packages
+        to available versions, or vice versa. An easy way to see if you
+        are up to date with what’s in your subscribed channels is
+        `nix-env -qc \*`.
+    
+      - `nix-env --query` now takes as arguments a list of package names
+        about which to show information, just like `--install`, etc.:
+        for example, `nix-env -q gcc`. Note that to show all
+        derivations, you need to specify `\*`.
+    
+      - `nix-env -i
+                                                        pkgname` will now install the highest available version of
+        pkgname, rather than installing all available versions (which
+        would probably give collisions) (`NIX-31`).
+    
+      - `nix-env (-i|-u) --dry-run` now shows exactly which missing
+        paths will be built or substituted.
+    
+      - `nix-env -qa --description` shows human-readable descriptions of
+        packages, provided that they have a `meta.description` attribute
+        (which most packages in Nixpkgs don’t have yet).
+
+  - New language features:
+    
+      - Reference scanning (which happens after each build) is much
+        faster and takes a constant amount of memory.
+    
+      - String interpolation. Expressions like
+        
+            "--with-freetype2-library=" + freetype + "/lib"
+        
+        can now be written as
+        
+            "--with-freetype2-library=${freetype}/lib"
+        
+        You can write arbitrary expressions within `${...}`, not just
+        identifiers.
+    
+      - Multi-line string literals.
+    
+      - String concatenations can now involve derivations, as in the
+        example `"--with-freetype2-library="
+                                                        + freetype + "/lib"`. This was not previously possible because
+        we need to register that a derivation that uses such a string is
+        dependent on `freetype`. The evaluator now properly propagates
+        this information. Consequently, the subpath operator (`~`) has
+        been deprecated.
+    
+      - Default values of function arguments can now refer to other
+        function arguments; that is, all arguments are in scope in the
+        default values (`NIX-45`).
+    
+      - Lots of new built-in primitives, such as functions for list
+        manipulation and integer arithmetic. See the manual for a
+        complete list. All primops are now available in the set
+        `builtins`, allowing one to test for the availability of primop
+        in a backwards-compatible way.
+    
+      - Real let-expressions: `let x = ...;
+                                                        ... z = ...; in ...`.
+
+  - New commands `nix-pack-closure` and `nix-unpack-closure` than can be
+    used to easily transfer a store path with all its dependencies to
+    another machine. Very convenient whenever you have some package on
+    your machine and you want to copy it somewhere else.
+
+  - XML support:
+    
+      - `nix-env -q --xml` prints the installed or available packages in
+        an XML representation for easy processing by other tools.
+    
+      - `nix-instantiate --eval-only
+                                                        --xml` prints an XML representation of the resulting term. (The
+        new flag `--strict` forces ‘deep’ evaluation of the result,
+        i.e., list elements and attributes are evaluated recursively.)
+    
+      - In Nix expressions, the primop `builtins.toXML` converts a term
+        to an XML representation. This is primarily useful for passing
+        structured information to builders.
+
+  - You can now unambiguously specify which derivation to build or
+    install in `nix-env`, `nix-instantiate` and `nix-build` using the
+    `--attr` / `-A` flags, which takes an attribute name as argument.
+    (Unlike symbolic package names such as `subversion-1.4.0`, attribute
+    names in an attribute set are unique.) For instance, a quick way to
+    perform a test build of a package in Nixpkgs is `nix-build
+            pkgs/top-level/all-packages.nix -A
+            foo`. `nix-env -q
+            --attr` shows the attribute names corresponding to each derivation.
+
+  - If the top-level Nix expression used by `nix-env`, `nix-instantiate`
+    or `nix-build` evaluates to a function whose arguments all have
+    default values, the function will be called automatically. Also, the
+    new command-line switch `--arg
+            name
+            value` can be used to specify function arguments on the command
+    line.
+
+  - `nix-install-package --url
+            URL` allows a package to be installed directly from the given URL.
+
+  - Nix now works behind an HTTP proxy server; just set the standard
+    environment variables http\_proxy, https\_proxy, ftp\_proxy or
+    all\_proxy appropriately. Functions such as `fetchurl` in Nixpkgs
+    also respect these variables.
+
+  - `nix-build -o
+            symlink` allows the symlink to the build result to be named
+    something other than `result`.
+
+  - Platform support:
+    
+      - Support for 64-bit platforms, provided a [suitably patched ATerm
+        library](http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=606) is
+        used. Also, files larger than 2 GiB are now supported.
+    
+      - Added support for Cygwin (Windows, `i686-cygwin`), Mac OS X on
+        Intel (`i686-darwin`) and Linux on PowerPC (`powerpc-linux`).
+    
+      - Users of SMP and multicore machines will appreciate that the
+        number of builds to be performed in parallel can now be
+        specified in the configuration file in the `build-max-jobs`
+        setting.
+
+  - Garbage collector improvements:
+    
+      - Open files (such as running programs) are now used as roots of
+        the garbage collector. This prevents programs that have been
+        uninstalled from being garbage collected while they are still
+        running. The script that detects these additional runtime roots
+        (`find-runtime-roots.pl`) is inherently system-specific, but it
+        should work on Linux and on all platforms that have the `lsof`
+        utility.
+    
+      - `nix-store --gc` (a.k.a. `nix-collect-garbage`) prints out the
+        number of bytes freed on standard output. `nix-store
+                                                        --gc --print-dead` shows how many bytes would be freed by an
+        actual garbage collection.
+    
+      - `nix-collect-garbage -d` removes all old generations of *all*
+        profiles before calling the actual garbage collector (`nix-store
+                                                        --gc`). This is an easy way to get rid of all old packages in
+        the Nix store.
+    
+      - `nix-store` now has an operation `--delete` to delete specific
+        paths from the Nix store. It won’t delete reachable
+        (non-garbage) paths unless `--ignore-liveness` is specified.
+
+  - Berkeley DB 4.4’s process registry feature is used to recover from
+    crashed Nix processes.
+
+  - A performance issue has been fixed with the `referer` table, which
+    stores the inverse of the `references` table (i.e., it tells you
+    what store paths refer to a given path). Maintaining this table
+    could take a quadratic amount of time, as well as a quadratic amount
+    of Berkeley DB log file space (in particular when running the
+    garbage collector) (`NIX-23`).
+
+  - Nix now catches the `TERM` and `HUP` signals in addition to the
+    `INT` signal. So you can now do a `killall
+            nix-store` without triggering a database recovery.
+
+  - `bsdiff` updated to version 4.3.
+
+  - Substantial performance improvements in expression evaluation and
+    `nix-env -qa`, all thanks to [Valgrind](http://valgrind.org/).
+    Memory use has been reduced by a factor 8 or so. Big speedup by
+    memoisation of path hashing.
+
+  - Lots of bug fixes, notably:
+    
+      - Make sure that the garbage collector can run successfully when
+        the disk is full (`NIX-18`).
+    
+      - `nix-env` now locks the profile to prevent races between
+        concurrent `nix-env` operations on the same profile (`NIX-7`).
+    
+      - Removed misleading messages from `nix-env -i` (e.g.,
+        ``installing
+                                                        `foo'`` followed by ``uninstalling
+                                                        `foo'``) (`NIX-17`).
+
+  - Nix source distributions are a lot smaller now since we no longer
+    include a full copy of the Berkeley DB source distribution (but only
+    the bits we need).
+
+  - Header files are now installed so that external programs can use the
+    Nix libraries.
diff --git a/doc/manual/src/release-notes/rl-0.11.md b/doc/manual/src/release-notes/rl-0.11.md
new file mode 100644
index 000000000..d2f4d73aa
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.11.md
@@ -0,0 +1,167 @@
+# Release 0.11 (2007-12-31)
+
+Nix 0.11 has many improvements over the previous stable release. The
+most important improvement is secure multi-user support. It also
+features many usability enhancements and language extensions, many of
+them prompted by NixOS, the purely functional Linux distribution based
+on Nix. Here is an (incomplete) list:
+
+  - Secure multi-user support. A single Nix store can now be shared
+    between multiple (possible untrusted) users. This is an important
+    feature for NixOS, where it allows non-root users to install
+    software. The old setuid method for sharing a store between multiple
+    users has been removed. Details for setting up a multi-user store
+    can be found in the manual.
+
+  - The new command `nix-copy-closure` gives you an easy and efficient
+    way to exchange software between machines. It copies the missing
+    parts of the closure of a set of store path to or from a remote
+    machine via `ssh`.
+
+  - A new kind of string literal: strings between double single-quotes
+    (`''`) have indentation “intelligently” removed. This allows large
+    strings (such as shell scripts or configuration file fragments in
+    NixOS) to cleanly follow the indentation of the surrounding
+    expression. It also requires much less escaping, since `''` is less
+    common in most languages than `"`.
+
+  - `nix-env` `--set` modifies the current generation of a profile so
+    that it contains exactly the specified derivation, and nothing else.
+    For example, `nix-env -p /nix/var/nix/profiles/browser --set
+            firefox` lets the profile named `browser` contain just Firefox.
+
+  - `nix-env` now maintains meta-information about installed packages in
+    profiles. The meta-information is the contents of the `meta`
+    attribute of derivations, such as `description` or `homepage`. The
+    command `nix-env -q --xml
+            --meta` shows all meta-information.
+
+  - `nix-env` now uses the `meta.priority` attribute of derivations to
+    resolve filename collisions between packages. Lower priority values
+    denote a higher priority. For instance, the GCC wrapper package and
+    the Binutils package in Nixpkgs both have a file `bin/ld`, so
+    previously if you tried to install both you would get a collision.
+    Now, on the other hand, the GCC wrapper declares a higher priority
+    than Binutils, so the former’s `bin/ld` is symlinked in the user
+    environment.
+
+  - `nix-env -i / -u`: instead of breaking package ties by version,
+    break them by priority and version number. That is, if there are
+    multiple packages with the same name, then pick the package with the
+    highest priority, and only use the version if there are multiple
+    packages with the same priority.
+    
+    This makes it possible to mark specific versions/variant in Nixpkgs
+    more or less desirable than others. A typical example would be a
+    beta version of some package (e.g., `gcc-4.2.0rc1`) which should not
+    be installed even though it is the highest version, except when it
+    is explicitly selected (e.g., `nix-env -i
+            gcc-4.2.0rc1`).
+
+  - `nix-env --set-flag` allows meta attributes of installed packages to
+    be modified. There are several attributes that can be usefully
+    modified, because they affect the behaviour of `nix-env` or the user
+    environment build script:
+    
+      - `meta.priority` can be changed to resolve filename clashes (see
+        above).
+    
+      - `meta.keep` can be set to `true` to prevent the package from
+        being upgraded or replaced. Useful if you want to hang on to an
+        older version of a package.
+    
+      - `meta.active` can be set to `false` to “disable” the package.
+        That is, no symlinks will be generated to the files of the
+        package, but it remains part of the profile (so it won’t be
+        garbage-collected). Set it back to `true` to re-enable the
+        package.
+
+  - `nix-env -q` now has a flag `--prebuilt-only` (`-b`) that causes
+    `nix-env` to show only those derivations whose output is already in
+    the Nix store or that can be substituted (i.e., downloaded from
+    somewhere). In other words, it shows the packages that can be
+    installed “quickly”, i.e., don’t need to be built from source. The
+    `-b` flag is also available in `nix-env -i` and `nix-env -u` to
+    filter out derivations for which no pre-built binary is available.
+
+  - The new option `--argstr` (in `nix-env`, `nix-instantiate` and
+    `nix-build`) is like `--arg`, except that the value is a string. For
+    example, `--argstr system
+            i686-linux` is equivalent to `--arg system
+            \"i686-linux\"` (note that `--argstr` prevents annoying quoting
+    around shell arguments).
+
+  - `nix-store` has a new operation `--read-log` (`-l`) `paths` that
+    shows the build log of the given paths.
+
+  - Nix now uses Berkeley DB 4.5. The database is upgraded
+    automatically, but you should be careful not to use old versions of
+    Nix that still use Berkeley DB 4.4.
+
+  - The option `--max-silent-time` (corresponding to the configuration
+    setting `build-max-silent-time`) allows you to set a timeout on
+    builds — if a build produces no output on `stdout` or `stderr` for
+    the given number of seconds, it is terminated. This is useful for
+    recovering automatically from builds that are stuck in an infinite
+    loop.
+
+  - `nix-channel`: each subscribed channel is its own attribute in the
+    top-level expression generated for the channel. This allows
+    disambiguation (e.g. `nix-env
+            -i -A nixpkgs_unstable.firefox`).
+
+  - The substitutes table has been removed from the database. This makes
+    operations such as `nix-pull` and `nix-channel --update` much, much
+    faster.
+
+  - `nix-pull` now supports bzip2-compressed manifests. This speeds up
+    channels.
+
+  - `nix-prefetch-url` now has a limited form of caching. This is used
+    by `nix-channel` to prevent unnecessary downloads when the channel
+    hasn’t changed.
+
+  - `nix-prefetch-url` now by default computes the SHA-256 hash of the
+    file instead of the MD5 hash. In calls to `fetchurl` you should pass
+    the `sha256` attribute instead of `md5`. You can pass either a
+    hexadecimal or a base-32 encoding of the hash.
+
+  - Nix can now perform builds in an automatically generated “chroot”.
+    This prevents a builder from accessing stuff outside of the Nix
+    store, and thus helps ensure purity. This is an experimental
+    feature.
+
+  - The new command `nix-store
+            --optimise` reduces Nix store disk space usage by finding identical
+    files in the store and hard-linking them to each other. It typically
+    reduces the size of the store by something like 25-35%.
+
+  - `~/.nix-defexpr` can now be a directory, in which case the Nix
+    expressions in that directory are combined into an attribute set,
+    with the file names used as the names of the attributes. The command
+    `nix-env
+            --import` (which set the `~/.nix-defexpr` symlink) is removed.
+
+  - Derivations can specify the new special attribute
+    `allowedReferences` to enforce that the references in the output of
+    a derivation are a subset of a declared set of paths. For example,
+    if `allowedReferences` is an empty list, then the output must not
+    have any references. This is used in NixOS to check that generated
+    files such as initial ramdisks for booting Linux don’t have any
+    dependencies.
+
+  - The new attribute `exportReferencesGraph` allows builders access to
+    the references graph of their inputs. This is used in NixOS for
+    tasks such as generating ISO-9660 images that contain a Nix store
+    populated with the closure of certain paths.
+
+  - Fixed-output derivations (like `fetchurl`) can define the attribute
+    `impureEnvVars` to allow external environment variables to be passed
+    to builders. This is used in Nixpkgs to support proxy configuration,
+    among other things.
+
+  - Several new built-in functions: `builtins.attrNames`,
+    `builtins.filterSource`, `builtins.isAttrs`, `builtins.isFunction`,
+    `builtins.listToAttrs`, `builtins.stringLength`, `builtins.sub`,
+    `builtins.substring`, `throw`, `builtins.trace`,
+    `builtins.readFile`.
diff --git a/doc/manual/src/release-notes/rl-0.12.md b/doc/manual/src/release-notes/rl-0.12.md
new file mode 100644
index 000000000..0dc727b69
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.12.md
@@ -0,0 +1,123 @@
+# Release 0.12 (2008-11-20)
+
+  - Nix no longer uses Berkeley DB to store Nix store metadata. The
+    principal advantages of the new storage scheme are: it works
+    properly over decent implementations of NFS (allowing Nix stores to
+    be shared between multiple machines); no recovery is needed when a
+    Nix process crashes; no write access is needed for read-only
+    operations; no more running out of Berkeley DB locks on certain
+    operations.
+    
+    You still need to compile Nix with Berkeley DB support if you want
+    Nix to automatically convert your old Nix store to the new schema.
+    If you don’t need this, you can build Nix with the `configure`
+    option `--disable-old-db-compat`.
+    
+    After the automatic conversion to the new schema, you can delete the
+    old Berkeley DB files:
+    
+        $ cd /nix/var/nix/db
+        $ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG
+    
+    The new metadata is stored in the directories `/nix/var/nix/db/info`
+    and `/nix/var/nix/db/referrer`. Though the metadata is stored in
+    human-readable plain-text files, they are not intended to be
+    human-editable, as Nix is rather strict about the format.
+    
+    The new storage schema may or may not require less disk space than
+    the Berkeley DB environment, mostly depending on the cluster size of
+    your file system. With 1 KiB clusters (which seems to be the `ext3`
+    default nowadays) it usually takes up much less space.
+
+  - There is a new substituter that copies paths directly from other
+    (remote) Nix stores mounted somewhere in the filesystem. For
+    instance, you can speed up an installation by mounting some remote
+    Nix store that already has the packages in question via NFS or
+    `sshfs`. The environment variable NIX\_OTHER\_STORES specifies the
+    locations of the remote Nix directories, e.g. `/mnt/remote-fs/nix`.
+
+  - New `nix-store` operations `--dump-db` and `--load-db` to dump and
+    reload the Nix database.
+
+  - The garbage collector has a number of new options to allow only some
+    of the garbage to be deleted. The option `--max-freed N` tells the
+    collector to stop after at least N bytes have been deleted. The
+    option `--max-links
+            N` tells it to stop after the link count on `/nix/store` has dropped
+    below N. This is useful for very large Nix stores on filesystems
+    with a 32000 subdirectories limit (like `ext3`). The option
+    `--use-atime` causes store paths to be deleted in order of ascending
+    last access time. This allows non-recently used stuff to be deleted.
+    The option `--max-atime time` specifies an upper limit to the last
+    accessed time of paths that may be deleted. For instance,
+    
+    ``` 
+        $ nix-store --gc -v --max-atime $(date +%s -d "2 months ago")
+    ```
+    
+    deletes everything that hasn’t been accessed in two months.
+
+  - `nix-env` now uses optimistic profile locking when performing an
+    operation like installing or upgrading, instead of setting an
+    exclusive lock on the profile. This allows multiple `nix-env -i / -u
+    / -e` operations on the same profile in parallel. If a `nix-env`
+    operation sees at the end that the profile was changed in the
+    meantime by another process, it will just restart. This is generally
+    cheap because the build results are still in the Nix store.
+
+  - The option `--dry-run` is now supported by `nix-store -r` and
+    `nix-build`.
+
+  - The information previously shown by `--dry-run` (i.e., which
+    derivations will be built and which paths will be substituted) is
+    now always shown by `nix-env`, `nix-store -r` and `nix-build`. The
+    total download size of substitutable paths is now also shown. For
+    instance, a build will show something like
+    
+        the following derivations will be built:
+          /nix/store/129sbxnk5n466zg6r1qmq1xjv9zymyy7-activate-configuration.sh.drv
+          /nix/store/7mzy971rdm8l566ch8hgxaf89x7lr7ik-upstart-jobs.drv
+          ...
+        the following paths will be downloaded/copied (30.02 MiB):
+          /nix/store/4m8pvgy2dcjgppf5b4cj5l6wyshjhalj-samba-3.2.4
+          /nix/store/7h1kwcj29ip8vk26rhmx6bfjraxp0g4l-libunwind-0.98.6
+          ...
+
+  - Language features:
+    
+      - @-patterns as in Haskell. For instance, in a function definition
+        
+            f = args @ {x, y, z}: ...;
+        
+        `args` refers to the argument as a whole, which is further
+        pattern-matched against the attribute set pattern `{x, y, z}`.
+    
+      - “`...`” (ellipsis) patterns. An attribute set pattern can now
+        say `...` at the end of the attribute name list to specify that
+        the function takes *at least* the listed attributes, while
+        ignoring additional attributes. For instance,
+        
+            {stdenv, fetchurl, fuse, ...}: ...
+        
+        defines a function that accepts any attribute set that includes
+        at least the three listed attributes.
+    
+      - New primops: `builtins.parseDrvName` (split a package name
+        string like `"nix-0.12pre12876"` into its name and version
+        components, e.g. `"nix"` and `"0.12pre12876"`),
+        `builtins.compareVersions` (compare two version strings using
+        the same algorithm that `nix-env` uses), `builtins.length`
+        (efficiently compute the length of a list), `builtins.mul`
+        (integer multiplication), `builtins.div` (integer division).
+
+  - `nix-prefetch-url` now supports `mirror://` URLs, provided that the
+    environment variable NIXPKGS\_ALL points at a Nixpkgs tree.
+
+  - Removed the commands `nix-pack-closure` and `nix-unpack-closure`.
+    You can do almost the same thing but much more efficiently by doing
+    `nix-store --export
+            $(nix-store -qR paths) > closure` and `nix-store --import <
+            closure`.
+
+  - Lots of bug fixes, including a big performance bug in the handling
+    of `with`-expressions.
diff --git a/doc/manual/src/release-notes/rl-0.13.md b/doc/manual/src/release-notes/rl-0.13.md
new file mode 100644
index 000000000..21f33e3db
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.13.md
@@ -0,0 +1,55 @@
+# Release 0.13 (2009-11-05)
+
+This is primarily a bug fix release. It has some new features:
+
+  - Syntactic sugar for writing nested attribute sets. Instead of
+    
+        {
+          foo = {
+            bar = 123;
+            xyzzy = true;
+          };
+          a = { b = { c = "d"; }; };
+        }
+    
+    you can write
+    
+        {
+          foo.bar = 123;
+          foo.xyzzy = true;
+          a.b.c = "d";
+        }
+    
+    This is useful, for instance, in NixOS configuration files.
+
+  - Support for Nix channels generated by Hydra, the Nix-based
+    continuous build system. (Hydra generates NAR archives on the fly,
+    so the size and hash of these archives isn’t known in advance.)
+
+  - Support `i686-linux` builds directly on `x86_64-linux` Nix
+    installations. This is implemented using the `personality()`
+    syscall, which causes `uname` to return `i686` in child processes.
+
+  - Various improvements to the `chroot` support. Building in a `chroot`
+    works quite well now.
+
+  - Nix no longer blocks if it tries to build a path and another process
+    is already building the same path. Instead it tries to build another
+    buildable path first. This improves parallelism.
+
+  - Support for large (\> 4 GiB) files in NAR archives.
+
+  - Various (performance) improvements to the remote build mechanism.
+
+  - New primops: `builtins.addErrorContext` (to add a string to stack
+    traces — useful for debugging), `builtins.isBool`,
+    `builtins.isString`, `builtins.isInt`, `builtins.intersectAttrs`.
+
+  - OpenSolaris support (Sander van der Burg).
+
+  - Stack traces are no longer displayed unless the `--show-trace`
+    option is used.
+
+  - The scoping rules for `inherit
+                    (e) ...` in recursive attribute sets have changed. The expression e
+    can now refer to the attributes defined in the containing set.
diff --git a/doc/manual/src/release-notes/rl-0.14.md b/doc/manual/src/release-notes/rl-0.14.md
new file mode 100644
index 000000000..9d58f2072
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.14.md
@@ -0,0 +1,21 @@
+# Release 0.14 (2010-02-04)
+
+This release has the following improvements:
+
+  - The garbage collector now starts deleting garbage much faster than
+    before. It no longer determines liveness of all paths in the store,
+    but does so on demand.
+
+  - Added a new operation, `nix-store --query
+                    --roots`, that shows the garbage collector roots that directly or
+    indirectly point to the given store paths.
+
+  - Removed support for converting Berkeley DB-based Nix databases to
+    the new schema.
+
+  - Removed the `--use-atime` and `--max-atime` garbage collector
+    options. They were not very useful in practice.
+
+  - On Windows, Nix now requires Cygwin 1.7.x.
+
+  - A few bug fixes.
diff --git a/doc/manual/src/release-notes/rl-0.15.md b/doc/manual/src/release-notes/rl-0.15.md
new file mode 100644
index 000000000..48e2a6f1b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.15.md
@@ -0,0 +1,5 @@
+# Release 0.15 (2010-03-17)
+
+This is a bug-fix release. Among other things, it fixes building on Mac
+OS X (Snow Leopard), and improves the contents of `/etc/passwd` and
+`/etc/group` in `chroot` builds.
diff --git a/doc/manual/src/release-notes/rl-0.16.md b/doc/manual/src/release-notes/rl-0.16.md
new file mode 100644
index 000000000..121bbde28
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.16.md
@@ -0,0 +1,25 @@
+# Release 0.16 (2010-08-17)
+
+This release has the following improvements:
+
+  - The Nix expression evaluator is now much faster in most cases:
+    typically, [3 to 8 times compared to the old
+    implementation](http://www.mail-archive.com/nix-dev@cs.uu.nl/msg04113.html).
+    It also uses less memory. It no longer depends on the ATerm library.
+
+  - Support for configurable parallelism inside builders. Build scripts
+    have always had the ability to perform multiple build actions in
+    parallel (for instance, by running `make -j
+                            2`), but this was not desirable because the number of actions to be
+    performed in parallel was not configurable. Nix now has an option
+    `--cores
+                            N` as well as a configuration setting `build-cores =
+                            N` that causes the environment variable NIX\_BUILD\_CORES to be set
+    to N when the builder is invoked. The builder can use this at its
+    discretion to perform a parallel build, e.g., by calling `make -j
+                            N`. In Nixpkgs, this can be enabled on a per-package basis by
+    setting the derivation attribute `enableParallelBuilding` to `true`.
+
+  - `nix-store -q` now supports XML output through the `--xml` flag.
+
+  - Several bug fixes.
diff --git a/doc/manual/src/release-notes/rl-0.5.md b/doc/manual/src/release-notes/rl-0.5.md
new file mode 100644
index 000000000..5cff2da0b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.5.md
@@ -0,0 +1,3 @@
+# Release 0.5 and earlier
+
+Please refer to the Subversion commit log messages.
diff --git a/doc/manual/src/release-notes/rl-0.6.md b/doc/manual/src/release-notes/rl-0.6.md
new file mode 100644
index 000000000..c816c9851
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.6.md
@@ -0,0 +1,64 @@
+# Release 0.6 (2004-11-14)
+
+  - Rewrite of the normalisation engine.
+    
+      - Multiple builds can now be performed in parallel (option `-j`).
+    
+      - Distributed builds. Nix can now call a shell script to forward
+        builds to Nix installations on remote machines, which may or may
+        not be of the same platform type.
+    
+      - Option `--fallback` allows recovery from broken substitutes.
+    
+      - Option `--keep-going` causes building of other (unaffected)
+        derivations to continue if one failed.
+
+  - Improvements to the garbage collector (i.e., it should actually work
+    now).
+
+  - Setuid Nix installations allow a Nix store to be shared among
+    multiple users.
+
+  - Substitute registration is much faster now.
+
+  - A utility `nix-build` to build a Nix expression and create a symlink
+    to the result int the current directory; useful for testing Nix
+    derivations.
+
+  - Manual updates.
+
+  - `nix-env` changes:
+    
+      - Derivations for other platforms are filtered out (which can be
+        overridden using `--system-filter`).
+    
+      - `--install` by default now uninstall previous derivations with
+        the same name.
+    
+      - `--upgrade` allows upgrading to a specific version.
+    
+      - New operation `--delete-generations` to remove profile
+        generations (necessary for effective garbage collection).
+    
+      - Nicer output (sorted, columnised).
+
+  - More sensible verbosity levels all around (builder output is now
+    shown always, unless `-Q` is given).
+
+  - Nix expression language changes:
+    
+      - New language construct: `with
+                                                        E1;
+                                                        E2` brings all attributes defined in the attribute set E1 in
+        scope in E2.
+    
+      - Added a `map` function.
+    
+      - Various new operators (e.g., string concatenation).
+
+  - Expression evaluation is much faster.
+
+  - An Emacs mode for editing Nix expressions (with syntax highlighting
+    and indentation) has been added.
+
+  - Many bug fixes.
diff --git a/doc/manual/src/release-notes/rl-0.7.md b/doc/manual/src/release-notes/rl-0.7.md
new file mode 100644
index 000000000..d873fe890
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.7.md
@@ -0,0 +1,21 @@
+# Release 0.7 (2005-01-12)
+
+  - Binary patching. When upgrading components using pre-built binaries
+    (through nix-pull / nix-channel), Nix can automatically download and
+    apply binary patches to already installed components instead of full
+    downloads. Patching is “smart”: if there is a *sequence* of patches
+    to an installed component, Nix will use it. Patches are currently
+    generated automatically between Nixpkgs (pre-)releases.
+
+  - Simplifications to the substitute mechanism.
+
+  - Nix-pull now stores downloaded manifests in
+    `/nix/var/nix/manifests`.
+
+  - Metadata on files in the Nix store is canonicalised after builds:
+    the last-modified timestamp is set to 0 (00:00:00 1/1/1970), the
+    mode is set to 0444 or 0555 (readable and possibly executable by
+    all; setuid/setgid bits are dropped), and the group is set to the
+    default. This ensures that the result of a build and an installation
+    through a substitute is the same; and that timestamp dependencies
+    are revealed.
diff --git a/doc/manual/src/release-notes/rl-0.8.1.md b/doc/manual/src/release-notes/rl-0.8.1.md
new file mode 100644
index 000000000..7629f81cb
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.8.1.md
@@ -0,0 +1,8 @@
+# Release 0.8.1 (2005-04-13)
+
+This is a bug fix release.
+
+  - Patch downloading was broken.
+
+  - The garbage collector would not delete paths that had references
+    from invalid (but substitutable) paths.
diff --git a/doc/manual/src/release-notes/rl-0.8.md b/doc/manual/src/release-notes/rl-0.8.md
new file mode 100644
index 000000000..626c0c92b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.8.md
@@ -0,0 +1,166 @@
+# Release 0.8 (2005-04-11)
+
+NOTE: the hashing scheme in Nix 0.8 changed (as detailed below). As a
+result, `nix-pull` manifests and channels built for Nix 0.7 and below
+will not work anymore. However, the Nix expression language has not
+changed, so you can still build from source. Also, existing user
+environments continue to work. Nix 0.8 will automatically upgrade the
+database schema of previous installations when it is first run.
+
+If you get the error message
+
+    you have an old-style manifest `/nix/var/nix/manifests/[...]'; please
+    delete it
+
+you should delete previously downloaded manifests:
+
+    $ rm /nix/var/nix/manifests/*
+
+If `nix-channel` gives the error message
+
+    manifest `http://catamaran.labs.cs.uu.nl/dist/nix/channels/[channel]/MANIFEST'
+    is too old (i.e., for Nix <= 0.7)
+
+then you should unsubscribe from the offending channel (`nix-channel
+--remove
+URL`; leave out `/MANIFEST`), and subscribe to the same URL, with
+`channels` replaced by `channels-v3` (e.g.,
+<http://catamaran.labs.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable>).
+
+Nix 0.8 has the following improvements:
+
+  - The cryptographic hashes used in store paths are now 160 bits long,
+    but encoded in base-32 so that they are still only 32 characters
+    long (e.g.,
+    `/nix/store/csw87wag8bqlqk7ipllbwypb14xainap-atk-1.9.0`). (This is
+    actually a 160 bit truncation of a SHA-256 hash.)
+
+  - Big cleanups and simplifications of the basic store semantics. The
+    notion of “closure store expressions” is gone (and so is the notion
+    of “successors”); the file system references of a store path are now
+    just stored in the database.
+    
+    For instance, given any store path, you can query its closure:
+    
+        $ nix-store -qR $(which firefox)
+        ... lots of paths ...
+    
+    Also, Nix now remembers for each store path the derivation that
+    built it (the “deriver”):
+    
+        $ nix-store -qR $(which firefox)
+        /nix/store/4b0jx7vq80l9aqcnkszxhymsf1ffa5jd-firefox-1.0.1.drv
+    
+    So to see the build-time dependencies, you can do
+    
+        $ nix-store -qR $(nix-store -qd $(which firefox))
+    
+    or, in a nicer format:
+    
+        $ nix-store -q --tree $(nix-store -qd $(which firefox))
+    
+    File system references are also stored in reverse. For instance, you
+    can query all paths that directly or indirectly use a certain Glibc:
+    
+        $ nix-store -q --referrers-closure \
+            /nix/store/8lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
+
+  - The concept of fixed-output derivations has been formalised.
+    Previously, functions such as `fetchurl` in Nixpkgs used a hack
+    (namely, explicitly specifying a store path hash) to prevent changes
+    to, say, the URL of the file from propagating upwards through the
+    dependency graph, causing rebuilds of everything. This can now be
+    done cleanly by specifying the `outputHash` and `outputHashAlgo`
+    attributes. Nix itself checks that the content of the output has the
+    specified hash. (This is important for maintaining certain
+    invariants necessary for future work on secure shared stores.)
+
+  - One-click installation :-) It is now possible to install any
+    top-level component in Nixpkgs directly, through the web — see,
+    e.g., <http://catamaran.labs.cs.uu.nl/dist/nixpkgs-0.8/>. All you
+    have to do is associate `/nix/bin/nix-install-package` with the MIME
+    type `application/nix-package` (or the extension `.nixpkg`), and
+    clicking on a package link will cause it to be installed, with all
+    appropriate dependencies. If you just want to install some specific
+    application, this is easier than subscribing to a channel.
+
+  - `nix-store -r
+            PATHS` now builds all the derivations PATHS in parallel. Previously
+    it did them sequentially (though exploiting possible parallelism
+    between subderivations). This is nice for build farms.
+
+  - `nix-channel` has new operations `--list` and `--remove`.
+
+  - New ways of installing components into user environments:
+    
+      - Copy from another user environment:
+        
+            $ nix-env -i --from-profile .../other-profile firefox
+    
+      - Install a store derivation directly (bypassing the Nix
+        expression language entirely):
+        
+            $ nix-env -i /nix/store/z58v41v21xd3...-aterm-2.3.1.drv
+        
+        (This is used to implement `nix-install-package`, which is
+        therefore immune to evolution in the Nix expression language.)
+    
+      - Install an already built store path directly:
+        
+            $ nix-env -i /nix/store/hsyj5pbn0d9i...-aterm-2.3.1
+    
+      - Install the result of a Nix expression specified as a
+        command-line argument:
+        
+            $ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper'
+        
+        The difference with the normal installation mode is that `-E`
+        does not use the `name` attributes of derivations. Therefore,
+        this can be used to disambiguate multiple derivations with the
+        same name.
+
+  - A hash of the contents of a store path is now stored in the database
+    after a successful build. This allows you to check whether store
+    paths have been tampered with: `nix-store
+            --verify --check-contents`.
+
+  - Implemented a concurrent garbage collector. It is now always safe to
+    run the garbage collector, even if other Nix operations are
+    happening simultaneously.
+    
+    However, there can still be GC races if you use `nix-instantiate`
+    and `nix-store
+                    --realise` directly to build things. To prevent races, use the
+    `--add-root` flag of those commands.
+
+  - The garbage collector now finally deletes paths in the right order
+    (i.e., topologically sorted under the “references” relation), thus
+    making it safe to interrupt the collector without risking a store
+    that violates the closure invariant.
+
+  - Likewise, the substitute mechanism now downloads files in the right
+    order, thus preserving the closure invariant at all times.
+
+  - The result of `nix-build` is now registered as a root of the garbage
+    collector. If the `./result` link is deleted, the GC root disappears
+    automatically.
+
+  - The behaviour of the garbage collector can be changed globally by
+    setting options in `/nix/etc/nix/nix.conf`.
+    
+      - `gc-keep-derivations` specifies whether deriver links should be
+        followed when searching for live paths.
+    
+      - `gc-keep-outputs` specifies whether outputs of derivations
+        should be followed when searching for live paths.
+    
+      - `env-keep-derivations` specifies whether user environments
+        should store the paths of derivations when they are added (thus
+        keeping the derivations alive).
+
+  - New `nix-env` query flags `--drv-path` and `--out-path`.
+
+  - `fetchurl` allows SHA-1 and SHA-256 in addition to MD5. Just specify
+    the attribute `sha1` or `sha256` instead of `md5`.
+
+  - Manual updates.
diff --git a/doc/manual/src/release-notes/rl-0.9.1.md b/doc/manual/src/release-notes/rl-0.9.1.md
new file mode 100644
index 000000000..9c20eed1b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.9.1.md
@@ -0,0 +1,4 @@
+# Release 0.9.1 (2005-09-20)
+
+This bug fix release addresses a problem with the ATerm library when the
+`--with-aterm` flag in `configure` was *not* used.
diff --git a/doc/manual/src/release-notes/rl-0.9.2.md b/doc/manual/src/release-notes/rl-0.9.2.md
new file mode 100644
index 000000000..0caaf28de
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.9.2.md
@@ -0,0 +1,11 @@
+# Release 0.9.2 (2005-09-21)
+
+This bug fix release fixes two problems on Mac OS X:
+
+  - If Nix was linked against statically linked versions of the ATerm or
+    Berkeley DB library, there would be dynamic link errors at runtime.
+
+  - `nix-pull` and `nix-push` intermittently failed due to race
+    conditions involving pipes and child processes with error messages
+    such as `open2: open(GLOB(0x180b2e4), >&=9) failed: Bad
+            file descriptor at /nix/bin/nix-pull line 77` (issue `NIX-14`).
diff --git a/doc/manual/src/release-notes/rl-0.9.md b/doc/manual/src/release-notes/rl-0.9.md
new file mode 100644
index 000000000..8c3e1b28e
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-0.9.md
@@ -0,0 +1,72 @@
+# Release 0.9 (2005-09-16)
+
+NOTE: this version of Nix uses Berkeley DB 4.3 instead of 4.2. The
+database is upgraded automatically, but you should be careful not to use
+old versions of Nix that still use Berkeley DB 4.2. In particular, if
+you use a Nix installed through Nix, you should run
+
+    $ nix-store --clear-substitutes
+
+first.
+
+  - Unpacking of patch sequences is much faster now since we no longer
+    do redundant unpacking and repacking of intermediate paths.
+
+  - Nix now uses Berkeley DB 4.3.
+
+  - The `derivation` primitive is lazier. Attributes of dependent
+    derivations can mutually refer to each other (as long as there are
+    no data dependencies on the `outPath` and `drvPath` attributes
+    computed by `derivation`).
+    
+    For example, the expression `derivation
+            attrs` now evaluates to (essentially)
+    
+        attrs // {
+          type = "derivation";
+          outPath = derivation! attrs;
+          drvPath = derivation! attrs;
+        }
+    
+    where `derivation!` is a primop that does the actual derivation
+    instantiation (i.e., it does what `derivation` used to do). The
+    advantage is that it allows commands such as `nix-env -qa` and
+    `nix-env -i` to be much faster since they no longer need to
+    instantiate all derivations, just the `name` attribute.
+    
+    Also, it allows derivations to cyclically reference each other, for
+    example,
+    
+        webServer = derivation {
+          ...
+          hostName = "svn.cs.uu.nl";
+          services = [svnService];
+        };
+         
+        svnService = derivation {
+          ...
+          hostName = webServer.hostName;
+        };
+    
+    Previously, this would yield a black hole (infinite recursion).
+
+  - `nix-build` now defaults to using `./default.nix` if no Nix
+    expression is specified.
+
+  - `nix-instantiate`, when applied to a Nix expression that evaluates
+    to a function, will call the function automatically if all its
+    arguments have defaults.
+
+  - Nix now uses libtool to build dynamic libraries. This reduces the
+    size of executables.
+
+  - A new list concatenation operator `++`. For example, `[1 2 3] ++
+    [4 5
+            6]` evaluates to `[1 2 3 4 5
+            6]`.
+
+  - Some currently undocumented primops to support low-level build
+    management using Nix (i.e., using Nix as a Make replacement). See
+    the commit messages for `r3578` and `r3580`.
+
+  - Various bug fixes and performance improvements.
diff --git a/doc/manual/src/release-notes/rl-1.0.md b/doc/manual/src/release-notes/rl-1.0.md
new file mode 100644
index 000000000..025f827d9
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.0.md
@@ -0,0 +1,68 @@
+# Release 1.0 (2012-05-11)
+
+There have been numerous improvements and bug fixes since the previous
+release. Here are the most significant:
+
+  - Nix can now optionally use the Boehm garbage collector. This
+    significantly reduces the Nix evaluator’s memory footprint,
+    especially when evaluating large NixOS system configurations. It can
+    be enabled using the `--enable-gc` configure option.
+
+  - Nix now uses SQLite for its database. This is faster and more
+    flexible than the old *ad hoc* format. SQLite is also used to cache
+    the manifests in `/nix/var/nix/manifests`, resulting in a
+    significant speedup.
+
+  - Nix now has an search path for expressions. The search path is set
+    using the environment variable NIX\_PATH and the `-I` command line
+    option. In Nix expressions, paths between angle brackets are used to
+    specify files that must be looked up in the search path. For
+    instance, the expression `<nixpkgs/default.nix>` looks for a file
+    `nixpkgs/default.nix` relative to every element in the search path.
+
+  - The new command `nix-build --run-env` builds all dependencies of a
+    derivation, then starts a shell in an environment containing all
+    variables from the derivation. This is useful for reproducing the
+    environment of a derivation for development.
+
+  - The new command `nix-store --verify-path` verifies that the contents
+    of a store path have not changed.
+
+  - The new command `nix-store --print-env` prints out the environment
+    of a derivation in a format that can be evaluated by a shell.
+
+  - Attribute names can now be arbitrary strings. For instance, you can
+    write `{ "foo-1.2" = …; "bla bla" = …; }."bla
+                    bla"`.
+
+  - Attribute selection can now provide a default value using the `or`
+    operator. For instance, the expression `x.y.z or e` evaluates to the
+    attribute `x.y.z` if it exists, and `e` otherwise.
+
+  - The right-hand side of the `?` operator can now be an attribute
+    path, e.g., `attrs ?
+                    a.b.c`.
+
+  - On Linux, Nix will now make files in the Nix store immutable on
+    filesystems that support it. This prevents accidental modification
+    of files in the store by the root user.
+
+  - Nix has preliminary support for derivations with multiple outputs.
+    This is useful because it allows parts of a package to be deployed
+    and garbage-collected separately. For instance, development parts of
+    a package such as header files or static libraries would typically
+    not be part of the closure of an application, resulting in reduced
+    disk usage and installation time.
+
+  - The Nix store garbage collector is faster and holds the global lock
+    for a shorter amount of time.
+
+  - The option `--timeout` (corresponding to the configuration setting
+    `build-timeout`) allows you to set an absolute timeout on builds —
+    if a build runs for more than the given number of seconds, it is
+    terminated. This is useful for recovering automatically from builds
+    that are stuck in an infinite loop but keep producing output, and
+    for which `--max-silent-time` is ineffective.
+
+  - Nix development has moved to GitHub
+    (<https://github.com/NixOS/nix>).
diff --git a/doc/manual/src/release-notes/rl-1.1.md b/doc/manual/src/release-notes/rl-1.1.md
new file mode 100644
index 000000000..1e658fe15
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.1.md
@@ -0,0 +1,61 @@
+# Release 1.1 (2012-07-18)
+
+This release has the following improvements:
+
+  - On Linux, when doing a chroot build, Nix now uses various namespace
+    features provided by the Linux kernel to improve build isolation.
+    Namely:
+    
+      - The private network namespace ensures that builders cannot talk
+        to the outside world (or vice versa): each build only sees a
+        private loopback interface. This also means that two concurrent
+        builds can listen on the same port (e.g. as part of a test)
+        without conflicting with each other.
+    
+      - The PID namespace causes each build to start as PID 1. Processes
+        outside of the chroot are not visible to those on the inside. On
+        the other hand, processes inside the chroot *are* visible from
+        the outside (though with different PIDs).
+    
+      - The IPC namespace prevents the builder from communicating with
+        outside processes using SysV IPC mechanisms (shared memory,
+        message queues, semaphores). It also ensures that all IPC
+        objects are destroyed when the builder exits.
+    
+      - The UTS namespace ensures that builders see a hostname of
+        `localhost` rather than the actual hostname.
+    
+      - The private mount namespace was already used by Nix to ensure
+        that the bind-mounts used to set up the chroot are cleaned up
+        automatically.
+
+  - Build logs are now compressed using `bzip2`. The command `nix-store
+                    -l` decompresses them on the fly. This can be disabled by setting
+    the option `build-compress-log` to `false`.
+
+  - The creation of build logs in `/nix/var/log/nix/drvs` can be
+    disabled by setting the new option `build-keep-log` to `false`. This
+    is useful, for instance, for Hydra build machines.
+
+  - Nix now reserves some space in `/nix/var/nix/db/reserved` to ensure
+    that the garbage collector can run successfully if the disk is full.
+    This is necessary because SQLite transactions fail if the disk is
+    full.
+
+  - Added a basic `fetchurl` function. This is not intended to replace
+    the `fetchurl` in Nixpkgs, but is useful for bootstrapping; e.g., it
+    will allow us to get rid of the bootstrap binaries in the Nixpkgs
+    source tree and download them instead. You can use it by doing
+    `import <nix/fetchurl.nix> { url =
+                    url; sha256 =
+                    "hash"; }`. (Shea Levy)
+
+  - Improved RPM spec file. (Michel Alexandre Salim)
+
+  - Support for on-demand socket-based activation in the Nix daemon with
+    `systemd`.
+
+  - Added a manpage for nix.conf5.
+
+  - When using the Nix daemon, the `-s` flag in `nix-env -qa` is now
+    much faster.
diff --git a/doc/manual/src/release-notes/rl-1.10.md b/doc/manual/src/release-notes/rl-1.10.md
new file mode 100644
index 000000000..2bb859536
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.10.md
@@ -0,0 +1,31 @@
+# Release 1.10 (2015-09-03)
+
+This is primarily a bug fix release. It also has a number of new
+features:
+
+  - A number of builtin functions have been added to reduce
+    Nixpkgs/NixOS evaluation time and memory consumption: `all`, `any`,
+    `concatStringsSep`, `foldl’`, `genList`, `replaceStrings`, `sort`.
+
+  - The garbage collector is more robust when the disk is full.
+
+  - Nix supports a new API for building derivations that doesn’t require
+    a `.drv` file to be present on disk; it only requires an in-memory
+    representation of the derivation. This is used by the Hydra
+    continuous build system to make remote builds more efficient.
+
+  - The function `<nix/fetchurl.nix>` now uses a *builtin* builder (i.e.
+    it doesn’t require starting an external process; the download is
+    performed by Nix itself). This ensures that derivation paths don’t
+    change when Nix is upgraded, and obviates the need for ugly hacks to
+    support chroot execution.
+
+  - `--version -v` now prints some configuration information, in
+    particular what compile-time optional features are enabled, and the
+    paths of various directories.
+
+  - Build users have their supplementary groups set correctly.
+
+This release has contributions from Eelco Dolstra, Guillaume Maudoux,
+Iwan Aucamp, Jaka Hudoklin, Kirill Elagin, Ludovic Courtès, Manolis
+Ragkousis, Nicolas B. Pierron and Shea Levy.
diff --git a/doc/manual/src/release-notes/rl-1.11.10.md b/doc/manual/src/release-notes/rl-1.11.10.md
new file mode 100644
index 000000000..d1efe1d0b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.11.10.md
@@ -0,0 +1,21 @@
+# Release 1.11.10 (2017-06-12)
+
+This release fixes a security bug in Nix’s “build user” build isolation
+mechanism. Previously, Nix builders had the ability to create setuid
+binaries owned by a `nixbld` user. Such a binary could then be used by
+an attacker to assume a `nixbld` identity and interfere with subsequent
+builds running under the same UID.
+
+To prevent this issue, Nix now disallows builders to create setuid and
+setgid binaries. On Linux, this is done using a seccomp BPF filter. Note
+that this imposes a small performance penalty (e.g. 1% when building GNU
+Hello). Using seccomp, we now also prevent the creation of extended
+attributes and POSIX ACLs since these cannot be represented in the NAR
+format and (in the case of POSIX ACLs) allow bypassing regular Nix store
+permissions. On macOS, the restriction is implemented using the existing
+sandbox mechanism, which now uses a minimal “allow all except the
+creation of setuid/setgid binaries” profile when regular sandboxing is
+disabled. On other platforms, the “build user” mechanism is now
+disabled.
+
+Thanks go to Linus Heckemann for discovering and reporting this bug.
diff --git a/doc/manual/src/release-notes/rl-1.11.md b/doc/manual/src/release-notes/rl-1.11.md
new file mode 100644
index 000000000..381887bd8
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.11.md
@@ -0,0 +1,87 @@
+# Release 1.11 (2016-01-19)
+
+This is primarily a bug fix release. It also has a number of new
+features:
+
+  - `nix-prefetch-url` can now download URLs specified in a Nix
+    expression. For example,
+    
+        $ nix-prefetch-url -A hello.src
+    
+    will prefetch the file specified by the `fetchurl` call in the
+    attribute `hello.src` from the Nix expression in the current
+    directory, and print the cryptographic hash of the resulting file on
+    stdout. This differs from `nix-build -A
+                    hello.src` in that it doesn't verify the hash, and is thus useful
+    when you’re updating a Nix expression.
+    
+    You can also prefetch the result of functions that unpack a tarball,
+    such as `fetchFromGitHub`. For example:
+    
+        $ nix-prefetch-url --unpack https://github.com/NixOS/patchelf/archive/0.8.tar.gz
+    
+    or from a Nix expression:
+    
+        $ nix-prefetch-url -A nix-repl.src
+
+  - The builtin function `<nix/fetchurl.nix>` now supports downloading
+    and unpacking NARs. This removes the need to have multiple downloads
+    in the Nixpkgs stdenv bootstrap process (like a separate busybox
+    binary for Linux, or curl/mkdir/sh/bzip2 for Darwin). Now all those
+    files can be combined into a single NAR, optionally compressed using
+    `xz`.
+
+  - Nix now supports SHA-512 hashes for verifying fixed-output
+    derivations, and in `builtins.hashString`.
+
+  - The new flag `--option build-repeat
+                            N` will cause every build to be executed N+1 times. If the build
+    output differs between any round, the build is rejected, and the
+    output paths are not registered as valid. This is primarily useful
+    to verify build determinism. (We already had a `--check` option to
+    repeat a previously succeeded build. However, with `--check`,
+    non-deterministic builds are registered in the DB. Preventing that
+    is useful for Hydra to ensure that non-deterministic builds don't
+    end up getting published to the binary cache.)
+
+  - The options `--check` and `--option
+                            build-repeat N`, if they detect a difference between two runs of the
+    same derivation and `-K` is given, will make the output of the other
+    run available under `store-path-check`. This makes it easier to
+    investigate the non-determinism using tools like `diffoscope`, e.g.,
+    
+        $ nix-build pkgs/stdenv/linux -A stage1.pkgs.zlib --check -K
+        error: derivation ‘/nix/store/l54i8wlw2265…-zlib-1.2.8.drv’ may not
+        be deterministic: output ‘/nix/store/11a27shh6n2i…-zlib-1.2.8’
+        differs from ‘/nix/store/11a27shh6n2i…-zlib-1.2.8-check’
+        
+        $ diffoscope /nix/store/11a27shh6n2i…-zlib-1.2.8 /nix/store/11a27shh6n2i…-zlib-1.2.8-check
+        …
+        ├── lib/libz.a
+        │   ├── metadata
+        │   │ @@ -1,15 +1,15 @@
+        │   │ -rw-r--r-- 30001/30000   3096 Jan 12 15:20 2016 adler32.o
+        …
+        │   │ +rw-r--r-- 30001/30000   3096 Jan 12 15:28 2016 adler32.o
+        …
+
+  - Improved FreeBSD support.
+
+  - `nix-env -qa --xml --meta` now prints license information.
+
+  - The maximum number of parallel TCP connections that the binary cache
+    substituter will use has been decreased from 150 to 25. This should
+    prevent upsetting some broken NAT routers, and also improves
+    performance.
+
+  - All "chroot"-containing strings got renamed to "sandbox". In
+    particular, some Nix options got renamed, but the old names are
+    still accepted as lower-priority aliases.
+
+This release has contributions from Anders Claesson, Anthony Cowley,
+Bjørn Forsman, Brian McKenna, Danny Wilson, davidak, Eelco Dolstra,
+Fabian Schmitthenner, FrankHB, Ilya Novoselov, janus, Jim Garrison, John
+Ericson, Jude Taylor, Ludovic Courtès, Manuel Jacob, Mathnerd314, Pascal
+Wittmann, Peter Simons, Philip Potter, Preston Bennes, Rommel M.
+Martinez, Sander van der Burg, Shea Levy, Tim Cuthbertson, Tuomas
+Tynkkynen, Utku Demir and Vladimír Čunát.
diff --git a/doc/manual/src/release-notes/rl-1.2.md b/doc/manual/src/release-notes/rl-1.2.md
new file mode 100644
index 000000000..e62b2dac9
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.2.md
@@ -0,0 +1,97 @@
+# Release 1.2 (2012-12-06)
+
+This release has the following improvements and changes:
+
+  - Nix has a new binary substituter mechanism: the *binary cache*. A
+    binary cache contains pre-built binaries of Nix packages. Whenever
+    Nix wants to build a missing Nix store path, it will check a set of
+    binary caches to see if any of them has a pre-built binary of that
+    path. The configuration setting `binary-caches` contains a list of
+    URLs of binary caches. For instance, doing
+    
+        $ nix-env -i thunderbird --option binary-caches http://cache.nixos.org
+    
+    will install Thunderbird and its dependencies, using the available
+    pre-built binaries in <http://cache.nixos.org>. The main advantage
+    over the old “manifest”-based method of getting pre-built binaries
+    is that you don’t have to worry about your manifest being in sync
+    with the Nix expressions you’re installing from; i.e., you don’t
+    need to run `nix-pull` to update your manifest. It’s also more
+    scalable because you don’t need to redownload a giant manifest file
+    every time.
+    
+    A Nix channel can provide a binary cache URL that will be used
+    automatically if you subscribe to that channel. If you use the
+    Nixpkgs or NixOS channels (<http://nixos.org/channels>) you
+    automatically get the cache <http://cache.nixos.org>.
+    
+    Binary caches are created using `nix-push`. For details on the
+    operation and format of binary caches, see the `nix-push` manpage.
+    More details are provided in [this nix-dev
+    posting](https://nixos.org/nix-dev/2012-September/009826.html).
+
+  - Multiple output support should now be usable. A derivation can
+    declare that it wants to produce multiple store paths by saying
+    something like
+    
+        outputs = [ "lib" "headers" "doc" ];
+    
+    This will cause Nix to pass the intended store path of each output
+    to the builder through the environment variables `lib`, `headers`
+    and `doc`. Other packages can refer to a specific output by
+    referring to `pkg.output`, e.g.
+    
+        buildInputs = [ pkg.lib pkg.headers ];
+    
+    If you install a package with multiple outputs using `nix-env`, each
+    output path will be symlinked into the user environment.
+
+  - Dashes are now valid as part of identifiers and attribute names.
+
+  - The new operation `nix-store --repair-path` allows corrupted or
+    missing store paths to be repaired by redownloading them. `nix-store
+    --verify --check-contents
+                    --repair` will scan and repair all paths in the Nix store.
+    Similarly, `nix-env`, `nix-build`, `nix-instantiate` and `nix-store
+    --realise` have a `--repair` flag to detect and fix bad paths by
+    rebuilding or redownloading them.
+
+  - Nix no longer sets the immutable bit on files in the Nix store.
+    Instead, the recommended way to guard the Nix store against
+    accidental modification on Linux is to make it a read-only bind
+    mount, like this:
+    
+        $ mount --bind /nix/store /nix/store
+        $ mount -o remount,ro,bind /nix/store
+    
+    Nix will automatically make `/nix/store` writable as needed (using a
+    private mount namespace) to allow modifications.
+
+  - Store optimisation (replacing identical files in the store with hard
+    links) can now be done automatically every time a path is added to
+    the store. This is enabled by setting the configuration option
+    `auto-optimise-store` to `true` (disabled by default).
+
+  - Nix now supports `xz` compression for NARs in addition to `bzip2`.
+    It compresses about 30% better on typical archives and decompresses
+    about twice as fast.
+
+  - Basic Nix expression evaluation profiling: setting the environment
+    variable NIX\_COUNT\_CALLS to `1` will cause Nix to print how many
+    times each primop or function was executed.
+
+  - New primops: `concatLists`, `elem`, `elemAt` and `filter`.
+
+  - The command `nix-copy-closure` has a new flag `--use-substitutes`
+    (`-s`) to download missing paths on the target machine using the
+    substitute mechanism.
+
+  - The command `nix-worker` has been renamed to `nix-daemon`. Support
+    for running the Nix worker in “slave” mode has been removed.
+
+  - The `--help` flag of every Nix command now invokes `man`.
+
+  - Chroot builds are now supported on systemd machines.
+
+This release has contributions from Eelco Dolstra, Florian Friesdorf,
+Mats Erik Andersson and Shea Levy.
diff --git a/doc/manual/src/release-notes/rl-1.3.md b/doc/manual/src/release-notes/rl-1.3.md
new file mode 100644
index 000000000..0c7b48380
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.3.md
@@ -0,0 +1,10 @@
+# Release 1.3 (2013-01-04)
+
+This is primarily a bug fix release. When this version is first run on
+Linux, it removes any immutable bits from the Nix store and increases
+the schema version of the Nix store. (The previous release removed
+support for setting the immutable bit; this release clears any remaining
+immutable bits to make certain operations more efficient.)
+
+This release has contributions from Eelco Dolstra and Stuart
+Pernsteiner.
diff --git a/doc/manual/src/release-notes/rl-1.4.md b/doc/manual/src/release-notes/rl-1.4.md
new file mode 100644
index 000000000..d6d2227f8
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.4.md
@@ -0,0 +1,22 @@
+# Release 1.4 (2013-02-26)
+
+This release fixes a security bug in multi-user operation. It was
+possible for derivations to cause the mode of files outside of the Nix
+store to be changed to 444 (read-only but world-readable) by creating
+hard links to those files
+([details](https://github.com/NixOS/nix/commit/5526a282b5b44e9296e61e07d7d2626a79141ac4)).
+
+There are also the following improvements:
+
+  - New built-in function: `builtins.hashString`.
+
+  - Build logs are now stored in `/nix/var/log/nix/drvs/XX/`, where XX
+    is the first two characters of the derivation. This is useful on
+    machines that keep a lot of build logs (such as Hydra servers).
+
+  - The function `corepkgs/fetchurl` can now make the downloaded file
+    executable. This will allow getting rid of all bootstrap binaries in
+    the Nixpkgs source tree.
+
+  - Language change: The expression `"${./path}
+            ..."` now evaluates to a string instead of a path.
diff --git a/doc/manual/src/release-notes/rl-1.5.1.md b/doc/manual/src/release-notes/rl-1.5.1.md
new file mode 100644
index 000000000..72b29518e
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.5.1.md
@@ -0,0 +1,4 @@
+# Release 1.5.1 (2013-02-28)
+
+The bug fix to the bug fix had a bug itself, of course. But this time it
+will work for sure\!
diff --git a/doc/manual/src/release-notes/rl-1.5.2.md b/doc/manual/src/release-notes/rl-1.5.2.md
new file mode 100644
index 000000000..508580554
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.5.2.md
@@ -0,0 +1,4 @@
+# Release 1.5.2 (2013-05-13)
+
+This is primarily a bug fix release. It has contributions from Eelco
+Dolstra, Lluís Batlle i Rossell and Shea Levy.
diff --git a/doc/manual/src/release-notes/rl-1.5.md b/doc/manual/src/release-notes/rl-1.5.md
new file mode 100644
index 000000000..d2ccf8a5d
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.5.md
@@ -0,0 +1,4 @@
+# Release 1.5 (2013-02-27)
+
+This is a brown paper bag release to fix a regression introduced by the
+hard link security fix in 1.4.
diff --git a/doc/manual/src/release-notes/rl-1.6.1.md b/doc/manual/src/release-notes/rl-1.6.1.md
new file mode 100644
index 000000000..ed974fe0b
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.6.1.md
@@ -0,0 +1,32 @@
+# Release 1.6.1 (2013-10-28)
+
+This is primarily a bug fix release. Changes of interest are:
+
+  - Nix 1.6 accidentally changed the semantics of antiquoted paths in
+    strings, such as `"${/foo}/bar"`. This release reverts to the Nix
+    1.5.3 behaviour.
+
+  - Previously, Nix optimised expressions such as `"${expr}"` to expr.
+    Thus it neither checked whether expr could be coerced to a string,
+    nor applied such coercions. This meant that `"${123}"` evaluatued to
+    `123`, and `"${./foo}"` evaluated to `./foo` (even though `"${./foo}
+    "` evaluates to `"/nix/store/hash-foo "`). Nix now checks the type
+    of antiquoted expressions and applies coercions.
+
+  - Nix now shows the exact position of undefined variables. In
+    particular, undefined variable errors in a `with` previously didn't
+    show *any* position information, so this makes it a lot easier to
+    fix such errors.
+
+  - Undefined variables are now treated consistently. Previously, the
+    `tryEval` function would catch undefined variables inside a `with`
+    but not outside. Now `tryEval` never catches undefined variables.
+
+  - Bash completion in `nix-shell` now works correctly.
+
+  - Stack traces are less verbose: they no longer show calls to builtin
+    functions and only show a single line for each derivation on the
+    call stack.
+
+  - New built-in function: `builtins.typeOf`, which returns the type of
+    its argument as a string.
diff --git a/doc/manual/src/release-notes/rl-1.6.md b/doc/manual/src/release-notes/rl-1.6.md
new file mode 100644
index 000000000..a4583f4e6
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.6.md
@@ -0,0 +1,72 @@
+# Release 1.6 (2013-09-10)
+
+In addition to the usual bug fixes, this release has several new
+features:
+
+  - The command `nix-build --run-env` has been renamed to `nix-shell`.
+
+  - `nix-shell` now sources `$stdenv/setup` *inside* the interactive
+    shell, rather than in a parent shell. This ensures that shell
+    functions defined by `stdenv` can be used in the interactive shell.
+
+  - `nix-shell` has a new flag `--pure` to clear the environment, so you
+    get an environment that more closely corresponds to the “real” Nix
+    build.
+
+  - `nix-shell` now sets the shell prompt (PS1) to ensure that Nix
+    shells are distinguishable from your regular shells.
+
+  - `nix-env` no longer requires a `*` argument to match all packages,
+    so `nix-env -qa` is equivalent to `nix-env
+                    -qa '*'`.
+
+  - `nix-env -i` has a new flag `--remove-all` (`-r`) to remove all
+    previous packages from the profile. This makes it easier to do
+    declarative package management similar to NixOS’s
+    `environment.systemPackages`. For instance, if you have a
+    specification `my-packages.nix` like this:
+    
+        with import <nixpkgs> {};
+        [ thunderbird
+          geeqie
+          ...
+        ]
+    
+    then after any change to this file, you can run:
+    
+        $ nix-env -f my-packages.nix -ir
+    
+    to update your profile to match the specification.
+
+  - The ‘`with`’ language construct is now more lazy. It only evaluates
+    its argument if a variable might actually refer to an attribute in
+    the argument. For instance, this now works:
+    
+        let
+          pkgs = with pkgs; { foo = "old"; bar = foo; } // overrides;
+          overrides = { foo = "new"; };
+        in pkgs.bar
+    
+    This evaluates to `"new"`, while previously it gave an “infinite
+    recursion” error.
+
+  - Nix now has proper integer arithmetic operators. For instance, you
+    can write `x + y` instead of `builtins.add x y`, or `x <
+                    y` instead of `builtins.lessThan x y`. The comparison operators also
+    work on strings.
+
+  - On 64-bit systems, Nix integers are now 64 bits rather than 32 bits.
+
+  - When using the Nix daemon, the `nix-daemon` worker process now runs
+    on the same CPU as the client, on systems that support setting CPU
+    affinity. This gives a significant speedup on some systems.
+
+  - If a stack overflow occurs in the Nix evaluator, you now get a
+    proper error message (rather than “Segmentation fault”) on some
+    systems.
+
+  - In addition to directories, you can now bind-mount regular files in
+    chroots through the (now misnamed) option `build-chroot-dirs`.
+
+This release has contributions from Domen Kožar, Eelco Dolstra, Florian
+Friesdorf, Gergely Risko, Ivan Kozik, Ludovic Courtès and Shea Levy.
diff --git a/doc/manual/src/release-notes/rl-1.7.md b/doc/manual/src/release-notes/rl-1.7.md
new file mode 100644
index 000000000..71a327ed6
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.7.md
@@ -0,0 +1,140 @@
+# Release 1.7 (2014-04-11)
+
+In addition to the usual bug fixes, this release has the following new
+features:
+
+  - Antiquotation is now allowed inside of quoted attribute names (e.g.
+    `set."${foo}"`). In the case where the attribute name is just a
+    single antiquotation, the quotes can be dropped (e.g. the above
+    example can be written `set.${foo}`). If an attribute name inside of
+    a set declaration evaluates to `null` (e.g. `{ ${null} = false; }`),
+    then that attribute is not added to the set.
+
+  - Experimental support for cryptographically signed binary caches. See
+    [the commit for
+    details](https://github.com/NixOS/nix/commit/0fdf4da0e979f992db75cc17376e455ddc5a96d8).
+
+  - An experimental new substituter, `download-via-ssh`, that fetches
+    binaries from remote machines via SSH. Specifying the flags
+    `--option
+                    use-ssh-substituter true --option ssh-substituter-hosts
+                    user@hostname` will cause Nix to download binaries from the
+    specified machine, if it has them.
+
+  - `nix-store -r` and `nix-build` have a new flag, `--check`, that
+    builds a previously built derivation again, and prints an error
+    message if the output is not exactly the same. This helps to verify
+    whether a derivation is truly deterministic. For example:
+    
+        $ nix-build '<nixpkgs>' -A patchelf
+        …
+        $ nix-build '<nixpkgs>' -A patchelf --check
+        …
+        error: derivation `/nix/store/1ipvxs…-patchelf-0.6' may not be deterministic:
+          hash mismatch in output `/nix/store/4pc1dm…-patchelf-0.6.drv'
+
+  - The `nix-instantiate` flags `--eval-only` and `--parse-only` have
+    been renamed to `--eval` and `--parse`, respectively.
+
+  - `nix-instantiate`, `nix-build` and `nix-shell` now have a flag
+    `--expr` (or `-E`) that allows you to specify the expression to be
+    evaluated as a command line argument. For instance, `nix-instantiate
+    --eval -E
+                    '1 + 2'` will print `3`.
+
+  - `nix-shell` improvements:
+    
+      - It has a new flag, `--packages` (or `-p`), that sets up a build
+        environment containing the specified packages from Nixpkgs. For
+        example, the command
+        
+            $ nix-shell -p sqlite xorg.libX11 hello
+        
+        will start a shell in which the given packages are present.
+    
+      - It now uses `shell.nix` as the default expression, falling back
+        to `default.nix` if the former doesn’t exist. This makes it
+        convenient to have a `shell.nix` in your project to set up a
+        nice development environment.
+    
+      - It evaluates the derivation attribute `shellHook`, if set. Since
+        `stdenv` does not normally execute this hook, it allows you to
+        do `nix-shell`-specific setup.
+    
+      - It preserves the user’s timezone setting.
+
+  - In chroots, Nix now sets up a `/dev` containing only a minimal set
+    of devices (such as `/dev/null`). Note that it only does this if you
+    *don’t* have `/dev` listed in your `build-chroot-dirs` setting;
+    otherwise, it will bind-mount the `/dev` from outside the chroot.
+    
+    Similarly, if you don’t have `/dev/pts` listed in
+    `build-chroot-dirs`, Nix will mount a private `devpts` filesystem on
+    the chroot’s `/dev/pts`.
+
+  - New built-in function: `builtins.toJSON`, which returns a JSON
+    representation of a value.
+
+  - `nix-env -q` has a new flag `--json` to print a JSON representation
+    of the installed or available packages.
+
+  - `nix-env` now supports meta attributes with more complex values,
+    such as attribute sets.
+
+  - The `-A` flag now allows attribute names with dots in them, e.g.
+    
+        $ nix-instantiate --eval '<nixos>' -A 'config.systemd.units."nscd.service".text'
+
+  - The `--max-freed` option to `nix-store --gc` now accepts a unit
+    specifier. For example, `nix-store --gc --max-freed
+                    1G` will free up to 1 gigabyte of disk space.
+
+  - `nix-collect-garbage` has a new flag `--delete-older-than` N`d`,
+    which deletes all user environment generations older than N days.
+    Likewise, `nix-env
+                    --delete-generations` accepts a N`d` age limit.
+
+  - Nix now heuristically detects whether a build failure was due to a
+    disk-full condition. In that case, the build is not flagged as
+    “permanently failed”. This is mostly useful for Hydra, which needs
+    to distinguish between permanent and transient build failures.
+
+  - There is a new symbol `__curPos` that expands to an attribute set
+    containing its file name and line and column numbers, e.g. `{ file =
+    "foo.nix"; line = 10;
+                    column = 5; }`. There also is a new builtin function,
+    `unsafeGetAttrPos`, that returns the position of an attribute. This
+    is used by Nixpkgs to provide location information in error
+    messages, e.g.
+    
+        $ nix-build '<nixpkgs>' -A libreoffice --argstr system x86_64-darwin
+        error: the package ‘libreoffice-4.0.5.2’ in ‘.../applications/office/libreoffice/default.nix:263’
+          is not supported on ‘x86_64-darwin’
+
+  - The garbage collector is now more concurrent with other Nix
+    processes because it releases certain locks earlier.
+
+  - The binary tarball installer has been improved. You can now install
+    Nix by running:
+    
+        $ bash <(curl https://nixos.org/nix/install)
+
+  - More evaluation errors include position information. For instance,
+    selecting a missing attribute will print something like
+    
+        error: attribute `nixUnstabl' missing, at /etc/nixos/configurations/misc/eelco/mandark.nix:216:15
+
+  - The command `nix-setuid-helper` is gone.
+
+  - Nix no longer uses Automake, but instead has a non-recursive, GNU
+    Make-based build system.
+
+  - All installed libraries now have the prefix `libnix`. In particular,
+    this gets rid of `libutil`, which could clash with libraries with
+    the same name from other packages.
+
+  - Nix now requires a compiler that supports C++11.
+
+This release has contributions from Danny Wilson, Domen Kožar, Eelco
+Dolstra, Ian-Woo Kim, Ludovic Courtès, Maxim Ivanov, Petr Rockai,
+Ricardo M. Correia and Shea Levy.
diff --git a/doc/manual/src/release-notes/rl-1.8.md b/doc/manual/src/release-notes/rl-1.8.md
new file mode 100644
index 000000000..10a82d52a
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.8.md
@@ -0,0 +1,88 @@
+# Release 1.8 (2014-12-14)
+
+  - Breaking change: to address a race condition, the remote build hook
+    mechanism now uses `nix-store
+            --serve` on the remote machine. This requires build slaves to be
+    updated to Nix 1.8.
+
+  - Nix now uses HTTPS instead of HTTP to access the default binary
+    cache, `cache.nixos.org`.
+
+  - `nix-env` selectors are now regular expressions. For instance, you
+    can do
+    
+        $ nix-env -qa '.*zip.*'
+    
+    to query all packages with a name containing `zip`.
+
+  - `nix-store --read-log` can now fetch remote build logs. If a build
+    log is not available locally, then ‘nix-store -l’ will now try to
+    download it from the servers listed in the ‘log-servers’ option in
+    nix.conf. For instance, if you have the configuration option
+    
+        log-servers = http://hydra.nixos.org/log
+    
+    then it will try to get logs from `http://hydra.nixos.org/log/base
+    name of the
+    store path`. This allows you to do things like:
+    
+        $ nix-store -l $(which xterm)
+    
+    and get a log even if `xterm` wasn't built locally.
+
+  - New builtin functions: `attrValues`, `deepSeq`, `fromJSON`,
+    `readDir`, `seq`.
+
+  - `nix-instantiate --eval` now has a `--json` flag to print the
+    resulting value in JSON format.
+
+  - `nix-copy-closure` now uses `nix-store --serve` on the remote side
+    to send or receive closures. This fixes a race condition between
+    `nix-copy-closure` and the garbage collector.
+
+  - Derivations can specify the new special attribute
+    `allowedRequisites`, which has a similar meaning to
+    `allowedReferences`. But instead of only enforcing to explicitly
+    specify the immediate references, it requires the derivation to
+    specify all the dependencies recursively (hence the name,
+    requisites) that are used by the resulting output.
+
+  - On Mac OS X, Nix now handles case collisions when importing closures
+    from case-sensitive file systems. This is mostly useful for running
+    NixOps on Mac OS X.
+
+  - The Nix daemon has new configuration options `allowed-users`
+    (specifying the users and groups that are allowed to connect to the
+    daemon) and `trusted-users` (specifying the users and groups that
+    can perform privileged operations like specifying untrusted binary
+    caches).
+
+  - The configuration option `build-cores` now defaults to the number of
+    available CPU cores.
+
+  - Build users are now used by default when Nix is invoked as root.
+    This prevents builds from accidentally running as root.
+
+  - Nix now includes systemd units and Upstart jobs.
+
+  - Speed improvements to `nix-store
+            --optimise`.
+
+  - Language change: the `==` operator now ignores string contexts (the
+    “dependencies” of a string).
+
+  - Nix now filters out Nix-specific ANSI escape sequences on standard
+    error. They are supposed to be invisible, but some terminals show
+    them anyway.
+
+  - Various commands now automatically pipe their output into the pager
+    as specified by the PAGER environment variable.
+
+  - Several improvements to reduce memory consumption in the evaluator.
+
+This release has contributions from Adam Szkoda, Aristid Breitkreuz, Bob
+van der Linden, Charles Strahan, darealshinji, Eelco Dolstra, Gergely
+Risko, Joel Taylor, Ludovic Courtès, Marko Durkovic, Mikey Ariel, Paul
+Colomiets, Ricardo M. Correia, Ricky Elrod, Robert Helgesson, Rob
+Vermaas, Russell O'Connor, Shea Levy, Shell Turner, Sönke Hahn, Steve
+Purcell, Vladimír Čunát and Wout Mertens.
diff --git a/doc/manual/src/release-notes/rl-1.9.md b/doc/manual/src/release-notes/rl-1.9.md
new file mode 100644
index 000000000..01b067aab
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-1.9.md
@@ -0,0 +1,143 @@
+# Release 1.9 (2015-06-12)
+
+In addition to the usual bug fixes, this release has the following new
+features:
+
+  - Signed binary cache support. You can enable signature checking by
+    adding the following to `nix.conf`:
+    
+        signed-binary-caches = *
+        binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+    
+    This will prevent Nix from downloading any binary from the cache
+    that is not signed by one of the keys listed in
+    `binary-cache-public-keys`.
+    
+    Signature checking is only supported if you built Nix with the
+    `libsodium` package.
+    
+    Note that while Nix has had experimental support for signed binary
+    caches since version 1.7, this release changes the signature format
+    in a backwards-incompatible way.
+
+  - Automatic downloading of Nix expression tarballs. In various places,
+    you can now specify the URL of a tarball containing Nix expressions
+    (such as Nixpkgs), which will be downloaded and unpacked
+    automatically. For example:
+    
+      - In `nix-env`:
+        
+            $ nix-env -f https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz -iA firefox
+        
+        This installs Firefox from the latest tested and built revision
+        of the NixOS 14.12 channel.
+    
+      - In `nix-build` and `nix-shell`:
+        
+            $ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
+        
+        This builds GNU Hello from the latest revision of the Nixpkgs
+        master branch.
+    
+      - In the Nix search path (as specified via NIX\_PATH or `-I`). For
+        example, to start a shell containing the Pan package from a
+        specific version of Nixpkgs:
+        
+            $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
+    
+      - In `nixos-rebuild` (on NixOS):
+        
+            $ nixos-rebuild test -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
+    
+      - In Nix expressions, via the new builtin function `fetchTarball`:
+        
+            with import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz) {}; …
+        
+        (This is not allowed in restricted mode.)
+
+  - `nix-shell` improvements:
+    
+      - `nix-shell` now has a flag `--run` to execute a command in the
+        `nix-shell` environment, e.g. `nix-shell --run make`. This is
+        like the existing `--command` flag, except that it uses a
+        non-interactive shell (ensuring that hitting Ctrl-C won’t drop
+        you into the child shell).
+    
+      - `nix-shell` can now be used as a `#!`-interpreter. This allows
+        you to write scripts that dynamically fetch their own
+        dependencies. For example, here is a Haskell script that, when
+        invoked, first downloads GHC and the Haskell packages on which
+        it depends:
+        
+            #! /usr/bin/env nix-shell
+            #! nix-shell -i runghc -p haskellPackages.ghc haskellPackages.HTTP
+            
+            import Network.HTTP
+            
+            main = do
+              resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
+              body <- getResponseBody resp
+              print (take 100 body)
+        
+        Of course, the dependencies are cached in the Nix store, so the
+        second invocation of this script will be much faster.
+
+  - Chroot improvements:
+    
+      - Chroot builds are now supported on Mac OS X (using its sandbox
+        mechanism).
+    
+      - If chroots are enabled, they are now used for all derivations,
+        including fixed-output derivations (such as `fetchurl`). The
+        latter do have network access, but can no longer access the host
+        filesystem. If you need the old behaviour, you can set the
+        option `build-use-chroot` to `relaxed`.
+    
+      - On Linux, if chroots are enabled, builds are performed in a
+        private PID namespace once again. (This functionality was lost
+        in Nix 1.8.)
+    
+      - Store paths listed in `build-chroot-dirs` are now automatically
+        expanded to their closure. For instance, if you want
+        `/nix/store/…-bash/bin/sh` mounted in your chroot as `/bin/sh`,
+        you only need to say `build-chroot-dirs =
+                                                        /bin/sh=/nix/store/…-bash/bin/sh`; it is no longer necessary to
+        specify the dependencies of Bash.
+
+  - The new derivation attribute `passAsFile` allows you to specify that
+    the contents of derivation attributes should be passed via files
+    rather than environment variables. This is useful if you need to
+    pass very long strings that exceed the size limit of the
+    environment. The Nixpkgs function `writeTextFile` uses this.
+
+  - You can now use `~` in Nix file names to refer to your home
+    directory, e.g. `import
+            ~/.nixpkgs/config.nix`.
+
+  - Nix has a new option `restrict-eval` that allows limiting what paths
+    the Nix evaluator has access to. By passing `--option restrict-eval
+    true` to Nix, the evaluator will throw an exception if an attempt is
+    made to access any file outside of the Nix search path. This is
+    primarily intended for Hydra to ensure that a Hydra jobset only
+    refers to its declared inputs (and is therefore reproducible).
+
+  - `nix-env` now only creates a new “generation” symlink in
+    `/nix/var/nix/profiles` if something actually changed.
+
+  - The environment variable NIX\_PAGER can now be set to override
+    PAGER. You can set it to `cat` to disable paging for Nix commands
+    only.
+
+  - Failing `<...>` lookups now show position information.
+
+  - Improved Boehm GC use: we disabled scanning for interior pointers,
+    which should reduce the “`Repeated
+            allocation of very large block`” warnings and associated retention
+    of memory.
+
+This release has contributions from aszlig, Benjamin Staffin, Charles
+Strahan, Christian Theune, Daniel Hahler, Danylo Hlynskyi Daniel
+Peebles, Dan Peebles, Domen Kožar, Eelco Dolstra, Harald van Dijk, Hoang
+Xuan Phu, Jaka Hudoklin, Jeff Ramnani, j-keck, Linquize, Luca Bruno,
+Michael Merickel, Oliver Dunkl, Rob Vermaas, Rok Garbas, Shea Levy,
+Tobias Geerinckx-Rice and William A. Kennington III.
diff --git a/doc/manual/src/release-notes/rl-2.0.md b/doc/manual/src/release-notes/rl-2.0.md
new file mode 100644
index 000000000..0ce985b2f
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.0.md
@@ -0,0 +1,557 @@
+# Release 2.0 (2018-02-22)
+
+The following incompatible changes have been made:
+
+  - The manifest-based substituter mechanism
+    (`download-using-manifests`) has been
+    [removed](https://github.com/NixOS/nix/commit/867967265b80946dfe1db72d40324b4f9af988ed).
+    It has been superseded by the binary cache substituter mechanism
+    since several years. As a result, the following programs have been
+    removed:
+    
+      - `nix-pull`
+    
+      - `nix-generate-patches`
+    
+      - `bsdiff`
+    
+      - `bspatch`
+
+  - The “copy from other stores” substituter mechanism
+    (`copy-from-other-stores` and the NIX\_OTHER\_STORES environment
+    variable) has been removed. It was primarily used by the NixOS
+    installer to copy available paths from the installation medium. The
+    replacement is to use a chroot store as a substituter (e.g.
+    `--substituters /mnt`), or to build into a chroot store (e.g.
+    `--store /mnt --substituters /`).
+
+  - The command `nix-push` has been removed as part of the effort to
+    eliminate Nix's dependency on Perl. You can use `nix copy` instead,
+    e.g. `nix copy
+                    --to file:///tmp/my-binary-cache paths…`
+
+  - The “nested” log output feature (`--log-type
+                    pretty`) has been removed. As a result, `nix-log2xml` was also
+    removed.
+
+  - OpenSSL-based signing has been
+    [removed](https://github.com/NixOS/nix/commit/f435f8247553656774dd1b2c88e9de5d59cab203).
+    This feature was never well-supported. A better alternative is
+    provided by the `secret-key-files` and `trusted-public-keys`
+    options.
+
+  - Failed build caching has been
+    [removed](https://github.com/NixOS/nix/commit/8cffec84859cec8b610a2a22ab0c4d462a9351ff).
+    This feature was introduced to support the Hydra continuous build
+    system, but Hydra no longer uses it.
+
+  - `nix-mode.el` has been removed from Nix. It is now [a separate
+    repository](https://github.com/NixOS/nix-mode) and can be installed
+    through the MELPA package repository.
+
+This release has the following new features:
+
+  - It introduces a new command named `nix`, which is intended to
+    eventually replace all `nix-*` commands with a more consistent and
+    better designed user interface. It currently provides replacements
+    for some (but not all) of the functionality provided by `nix-store`,
+    `nix-build`, `nix-shell -p`, `nix-env -qa`, `nix-instantiate
+    --eval`, `nix-push` and `nix-copy-closure`. It has the following
+    major features:
+    
+      - Unlike the legacy commands, it has a consistent way to refer to
+        packages and package-like arguments (like store paths). For
+        example, the following commands all copy the GNU Hello package
+        to a remote machine:
+        
+            nix copy --to ssh://machine nixpkgs.hello
+        
+            nix copy --to ssh://machine /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10
+        
+            nix copy --to ssh://machine '(with import <nixpkgs> {}; hello)'
+        
+        By contrast, `nix-copy-closure` only accepted store paths as
+        arguments.
+    
+      - It is self-documenting: `--help` shows all available
+        command-line arguments. If `--help` is given after a subcommand,
+        it shows examples for that subcommand. `nix
+                                                                        --help-config` shows all configuration options.
+    
+      - It is much less verbose. By default, it displays a single-line
+        progress indicator that shows how many packages are left to be
+        built or downloaded, and (if there are running builds) the most
+        recent line of builder output. If a build fails, it shows the
+        last few lines of builder output. The full build log can be
+        retrieved using `nix
+                                                                        log`.
+    
+      - It
+        [provides](https://github.com/NixOS/nix/commit/b8283773bd64d7da6859ed520ee19867742a03ba)
+        all `nix.conf` configuration options as command line flags. For
+        example, instead of `--option
+                                                                        http-connections 100` you can write `--http-connections 100`.
+        Boolean options can be written as `--foo` or `--no-foo` (e.g.
+        `--no-auto-optimise-store`).
+    
+      - Many subcommands have a `--json` flag to write results to stdout
+        in JSON format.
+    
+    > **Warning**
+    > 
+    > Please note that the `nix` command is a work in progress and the
+    > interface is subject to change.
+    
+    It provides the following high-level (“porcelain”) subcommands:
+    
+      - `nix build` is a replacement for `nix-build`.
+    
+      - `nix run` executes a command in an environment in which the
+        specified packages are available. It is (roughly) a replacement
+        for `nix-shell
+                                                                        -p`. Unlike that command, it does not execute the command in a
+        shell, and has a flag (`-c`) that specifies the unquoted command
+        line to be executed.
+        
+        It is particularly useful in conjunction with chroot stores,
+        allowing Linux users who do not have permission to install Nix
+        in `/nix/store` to still use binary substitutes that assume
+        `/nix/store`. For example,
+        
+            nix run --store ~/my-nix nixpkgs.hello -c hello --greeting 'Hi everybody!'
+        
+        downloads (or if not substitutes are available, builds) the GNU
+        Hello package into `~/my-nix/nix/store`, then runs `hello` in a
+        mount namespace where `~/my-nix/nix/store` is mounted onto
+        `/nix/store`.
+    
+      - `nix search` replaces `nix-env
+                                                                        -qa`. It searches the available packages for occurrences of a
+        search string in the attribute name, package name or
+        description. Unlike `nix-env -qa`, it has a cache to speed up
+        subsequent searches.
+    
+      - `nix copy` copies paths between arbitrary Nix stores,
+        generalising `nix-copy-closure` and `nix-push`.
+    
+      - `nix repl` replaces the external program `nix-repl`. It provides
+        an interactive environment for evaluating and building Nix
+        expressions. Note that it uses `linenoise-ng` instead of GNU
+        Readline.
+    
+      - `nix upgrade-nix` upgrades Nix to the latest stable version.
+        This requires that Nix is installed in a profile. (Thus it won’t
+        work on NixOS, or if it’s installed outside of the Nix store.)
+    
+      - `nix verify` checks whether store paths are unmodified and/or
+        “trusted” (see below). It replaces `nix-store --verify` and
+        `nix-store
+                                                                        --verify-path`.
+    
+      - `nix log` shows the build log of a package or path. If the build
+        log is not available locally, it will try to obtain it from the
+        configured substituters (such as
+        [cache.nixos.org](cache.nixos.org), which now provides build
+        logs).
+    
+      - `nix edit` opens the source code of a package in your editor.
+    
+      - `nix eval` replaces `nix-instantiate --eval`.
+    
+      - `nix
+                                                                        why-depends` shows why one store path has another in its
+        closure. This is primarily useful to finding the causes of
+        closure bloat. For example,
+        
+            nix why-depends nixpkgs.vlc nixpkgs.libdrm.dev
+        
+        shows a chain of files and fragments of file contents that cause
+        the VLC package to have the “dev” output of `libdrm` in its
+        closure — an undesirable situation.
+    
+      - `nix path-info` shows information about store paths, replacing
+        `nix-store -q`. A useful feature is the option `--closure-size`
+        (`-S`). For example, the following command show the closure
+        sizes of every path in the current NixOS system closure, sorted
+        by size:
+        
+            nix path-info -rS /run/current-system | sort -nk2
+    
+      - `nix optimise-store` replaces `nix-store --optimise`. The main
+        difference is that it has a progress indicator.
+    
+    A number of low-level (“plumbing”) commands are also available:
+    
+      - `nix ls-store` and `nix
+                                                                        ls-nar` list the contents of a store path or NAR file. The
+        former is primarily useful in conjunction with remote stores,
+        e.g.
+        
+            nix ls-store --store https://cache.nixos.org/ -lR /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10
+        
+        lists the contents of path in a binary cache.
+    
+      - `nix cat-store` and `nix
+                                                                        cat-nar` allow extracting a file from a store path or NAR file.
+    
+      - `nix dump-path` writes the contents of a store path to stdout in
+        NAR format. This replaces `nix-store --dump`.
+    
+      - `nix
+                                                                        show-derivation` displays a store derivation in JSON format.
+        This is an alternative to `pp-aterm`.
+    
+      - `nix
+                                                                        add-to-store` replaces `nix-store
+                                                                        --add`.
+    
+      - `nix sign-paths` signs store paths.
+    
+      - `nix copy-sigs` copies signatures from one store to another.
+    
+      - `nix show-config` shows all configuration options and their
+        current values.
+
+  - The store abstraction that Nix has had for a long time to support
+    store access via the Nix daemon has been extended significantly. In
+    particular, substituters (which used to be external programs such as
+    `download-from-binary-cache`) are now subclasses of the abstract
+    `Store` class. This allows many Nix commands to operate on such
+    store types. For example, `nix path-info` shows information about
+    paths in your local Nix store, while `nix path-info --store
+                    https://cache.nixos.org/` shows information about paths in the
+    specified binary cache. Similarly, `nix-copy-closure`, `nix-push`
+    and substitution are all instances of the general notion of copying
+    paths between different kinds of Nix stores.
+    
+    Stores are specified using an URI-like syntax, e.g.
+    <https://cache.nixos.org/> or <ssh://machine>. The following store
+    types are supported:
+    
+      - `LocalStore` (stori URI `local` or an absolute path) and the
+        misnamed `RemoteStore` (`daemon`) provide access to a local Nix
+        store, the latter via the Nix daemon. You can use `auto` or the
+        empty string to auto-select a local or daemon store depending on
+        whether you have write permission to the Nix store. It is no
+        longer necessary to set the NIX\_REMOTE environment variable to
+        use the Nix daemon.
+        
+        As noted above, `LocalStore` now supports chroot builds,
+        allowing the “physical” location of the Nix store (e.g.
+        `/home/alice/nix/store`) to differ from its “logical” location
+        (typically `/nix/store`). This allows non-root users to use Nix
+        while still getting the benefits from prebuilt binaries from
+        [cache.nixos.org](cache.nixos.org).
+    
+      - `BinaryCacheStore` is the abstract superclass of all binary
+        cache stores. It supports writing build logs and NAR content
+        listings in JSON format.
+    
+      - `HttpBinaryCacheStore` (`http://`, `https://`) supports binary
+        caches via HTTP or HTTPS. If the server supports `PUT` requests,
+        it supports uploading store paths via commands such as `nix
+                                                                        copy`.
+    
+      - `LocalBinaryCacheStore` (`file://`) supports binary caches in
+        the local filesystem.
+    
+      - `S3BinaryCacheStore` (`s3://`) supports binary caches stored in
+        Amazon S3, if enabled at compile time.
+    
+      - `LegacySSHStore` (`ssh://`) is used to implement remote builds
+        and `nix-copy-closure`.
+    
+      - `SSHStore` (`ssh-ng://`) supports arbitrary Nix operations on a
+        remote machine via the same protocol used by `nix-daemon`.
+
+  - Security has been improved in various ways:
+    
+      - Nix now stores signatures for local store paths. When paths are
+        copied between stores (e.g., copied from a binary cache to a
+        local store), signatures are propagated.
+        
+        Locally-built paths are signed automatically using the secret
+        keys specified by the `secret-key-files` store option.
+        Secret/public key pairs can be generated using `nix-store
+                                                                        --generate-binary-cache-key`.
+        
+        In addition, locally-built store paths are marked as “ultimately
+        trusted”, but this bit is not propagated when paths are copied
+        between stores.
+    
+      - Content-addressable store paths no longer require signatures —
+        they can be imported into a store by unprivileged users even if
+        they lack signatures.
+    
+      - The command `nix verify` checks whether the specified paths are
+        trusted, i.e., have a certain number of trusted signatures, are
+        ultimately trusted, or are content-addressed.
+    
+      - Substitutions from binary caches
+        [now](https://github.com/NixOS/nix/commit/ecbc3fedd3d5bdc5a0e1a0a51b29062f2874ac8b)
+        require signatures by default. This was already the case on
+        NixOS.
+    
+      - In Linux sandbox builds, we
+        [now](https://github.com/NixOS/nix/commit/eba840c8a13b465ace90172ff76a0db2899ab11b)
+        use `/build` instead of `/tmp` as the temporary build directory.
+        This fixes potential security problems when a build accidentally
+        stores its TMPDIR in some security-sensitive place, such as an
+        RPATH.
+
+  - *Pure evaluation mode*. With the `--pure-eval` flag, Nix enables a
+    variant of the existing restricted evaluation mode that forbids
+    access to anything that could cause different evaluations of the
+    same command line arguments to produce a different result. This
+    includes builtin functions such as `builtins.getEnv`, but more
+    importantly, *all* filesystem or network access unless a content
+    hash or commit hash is specified. For example, calls to
+    `builtins.fetchGit` are only allowed if a `rev` attribute is
+    specified.
+    
+    The goal of this feature is to enable true reproducibility and
+    traceability of builds (including NixOS system configurations) at
+    the evaluation level. For example, in the future, `nixos-rebuild`
+    might build configurations from a Nix expression in a Git repository
+    in pure mode. That expression might fetch other repositories such as
+    Nixpkgs via `builtins.fetchGit`. The commit hash of the top-level
+    repository then uniquely identifies a running system, and, in
+    conjunction with that repository, allows it to be reproduced or
+    modified.
+
+  - There are several new features to support binary reproducibility
+    (i.e. to help ensure that multiple builds of the same derivation
+    produce exactly the same output). When `enforce-determinism` is set
+    to `false`, it’s [no
+    longer](https://github.com/NixOS/nix/commit/8bdf83f936adae6f2c907a6d2541e80d4120f051)
+    a fatal error if build rounds produce different output. Also, a hook
+    named `diff-hook` is
+    [provided](https://github.com/NixOS/nix/commit/9a313469a4bdea2d1e8df24d16289dc2a172a169)
+    to allow you to run tools such as `diffoscope` when build rounds
+    produce different output.
+
+  - Configuring remote builds is a lot easier now. Provided you are not
+    using the Nix daemon, you can now just specify a remote build
+    machine on the command line, e.g. `--option builders
+                    'ssh://my-mac x86_64-darwin'`. The environment variable
+    NIX\_BUILD\_HOOK has been removed and is no longer needed. The
+    environment variable NIX\_REMOTE\_SYSTEMS is still supported for
+    compatibility, but it is also possible to specify builders in
+    `nix.conf` by setting the option `builders =
+                    @path`.
+
+  - If a fixed-output derivation produces a result with an incorrect
+    hash, the output path is moved to the location corresponding to the
+    actual hash and registered as valid. Thus, a subsequent build of the
+    fixed-output derivation with the correct hash is unnecessary.
+
+  - `nix-shell`
+    [now](https://github.com/NixOS/nix/commit/ea59f39326c8e9dc42dfed4bcbf597fbce58797c)
+    sets the `IN_NIX_SHELL` environment variable during evaluation and
+    in the shell itself. This can be used to perform different actions
+    depending on whether you’re in a Nix shell or in a regular build.
+    Nixpkgs provides `lib.inNixShell` to check this variable during
+    evaluation.
+
+  - NIX\_PATH is now lazy, so URIs in the path are only downloaded if
+    they are needed for evaluation.
+
+  - You can now use <channel:> as a short-hand for
+    <https://nixos.org/channels//nixexprs.tar.xz>. For example,
+    `nix-build channel:nixos-15.09 -A hello` will build the GNU Hello
+    package from the `nixos-15.09` channel. In the future, this may use
+    Git to fetch updates more efficiently.
+
+  - When `--no-build-output` is given, the last 10 lines of the build
+    log will be shown if a build fails.
+
+  - Networking has been improved:
+    
+      - HTTP/2 is now supported. This makes binary cache lookups [much
+        more
+        efficient](https://github.com/NixOS/nix/commit/90ad02bf626b885a5dd8967894e2eafc953bdf92).
+    
+      - We now retry downloads on many HTTP errors, making binary caches
+        substituters more resilient to temporary failures.
+    
+      - HTTP credentials can now be configured via the standard `netrc`
+        mechanism.
+    
+      - If S3 support is enabled at compile time, <s3://> URIs are
+        [supported](https://github.com/NixOS/nix/commit/9ff9c3f2f80ba4108e9c945bbfda2c64735f987b)
+        in all places where Nix allows URIs.
+    
+      - Brotli compression is now supported. In particular,
+        [cache.nixos.org](cache.nixos.org) build logs are now compressed
+        using Brotli.
+
+  - `nix-env`
+    [now](https://github.com/NixOS/nix/commit/b0cb11722626e906a73f10dd9a0c9eea29faf43a)
+    ignores packages with bad derivation names (in particular those
+    starting with a digit or containing a dot).
+
+  - Many configuration options have been renamed, either because they
+    were unnecessarily verbose (e.g. `build-use-sandbox` is now just
+    `sandbox`) or to reflect generalised behaviour (e.g. `binary-caches`
+    is now `substituters` because it allows arbitrary store URIs). The
+    old names are still supported for compatibility.
+
+  - The `max-jobs` option can
+    [now](https://github.com/NixOS/nix/commit/7251d048fa812d2551b7003bc9f13a8f5d4c95a5)
+    be set to `auto` to use the number of CPUs in the system.
+
+  - Hashes can
+    [now](https://github.com/NixOS/nix/commit/c0015e87af70f539f24d2aa2bc224a9d8b84276b)
+    be specified in base-64 format, in addition to base-16 and the
+    non-standard base-32.
+
+  - `nix-shell` now uses `bashInteractive` from Nixpkgs, rather than the
+    `bash` command that happens to be in the caller’s PATH. This is
+    especially important on macOS where the `bash` provided by the
+    system is seriously outdated and cannot execute `stdenv`’s setup
+    script.
+
+  - Nix can now automatically trigger a garbage collection if free disk
+    space drops below a certain level during a build. This is configured
+    using the `min-free` and `max-free` options.
+
+  - `nix-store -q --roots` and `nix-store --gc --print-roots` now show
+    temporary and in-memory roots.
+
+  - Nix can now be extended with plugins. See the documentation of the
+    `plugin-files` option for more details.
+
+The Nix language has the following new features:
+
+  - It supports floating point numbers. They are based on the C++
+    `float` type and are supported by the existing numerical operators.
+    Export and import to and from JSON and XML works, too.
+
+  - Derivation attributes can now reference the outputs of the
+    derivation using the `placeholder` builtin function. For example,
+    the attribute
+    
+        configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"}";
+    
+    will cause the configureFlags environment variable to contain the
+    actual store paths corresponding to the `out` and `dev` outputs.
+
+The following builtin functions are new or extended:
+
+  - `builtins.fetchGit` allows Git repositories to be fetched at
+    evaluation time. Thus it differs from the `fetchgit` function in
+    Nixpkgs, which fetches at build time and cannot be used to fetch Nix
+    expressions during evaluation. A typical use case is to import
+    external NixOS modules from your configuration, e.g.
+    
+        imports = [ (builtins.fetchGit https://github.com/edolstra/dwarffs + "/module.nix") ];
+
+  - Similarly, `builtins.fetchMercurial` allows you to fetch Mercurial
+    repositories.
+
+  - `builtins.path` generalises `builtins.filterSource` and path
+    literals (e.g. `./foo`). It allows specifying a store path name that
+    differs from the source path name (e.g. `builtins.path { path =
+    ./foo; name = "bar";
+                    }`) and also supports filtering out unwanted files.
+
+  - `builtins.fetchurl` and `builtins.fetchTarball` now support `sha256`
+    and `name` attributes.
+
+  - `builtins.split` splits a string using a POSIX extended regular
+    expression as the separator.
+
+  - `builtins.partition` partitions the elements of a list into two
+    lists, depending on a Boolean predicate.
+
+  - `<nix/fetchurl.nix>` now uses the content-addressable tarball cache
+    at <http://tarballs.nixos.org/>, just like `fetchurl` in Nixpkgs.
+    (f2682e6e18a76ecbfb8a12c17e3a0ca15c084197)
+
+  - In restricted and pure evaluation mode, builtin functions that
+    download from the network (such as `fetchGit`) are permitted to
+    fetch underneath a list of URI prefixes specified in the option
+    `allowed-uris`.
+
+The Nix build environment has the following changes:
+
+  - Values such as Booleans, integers, (nested) lists and attribute sets
+    can
+    [now](https://github.com/NixOS/nix/commit/6de33a9c675b187437a2e1abbcb290981a89ecb1)
+    be passed to builders in a non-lossy way. If the special attribute
+    `__structuredAttrs` is set to `true`, the other derivation
+    attributes are serialised in JSON format and made available to the
+    builder via the file .attrs.json in the builder’s temporary
+    directory. This obviates the need for `passAsFile` since JSON files
+    have no size restrictions, unlike process environments.
+    
+    [As a convenience to Bash
+    builders](https://github.com/NixOS/nix/commit/2d5b1b24bf70a498e4c0b378704cfdb6471cc699),
+    Nix writes a script named .attrs.sh to the builder’s directory that
+    initialises shell variables corresponding to all attributes that are
+    representable in Bash. This includes non-nested (associative)
+    arrays. For example, the attribute `hardening.format =
+                    true` ends up as the Bash associative array element
+    `${hardening[format]}`.
+
+  - Builders can
+    [now](https://github.com/NixOS/nix/commit/88e6bb76de5564b3217be9688677d1c89101b2a3)
+    communicate what build phase they are in by writing messages to the
+    file descriptor specified in NIX\_LOG\_FD. The current phase is
+    shown by the `nix` progress indicator.
+
+  - In Linux sandbox builds, we
+    [now](https://github.com/NixOS/nix/commit/a2d92bb20e82a0957067ede60e91fab256948b41)
+    provide a default `/bin/sh` (namely `ash` from BusyBox).
+
+  - In structured attribute mode, `exportReferencesGraph`
+    [exports](https://github.com/NixOS/nix/commit/c2b0d8749f7e77afc1c4b3e8dd36b7ee9720af4a)
+    extended information about closures in JSON format. In particular,
+    it includes the sizes and hashes of paths. This is primarily useful
+    for NixOS image builders.
+
+  - Builds are
+    [now](https://github.com/NixOS/nix/commit/21948deed99a3295e4d5666e027a6ca42dc00b40)
+    killed as soon as Nix receives EOF on the builder’s stdout or
+    stderr. This fixes a bug that allowed builds to hang Nix
+    indefinitely, regardless of timeouts.
+
+  - The `sandbox-paths` configuration option can now specify optional
+    paths by appending a `?`, e.g. `/dev/nvidiactl?` will bind-mount
+    `/dev/nvidiactl` only if it exists.
+
+  - On Linux, builds are now executed in a user namespace with UID 1000
+    and GID 100.
+
+A number of significant internal changes were made:
+
+  - Nix no longer depends on Perl and all Perl components have been
+    rewritten in C++ or removed. The Perl bindings that used to be part
+    of Nix have been moved to a separate package, `nix-perl`.
+
+  - All `Store` classes are now thread-safe. `RemoteStore` supports
+    multiple concurrent connections to the daemon. This is primarily
+    useful in multi-threaded programs such as `hydra-queue-runner`.
+
+This release has contributions from Adrien Devresse, Alexander Ried,
+Alex Cruice, Alexey Shmalko, AmineChikhaoui, Andy Wingo, Aneesh Agrawal,
+Anthony Cowley, Armijn Hemel, aszlig, Ben Gamari, Benjamin Hipple,
+Benjamin Staffin, Benno Fünfstück, Bjørn Forsman, Brian McKenna, Charles
+Strahan, Chase Adams, Chris Martin, Christian Theune, Chris Warburton,
+Daiderd Jordan, Dan Connolly, Daniel Peebles, Dan Peebles, davidak,
+David McFarland, Dmitry Kalinkin, Domen Kožar, Eelco Dolstra, Emery
+Hemingway, Eric Litak, Eric Wolf, Fabian Schmitthenner, Frederik
+Rietdijk, Gabriel Gonzalez, Giorgio Gallo, Graham Christensen, Guillaume
+Maudoux, Harmen, Iavael, James Broadhead, James Earl Douglas, Janus
+Troelsen, Jeremy Shaw, Joachim Schiele, Joe Hermaszewski, Joel Moberg,
+Johannes 'fish' Ziemke, Jörg Thalheim, Jude Taylor, kballou, Keshav
+Kini, Kjetil Orbekk, Langston Barrett, Linus Heckemann, Ludovic Courtès,
+Manav Rathi, Marc Scholten, Markus Hauck, Matt Audesse, Matthew Bauer,
+Matthias Beyer, Matthieu Coudron, N1X, Nathan Zadoks, Neil Mayhew,
+Nicolas B. Pierron, Niklas Hambüchen, Nikolay Amiantov, Ole Jørgen
+Brønner, Orivej Desh, Peter Simons, Peter Stuart, Pyry Jahkola, regnat,
+Renzo Carbonara, Rhys, Robert Vollmert, Scott Olson, Scott R. Parish,
+Sergei Trofimovich, Shea Levy, Sheena Artrip, Spencer Baugh, Stefan
+Junker, Susan Potter, Thomas Tuegel, Timothy Allen, Tristan Hume, Tuomas
+Tynkkynen, tv, Tyson Whitehead, Vladimír Čunát, Will Dietz, wmertens,
+Wout Mertens, zimbatm and Zoran Plesivčak.
diff --git a/doc/manual/src/release-notes/rl-2.1.md b/doc/manual/src/release-notes/rl-2.1.md
new file mode 100644
index 000000000..08986ef9d
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.1.md
@@ -0,0 +1,49 @@
+# Release 2.1 (2018-09-02)
+
+This is primarily a bug fix release. It also reduces memory consumption
+in certain situations. In addition, it has the following new features:
+
+  - The Nix installer will no longer default to the Multi-User
+    installation for macOS. You can still [instruct the installer to run
+    in multi-user mode](#sect-multi-user-installation).
+
+  - The Nix installer now supports performing a Multi-User installation
+    for Linux computers which are running systemd. You can [select a
+    Multi-User installation](#sect-multi-user-installation) by passing
+    the `--daemon` flag to the installer: `sh <(curl
+                    https://nixos.org/nix/install) --daemon`.
+    
+    The multi-user installer cannot handle systems with SELinux. If your
+    system has SELinux enabled, you can [force the installer to run in
+    single-user mode](#sect-single-user-installation).
+
+  - New builtin functions: `builtins.bitAnd`, `builtins.bitOr`,
+    `builtins.bitXor`, `builtins.fromTOML`, `builtins.concatMap`,
+    `builtins.mapAttrs`.
+
+  - The S3 binary cache store now supports uploading NARs larger than 5
+    GiB.
+
+  - The S3 binary cache store now supports uploading to S3-compatible
+    services with the `endpoint` option.
+
+  - The flag `--fallback` is no longer required to recover from
+    disappeared NARs in binary caches.
+
+  - `nix-daemon` now respects `--store`.
+
+  - `nix run` now respects `nix-support/propagated-user-env-packages`.
+
+This release has contributions from Adrien Devresse, Aleksandr Pashkov,
+Alexandre Esteves, Amine Chikhaoui, Andrew Dunham, Asad Saeeduddin,
+aszlig, Ben Challenor, Ben Gamari, Benjamin Hipple, Bogdan Seniuc, Corey
+O'Connor, Daiderd Jordan, Daniel Peebles, Daniel Poelzleithner, Danylo
+Hlynskyi, Dmitry Kalinkin, Domen Kožar, Doug Beardsley, Eelco Dolstra,
+Erik Arvstedt, Félix Baylac-Jacqué, Gleb Peregud, Graham Christensen,
+Guillaume Maudoux, Ivan Kozik, John Arnold, Justin Humm, Linus
+Heckemann, Lorenzo Manacorda, Matthew Justin Bauer, Matthew O'Gorman,
+Maximilian Bosch, Michael Bishop, Michael Fiano, Michael Mercier,
+Michael Raskin, Michael Weiss, Nicolas Dudebout, Peter Simons, Ryan
+Trinkle, Samuel Dionne-Riel, Sean Seefried, Shea Levy, Symphorien Gibol,
+Tim Engler, Tim Sears, Tuomas Tynkkynen, volth, Will Dietz, Yorick van
+Pelt and zimbatm.
diff --git a/doc/manual/src/release-notes/rl-2.2.md b/doc/manual/src/release-notes/rl-2.2.md
new file mode 100644
index 000000000..3667a48dc
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.2.md
@@ -0,0 +1,82 @@
+# Release 2.2 (2019-01-11)
+
+This is primarily a bug fix release. It also has the following changes:
+
+  - In derivations that use structured attributes (i.e. that specify set
+    the `__structuredAttrs` attribute to `true` to cause all attributes
+    to be passed to the builder in JSON format), you can now specify
+    closure checks per output, e.g.:
+    
+        outputChecks."out" = {
+          # The closure of 'out' must not be larger than 256 MiB.
+          maxClosureSize = 256 * 1024 * 1024;
+        
+          # It must not refer to C compiler or to the 'dev' output.
+          disallowedRequisites = [ stdenv.cc "dev" ];
+        };
+        
+        outputChecks."dev" = {
+          # The 'dev' output must not be larger than 128 KiB.
+          maxSize = 128 * 1024;
+        };
+
+  - The derivation attribute `requiredSystemFeatures` is now enforced
+    for local builds, and not just to route builds to remote builders.
+    The supported features of a machine can be specified through the
+    configuration setting `system-features`.
+    
+    By default, `system-features` includes `kvm` if `/dev/kvm` exists.
+    For compatibility, it also includes the pseudo-features
+    `nixos-test`, `benchmark` and `big-parallel` which are used by
+    Nixpkgs to route builds to particular Hydra build machines.
+
+  - Sandbox builds are now enabled by default on Linux.
+
+  - The new command `nix doctor` shows potential issues with your Nix
+    installation.
+
+  - The `fetchGit` builtin function now uses a caching scheme that puts
+    different remote repositories in distinct local repositories, rather
+    than a single shared repository. This may require more disk space
+    but is faster.
+
+  - The `dirOf` builtin function now works on relative paths.
+
+  - Nix now supports [SRI hashes](https://www.w3.org/TR/SRI/), allowing
+    the hash algorithm and hash to be specified in a single string. For
+    example, you can write:
+    
+        import <nix/fetchurl.nix> {
+          url = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz;
+          hash = "sha256-XSLa0FjVyADWWhFfkZ2iKTjFDda6mMXjoYMXLRSYQKQ=";
+        };
+    
+    instead of
+    
+        import <nix/fetchurl.nix> {
+          url = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz;
+          sha256 = "5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4";
+        };
+    
+    In fixed-output derivations, the `outputHashAlgo` attribute is no
+    longer mandatory if `outputHash` specifies the hash.
+    
+    `nix hash-file` and `nix
+                    hash-path` now print hashes in SRI format by default. They also use
+    SHA-256 by default instead of SHA-512 because that's what we use
+    most of the time in Nixpkgs.
+
+  - Integers are now 64 bits on all platforms.
+
+  - The evaluator now prints profiling statistics (enabled via the
+    NIX\_SHOW\_STATS and NIX\_COUNT\_CALLS environment variables) in
+    JSON format.
+
+  - The option `--xml` in `nix-store
+                    --query` has been removed. Instead, there now is an option
+    `--graphml` to output the dependency graph in GraphML format.
+
+  - All `nix-*` commands are now symlinks to `nix`. This saves a bit of
+    disk space.
+
+  - `nix repl` now uses `libeditline` or `libreadline`.
diff --git a/doc/manual/src/release-notes/rl-2.3.md b/doc/manual/src/release-notes/rl-2.3.md
new file mode 100644
index 000000000..a4bb6ebb0
--- /dev/null
+++ b/doc/manual/src/release-notes/rl-2.3.md
@@ -0,0 +1,44 @@
+# Release 2.3 (2019-09-04)
+
+This is primarily a bug fix release. However, it makes some incompatible
+changes:
+
+  - Nix now uses BSD file locks instead of POSIX file locks. Because of
+    this, you should not use Nix 2.3 and previous releases at the same
+    time on a Nix store.
+
+It also has the following changes:
+
+  - `builtins.fetchGit`'s `ref` argument now allows specifying an
+    absolute remote ref. Nix will automatically prefix `ref` with
+    `refs/heads` only if `ref` doesn't already begin with `refs/`.
+
+  - The installer now enables sandboxing by default on Linux when the
+    system has the necessary kernel support.
+
+  - The `max-jobs` setting now defaults to 1.
+
+  - New builtin functions: `builtins.isPath`, `builtins.hashFile`.
+
+  - The `nix` command has a new `--print-build-logs` (`-L`) flag to
+    print build log output to stderr, rather than showing the last log
+    line in the progress bar. To distinguish between concurrent builds,
+    log lines are prefixed by the name of the package.
+
+  - Builds are now executed in a pseudo-terminal, and the TERM
+    environment variable is set to `xterm-256color`. This allows many
+    programs (e.g. `gcc`, `clang`, `cmake`) to print colorized log
+    output.
+
+  - Add `--no-net` convenience flag. This flag disables substituters;
+    sets the `tarball-ttl` setting to infinity (ensuring that any
+    previously downloaded files are considered current); and disables
+    retrying downloads and sets the connection timeout to the minimum.
+    This flag is enabled automatically if there are no configured
+    non-loopback network interfaces.
+
+  - Add a `post-build-hook` setting to run a program after a build has
+    succeeded.
+
+  - Add a `trace-function-calls` setting to log the duration of Nix
+    function calls to stderr.

From 942cd687f9ae190fc9a989a46c3207bd38377ade Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 22 Jul 2020 23:44:34 +0200
Subject: [PATCH 013/176] Remove libxml2 / libxslt prerequisites

---
 doc/manual/installation/prerequisites-source.xml    | 12 ------------
 doc/manual/src/installation/prerequisites-source.md |  9 ---------
 2 files changed, 21 deletions(-)

diff --git a/doc/manual/installation/prerequisites-source.xml b/doc/manual/installation/prerequisites-source.xml
index fa6da9b1e..77955eecc 100644
--- a/doc/manual/installation/prerequisites-source.xml
+++ b/doc/manual/installation/prerequisites-source.xml
@@ -74,18 +74,6 @@
   1.14.0 or higher. It can be obtained from the its repository
   <link xlink:href="https://github.com/troglobit/editline" />.</para></listitem>
 
-  <listitem><para>The <command>xmllint</command> and
-  <command>xsltproc</command> programs to build this manual and the
-  man-pages.  These are part of the <literal>libxml2</literal> and
-  <literal>libxslt</literal> packages, respectively.  You also need
-  the <link
-  xlink:href="http://docbook.sourceforge.net/projects/xsl/">DocBook
-  XSL stylesheets</link> and optionally the <link
-  xlink:href="http://www.docbook.org/schemas/5x"> DocBook 5.0 RELAX NG
-  schemas</link>.  Note that these are only required if you modify the
-  manual sources or when you are building from the Git
-  repository.</para></listitem>
-
   <listitem><para>Recent versions of Bison and Flex to build the
   parser.  (This is because Nix needs GLR support in Bison and
   reentrancy support in Flex.)  For Bison, you need version 2.6, which
diff --git a/doc/manual/src/installation/prerequisites-source.md b/doc/manual/src/installation/prerequisites-source.md
index 311961fe9..69b7c5a5e 100644
--- a/doc/manual/src/installation/prerequisites-source.md
+++ b/doc/manual/src/installation/prerequisites-source.md
@@ -54,15 +54,6 @@
     obtained from the its repository
     <https://github.com/troglobit/editline>.
 
-  - The `xmllint` and `xsltproc` programs to build this manual and the
-    man-pages. These are part of the `libxml2` and `libxslt` packages,
-    respectively. You also need the [DocBook XSL
-    stylesheets](http://docbook.sourceforge.net/projects/xsl/) and
-    optionally the [DocBook 5.0 RELAX NG
-    schemas](http://www.docbook.org/schemas/5x). Note that these are
-    only required if you modify the manual sources or when you are
-    building from the Git repository.
-
   - Recent versions of Bison and Flex to build the parser. (This is
     because Nix needs GLR support in Bison and reentrancy support in
     Flex.) For Bison, you need version 2.6, which can be obtained from

From c20c0823838d257b1e18e71c307f53afac0d2b39 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 10:38:19 +0200
Subject: [PATCH 014/176] <envar> -> <literal>

---
 doc/manual/advanced-topics/cores-vs-jobs.xml  | 10 +++---
 .../advanced-topics/distributed-builds.xml    |  2 +-
 doc/manual/command-ref/conf-file.xml          | 20 +++++------
 doc/manual/command-ref/env-common.xml         | 34 +++++++++----------
 doc/manual/command-ref/nix-copy-closure.xml   |  2 +-
 doc/manual/command-ref/nix-env.xml            |  4 +--
 doc/manual/command-ref/nix-instantiate.xml    |  4 +--
 doc/manual/command-ref/nix-shell.xml          | 10 +++---
 doc/manual/command-ref/nix-store.xml          |  2 +-
 doc/manual/command-ref/opt-common.xml         |  6 ++--
 .../expressions/advanced-attributes.xml       |  6 ++--
 doc/manual/expressions/build-script.xml       | 14 ++++----
 doc/manual/expressions/derivations.xml        | 16 ++++-----
 doc/manual/expressions/generic-builder.xml    |  8 ++---
 doc/manual/expressions/language-values.xml    |  2 +-
 .../expressions/simple-building-testing.xml   |  2 +-
 doc/manual/installation/env-variables.xml     | 10 +++---
 doc/manual/installation/installing-binary.xml |  2 +-
 doc/manual/installation/multi-user.xml        |  2 +-
 doc/manual/introduction/about-nix.xml         |  2 +-
 doc/manual/packages/basic-package-mgmt.xml    |  2 +-
 doc/manual/packages/profiles.xml              |  8 ++---
 doc/manual/release-notes/rl-0.10.xml          |  6 ++--
 doc/manual/release-notes/rl-0.12.xml          |  4 +--
 doc/manual/release-notes/rl-0.16.xml          |  2 +-
 doc/manual/release-notes/rl-1.0.xml           |  2 +-
 doc/manual/release-notes/rl-1.2.xml           |  2 +-
 doc/manual/release-notes/rl-1.6.xml           |  2 +-
 doc/manual/release-notes/rl-1.8.xml           |  2 +-
 doc/manual/release-notes/rl-1.9.xml           |  6 ++--
 doc/manual/release-notes/rl-2.0.xml           | 22 ++++++------
 doc/manual/release-notes/rl-2.2.xml           |  4 +--
 doc/manual/release-notes/rl-2.3.xml           |  2 +-
 33 files changed, 111 insertions(+), 111 deletions(-)

diff --git a/doc/manual/advanced-topics/cores-vs-jobs.xml b/doc/manual/advanced-topics/cores-vs-jobs.xml
index 4d58ac7c5..a75dea37f 100644
--- a/doc/manual/advanced-topics/cores-vs-jobs.xml
+++ b/doc/manual/advanced-topics/cores-vs-jobs.xml
@@ -31,13 +31,13 @@ they are, how they interact, and their configuration trade-offs.</para>
 </variablelist>
 
 <para>The <xref linkend="conf-cores" /> setting determines the value of
-<envar>NIX_BUILD_CORES</envar>. <envar>NIX_BUILD_CORES</envar> is equal
+<literal>NIX_BUILD_CORES</literal>. <literal>NIX_BUILD_CORES</literal> is equal
 to <xref linkend="conf-cores" />, unless <xref linkend="conf-cores" />
-equals <literal>0</literal>, in which case <envar>NIX_BUILD_CORES</envar>
+equals <literal>0</literal>, in which case <literal>NIX_BUILD_CORES</literal>
 will be the total number of cores in the system.</para>
 
 <para>The maximum number of consumed cores is a simple multiplication,
-<xref linkend="conf-max-jobs" /> * <envar>NIX_BUILD_CORES</envar>.</para>
+<xref linkend="conf-max-jobs" /> * <literal>NIX_BUILD_CORES</literal>.</para>
 
 <para>The balance on how to set these two independent variables depends
 upon each builder's workload and hardware. Here are a few example
@@ -49,7 +49,7 @@ scenarios on a machine with 24 cores:</para>
     <tr>
       <th><xref linkend="conf-max-jobs" /></th>
       <th><xref linkend="conf-cores" /></th>
-      <th><envar>NIX_BUILD_CORES</envar></th>
+      <th><literal>NIX_BUILD_CORES</literal></th>
       <th>Maximum Processes</th>
       <th>Result</th>
     </tr>
@@ -116,6 +116,6 @@ scenarios on a machine with 24 cores:</para>
 
 <para>It is up to the derivations' build script to respect
 host's requested cores-per-build by following the value of the
-<envar>NIX_BUILD_CORES</envar> environment variable.</para>
+<literal>NIX_BUILD_CORES</literal> environment variable.</para>
 
 </chapter>
diff --git a/doc/manual/advanced-topics/distributed-builds.xml b/doc/manual/advanced-topics/distributed-builds.xml
index 9ac4a92cd..a649b6f8d 100644
--- a/doc/manual/advanced-topics/distributed-builds.xml
+++ b/doc/manual/advanced-topics/distributed-builds.xml
@@ -43,7 +43,7 @@ bash: nix-store: command not found
 error: cannot connect to 'mac'
 </screen>
 
-then you need to ensure that the <envar>PATH</envar> of
+then you need to ensure that the <literal>PATH</literal> of
 non-interactive login shells contains Nix.</para>
 
 <warning><para>If you are building via the Nix daemon, it is the Nix
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 1fa74a143..ff9c7d46c 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -25,20 +25,20 @@
 <filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>
 (i.e. <filename>/etc/nix/nix.conf</filename> on most systems), or
 <filename>$NIX_CONF_DIR/nix.conf</filename> if
-<envar>NIX_CONF_DIR</envar> is set. Values loaded in this file are not forwarded to the Nix daemon. The
+<literal>NIX_CONF_DIR</literal> is set. Values loaded in this file are not forwarded to the Nix daemon. The
 client assumes that the daemon has already loaded them.
 </para>
 
 <para>User-specific configuration files:</para>
 
 <para>
-  If <envar>NIX_USER_CONF_FILES</envar> is set, then each path separated by
+  If <literal>NIX_USER_CONF_FILES</literal> is set, then each path separated by
   <literal>:</literal> will be loaded in reverse order.
 </para>
 
 <para>
   Otherwise it will look for <filename>nix/nix.conf</filename> files in
-  <envar>XDG_CONFIG_DIRS</envar> and <envar>XDG_CONFIG_HOME</envar>.
+  <literal>XDG_CONFIG_DIRS</literal> and <literal>XDG_CONFIG_HOME</literal>.
 
   The default location is <filename>$HOME/.config/nix.conf</filename> if
   those environment variables are unset.
@@ -195,8 +195,8 @@ false</literal>.</para>
 
     <para>If the build users group is empty, builds will be performed
     under the uid of the Nix process (that is, the uid of the caller
-    if <envar>NIX_REMOTE</envar> is empty, the uid under which the Nix
-    daemon runs if <envar>NIX_REMOTE</envar> is
+    if <literal>NIX_REMOTE</literal> is empty, the uid under which the Nix
+    daemon runs if <literal>NIX_REMOTE</literal> is
     <literal>daemon</literal>).  Obviously, this should not be used in
     multi-user settings with untrusted users.</para>
 
@@ -231,7 +231,7 @@ false</literal>.</para>
   <varlistentry xml:id="conf-cores"><term><literal>cores</literal></term>
 
     <listitem><para>Sets the value of the
-    <envar>NIX_BUILD_CORES</envar> environment variable in the
+    <literal>NIX_BUILD_CORES</literal> environment variable in the
     invocation of builders.  Builders can use this variable at their
     discretion to control the maximum amount of parallelism.  For
     instance, in Nixpkgs, if the derivation attribute
@@ -694,7 +694,7 @@ password <replaceable>my-password</replaceable>
 
       <variablelist>
         <varlistentry>
-          <term><envar>DRV_PATH</envar></term>
+          <term><literal>DRV_PATH</literal></term>
           <listitem>
             <para>The derivation for the built paths.</para>
             <para>Example:
@@ -704,7 +704,7 @@ password <replaceable>my-password</replaceable>
         </varlistentry>
 
         <varlistentry>
-          <term><envar>OUT_PATHS</envar></term>
+          <term><literal>OUT_PATHS</literal></term>
           <listitem>
             <para>Output paths of the built derivation, separated by a space character.</para>
             <para>Example:
@@ -754,7 +754,7 @@ password <replaceable>my-password</replaceable>
 
       <para>If set to <literal>true</literal>, the Nix evaluator will
       not allow access to any files outside of the Nix search path (as
-      set via the <envar>NIX_PATH</envar> environment variable or the
+      set via the <literal>NIX_PATH</literal> environment variable or the
       <option>-I</option> option), or to URIs outside of
       <option>allowed-uri</option>. The default is
       <literal>false</literal>.</para>
@@ -958,7 +958,7 @@ requiredSystemFeatures = [ "kvm" ];
       <para>Nix caches tarballs in
       <filename>$XDG_CACHE_HOME/nix/tarballs</filename>.</para>
 
-      <para>Files fetched via <envar>NIX_PATH</envar>,
+      <para>Files fetched via <literal>NIX_PATH</literal>,
       <function>fetchGit</function>, <function>fetchMercurial</function>,
       <function>fetchTarball</function>, and <function>fetchurl</function>
       respect this TTL.
diff --git a/doc/manual/command-ref/env-common.xml b/doc/manual/command-ref/env-common.xml
index 8466cc463..3196cbbd2 100644
--- a/doc/manual/command-ref/env-common.xml
+++ b/doc/manual/command-ref/env-common.xml
@@ -11,7 +11,7 @@
 
 <variablelist xml:id="env-common">
 
-<varlistentry><term><envar>IN_NIX_SHELL</envar></term>
+<varlistentry><term><literal>IN_NIX_SHELL</literal></term>
 
   <listitem><para>Indicator that tells if the current environment was set up by
   <command>nix-shell</command>.  Since Nix 2.0 the values are
@@ -19,7 +19,7 @@
 
 </varlistentry>
 
-<varlistentry xml:id="env-NIX_PATH"><term><envar>NIX_PATH</envar></term>
+<varlistentry xml:id="env-NIX_PATH"><term><literal>NIX_PATH</literal></term>
 
   <listitem>
 
@@ -50,7 +50,7 @@ nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos</screen>
     interpreted as the URL of a tarball that will be downloaded and
     unpacked to a temporary location. The tarball must consist of a
     single top-level directory. For example, setting
-    <envar>NIX_PATH</envar> to
+    <literal>NIX_PATH</literal> to
 
     <screen>
 nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz</screen>
@@ -65,12 +65,12 @@ nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz</screen>
 
     <para>The search path can be extended using the <option
     linkend="opt-I">-I</option> option, which takes precedence over
-    <envar>NIX_PATH</envar>.</para></listitem>
+    <literal>NIX_PATH</literal>.</para></listitem>
 
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_IGNORE_SYMLINK_STORE</envar></term>
+<varlistentry><term><literal>NIX_IGNORE_SYMLINK_STORE</literal></term>
 
   <listitem>
 
@@ -84,7 +84,7 @@ nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz</screen>
   except when builds are deployed to machines where
   <filename>/nix/store</filename> resolves differently.  If you are
   sure that you’re not going to do that, you can set
-  <envar>NIX_IGNORE_SYMLINK_STORE</envar> to <envar>1</envar>.</para>
+  <literal>NIX_IGNORE_SYMLINK_STORE</literal> to <literal>1</literal>.</para>
 
   <para>Note that if you’re symlinking the Nix store so that you can
   put it on another file system than the root file system, on Linux
@@ -102,7 +102,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_STORE_DIR</envar></term>
+<varlistentry><term><literal>NIX_STORE_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix store (default
   <filename><replaceable>prefix</replaceable>/store</filename>).</para></listitem>
@@ -110,7 +110,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_DATA_DIR</envar></term>
+<varlistentry><term><literal>NIX_DATA_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix static data
   directory (default
@@ -119,7 +119,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_LOG_DIR</envar></term>
+<varlistentry><term><literal>NIX_LOG_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix log directory
   (default <filename><replaceable>prefix</replaceable>/var/log/nix</filename>).</para></listitem>
@@ -127,7 +127,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_STATE_DIR</envar></term>
+<varlistentry><term><literal>NIX_STATE_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix state directory
   (default <filename><replaceable>prefix</replaceable>/var/nix</filename>).</para></listitem>
@@ -135,7 +135,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_CONF_DIR</envar></term>
+<varlistentry><term><literal>NIX_CONF_DIR</literal></term>
 
   <listitem><para>Overrides the location of the system Nix configuration
   directory (default
@@ -143,7 +143,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 
 </varlistentry>
 
-<varlistentry><term><envar>NIX_USER_CONF_FILES</envar></term>
+<varlistentry><term><literal>NIX_USER_CONF_FILES</literal></term>
 
   <listitem><para>Overrides the location of the user Nix configuration files
   to load from (defaults to the XDG spec locations). The variable is treated
@@ -151,7 +151,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 
 </varlistentry>
 
-<varlistentry><term><envar>TMPDIR</envar></term>
+<varlistentry><term><literal>TMPDIR</literal></term>
 
   <listitem><para>Use the specified directory to store temporary
   files.  In particular, this includes temporary build directories;
@@ -161,7 +161,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry xml:id="envar-remote"><term><envar>NIX_REMOTE</envar></term>
+<varlistentry xml:id="envar-remote"><term><literal>NIX_REMOTE</literal></term>
 
   <listitem><para>This variable should be set to
   <literal>daemon</literal> if you want to use the Nix daemon to
@@ -174,7 +174,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_SHOW_STATS</envar></term>
+<varlistentry><term><literal>NIX_SHOW_STATS</literal></term>
 
   <listitem><para>If set to <literal>1</literal>, Nix will print some
   evaluation statistics, such as the number of values
@@ -183,7 +183,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>NIX_COUNT_CALLS</envar></term>
+<varlistentry><term><literal>NIX_COUNT_CALLS</literal></term>
 
   <listitem><para>If set to <literal>1</literal>, Nix will print how
   often functions were called during Nix expression evaluation.  This
@@ -192,7 +192,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 </varlistentry>
 
 
-<varlistentry><term><envar>GC_INITIAL_HEAP_SIZE</envar></term>
+<varlistentry><term><literal>GC_INITIAL_HEAP_SIZE</literal></term>
 
   <listitem><para>If Nix has been configured to use the Boehm garbage
   collector, this variable sets the initial size of the heap in bytes.
diff --git a/doc/manual/command-ref/nix-copy-closure.xml b/doc/manual/command-ref/nix-copy-closure.xml
index e6dcf180a..8c07984fb 100644
--- a/doc/manual/command-ref/nix-copy-closure.xml
+++ b/doc/manual/command-ref/nix-copy-closure.xml
@@ -129,7 +129,7 @@ those paths.  If this bothers you, use
 
 <variablelist>
 
-  <varlistentry><term><envar>NIX_SSHOPTS</envar></term>
+  <varlistentry><term><literal>NIX_SSHOPTS</literal></term>
 
     <listitem><para>Additional options to be passed to
     <command>ssh</command> on the command line.</para></listitem>
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml
index 55f25d959..4dedd90ca 100644
--- a/doc/manual/command-ref/nix-env.xml
+++ b/doc/manual/command-ref/nix-env.xml
@@ -277,7 +277,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
     <listitem><para>A symbolic link to the user's current profile.  By
     default, this symlink points to
     <filename><replaceable>prefix</replaceable>/var/nix/profiles/default</filename>.
-    The <envar>PATH</envar> environment variable should include
+    The <literal>PATH</literal> environment variable should include
     <filename>~/.nix-profile/bin</filename> for the user environment
     to be visible to the user.</para></listitem>
 
@@ -1485,7 +1485,7 @@ error: no generation older than the current (91) exists</screen>
 
 <variablelist>
 
-  <varlistentry><term><envar>NIX_PROFILE</envar></term>
+  <varlistentry><term><literal>NIX_PROFILE</literal></term>
 
     <listitem><para>Location of the Nix profile.  Defaults to the
     target of the symlink <filename>~/.nix-profile</filename>, if it
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
index 53f06aed1..4ff967ecf 100644
--- a/doc/manual/command-ref/nix-instantiate.xml
+++ b/doc/manual/command-ref/nix-instantiate.xml
@@ -106,10 +106,10 @@ input.</para>
   <varlistentry><term><option>--find-file</option></term>
 
     <listitem><para>Look up the given files in Nix’s search path (as
-    specified by the <envar linkend="env-NIX_PATH">NIX_PATH</envar>
+    specified by the <envar linkend="env-NIX_PATH">NIX_PATH</literal>
     environment variable).  If found, print the corresponding absolute
     paths on standard output.  For instance, if
-    <envar>NIX_PATH</envar> is
+    <literal>NIX_PATH</literal> is
     <literal>nixpkgs=/home/alice/nixpkgs</literal>, then
     <literal>nix-instantiate --find-file nixpkgs/default.nix</literal>
     will print
diff --git a/doc/manual/command-ref/nix-shell.xml b/doc/manual/command-ref/nix-shell.xml
index 2fef323c5..de9755d58 100644
--- a/doc/manual/command-ref/nix-shell.xml
+++ b/doc/manual/command-ref/nix-shell.xml
@@ -141,8 +141,8 @@ also <xref linkend="sec-common-options" />.</phrase></para>
     almost entirely cleared before the interactive shell is started,
     so you get an environment that more closely corresponds to the
     “real” Nix build.  A few variables, in particular
-    <envar>HOME</envar>, <envar>USER</envar> and
-    <envar>DISPLAY</envar>, are retained.  Note that
+    <literal>HOME</literal>, <literal>USER</literal> and
+    <literal>DISPLAY</literal>, are retained.  Note that
     <filename>~/.bashrc</filename> and (depending on your Bash
     installation) <filename>/etc/bashrc</filename> are still sourced,
     so any variables set there will affect the interactive
@@ -193,10 +193,10 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
 <variablelist>
 
-  <varlistentry><term><envar>NIX_BUILD_SHELL</envar></term>
+  <varlistentry><term><literal>NIX_BUILD_SHELL</literal></term>
 
     <listitem><para>Shell used to start the interactive environment.
-    Defaults to the <command>bash</command> found in <envar>PATH</envar>.</para></listitem>
+    Defaults to the <command>bash</command> found in <literal>PATH</literal>.</para></listitem>
 
   </varlistentry>
 
@@ -254,7 +254,7 @@ $ nix-shell -p sqlite 'git.override { withManual = false; }'
 
 The <command>-p</command> flag looks up Nixpkgs in the Nix search
 path. You can override it by passing <option>-I</option> or setting
-<envar>NIX_PATH</envar>. For example, the following gives you a shell
+<literal>NIX_PATH</literal>. For example, the following gives you a shell
 containing the Pan package from a specific revision of Nixpkgs:
 
 <screen>
diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml
index d71f9d8e4..459100984 100644
--- a/doc/manual/command-ref/nix-store.xml
+++ b/doc/manual/command-ref/nix-store.xml
@@ -1433,7 +1433,7 @@ loads it into the Nix database.</para>
 <para>The operation <option>--print-env</option> prints out the
 environment of a derivation in a format that can be evaluated by a
 shell.  The command line arguments of the builder are placed in the
-variable <envar>_args</envar>.</para>
+variable <literal>_args</literal>.</para>
 
 </refsection>
 
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml
index a68eef1d0..150e732ff 100644
--- a/doc/manual/command-ref/opt-common.xml
+++ b/doc/manual/command-ref/opt-common.xml
@@ -160,7 +160,7 @@
 
 <varlistentry xml:id="opt-cores"><term><option>--cores</option></term>
 
-  <listitem><para>Sets the value of the <envar>NIX_BUILD_CORES</envar>
+  <listitem><para>Sets the value of the <literal>NIX_BUILD_CORES</literal>
   environment variable in the invocation of builders.  Builders can
   use this variable at their discretion to control the maximum amount
   of parallelism.  For instance, in Nixpkgs, if the derivation
@@ -370,10 +370,10 @@
 
   <listitem><para>Add a path to the Nix expression search path.  This
   option may be given multiple times.  See the <envar
-  linkend="env-NIX_PATH">NIX_PATH</envar> environment variable for
+  linkend="env-NIX_PATH">NIX_PATH</literal> environment variable for
   information on the semantics of the Nix search path.  Paths added
   through <option>-I</option> take precedence over
-  <envar>NIX_PATH</envar>.</para></listitem>
+  <literal>NIX_PATH</literal>.</para></listitem>
 
 </varlistentry>
 
diff --git a/doc/manual/expressions/advanced-attributes.xml b/doc/manual/expressions/advanced-attributes.xml
index 5759ff50e..3a0413ceb 100644
--- a/doc/manual/expressions/advanced-attributes.xml
+++ b/doc/manual/expressions/advanced-attributes.xml
@@ -139,7 +139,7 @@ impureEnvVars = [ "http_proxy" "https_proxy" <replaceable>...</replaceable> ];
 </programlisting>
 
     to make it use the proxy server configuration specified by the
-    user in the environment variables <envar>http_proxy</envar> and
+    user in the environment variables <literal>http_proxy</literal> and
     friends.</para>
 
     <para>This attribute is only allowed in <link
@@ -294,12 +294,12 @@ big = "a very long string";
     </programlisting>
 
     then when the builder runs, the environment variable
-    <envar>bigPath</envar> will contain the absolute path to a
+    <literal>bigPath</literal> will contain the absolute path to a
     temporary file containing <literal>a very long
     string</literal>. That is, for any attribute
     <replaceable>x</replaceable> listed in
     <varname>passAsFile</varname>, Nix will pass an environment
-    variable <envar><replaceable>x</replaceable>Path</envar> holding
+    variable <literal><replaceable>x</replaceable>Path</literal> holding
     the path of the file containing the value of attribute
     <replaceable>x</replaceable>. This is useful when you need to pass
     large strings to a builder, since most operating systems impose a
diff --git a/doc/manual/expressions/build-script.xml b/doc/manual/expressions/build-script.xml
index 7bad8f808..44264239d 100644
--- a/doc/manual/expressions/build-script.xml
+++ b/doc/manual/expressions/build-script.xml
@@ -35,19 +35,19 @@ steps:</para>
 
     <para>When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the
-    derivation).  For instance, the <envar>PATH</envar> variable is
+    derivation).  For instance, the <literal>PATH</literal> variable is
     empty<footnote><para>Actually, it's initialised to
     <filename>/path-not-set</filename> to prevent Bash from setting it
     to a default value.</para></footnote>.  This is done to prevent
     undeclared inputs from being used in the build process.  If for
-    example the <envar>PATH</envar> contained
+    example the <literal>PATH</literal> contained
     <filename>/usr/bin</filename>, then you might accidentally use
     <filename>/usr/bin/gcc</filename>.</para>
 
     <para>So the first step is to set up the environment.  This is
     done by calling the <filename>setup</filename> script of the
     standard environment.  The environment variable
-    <envar>stdenv</envar> points to the location of the standard
+    <literal>stdenv</literal> points to the location of the standard
     environment being used.  (It wasn't specified explicitly as an
     attribute in <xref linkend='ex-hello-nix' />, but
     <varname>mkDerivation</varname> adds it automatically.)</para>
@@ -57,7 +57,7 @@ steps:</para>
   <callout arearefs='ex-hello-builder-co-2'>
 
     <para>Since Hello needs Perl, we have to make sure that Perl is in
-    the <envar>PATH</envar>.  The <envar>perl</envar> environment
+    the <literal>PATH</literal>.  The <literal>perl</literal> environment
     variable points to the location of the Perl package (since it
     was passed in as an attribute to the derivation), so
     <filename><replaceable>$perl</replaceable>/bin</filename> is the
@@ -70,7 +70,7 @@ steps:</para>
     <para>Now we have to unpack the sources.  The
     <varname>src</varname> attribute was bound to the result of
     fetching the Hello source tarball from the network, so the
-    <envar>src</envar> environment variable points to the location in
+    <literal>src</literal> environment variable points to the location in
     the Nix store to which the tarball was downloaded.  After
     unpacking, we <command>cd</command> to the resulting source
     directory.</para>
@@ -93,7 +93,7 @@ steps:</para>
     <filename>/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1</filename>.
     Nix computes this path by cryptographically hashing all attributes
     of the derivation.  The path is passed to the builder through the
-    <envar>out</envar> environment variable.  So here we give
+    <literal>out</literal> environment variable.  So here we give
     <filename>configure</filename> the parameter
     <literal>--prefix=$out</literal> to cause Hello to be installed in
     the expected location.</para>
@@ -103,7 +103,7 @@ steps:</para>
   <callout arearefs='ex-hello-builder-co-5'>
 
     <para>Finally we build Hello (<literal>make</literal>) and install
-    it into the location specified by <envar>out</envar>
+    it into the location specified by <literal>out</literal>
     (<literal>make install</literal>).</para>
 
   </callout>
diff --git a/doc/manual/expressions/derivations.xml b/doc/manual/expressions/derivations.xml
index 6f6297565..a11de0088 100644
--- a/doc/manual/expressions/derivations.xml
+++ b/doc/manual/expressions/derivations.xml
@@ -122,7 +122,7 @@ the Nixpkgs manual for details.</para>
 <itemizedlist>
 
   <listitem><para>A temporary directory is created under the directory
-  specified by <envar>TMPDIR</envar> (default
+  specified by <literal>TMPDIR</literal> (default
   <filename>/tmp</filename>) where the build will take place.  The
   current directory is changed to this directory.</para></listitem>
 
@@ -133,29 +133,29 @@ the Nixpkgs manual for details.</para>
 
   <itemizedlist>
 
-    <listitem><para><envar>NIX_BUILD_TOP</envar> contains the path of
+    <listitem><para><literal>NIX_BUILD_TOP</literal> contains the path of
     the temporary directory for this build.</para></listitem>
 
-    <listitem><para>Also, <envar>TMPDIR</envar>,
-    <envar>TEMPDIR</envar>, <envar>TMP</envar>, <envar>TEMP</envar>
+    <listitem><para>Also, <literal>TMPDIR</literal>,
+    <literal>TEMPDIR</literal>, <literal>TMP</literal>, <literal>TEMP</literal>
     are set to point to the temporary directory.  This is to prevent
     the builder from accidentally writing temporary files anywhere
     else.  Doing so might cause interference by other
     processes.</para></listitem>
 
-    <listitem><para><envar>PATH</envar> is set to
+    <listitem><para><literal>PATH</literal> is set to
     <filename>/path-not-set</filename> to prevent shells from
     initialising it to their built-in default value.</para></listitem>
 
-    <listitem><para><envar>HOME</envar> is set to
+    <listitem><para><literal>HOME</literal> is set to
     <filename>/homeless-shelter</filename> to prevent programs from
     using <filename>/etc/passwd</filename> or the like to find the
     user's home directory, which could cause impurity.  Usually, when
-    <envar>HOME</envar> is set, it is used as the location of the home
+    <literal>HOME</literal> is set, it is used as the location of the home
     directory, even if it points to a non-existent
     path.</para></listitem>
 
-    <listitem><para><envar>NIX_STORE</envar> is set to the path of the
+    <listitem><para><literal>NIX_STORE</literal> is set to the path of the
     top-level Nix store directory (typically,
     <filename>/nix/store</filename>).</para></listitem>
 
diff --git a/doc/manual/expressions/generic-builder.xml b/doc/manual/expressions/generic-builder.xml
index db7ff405d..16b0268a7 100644
--- a/doc/manual/expressions/generic-builder.xml
+++ b/doc/manual/expressions/generic-builder.xml
@@ -38,18 +38,18 @@ genericBuild <co xml:id='ex-hello-builder2-co-3' /></programlisting>
 
   <callout arearefs='ex-hello-builder2-co-1'>
 
-    <para>The <envar>buildInputs</envar> variable tells
+    <para>The <literal>buildInputs</literal> variable tells
     <filename>setup</filename> to use the indicated packages as
     <quote>inputs</quote>.  This means that if a package provides a
     <filename>bin</filename> subdirectory, it's added to
-    <envar>PATH</envar>; if it has a <filename>include</filename>
+    <literal>PATH</literal>; if it has a <filename>include</filename>
     subdirectory, it's added to GCC's header search path; and so
     on.<footnote><para>How does it work? <filename>setup</filename>
     tries to source the file
     <filename><replaceable>pkg</replaceable>/nix-support/setup-hook</filename>
     of all dependencies.  These “setup hooks” can then set up whatever
     environment variables they want; for instance, the setup hook for
-    Perl sets the <envar>PERL5LIB</envar> environment variable to
+    Perl sets the <literal>PERL5LIB</literal> environment variable to
     contain the <filename>lib/site_perl</filename> directories of all
     inputs.</para></footnote>
     </para>
@@ -78,7 +78,7 @@ genericBuild <co xml:id='ex-hello-builder2-co-3' /></programlisting>
 </calloutlist>
 
 <para>Discerning readers will note that the
-<envar>buildInputs</envar> could just as well have been set in the Nix
+<literal>buildInputs</literal> could just as well have been set in the Nix
 expression, like this:
 
 <programlisting>
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
index bb2090c88..4a72c67a8 100644
--- a/doc/manual/expressions/language-values.xml
+++ b/doc/manual/expressions/language-values.xml
@@ -176,7 +176,7 @@ stdenv.mkDerivation {
   <para>Paths can also be specified between angle brackets, e.g.
   <literal>&lt;nixpkgs&gt;</literal>. This means that the directories
   listed in the environment variable
-  <envar linkend="env-NIX_PATH">NIX_PATH</envar> will be searched
+  <envar linkend="env-NIX_PATH">NIX_PATH</literal> will be searched
   for the given file or directory name.
   </para>
 
diff --git a/doc/manual/expressions/simple-building-testing.xml b/doc/manual/expressions/simple-building-testing.xml
index ce0a1636d..33a802e83 100644
--- a/doc/manual/expressions/simple-building-testing.xml
+++ b/doc/manual/expressions/simple-building-testing.xml
@@ -45,7 +45,7 @@ name.</para>
 
 <para>Nix has transactional semantics.  Once a build finishes
 successfully, Nix makes a note of this in its database: it registers
-that the path denoted by <envar>out</envar> is now
+that the path denoted by <literal>out</literal> is now
 <quote>valid</quote>.  If you try to build the derivation again, Nix
 will see that the path is already valid and finish immediately.  If a
 build fails, either because it returns a non-zero exit code, because
diff --git a/doc/manual/installation/env-variables.xml b/doc/manual/installation/env-variables.xml
index cc52f5b4a..436f15f31 100644
--- a/doc/manual/installation/env-variables.xml
+++ b/doc/manual/installation/env-variables.xml
@@ -7,7 +7,7 @@
 <title>Environment Variables</title>
 
 <para>To use Nix, some environment variables should be set.  In
-particular, <envar>PATH</envar> should contain the directories
+particular, <literal>PATH</literal> should contain the directories
 <filename><replaceable>prefix</replaceable>/bin</filename> and
 <filename>~/.nix-profile/bin</filename>.  The first directory contains
 the Nix tools themselves, while <filename>~/.nix-profile</filename> is
@@ -23,15 +23,15 @@ source <replaceable>prefix</replaceable>/etc/profile.d/nix.sh</screen>
 
 <section xml:id="sec-nix-ssl-cert-file">
 
-<title><envar>NIX_SSL_CERT_FILE</envar></title>
+<title><literal>NIX_SSL_CERT_FILE</literal></title>
 
 <para>If you need to specify a custom certificate bundle to account
 for an HTTPS-intercepting man in the middle proxy, you must specify
 the path to the certificate bundle in the environment variable
-<envar>NIX_SSL_CERT_FILE</envar>.</para>
+<literal>NIX_SSL_CERT_FILE</literal>.</para>
 
 
-<para>If you don't specify a <envar>NIX_SSL_CERT_FILE</envar>
+<para>If you don't specify a <literal>NIX_SSL_CERT_FILE</literal>
 manually, Nix will install and use its own certificate
 bundle.</para>
 
@@ -56,7 +56,7 @@ the Nix installer will detect the presense of Nix configuration, and
 abort.</para></note>
 
 <section xml:id="sec-nix-ssl-cert-file-with-nix-daemon-and-macos">
-<title><envar>NIX_SSL_CERT_FILE</envar> with macOS and the Nix daemon</title>
+<title><literal>NIX_SSL_CERT_FILE</literal> with macOS and the Nix daemon</title>
 
 <para>On macOS you must specify the environment variable for the Nix
 daemon service, then restart it:</para>
diff --git a/doc/manual/installation/installing-binary.xml b/doc/manual/installation/installing-binary.xml
index 64c7a37fb..ad47ce8b9 100644
--- a/doc/manual/installation/installing-binary.xml
+++ b/doc/manual/installation/installing-binary.xml
@@ -61,7 +61,7 @@ The install script will modify the first writable file from amongst
 <filename>.bash_profile</filename>, <filename>.bash_login</filename>
 and <filename>.profile</filename> to source
 <filename>~/.nix-profile/etc/profile.d/nix.sh</filename>. You can set
-the <envar>NIX_INSTALLER_NO_MODIFY_PROFILE</envar> environment
+the <literal>NIX_INSTALLER_NO_MODIFY_PROFILE</literal> environment
 variable before executing the install script to disable this
 behaviour.
 </para>
diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml
index 69ae1ef27..331b5f128 100644
--- a/doc/manual/installation/multi-user.xml
+++ b/doc/manual/installation/multi-user.xml
@@ -69,7 +69,7 @@ You’ll want to put that line somewhere in your system’s boot
 scripts.</para>
 
 <para>To let unprivileged users use the daemon, they should set the
-<link linkend="envar-remote"><envar>NIX_REMOTE</envar> environment
+<link linkend="envar-remote"><literal>NIX_REMOTE</literal> environment
 variable</link> to <literal>daemon</literal>.  So you should put a
 line like
 
diff --git a/doc/manual/introduction/about-nix.xml b/doc/manual/introduction/about-nix.xml
index c21ed34dd..ec6f1ca3f 100644
--- a/doc/manual/introduction/about-nix.xml
+++ b/doc/manual/introduction/about-nix.xml
@@ -76,7 +76,7 @@ extremely well.</para>
 <para>Nix has multi-user support.  This means that non-privileged
 users can securely install software.  Each user can have a different
 <emphasis>profile</emphasis>, a set of packages in the Nix store that
-appear in the user’s <envar>PATH</envar>.  If a user installs a
+appear in the user’s <literal>PATH</literal>.  If a user installs a
 package that another user has already installed previously, the
 package won’t be built or downloaded a second time.  At the same time,
 it is not possible for one user to inject a Trojan horse into a
diff --git a/doc/manual/packages/basic-package-mgmt.xml b/doc/manual/packages/basic-package-mgmt.xml
index 0f21297f3..758a4500d 100644
--- a/doc/manual/packages/basic-package-mgmt.xml
+++ b/doc/manual/packages/basic-package-mgmt.xml
@@ -16,7 +16,7 @@ on the set of installed applications.  That is, there might be lots of
 applications present on the system (possibly in many different
 versions), but users can have a specific selection of those active —
 where “active” just means that it appears in a directory
-in the user’s <envar>PATH</envar>.  Such a view on the set of
+in the user’s <literal>PATH</literal>.  Such a view on the set of
 installed applications is called a <emphasis>user
 environment</emphasis>, which is just a directory tree consisting of
 symlinks to the files of the active applications.  </para>
diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml
index 4d10319ab..15085ab58 100644
--- a/doc/manual/packages/profiles.xml
+++ b/doc/manual/packages/profiles.xml
@@ -41,9 +41,9 @@ store.</para>
 $ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn</screen>
 
 every time you want to run Subversion.  Of course we could set up the
-<envar>PATH</envar> environment variable to include the
+<literal>PATH</literal> environment variable to include the
 <filename>bin</filename> directory of every package we want to use,
-but this is not very convenient since changing <envar>PATH</envar>
+but this is not very convenient since changing <literal>PATH</literal>
 doesn’t take effect for already existing processes.  The solution Nix
 uses is to create directory trees of symlinks to
 <emphasis>activated</emphasis> packages.  These are called
@@ -122,10 +122,10 @@ $ nix-env --list-generations</screen></para>
 
 <para>You generally wouldn’t have
 <filename>/nix/var/nix/profiles/<replaceable>some-profile</replaceable>/bin</filename>
-in your <envar>PATH</envar>.  Rather, there is a symlink
+in your <literal>PATH</literal>.  Rather, there is a symlink
 <filename>~/.nix-profile</filename> that points to your current
 profile.  This means that you should put
-<filename>~/.nix-profile/bin</filename> in your <envar>PATH</envar>
+<filename>~/.nix-profile/bin</filename> in your <literal>PATH</literal>
 (and indeed, that’s what the initialisation script
 <filename>/nix/etc/profile.d/nix.sh</filename> does).  This makes it
 easier to switch to a different profile.  You can do that using the
diff --git a/doc/manual/release-notes/rl-0.10.xml b/doc/manual/release-notes/rl-0.10.xml
index 9afec4de9..9b4233546 100644
--- a/doc/manual/release-notes/rl-0.10.xml
+++ b/doc/manual/release-notes/rl-0.10.xml
@@ -184,9 +184,9 @@ irreversible.</para></warning>
 
 
   <listitem><para>Nix now works behind an HTTP proxy server; just set
-  the standard environment variables <envar>http_proxy</envar>,
-  <envar>https_proxy</envar>, <envar>ftp_proxy</envar> or
-  <envar>all_proxy</envar> appropriately.  Functions such as
+  the standard environment variables <literal>http_proxy</literal>,
+  <literal>https_proxy</literal>, <literal>ftp_proxy</literal> or
+  <literal>all_proxy</literal> appropriately.  Functions such as
   <function>fetchurl</function> in Nixpkgs also respect these
   variables.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-0.12.xml b/doc/manual/release-notes/rl-0.12.xml
index fdba8c4d5..18978ac4b 100644
--- a/doc/manual/release-notes/rl-0.12.xml
+++ b/doc/manual/release-notes/rl-0.12.xml
@@ -49,7 +49,7 @@ $ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG</sc
   filesystem.  For instance, you can speed up an installation by
   mounting some remote Nix store that already has the packages in
   question via NFS or <literal>sshfs</literal>.  The environment
-  variable <envar>NIX_OTHER_STORES</envar> specifies the locations of
+  variable <literal>NIX_OTHER_STORES</literal> specifies the locations of
   the remote Nix directories,
   e.g. <literal>/mnt/remote-fs/nix</literal>.</para></listitem>
 
@@ -156,7 +156,7 @@ the following paths will be downloaded/copied (30.02 MiB):
 
   <listitem><para><command>nix-prefetch-url</command> now supports
   <literal>mirror://</literal> URLs, provided that the environment
-  variable <envar>NIXPKGS_ALL</envar> points at a Nixpkgs
+  variable <literal>NIXPKGS_ALL</literal> points at a Nixpkgs
   tree.</para></listitem>
 
   <listitem><para>Removed the commands
diff --git a/doc/manual/release-notes/rl-0.16.xml b/doc/manual/release-notes/rl-0.16.xml
index af1edc0eb..43b7622c6 100644
--- a/doc/manual/release-notes/rl-0.16.xml
+++ b/doc/manual/release-notes/rl-0.16.xml
@@ -30,7 +30,7 @@
       <replaceable>N</replaceable></option> as well as a configuration
       setting <varname>build-cores =
       <replaceable>N</replaceable></varname> that causes the
-      environment variable <envar>NIX_BUILD_CORES</envar> to be set to
+      environment variable <literal>NIX_BUILD_CORES</literal> to be set to
       <replaceable>N</replaceable> when the builder is invoked.  The
       builder can use this at its discretion to perform a parallel
       build, e.g., by calling <command>make -j
diff --git a/doc/manual/release-notes/rl-1.0.xml b/doc/manual/release-notes/rl-1.0.xml
index ff11168d0..41081a19f 100644
--- a/doc/manual/release-notes/rl-1.0.xml
+++ b/doc/manual/release-notes/rl-1.0.xml
@@ -29,7 +29,7 @@ previous release.  Here are the most significant:</para>
 
   <listitem>
     <para>Nix now has an search path for expressions.  The search path
-    is set using the environment variable <envar>NIX_PATH</envar> and
+    is set using the environment variable <literal>NIX_PATH</literal> and
     the <option>-I</option> command line option.  In Nix expressions,
     paths between angle brackets are used to specify files that must
     be looked up in the search path.  For instance, the expression
diff --git a/doc/manual/release-notes/rl-1.2.xml b/doc/manual/release-notes/rl-1.2.xml
index 748fd9e67..29bd5bf81 100644
--- a/doc/manual/release-notes/rl-1.2.xml
+++ b/doc/manual/release-notes/rl-1.2.xml
@@ -116,7 +116,7 @@ $ mount -o remount,ro,bind /nix/store
 
   <listitem>
     <para>Basic Nix expression evaluation profiling: setting the
-    environment variable <envar>NIX_COUNT_CALLS</envar> to
+    environment variable <literal>NIX_COUNT_CALLS</literal> to
     <literal>1</literal> will cause Nix to print how many times each
     primop or function was executed.</para>
   </listitem>
diff --git a/doc/manual/release-notes/rl-1.6.xml b/doc/manual/release-notes/rl-1.6.xml
index 580563420..cdb52ed0b 100644
--- a/doc/manual/release-notes/rl-1.6.xml
+++ b/doc/manual/release-notes/rl-1.6.xml
@@ -33,7 +33,7 @@ features:</para>
 
   <listitem>
     <para><command>nix-shell</command> now sets the shell prompt
-    (<envar>PS1</envar>) to ensure that Nix shells are distinguishable
+    (<literal>PS1</literal>) to ensure that Nix shells are distinguishable
     from your regular shells.</para>
   </listitem>
 
diff --git a/doc/manual/release-notes/rl-1.8.xml b/doc/manual/release-notes/rl-1.8.xml
index c854c5c5f..326990774 100644
--- a/doc/manual/release-notes/rl-1.8.xml
+++ b/doc/manual/release-notes/rl-1.8.xml
@@ -105,7 +105,7 @@ $ nix-store -l $(which xterm)
   some terminals show them anyway.</para></listitem>
 
   <listitem><para>Various commands now automatically pipe their output
-  into the pager as specified by the <envar>PAGER</envar> environment
+  into the pager as specified by the <literal>PAGER</literal> environment
   variable.</para></listitem>
 
   <listitem><para>Several improvements to reduce memory consumption in
diff --git a/doc/manual/release-notes/rl-1.9.xml b/doc/manual/release-notes/rl-1.9.xml
index c8406bd20..cc6558b1a 100644
--- a/doc/manual/release-notes/rl-1.9.xml
+++ b/doc/manual/release-notes/rl-1.9.xml
@@ -62,7 +62,7 @@ $ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
       master branch.</para></listitem>
 
       <listitem><para>In the Nix search path (as specified via
-      <envar>NIX_PATH</envar> or <option>-I</option>). For example, to
+      <literal>NIX_PATH</literal> or <option>-I</option>). For example, to
       start a shell containing the Pan package from a specific version
       of Nixpkgs:
 
@@ -190,8 +190,8 @@ main = do
   “generation” symlink in <filename>/nix/var/nix/profiles</filename>
   if something actually changed.</para></listitem>
 
-  <listitem><para>The environment variable <envar>NIX_PAGER</envar>
-  can now be set to override <envar>PAGER</envar>. You can set it to
+  <listitem><para>The environment variable <literal>NIX_PAGER</literal>
+  can now be set to override <literal>PAGER</literal>. You can set it to
   <literal>cat</literal> to disable paging for Nix commands
   only.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml
index 4c683dd3d..57acfd0ba 100644
--- a/doc/manual/release-notes/rl-2.0.xml
+++ b/doc/manual/release-notes/rl-2.0.xml
@@ -30,7 +30,7 @@
   <listitem>
     <para>The “copy from other stores” substituter mechanism
     (<command>copy-from-other-stores</command> and the
-    <envar>NIX_OTHER_STORES</envar> environment variable) has been
+    <literal>NIX_OTHER_STORES</literal> environment variable) has been
     removed. It was primarily used by the NixOS installer to copy
     available paths from the installation medium. The replacement is
     to use a chroot store as a substituter
@@ -371,7 +371,7 @@
         daemon. You can use <literal>auto</literal> or the empty
         string to auto-select a local or daemon store depending on
         whether you have write permission to the Nix store. It is no
-        longer necessary to set the <envar>NIX_REMOTE</envar>
+        longer necessary to set the <literal>NIX_REMOTE</literal>
         environment variable to use the Nix daemon.</para>
 
         <para>As noted above, <classname>LocalStore</classname> now
@@ -492,7 +492,7 @@
         use <filename>/build</filename> instead of
         <filename>/tmp</filename> as the temporary build
         directory. This fixes potential security problems when a build
-        accidentally stores its <envar>TMPDIR</envar> in some
+        accidentally stores its <literal>TMPDIR</literal> in some
         security-sensitive place, such as an RPATH.</para>
       </listitem>
 
@@ -546,8 +546,8 @@
     are not using the Nix daemon, you can now just specify a remote
     build machine on the command line, e.g. <literal>--option builders
     'ssh://my-mac x86_64-darwin'</literal>. The environment variable
-    <envar>NIX_BUILD_HOOK</envar> has been removed and is no longer
-    needed. The environment variable <envar>NIX_REMOTE_SYSTEMS</envar>
+    <literal>NIX_BUILD_HOOK</literal> has been removed and is no longer
+    needed. The environment variable <literal>NIX_REMOTE_SYSTEMS</literal>
     is still supported for compatibility, but it is also possible to
     specify builders in <command>nix.conf</command> by setting the
     option <literal>builders =
@@ -574,7 +574,7 @@
   </listitem>
 
   <listitem>
-    <para><envar>NIX_PATH</envar> is now lazy, so URIs in the path are
+    <para><literal>NIX_PATH</literal> is now lazy, so URIs in the path are
     only downloaded if they are needed for evaluation.</para>
   </listitem>
 
@@ -672,7 +672,7 @@
     <para><command>nix-shell</command> now uses
     <varname>bashInteractive</varname> from Nixpkgs, rather than the
     <command>bash</command> command that happens to be in the caller’s
-    <envar>PATH</envar>. This is especially important on macOS where
+    <literal>PATH</literal>. This is especially important on macOS where
     the <command>bash</command> provided by the system is seriously
     outdated and cannot execute <literal>stdenv</literal>’s setup
     script.</para>
@@ -720,7 +720,7 @@
 configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"}";
 </programlisting>
 
-    will cause the <envar>configureFlags</envar> environment variable
+    will cause the <literal>configureFlags</literal> environment variable
     to contain the actual store paths corresponding to the
     <literal>out</literal> and <literal>dev</literal> outputs.</para>
   </listitem>
@@ -815,7 +815,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <varname>__structuredAttrs</varname> is set to
     <literal>true</literal>, the other derivation attributes are
     serialised in JSON format and made available to the builder via
-    the file <envar>.attrs.json</envar> in the builder’s temporary
+    the file <literal>.attrs.json</literal> in the builder’s temporary
     directory. This obviates the need for
     <varname>passAsFile</varname> since JSON files have no size
     restrictions, unlike process environments.</para>
@@ -823,7 +823,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <para><link
     xlink:href="https://github.com/NixOS/nix/commit/2d5b1b24bf70a498e4c0b378704cfdb6471cc699">As
     a convenience to Bash builders</link>, Nix writes a script named
-    <envar>.attrs.sh</envar> to the builder’s directory that
+    <literal>.attrs.sh</literal> to the builder’s directory that
     initialises shell variables corresponding to all attributes that
     are representable in Bash. This includes non-nested (associative)
     arrays. For example, the attribute <literal>hardening.format =
@@ -835,7 +835,7 @@ configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"
     <para>Builders can <link
     xlink:href="https://github.com/NixOS/nix/commit/88e6bb76de5564b3217be9688677d1c89101b2a3">now</link>
     communicate what build phase they are in by writing messages to
-    the file descriptor specified in <envar>NIX_LOG_FD</envar>. The
+    the file descriptor specified in <literal>NIX_LOG_FD</literal>. The
     current phase is shown by the <command>nix</command> progress
     indicator.
     </para>
diff --git a/doc/manual/release-notes/rl-2.2.xml b/doc/manual/release-notes/rl-2.2.xml
index d29eb87e8..cc992fabb 100644
--- a/doc/manual/release-notes/rl-2.2.xml
+++ b/doc/manual/release-notes/rl-2.2.xml
@@ -114,8 +114,8 @@ import &lt;nix/fetchurl.nix> {
 
   <listitem>
     <para>The evaluator now prints profiling statistics (enabled via
-    the <envar>NIX_SHOW_STATS</envar> and
-    <envar>NIX_COUNT_CALLS</envar> environment variables) in JSON
+    the <literal>NIX_SHOW_STATS</literal> and
+    <literal>NIX_COUNT_CALLS</literal> environment variables) in JSON
     format.</para>
   </listitem>
 
diff --git a/doc/manual/release-notes/rl-2.3.xml b/doc/manual/release-notes/rl-2.3.xml
index 0ad7d641f..83accf33e 100644
--- a/doc/manual/release-notes/rl-2.3.xml
+++ b/doc/manual/release-notes/rl-2.3.xml
@@ -60,7 +60,7 @@ incompatible changes:</para>
 
   <listitem>
     <para>Builds are now executed in a pseudo-terminal, and the
-    <envar>TERM</envar> environment variable is set to
+    <literal>TERM</literal> environment variable is set to
     <literal>xterm-256color</literal>. This allows many programs
     (e.g. <command>gcc</command>, <command>clang</command>,
     <command>cmake</command>) to print colorized log output.</para>

From f3903035667e158112dfd414091d8d50ef90c5f4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 10:44:54 +0200
Subject: [PATCH 015/176] Reconvert

---
 doc/manual/src/SUMMARY.md                     |   2 +
 .../src/advanced-topics/cores-vs-jobs.md      |  10 +-
 .../src/advanced-topics/distributed-builds.md |   2 +-
 doc/manual/src/command-ref/command-ref.md     |   2 +
 doc/manual/src/command-ref/env-common.md      | 112 +++++++++
 doc/manual/src/command-ref/opt-common.md      | 221 ++++++++++++++++++
 .../src/expressions/advanced-attributes.md    |  14 +-
 doc/manual/src/expressions/build-script.md    |  20 +-
 doc/manual/src/expressions/builder-syntax.md  |  20 +-
 doc/manual/src/expressions/derivations.md     |  16 +-
 doc/manual/src/expressions/generic-builder.md |  13 +-
 doc/manual/src/expressions/language-values.md |   4 +-
 .../expressions/simple-building-testing.md    |   2 +-
 doc/manual/src/installation/env-variables.md  |  10 +-
 .../src/installation/installing-binary.md     |   4 +-
 doc/manual/src/installation/multi-user.md     |   2 +-
 .../package-management/basic-package-mgmt.md  |   8 +-
 doc/manual/src/package-management/profiles.md |   8 +-
 doc/manual/src/release-notes/rl-0.10.md       |   4 +-
 doc/manual/src/release-notes/rl-0.12.md       |   4 +-
 doc/manual/src/release-notes/rl-0.16.md       |   2 +-
 doc/manual/src/release-notes/rl-1.0.md        |   2 +-
 doc/manual/src/release-notes/rl-1.2.md        |   2 +-
 doc/manual/src/release-notes/rl-1.6.md        |   2 +-
 doc/manual/src/release-notes/rl-1.8.md        |   2 +-
 doc/manual/src/release-notes/rl-1.9.md        |   8 +-
 doc/manual/src/release-notes/rl-2.0.md        |  28 +--
 doc/manual/src/release-notes/rl-2.2.md        |   2 +-
 doc/manual/src/release-notes/rl-2.3.md        |   2 +-
 29 files changed, 433 insertions(+), 95 deletions(-)
 create mode 100644 doc/manual/src/command-ref/env-common.md
 create mode 100644 doc/manual/src/command-ref/opt-common.md

diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index f562d1db4..f9ef1b060 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -45,6 +45,8 @@
   - [Verifying Build Reproducibility](advanced-topics/diff-hook.md)
   - [Using the `post-build-hook`](advanced-topics/post-build-hook.md)
 - [Command Reference](command-ref/command-ref.md)
+  - [Common Options](command-ref/opt-common.md)
+  - [Common Environment Variables](command-ref/env-common.md)
   - [Utilities](command-ref/utilities.md)
     - [nix-copy-closure](command-ref/nix-copy-closure.md)
 - [Glossary](glossary.md)
diff --git a/doc/manual/src/advanced-topics/cores-vs-jobs.md b/doc/manual/src/advanced-topics/cores-vs-jobs.md
index 846b6356e..91e95d5b4 100644
--- a/doc/manual/src/advanced-topics/cores-vs-jobs.md
+++ b/doc/manual/src/advanced-topics/cores-vs-jobs.md
@@ -16,18 +16,18 @@ configuration trade-offs.
     -j`.
 
 The [???](#conf-cores) setting determines the value of
-NIX\_BUILD\_CORES. NIX\_BUILD\_CORES is equal to [???](#conf-cores),
-unless [???](#conf-cores) equals `0`, in which case NIX\_BUILD\_CORES
+`NIX_BUILD_CORES`. `NIX_BUILD_CORES` is equal to [???](#conf-cores),
+unless [???](#conf-cores) equals `0`, in which case `NIX_BUILD_CORES`
 will be the total number of cores in the system.
 
 The maximum number of consumed cores is a simple multiplication,
-[???](#conf-max-jobs) \* NIX\_BUILD\_CORES.
+[???](#conf-max-jobs) \* `NIX_BUILD_CORES`.
 
 The balance on how to set these two independent variables depends upon
 each builder's workload and hardware. Here are a few example scenarios
 on a machine with 24 cores:
 
-| [???](#conf-max-jobs) | [???](#conf-cores) | NIX\_BUILD\_CORES | Maximum Processes | Result                                                                                                                                                                                                                                                                                 |
+| [???](#conf-max-jobs) | [???](#conf-cores) | `NIX_BUILD_CORES` | Maximum Processes | Result                                                                                                                                                                                                                                                                                 |
 | --------------------- | ------------------ | ----------------- | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | 1                     | 24                 | 24                | 24                | One derivation will be built at a time, each one can use 24 cores. Undersold if a job can’t use 24 cores.                                                                                                                                                                              |
 | 4                     | 6                  | 6                 | 24                | Four derivations will be built at once, each given access to six cores.                                                                                                                                                                                                                |
@@ -38,5 +38,5 @@ on a machine with 24 cores:
 Balancing 24 Build Cores
 
 It is up to the derivations' build script to respect host's requested
-cores-per-build by following the value of the NIX\_BUILD\_CORES
+cores-per-build by following the value of the `NIX_BUILD_CORES`
 environment variable.
diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md
index 197708ee5..4f24febb0 100644
--- a/doc/manual/src/advanced-topics/distributed-builds.md
+++ b/doc/manual/src/advanced-topics/distributed-builds.md
@@ -27,7 +27,7 @@ If you get the error
     bash: nix-store: command not found
     error: cannot connect to 'mac'
 
-then you need to ensure that the PATH of non-interactive login shells
+then you need to ensure that the `PATH` of non-interactive login shells
 contains Nix.
 
 > **Warning**
diff --git a/doc/manual/src/command-ref/command-ref.md b/doc/manual/src/command-ref/command-ref.md
index b15a50a3b..2c7dbf22e 100644
--- a/doc/manual/src/command-ref/command-ref.md
+++ b/doc/manual/src/command-ref/command-ref.md
@@ -1,2 +1,4 @@
+# Command Reference
+
 This section lists commands and options that you can use when you
 work with Nix.
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/src/command-ref/env-common.md
new file mode 100644
index 000000000..14e08e0f1
--- /dev/null
+++ b/doc/manual/src/command-ref/env-common.md
@@ -0,0 +1,112 @@
+# Common Environment Variables
+
+Most Nix commands interpret the following environment variables:
+
+  - `IN_NIX_SHELL`  
+    Indicator that tells if the current environment was set up by
+    `nix-shell`. Since Nix 2.0 the values are `"pure"` and `"impure"`
+
+  - `NIX_PATH`  
+    A colon-separated list of directories used to look up Nix
+    expressions enclosed in angle brackets (i.e., `<path>`). For
+    instance, the value
+    
+        /home/eelco/Dev:/etc/nixos
+    
+    will cause Nix to look for paths relative to `/home/eelco/Dev` and
+    `/etc/nixos`, in this order. It is also possible to match paths
+    against a prefix. For example, the value
+    
+        nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos
+    
+    will cause Nix to search for `<nixpkgs/path>` in
+    `/home/eelco/Dev/nixpkgs-branch/path` and `/etc/nixos/nixpkgs/path`.
+    
+    If a path in the Nix search path starts with `http://` or
+    `https://`, it is interpreted as the URL of a tarball that will be
+    downloaded and unpacked to a temporary location. The tarball must
+    consist of a single top-level directory. For example, setting
+    `NIX_PATH` to
+    
+        nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz
+    
+    tells Nix to download the latest revision in the Nixpkgs/NixOS 15.09
+    channel.
+    
+    A following shorthand can be used to refer to the official channels:
+    
+        nixpkgs=channel:nixos-15.09
+    
+    The search path can be extended using the `-I` option, which takes
+    precedence over `NIX_PATH`.
+
+  - `NIX_IGNORE_SYMLINK_STORE`  
+    Normally, the Nix store directory (typically `/nix/store`) is not
+    allowed to contain any symlink components. This is to prevent
+    “impure” builds. Builders sometimes “canonicalise” paths by
+    resolving all symlink components. Thus, builds on different machines
+    (with `/nix/store` resolving to different locations) could yield
+    different results. This is generally not a problem, except when
+    builds are deployed to machines where `/nix/store` resolves
+    differently. If you are sure that you’re not going to do that, you
+    can set `NIX_IGNORE_SYMLINK_STORE` to `1`.
+    
+    Note that if you’re symlinking the Nix store so that you can put it
+    on another file system than the root file system, on Linux you’re
+    better off using `bind` mount points, e.g.,
+    
+        $ mkdir /nix
+        $ mount -o bind /mnt/otherdisk/nix /nix
+    
+    Consult the mount 8 manual page for details.
+
+  - `NIX_STORE_DIR`  
+    Overrides the location of the Nix store (default `prefix/store`).
+
+  - `NIX_DATA_DIR`  
+    Overrides the location of the Nix static data directory (default
+    `prefix/share`).
+
+  - `NIX_LOG_DIR`  
+    Overrides the location of the Nix log directory (default
+    `prefix/var/log/nix`).
+
+  - `NIX_STATE_DIR`  
+    Overrides the location of the Nix state directory (default
+    `prefix/var/nix`).
+
+  - `NIX_CONF_DIR`  
+    Overrides the location of the system Nix configuration directory
+    (default `prefix/etc/nix`).
+
+  - `NIX_USER_CONF_FILES`  
+    Overrides the location of the user Nix configuration files to load
+    from (defaults to the XDG spec locations). The variable is treated
+    as a list separated by the `:` token.
+
+  - `TMPDIR`  
+    Use the specified directory to store temporary files. In particular,
+    this includes temporary build directories; these can take up
+    substantial amounts of disk space. The default is `/tmp`.
+
+  - `NIX_REMOTE`  
+    This variable should be set to `daemon` if you want to use the Nix
+    daemon to execute Nix operations. This is necessary in [multi-user
+    Nix installations](#ssec-multi-user). If the Nix daemon's Unix
+    socket is at some non-standard path, this variable should be set to
+    `unix://path/to/socket`. Otherwise, it should be left unset.
+
+  - `NIX_SHOW_STATS`  
+    If set to `1`, Nix will print some evaluation statistics, such as
+    the number of values allocated.
+
+  - `NIX_COUNT_CALLS`  
+    If set to `1`, Nix will print how often functions were called during
+    Nix expression evaluation. This is useful for profiling your Nix
+    expressions.
+
+  - `GC_INITIAL_HEAP_SIZE`  
+    If Nix has been configured to use the Boehm garbage collector, this
+    variable sets the initial size of the heap in bytes. It defaults to
+    384 MiB. Setting it to a low value reduces memory consumption, but
+    will increase runtime due to the overhead of garbage collection.
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
new file mode 100644
index 000000000..ac9d996c3
--- /dev/null
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -0,0 +1,221 @@
+# Common Options
+
+Most Nix commands accept the following command-line options:
+
+  - `--help`  
+    Prints out a summary of the command syntax and exits.
+
+  - `--version`  
+    Prints out the Nix version number on standard output and exits.
+
+  - `--verbose` / `-v`  
+    Increases the level of verbosity of diagnostic messages printed on
+    standard error. For each Nix operation, the information printed on
+    standard output is well-defined; any diagnostic information is
+    printed on standard error, never on standard output.
+    
+    This option may be specified repeatedly. Currently, the following
+    verbosity levels exist:
+    
+      - 0  
+        “Errors only”: only print messages explaining why the Nix
+        invocation failed.
+    
+      - 1  
+        “Informational”: print *useful* messages about what Nix is
+        doing. This is the default.
+    
+      - 2  
+        “Talkative”: print more informational messages.
+    
+      - 3  
+        “Chatty”: print even more informational messages.
+    
+      - 4  
+        “Debug”: print debug information.
+    
+      - 5  
+        “Vomit”: print vast amounts of debug information.
+
+  - `--quiet`  
+    Decreases the level of verbosity of diagnostic messages printed on
+    standard error. This is the inverse option to `-v` / `--verbose`.
+    
+    This option may be specified repeatedly. See the previous verbosity
+    levels list.
+
+  - `--log-format` format  
+    This option can be used to change the output of the log format, with
+    format being one of:
+    
+      - raw  
+        This is the raw format, as outputted by nix-build.
+    
+      - internal-json  
+        Outputs the logs in a structured manner. NOTE: the json schema
+        is not guarantees to be stable between releases.
+    
+      - bar  
+        Only display a progress bar during the builds.
+    
+      - bar-with-logs  
+        Display the raw logs, with the progress bar at the bottom.
+
+  - `--no-build-output` / `-Q`  
+    By default, output written by builders to standard output and
+    standard error is echoed to the Nix command's standard error. This
+    option suppresses this behaviour. Note that the builder's standard
+    output and error are always written to a log file in
+    `prefix/nix/var/log/nix`.
+
+  - `--max-jobs` / `-j` number  
+    Sets the maximum number of build jobs that Nix will perform in
+    parallel to the specified number. Specify `auto` to use the number
+    of CPUs in the system. The default is specified by the
+    [`max-jobs`](#conf-max-jobs) configuration setting, which itself
+    defaults to `1`. A higher value is useful on SMP systems or to
+    exploit I/O latency.
+    
+    Setting it to `0` disallows building on the local machine, which is
+    useful when you want builds to happen only on remote builders.
+
+  - `--cores`  
+    Sets the value of the `NIX_BUILD_CORES` environment variable in the
+    invocation of builders. Builders can use this variable at their
+    discretion to control the maximum amount of parallelism. For
+    instance, in Nixpkgs, if the derivation attribute
+    `enableParallelBuilding` is set to `true`, the builder passes the
+    `-jN` flag to GNU Make. It defaults to the value of the
+    [`cores`](#conf-cores) configuration setting, if set, or `1`
+    otherwise. The value `0` means that the builder should use all
+    available CPU cores in the system.
+
+  - `--max-silent-time`  
+    Sets the maximum number of seconds that a builder can go without
+    producing any data on standard output or standard error. The default
+    is specified by the [`max-silent-time`](#conf-max-silent-time)
+    configuration setting. `0` means no time-out.
+
+  - `--timeout`  
+    Sets the maximum number of seconds that a builder can run. The
+    default is specified by the [`timeout`](#conf-timeout) configuration
+    setting. `0` means no timeout.
+
+  - `--keep-going` / `-k`  
+    Keep going in case of failed builds, to the greatest extent
+    possible. That is, if building an input of some derivation fails,
+    Nix will still build the other inputs, but not the derivation
+    itself. Without this option, Nix stops if any build fails (except
+    for builds of substitutes), possibly killing builds in progress (in
+    case of parallel or distributed builds).
+
+  - `--keep-failed` / `-K`  
+    Specifies that in case of a build failure, the temporary directory
+    (usually in `/tmp`) in which the build takes place should not be
+    deleted. The path of the build directory is printed as an
+    informational message.
+
+  - `--fallback`  
+    Whenever Nix attempts to build a derivation for which substitutes
+    are known for each output path, but realising the output paths
+    through the substitutes fails, fall back on building the derivation.
+    
+    The most common scenario in which this is useful is when we have
+    registered substitutes in order to perform binary distribution from,
+    say, a network repository. If the repository is down, the
+    realisation of the derivation will fail. When this option is
+    specified, Nix will build the derivation instead. Thus, installation
+    from binaries falls back on installation from source. This option is
+    not the default since it is generally not desirable for a transient
+    failure in obtaining the substitutes to lead to a full build from
+    source (with the related consumption of resources).
+
+  - `--no-build-hook`  
+    Disables the build hook mechanism. This allows to ignore remote
+    builders if they are setup on the machine.
+    
+    It's useful in cases where the bandwidth between the client and the
+    remote builder is too low. In that case it can take more time to
+    upload the sources to the remote builder and fetch back the result
+    than to do the computation locally.
+
+  - `--readonly-mode`  
+    When this option is used, no attempt is made to open the Nix
+    database. Most Nix operations do need database access, so those
+    operations will fail.
+
+  - `--arg` name value  
+    This option is accepted by `nix-env`, `nix-instantiate`, `nix-shell`
+    and `nix-build`. When evaluating Nix expressions, the expression
+    evaluator will automatically try to call functions that it
+    encounters. It can automatically call functions for which every
+    argument has a [default value](#ss-functions) (e.g., `{ argName ?
+            defaultValue }:
+            ...`). With `--arg`, you can also call functions that have arguments
+    without a default value (or override a default value). That is, if
+    the evaluator encounters a function with an argument named name, it
+    will call it with value value.
+    
+    For instance, the top-level `default.nix` in Nixpkgs is actually a
+    function:
+    
+        { # The system (e.g., `i686-linux') for which to build the packages.
+          system ? builtins.currentSystem
+          ...
+        }: ...
+    
+    So if you call this Nix expression (e.g., when you do `nix-env -i
+    pkgname`), the function will be called automatically using the value
+    [`builtins.currentSystem`](#builtin-currentSystem) for the `system`
+    argument. You can override this using `--arg`, e.g., `nix-env -i
+            pkgname --arg system
+            \"i686-freebsd\"`. (Note that since the argument is a Nix string
+    literal, you have to escape the quotes.)
+
+  - `--argstr` name value  
+    This option is like `--arg`, only the value is not a Nix expression
+    but a string. So instead of `--arg system \"i686-linux\"` (the outer
+    quotes are to keep the shell happy) you can say `--argstr system
+            i686-linux`.
+
+  - `--attr` / `-A` attrPath  
+    Select an attribute from the top-level Nix expression being
+    evaluated. (`nix-env`, `nix-instantiate`, `nix-build` and
+    `nix-shell` only.) The *attribute path* attrPath is a sequence of
+    attribute names separated by dots. For instance, given a top-level
+    Nix expression e, the attribute path `xorg.xorgserver` would cause
+    the expression `e.xorg.xorgserver` to be used. See [`nix-env
+            --install`](#refsec-nix-env-install-examples) for some concrete
+    examples.
+    
+    In addition to attribute names, you can also specify array indices.
+    For instance, the attribute path `foo.3.bar` selects the `bar`
+    attribute of the fourth element of the array in the `foo` attribute
+    of the top-level expression.
+
+  - `--expr` / `-E`  
+    Interpret the command line arguments as a list of Nix expressions to
+    be parsed and evaluated, rather than as a list of file names of Nix
+    expressions. (`nix-instantiate`, `nix-build` and `nix-shell` only.)
+    
+    For `nix-shell`, this option is commonly used to give you a shell in
+    which you can build the packages returned by the expression. If you
+    want to get a shell which contain the *built* packages ready for
+    use, give your expression to the `nix-shell -p` convenience flag
+    instead.
+
+  - `-I` path  
+    Add a path to the Nix expression search path. This option may be
+    given multiple times. See the NIX\_PATH\</literal\> environment
+    variable for information on the semantics of the Nix search path.
+    Paths added through `-I` take precedence over `NIX_PATH`.
+
+  - `--option` name value  
+    Set the Nix configuration option name to value. This overrides
+    settings in the Nix configuration file (see nix.conf5).
+
+  - `--repair`  
+    Fix corrupted or missing store paths by redownloading or rebuilding
+    them. Note that this is slow because it requires computing a
+    cryptographic hash of the contents of every path in the closure of
+    the build. Also note the warning under `nix-store --repair-path`.
diff --git a/doc/manual/src/expressions/advanced-attributes.md b/doc/manual/src/expressions/advanced-attributes.md
index 683b504a7..01e18513d 100644
--- a/doc/manual/src/expressions/advanced-attributes.md
+++ b/doc/manual/src/expressions/advanced-attributes.md
@@ -87,7 +87,7 @@ Derivations can declare some infrequently used optional attributes.
         impureEnvVars = [ "http_proxy" "https_proxy" ... ];
     
     to make it use the proxy server configuration specified by the user
-    in the environment variables http\_proxy and friends.
+    in the environment variables `http_proxy` and friends.
     
     This attribute is only allowed in [fixed-output
     derivations](#fixed-output-drvs), where impurities such as these are
@@ -201,15 +201,15 @@ Derivations can declare some infrequently used optional attributes.
         
     ```
     
-    then when the builder runs, the environment variable bigPath will
+    then when the builder runs, the environment variable `bigPath` will
     contain the absolute path to a temporary file containing `a very
     long
                     string`. That is, for any attribute x listed in `passAsFile`, Nix
-    will pass an environment variable xPath holding the path of the file
-    containing the value of attribute x. This is useful when you need to
-    pass large strings to a builder, since most operating systems impose
-    a limit on the size of the environment (typically, a few hundred
-    kilobyte).
+    will pass an environment variable `xPath` holding the path of the
+    file containing the value of attribute x. This is useful when you
+    need to pass large strings to a builder, since most operating
+    systems impose a limit on the size of the environment (typically, a
+    few hundred kilobyte).
 
   - `preferLocalBuild`  
     If this attribute is set to `true` and [distributed building is
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
index 256a5cd44..a359ebc46 100644
--- a/doc/manual/src/expressions/build-script.md
+++ b/doc/manual/src/expressions/build-script.md
@@ -19,29 +19,29 @@ what a builder does. It performs the following steps:
 
   - When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the derivation).
-    For instance, the PATH variable is empty\[1\]. This is done to
+    For instance, the `PATH` variable is empty\[1\]. This is done to
     prevent undeclared inputs from being used in the build process. If
-    for example the PATH contained `/usr/bin`, then you might
+    for example the `PATH` contained `/usr/bin`, then you might
     accidentally use `/usr/bin/gcc`.
     
     So the first step is to set up the environment. This is done by
     calling the `setup` script of the standard environment. The
-    environment variable stdenv points to the location of the standard
+    environment variable `stdenv` points to the location of the standard
     environment being used. (It wasn't specified explicitly as an
     attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
     automatically.)
 
   - Since Hello needs Perl, we have to make sure that Perl is in the
-    PATH. The perl environment variable points to the location of the
-    Perl package (since it was passed in as an attribute to the
+    `PATH`. The `perl` environment variable points to the location of
+    the Perl package (since it was passed in as an attribute to the
     derivation), so `$perl/bin` is the directory containing the Perl
     interpreter.
 
   - Now we have to unpack the sources. The `src` attribute was bound to
     the result of fetching the Hello source tarball from the network, so
-    the src environment variable points to the location in the Nix store
-    to which the tarball was downloaded. After unpacking, we `cd` to the
-    resulting source directory.
+    the `src` environment variable points to the location in the Nix
+    store to which the tarball was downloaded. After unpacking, we `cd`
+    to the resulting source directory.
     
     The whole build is performed in a temporary directory created in
     `/tmp`, by the way. This directory is removed after the builder
@@ -55,13 +55,13 @@ what a builder does. It performs the following steps:
     separate location in the Nix store, for instance
     `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
     computes this path by cryptographically hashing all attributes of
-    the derivation. The path is passed to the builder through the out
+    the derivation. The path is passed to the builder through the `out`
     environment variable. So here we give `configure` the parameter
     `--prefix=$out` to cause Hello to be installed in the expected
     location.
 
   - Finally we build Hello (`make`) and install it into the location
-    specified by out (`make install`).
+    specified by `out` (`make install`).
 
 If you are wondering about the absence of error checking on the result
 of various commands called in the builder: this is because the shell
diff --git a/doc/manual/src/expressions/builder-syntax.md b/doc/manual/src/expressions/builder-syntax.md
index c92acf106..916159d40 100644
--- a/doc/manual/src/expressions/builder-syntax.md
+++ b/doc/manual/src/expressions/builder-syntax.md
@@ -19,29 +19,29 @@ what a builder does. It performs the following steps:
 
   - When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the derivation).
-    For instance, the PATH variable is empty\[1\]. This is done to
+    For instance, the `PATH` variable is empty\[1\]. This is done to
     prevent undeclared inputs from being used in the build process. If
-    for example the PATH contained `/usr/bin`, then you might
+    for example the `PATH` contained `/usr/bin`, then you might
     accidentally use `/usr/bin/gcc`.
     
     So the first step is to set up the environment. This is done by
     calling the `setup` script of the standard environment. The
-    environment variable stdenv points to the location of the standard
+    environment variable `stdenv` points to the location of the standard
     environment being used. (It wasn't specified explicitly as an
     attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
     automatically.)
 
   - Since Hello needs Perl, we have to make sure that Perl is in the
-    PATH. The perl environment variable points to the location of the
-    Perl package (since it was passed in as an attribute to the
+    `PATH`. The `perl` environment variable points to the location of
+    the Perl package (since it was passed in as an attribute to the
     derivation), so `$perl/bin` is the directory containing the Perl
     interpreter.
 
   - Now we have to unpack the sources. The `src` attribute was bound to
     the result of fetching the Hello source tarball from the network, so
-    the src environment variable points to the location in the Nix store
-    to which the tarball was downloaded. After unpacking, we `cd` to the
-    resulting source directory.
+    the `src` environment variable points to the location in the Nix
+    store to which the tarball was downloaded. After unpacking, we `cd`
+    to the resulting source directory.
     
     The whole build is performed in a temporary directory created in
     `/tmp`, by the way. This directory is removed after the builder
@@ -55,13 +55,13 @@ what a builder does. It performs the following steps:
     separate location in the Nix store, for instance
     `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
     computes this path by cryptographically hashing all attributes of
-    the derivation. The path is passed to the builder through the out
+    the derivation. The path is passed to the builder through the `out`
     environment variable. So here we give `configure` the parameter
     `--prefix=$out` to cause Hello to be installed in the expected
     location.
 
   - Finally we build Hello (`make`) and install it into the location
-    specified by out (`make install`).
+    specified by `out` (`make install`).
 
 If you are wondering about the absence of error checking on the result
 of various commands called in the builder: this is because the shell
diff --git a/doc/manual/src/expressions/derivations.md b/doc/manual/src/expressions/derivations.md
index 7ffc6fabe..a4df20baa 100644
--- a/doc/manual/src/expressions/derivations.md
+++ b/doc/manual/src/expressions/derivations.md
@@ -83,32 +83,32 @@ as a command-line argument. See the Nixpkgs manual for details.
 The builder is executed as follows:
 
   - A temporary directory is created under the directory specified by
-    TMPDIR (default `/tmp`) where the build will take place. The current
-    directory is changed to this directory.
+    `TMPDIR` (default `/tmp`) where the build will take place. The
+    current directory is changed to this directory.
 
   - The environment is cleared and set to the derivation attributes, as
     specified above.
 
   - In addition, the following variables are set:
     
-      - NIX\_BUILD\_TOP contains the path of the temporary directory for
+      - `NIX_BUILD_TOP` contains the path of the temporary directory for
         this build.
     
-      - Also, TMPDIR, TEMPDIR, TMP, TEMP are set to point to the
+      - Also, `TMPDIR`, `TEMPDIR`, `TMP`, `TEMP` are set to point to the
         temporary directory. This is to prevent the builder from
         accidentally writing temporary files anywhere else. Doing so
         might cause interference by other processes.
     
-      - PATH is set to `/path-not-set` to prevent shells from
+      - `PATH` is set to `/path-not-set` to prevent shells from
         initialising it to their built-in default value.
     
-      - HOME is set to `/homeless-shelter` to prevent programs from
+      - `HOME` is set to `/homeless-shelter` to prevent programs from
         using `/etc/passwd` or the like to find the user's home
-        directory, which could cause impurity. Usually, when HOME is
+        directory, which could cause impurity. Usually, when `HOME` is
         set, it is used as the location of the home directory, even if
         it points to a non-existent path.
     
-      - NIX\_STORE is set to the path of the top-level Nix store
+      - `NIX_STORE` is set to the path of the top-level Nix store
         directory (typically, `/nix/store`).
     
       - For each output declared in `outputs`, the corresponding
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
index cbc484199..a00b08b55 100644
--- a/doc/manual/src/expressions/generic-builder.md
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -22,9 +22,9 @@ build facilities in shown in [example\_title](#ex-hello-builder2).
     
     genericBuild 
 
-  - The buildInputs variable tells `setup` to use the indicated packages
-    as “inputs”. This means that if a package provides a `bin`
-    subdirectory, it's added to PATH; if it has a `include`
+  - The `buildInputs` variable tells `setup` to use the indicated
+    packages as “inputs”. This means that if a package provides a `bin`
+    subdirectory, it's added to `PATH`; if it has a `include`
     subdirectory, it's added to GCC's header search path; and so
     on.\[1\]
 
@@ -37,7 +37,7 @@ build facilities in shown in [example\_title](#ex-hello-builder2).
     It can be customised in many ways; see the Nixpkgs manual for
     details.
 
-Discerning readers will note that the buildInputs could just as well
+Discerning readers will note that the `buildInputs` could just as well
 have been set in the Nix expression, like this:
 
 ``` 
@@ -57,5 +57,6 @@ entirely.
 1.  How does it work? `setup` tries to source the file
     `pkg/nix-support/setup-hook` of all dependencies. These “setup
     hooks” can then set up whatever environment variables they want;
-    for instance, the setup hook for Perl sets the PERL5LIB environment
-    variable to contain the `lib/site_perl` directories of all inputs.
+    for instance, the setup hook for Perl sets the `PERL5LIB`
+    environment variable to contain the `lib/site_perl` directories of
+    all inputs.
diff --git a/doc/manual/src/expressions/language-values.md b/doc/manual/src/expressions/language-values.md
index 98ad97c97..fac0be47e 100644
--- a/doc/manual/src/expressions/language-values.md
+++ b/doc/manual/src/expressions/language-values.md
@@ -120,8 +120,8 @@ Nix has the following basic data types:
     
     Paths can also be specified between angle brackets, e.g.
     `<nixpkgs>`. This means that the directories listed in the
-    environment variable NIX\_PATH will be searched for the given file
-    or directory name.
+    environment variable NIX\_PATH\</literal\> will be searched for the
+    given file or directory name.
 
   - *Booleans* with values `true` and `false`.
 
diff --git a/doc/manual/src/expressions/simple-building-testing.md b/doc/manual/src/expressions/simple-building-testing.md
index bc064c733..c3e8d7f82 100644
--- a/doc/manual/src/expressions/simple-building-testing.md
+++ b/doc/manual/src/expressions/simple-building-testing.md
@@ -32,7 +32,7 @@ of the build will be safely kept on your system. You can use
 
 Nix has transactional semantics. Once a build finishes successfully, Nix
 makes a note of this in its database: it registers that the path denoted
-by out is now “valid”. If you try to build the derivation again, Nix
+by `out` is now “valid”. If you try to build the derivation again, Nix
 will see that the path is already valid and finish immediately. If a
 build fails, either because it returns a non-zero exit code, because Nix
 or the builder are killed, or because the machine crashes, then the
diff --git a/doc/manual/src/installation/env-variables.md b/doc/manual/src/installation/env-variables.md
index 7946ac437..6e78245c9 100644
--- a/doc/manual/src/installation/env-variables.md
+++ b/doc/manual/src/installation/env-variables.md
@@ -1,7 +1,7 @@
 # Environment Variables
 
 To use Nix, some environment variables should be set. In particular,
-PATH should contain the directories `prefix/bin` and
+`PATH` should contain the directories `prefix/bin` and
 `~/.nix-profile/bin`. The first directory contains the Nix tools
 themselves, while `~/.nix-profile` is a symbolic link to the current
 *user environment* (an automatically generated package consisting of
@@ -12,13 +12,13 @@ this:
 
     source prefix/etc/profile.d/nix.sh
 
-# NIX\_SSL\_CERT\_FILE
+# `NIX_SSL_CERT_FILE`
 
 If you need to specify a custom certificate bundle to account for an
 HTTPS-intercepting man in the middle proxy, you must specify the path to
-the certificate bundle in the environment variable NIX\_SSL\_CERT\_FILE.
+the certificate bundle in the environment variable `NIX_SSL_CERT_FILE`.
 
-If you don't specify a NIX\_SSL\_CERT\_FILE manually, Nix will install
+If you don't specify a `NIX_SSL_CERT_FILE` manually, Nix will install
 and use its own certificate bundle.
 
 Set the environment variable and install Nix
@@ -36,7 +36,7 @@ In the shell profile and rc files (for example, `/etc/bashrc`,
 > You must not add the export and then do the install, as the Nix
 > installer will detect the presense of Nix configuration, and abort.
 
-## NIX\_SSL\_CERT\_FILE with macOS and the Nix daemon
+## `NIX_SSL_CERT_FILE` with macOS and the Nix daemon
 
 On macOS you must specify the environment variable for the Nix daemon
 service, then restart it:
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md
index d4e412e67..6983452d3 100644
--- a/doc/manual/src/installation/installing-binary.md
+++ b/doc/manual/src/installation/installing-binary.md
@@ -34,8 +34,8 @@ manually create `/nix` first as root, e.g.:
 The install script will modify the first writable file from amongst
 `.bash_profile`, `.bash_login` and `.profile` to source
 `~/.nix-profile/etc/profile.d/nix.sh`. You can set the
-NIX\_INSTALLER\_NO\_MODIFY\_PROFILE environment variable before
-executing the install script to disable this behaviour.
+`NIX_INSTALLER_NO_MODIFY_PROFILE` environment variable before executing
+the install script to disable this behaviour.
 
 You can uninstall Nix simply by running:
 
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/src/installation/multi-user.md
index 17286fdc5..6493e717b 100644
--- a/doc/manual/src/installation/multi-user.md
+++ b/doc/manual/src/installation/multi-user.md
@@ -43,7 +43,7 @@ The [Nix daemon](#sec-nix-daemon) should be started as follows (as
 You’ll want to put that line somewhere in your system’s boot scripts.
 
 To let unprivileged users use the daemon, they should set the
-[NIX\_REMOTE environment variable](#envar-remote) to `daemon`. So you
+[`NIX_REMOTE` environment variable](#envar-remote) to `daemon`. So you
 should put a line like
 
     export NIX_REMOTE=daemon
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
index f5c550fd7..04dad3339 100644
--- a/doc/manual/src/package-management/basic-package-mgmt.md
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -8,10 +8,10 @@ In Nix, different users can have different “views” on the set of
 installed applications. That is, there might be lots of applications
 present on the system (possibly in many different versions), but users
 can have a specific selection of those active — where “active” just
-means that it appears in a directory in the user’s PATH. Such a view on
-the set of installed applications is called a *user environment*, which
-is just a directory tree consisting of symlinks to the files of the
-active applications.
+means that it appears in a directory in the user’s `PATH`. Such a view
+on the set of installed applications is called a *user environment*,
+which is just a directory tree consisting of symlinks to the files of
+the active applications.
 
 Components are installed from a set of *Nix expressions* that tell Nix
 how to build those packages, including, if necessary, their
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
index c46adf538..984afca55 100644
--- a/doc/manual/src/package-management/profiles.md
+++ b/doc/manual/src/package-management/profiles.md
@@ -24,9 +24,9 @@ Of course, you wouldn’t want to type
     $ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn
 
 every time you want to run Subversion. Of course we could set up the
-PATH environment variable to include the `bin` directory of every
+`PATH` environment variable to include the `bin` directory of every
 package we want to use, but this is not very convenient since changing
-PATH doesn’t take effect for already existing processes. The solution
+`PATH` doesn’t take effect for already existing processes. The solution
 Nix uses is to create directory trees of symlinks to *activated*
 packages. These are called *user environments* and they are packages
 themselves (though automatically generated by `nix-env`), so they too
@@ -89,9 +89,9 @@ also see all available generations:
     $ nix-env --list-generations
 
 You generally wouldn’t have `/nix/var/nix/profiles/some-profile/bin` in
-your PATH. Rather, there is a symlink `~/.nix-profile` that points to
+your `PATH`. Rather, there is a symlink `~/.nix-profile` that points to
 your current profile. This means that you should put
-`~/.nix-profile/bin` in your PATH (and indeed, that’s what the
+`~/.nix-profile/bin` in your `PATH` (and indeed, that’s what the
 initialisation script `/nix/etc/profile.d/nix.sh` does). This makes it
 easier to switch to a different profile. You can do that using the
 command `nix-env --switch-profile`:
diff --git a/doc/manual/src/release-notes/rl-0.10.md b/doc/manual/src/release-notes/rl-0.10.md
index bf0e59fad..07b19ff05 100644
--- a/doc/manual/src/release-notes/rl-0.10.md
+++ b/doc/manual/src/release-notes/rl-0.10.md
@@ -124,8 +124,8 @@
             URL` allows a package to be installed directly from the given URL.
 
   - Nix now works behind an HTTP proxy server; just set the standard
-    environment variables http\_proxy, https\_proxy, ftp\_proxy or
-    all\_proxy appropriately. Functions such as `fetchurl` in Nixpkgs
+    environment variables `http_proxy`, `https_proxy`, `ftp_proxy` or
+    `all_proxy` appropriately. Functions such as `fetchurl` in Nixpkgs
     also respect these variables.
 
   - `nix-build -o
diff --git a/doc/manual/src/release-notes/rl-0.12.md b/doc/manual/src/release-notes/rl-0.12.md
index 0dc727b69..aaecfbb70 100644
--- a/doc/manual/src/release-notes/rl-0.12.md
+++ b/doc/manual/src/release-notes/rl-0.12.md
@@ -33,7 +33,7 @@
     (remote) Nix stores mounted somewhere in the filesystem. For
     instance, you can speed up an installation by mounting some remote
     Nix store that already has the packages in question via NFS or
-    `sshfs`. The environment variable NIX\_OTHER\_STORES specifies the
+    `sshfs`. The environment variable `NIX_OTHER_STORES` specifies the
     locations of the remote Nix directories, e.g. `/mnt/remote-fs/nix`.
 
   - New `nix-store` operations `--dump-db` and `--load-db` to dump and
@@ -111,7 +111,7 @@
         (integer multiplication), `builtins.div` (integer division).
 
   - `nix-prefetch-url` now supports `mirror://` URLs, provided that the
-    environment variable NIXPKGS\_ALL points at a Nixpkgs tree.
+    environment variable `NIXPKGS_ALL` points at a Nixpkgs tree.
 
   - Removed the commands `nix-pack-closure` and `nix-unpack-closure`.
     You can do almost the same thing but much more efficiently by doing
diff --git a/doc/manual/src/release-notes/rl-0.16.md b/doc/manual/src/release-notes/rl-0.16.md
index 121bbde28..79074fcdc 100644
--- a/doc/manual/src/release-notes/rl-0.16.md
+++ b/doc/manual/src/release-notes/rl-0.16.md
@@ -14,7 +14,7 @@ This release has the following improvements:
     performed in parallel was not configurable. Nix now has an option
     `--cores
                             N` as well as a configuration setting `build-cores =
-                            N` that causes the environment variable NIX\_BUILD\_CORES to be set
+                            N` that causes the environment variable `NIX_BUILD_CORES` to be set
     to N when the builder is invoked. The builder can use this at its
     discretion to perform a parallel build, e.g., by calling `make -j
                             N`. In Nixpkgs, this can be enabled on a per-package basis by
diff --git a/doc/manual/src/release-notes/rl-1.0.md b/doc/manual/src/release-notes/rl-1.0.md
index 025f827d9..cdb257787 100644
--- a/doc/manual/src/release-notes/rl-1.0.md
+++ b/doc/manual/src/release-notes/rl-1.0.md
@@ -14,7 +14,7 @@ release. Here are the most significant:
     significant speedup.
 
   - Nix now has an search path for expressions. The search path is set
-    using the environment variable NIX\_PATH and the `-I` command line
+    using the environment variable `NIX_PATH` and the `-I` command line
     option. In Nix expressions, paths between angle brackets are used to
     specify files that must be looked up in the search path. For
     instance, the expression `<nixpkgs/default.nix>` looks for a file
diff --git a/doc/manual/src/release-notes/rl-1.2.md b/doc/manual/src/release-notes/rl-1.2.md
index e62b2dac9..25b830955 100644
--- a/doc/manual/src/release-notes/rl-1.2.md
+++ b/doc/manual/src/release-notes/rl-1.2.md
@@ -77,7 +77,7 @@ This release has the following improvements and changes:
     about twice as fast.
 
   - Basic Nix expression evaluation profiling: setting the environment
-    variable NIX\_COUNT\_CALLS to `1` will cause Nix to print how many
+    variable `NIX_COUNT_CALLS` to `1` will cause Nix to print how many
     times each primop or function was executed.
 
   - New primops: `concatLists`, `elem`, `elemAt` and `filter`.
diff --git a/doc/manual/src/release-notes/rl-1.6.md b/doc/manual/src/release-notes/rl-1.6.md
index a4583f4e6..9b83d9274 100644
--- a/doc/manual/src/release-notes/rl-1.6.md
+++ b/doc/manual/src/release-notes/rl-1.6.md
@@ -13,7 +13,7 @@ features:
     get an environment that more closely corresponds to the “real” Nix
     build.
 
-  - `nix-shell` now sets the shell prompt (PS1) to ensure that Nix
+  - `nix-shell` now sets the shell prompt (`PS1`) to ensure that Nix
     shells are distinguishable from your regular shells.
 
   - `nix-env` no longer requires a `*` argument to match all packages,
diff --git a/doc/manual/src/release-notes/rl-1.8.md b/doc/manual/src/release-notes/rl-1.8.md
index 10a82d52a..59af363e8 100644
--- a/doc/manual/src/release-notes/rl-1.8.md
+++ b/doc/manual/src/release-notes/rl-1.8.md
@@ -76,7 +76,7 @@
     them anyway.
 
   - Various commands now automatically pipe their output into the pager
-    as specified by the PAGER environment variable.
+    as specified by the `PAGER` environment variable.
 
   - Several improvements to reduce memory consumption in the evaluator.
 
diff --git a/doc/manual/src/release-notes/rl-1.9.md b/doc/manual/src/release-notes/rl-1.9.md
index 01b067aab..92c6af90b 100644
--- a/doc/manual/src/release-notes/rl-1.9.md
+++ b/doc/manual/src/release-notes/rl-1.9.md
@@ -39,8 +39,8 @@ features:
         This builds GNU Hello from the latest revision of the Nixpkgs
         master branch.
     
-      - In the Nix search path (as specified via NIX\_PATH or `-I`). For
-        example, to start a shell containing the Pan package from a
+      - In the Nix search path (as specified via `NIX_PATH` or `-I`).
+        For example, to start a shell containing the Pan package from a
         specific version of Nixpkgs:
         
             $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
@@ -124,8 +124,8 @@ features:
   - `nix-env` now only creates a new “generation” symlink in
     `/nix/var/nix/profiles` if something actually changed.
 
-  - The environment variable NIX\_PAGER can now be set to override
-    PAGER. You can set it to `cat` to disable paging for Nix commands
+  - The environment variable `NIX_PAGER` can now be set to override
+    `PAGER`. You can set it to `cat` to disable paging for Nix commands
     only.
 
   - Failing `<...>` lookups now show position information.
diff --git a/doc/manual/src/release-notes/rl-2.0.md b/doc/manual/src/release-notes/rl-2.0.md
index 0ce985b2f..170275f89 100644
--- a/doc/manual/src/release-notes/rl-2.0.md
+++ b/doc/manual/src/release-notes/rl-2.0.md
@@ -18,7 +18,7 @@ The following incompatible changes have been made:
       - `bspatch`
 
   - The “copy from other stores” substituter mechanism
-    (`copy-from-other-stores` and the NIX\_OTHER\_STORES environment
+    (`copy-from-other-stores` and the `NIX_OTHER_STORES` environment
     variable) has been removed. It was primarily used by the NixOS
     installer to copy available paths from the installation medium. The
     replacement is to use a chroot store as a substituter (e.g.
@@ -233,7 +233,7 @@ This release has the following new features:
         store, the latter via the Nix daemon. You can use `auto` or the
         empty string to auto-select a local or daemon store depending on
         whether you have write permission to the Nix store. It is no
-        longer necessary to set the NIX\_REMOTE environment variable to
+        longer necessary to set the `NIX_REMOTE` environment variable to
         use the Nix daemon.
         
         As noted above, `LocalStore` now supports chroot builds,
@@ -296,7 +296,7 @@ This release has the following new features:
         [now](https://github.com/NixOS/nix/commit/eba840c8a13b465ace90172ff76a0db2899ab11b)
         use `/build` instead of `/tmp` as the temporary build directory.
         This fixes potential security problems when a build accidentally
-        stores its TMPDIR in some security-sensitive place, such as an
+        stores its `TMPDIR` in some security-sensitive place, such as an
         RPATH.
 
   - *Pure evaluation mode*. With the `--pure-eval` flag, Nix enables a
@@ -334,8 +334,8 @@ This release has the following new features:
     using the Nix daemon, you can now just specify a remote build
     machine on the command line, e.g. `--option builders
                     'ssh://my-mac x86_64-darwin'`. The environment variable
-    NIX\_BUILD\_HOOK has been removed and is no longer needed. The
-    environment variable NIX\_REMOTE\_SYSTEMS is still supported for
+    `NIX_BUILD_HOOK` has been removed and is no longer needed. The
+    environment variable `NIX_REMOTE_SYSTEMS` is still supported for
     compatibility, but it is also possible to specify builders in
     `nix.conf` by setting the option `builders =
                     @path`.
@@ -353,7 +353,7 @@ This release has the following new features:
     Nixpkgs provides `lib.inNixShell` to check this variable during
     evaluation.
 
-  - NIX\_PATH is now lazy, so URIs in the path are only downloaded if
+  - `NIX_PATH` is now lazy, so URIs in the path are only downloaded if
     they are needed for evaluation.
 
   - You can now use <channel:> as a short-hand for
@@ -406,7 +406,7 @@ This release has the following new features:
     non-standard base-32.
 
   - `nix-shell` now uses `bashInteractive` from Nixpkgs, rather than the
-    `bash` command that happens to be in the caller’s PATH. This is
+    `bash` command that happens to be in the caller’s `PATH`. This is
     especially important on macOS where the `bash` provided by the
     system is seriously outdated and cannot execute `stdenv`’s setup
     script.
@@ -433,7 +433,7 @@ The Nix language has the following new features:
     
         configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"}";
     
-    will cause the configureFlags environment variable to contain the
+    will cause the `configureFlags` environment variable to contain the
     actual store paths corresponding to the `out` and `dev` outputs.
 
 The following builtin functions are new or extended:
@@ -481,23 +481,23 @@ The Nix build environment has the following changes:
     be passed to builders in a non-lossy way. If the special attribute
     `__structuredAttrs` is set to `true`, the other derivation
     attributes are serialised in JSON format and made available to the
-    builder via the file .attrs.json in the builder’s temporary
+    builder via the file `.attrs.json` in the builder’s temporary
     directory. This obviates the need for `passAsFile` since JSON files
     have no size restrictions, unlike process environments.
     
     [As a convenience to Bash
     builders](https://github.com/NixOS/nix/commit/2d5b1b24bf70a498e4c0b378704cfdb6471cc699),
-    Nix writes a script named .attrs.sh to the builder’s directory that
-    initialises shell variables corresponding to all attributes that are
-    representable in Bash. This includes non-nested (associative)
-    arrays. For example, the attribute `hardening.format =
+    Nix writes a script named `.attrs.sh` to the builder’s directory
+    that initialises shell variables corresponding to all attributes
+    that are representable in Bash. This includes non-nested
+    (associative) arrays. For example, the attribute `hardening.format =
                     true` ends up as the Bash associative array element
     `${hardening[format]}`.
 
   - Builders can
     [now](https://github.com/NixOS/nix/commit/88e6bb76de5564b3217be9688677d1c89101b2a3)
     communicate what build phase they are in by writing messages to the
-    file descriptor specified in NIX\_LOG\_FD. The current phase is
+    file descriptor specified in `NIX_LOG_FD`. The current phase is
     shown by the `nix` progress indicator.
 
   - In Linux sandbox builds, we
diff --git a/doc/manual/src/release-notes/rl-2.2.md b/doc/manual/src/release-notes/rl-2.2.md
index 3667a48dc..b67d65db7 100644
--- a/doc/manual/src/release-notes/rl-2.2.md
+++ b/doc/manual/src/release-notes/rl-2.2.md
@@ -69,7 +69,7 @@ This is primarily a bug fix release. It also has the following changes:
   - Integers are now 64 bits on all platforms.
 
   - The evaluator now prints profiling statistics (enabled via the
-    NIX\_SHOW\_STATS and NIX\_COUNT\_CALLS environment variables) in
+    `NIX_SHOW_STATS` and `NIX_COUNT_CALLS` environment variables) in
     JSON format.
 
   - The option `--xml` in `nix-store
diff --git a/doc/manual/src/release-notes/rl-2.3.md b/doc/manual/src/release-notes/rl-2.3.md
index a4bb6ebb0..d1f4e3734 100644
--- a/doc/manual/src/release-notes/rl-2.3.md
+++ b/doc/manual/src/release-notes/rl-2.3.md
@@ -25,7 +25,7 @@ It also has the following changes:
     line in the progress bar. To distinguish between concurrent builds,
     log lines are prefixed by the name of the package.
 
-  - Builds are now executed in a pseudo-terminal, and the TERM
+  - Builds are now executed in a pseudo-terminal, and the `TERM`
     environment variable is set to `xterm-256color`. This allows many
     programs (e.g. `gcc`, `clang`, `cmake`) to print colorized log
     output.

From efdb89994c2ee79763320d70fb4ba881d0e3b1e8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 10:56:15 +0200
Subject: [PATCH 016/176] Convert nix.conf manpage

---
 doc/manual/command-ref/conf-file.xml    |  43 +-
 doc/manual/local.mk                     |   6 +-
 doc/manual/src/SUMMARY.md               |   2 +
 doc/manual/src/command-ref/conf-file.md | 727 ++++++++++++++++++++++++
 doc/manual/src/command-ref/files.md     |   4 +
 5 files changed, 763 insertions(+), 19 deletions(-)
 create mode 100644 doc/manual/src/command-ref/conf-file.md
 create mode 100644 doc/manual/src/command-ref/files.md

diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index ff9c7d46c..4c103f505 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -21,28 +21,35 @@
 
 <para>By default Nix reads settings from the following places:</para>
 
-<para>The system-wide configuration file
-<filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>
-(i.e. <filename>/etc/nix/nix.conf</filename> on most systems), or
-<filename>$NIX_CONF_DIR/nix.conf</filename> if
-<literal>NIX_CONF_DIR</literal> is set. Values loaded in this file are not forwarded to the Nix daemon. The
-client assumes that the daemon has already loaded them.
-</para>
+<itemizedlist>
 
-<para>User-specific configuration files:</para>
+  <listitem>
+    <para>
+      The system-wide configuration file
+      <filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>
+      (i.e. <filename>/etc/nix/nix.conf</filename> on most systems),
+      or <filename>$NIX_CONF_DIR/nix.conf</filename> if
+      <literal>NIX_CONF_DIR</literal> is set. Values loaded in this
+      file are not forwarded to the Nix daemon. The client assumes
+      that the daemon has already loaded them.
+    </para>
+  </listitem>
 
-<para>
-  If <literal>NIX_USER_CONF_FILES</literal> is set, then each path separated by
-  <literal>:</literal> will be loaded in reverse order.
-</para>
+  <listitem>
+    <para>
+      If <literal>NIX_USER_CONF_FILES</literal> is set, then each path separated by
+      <literal>:</literal> will be loaded in reverse order.
+    </para>
 
-<para>
-  Otherwise it will look for <filename>nix/nix.conf</filename> files in
-  <literal>XDG_CONFIG_DIRS</literal> and <literal>XDG_CONFIG_HOME</literal>.
+    <para>
+      Otherwise it will look for <filename>nix/nix.conf</filename>
+      files in <literal>XDG_CONFIG_DIRS</literal> and
+      <literal>XDG_CONFIG_HOME</literal>.  If these are unset, it will
+      look in <filename>$HOME/.config/nix.conf</filename>.
+    </para>
+  </listitem>
 
-  The default location is <filename>$HOME/.config/nix.conf</filename> if
-  those environment variables are unset.
-</para>
+</itemizedlist>
 
 <para>The configuration files consist of
 <literal><replaceable>name</replaceable> =
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 65acd658c..80c517702 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -12,7 +12,8 @@ dist-files += $(d)/version.txt
 
 # Generate man pages.
 man-pages := $(foreach n, \
-  nix-copy-closure.1, \
+  nix-copy-closure.1 \
+  nix.conf.5, \
   $(d)/$(n))
 #  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
 #  nix-collect-garbage.1, \
@@ -27,6 +28,9 @@ dist-files += $(man-pages)
 $(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
+$(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
+	$(trace-gen) lowdown -sT man $^ -o $@
+
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
 
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index f9ef1b060..e8baf489b 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -49,6 +49,8 @@
   - [Common Environment Variables](command-ref/env-common.md)
   - [Utilities](command-ref/utilities.md)
     - [nix-copy-closure](command-ref/nix-copy-closure.md)
+  - [Files](command-ref/files.md)
+    - [nix.conf](command-ref/conf-file.md)
 - [Glossary](glossary.md)
 - [Hacking](hacking.md)
 - [Release Notes](release-notes/release-notes.md)
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
new file mode 100644
index 000000000..3f84373e2
--- /dev/null
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -0,0 +1,727 @@
+nix.conf
+
+5
+
+Nix
+
+nix.conf
+
+Nix configuration file
+
+# Description
+
+By default Nix reads settings from the following places:
+
+  - The system-wide configuration file `sysconfdir/nix/nix.conf` (i.e.
+    `/etc/nix/nix.conf` on most systems), or `$NIX_CONF_DIR/nix.conf` if
+    `NIX_CONF_DIR` is set. Values loaded in this file are not forwarded
+    to the Nix daemon. The client assumes that the daemon has already
+    loaded them.
+
+  - If `NIX_USER_CONF_FILES` is set, then each path separated by `:`
+    will be loaded in reverse order.
+    
+    Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
+    and `XDG_CONFIG_HOME`. If these are unset, it will look in
+    `$HOME/.config/nix.conf`.
+
+The configuration files consist of `name =
+value` pairs, one per line. Other files can be included with a line like
+`include
+path`, where path is interpreted relative to the current conf file and a
+missing file is an error unless `!include` is used instead. Comments
+start with a `#` character. Here is an example configuration file:
+
+    keep-outputs = true       # Nice for developers
+    keep-derivations = true   # Idem
+
+You can override settings on the command line using the `--option` flag,
+e.g. `--option keep-outputs
+false`.
+
+The following settings are currently available:
+
+  - `allowed-uris`  
+    A list of URI prefixes to which access is allowed in restricted
+    evaluation mode. For example, when set to
+    `https://github.com/NixOS`, builtin functions such as `fetchGit` are
+    allowed to access `https://github.com/NixOS/patchelf.git`.
+
+  - `allow-import-from-derivation`  
+    By default, Nix allows you to `import` from a derivation, allowing
+    building at evaluation time. With this option set to false, Nix will
+    throw an error when evaluating an expression that uses this feature,
+    allowing users to ensure their evaluation will not require any
+    builds to take place.
+
+  - `allow-new-privileges`  
+    (Linux-specific.) By default, builders on Linux cannot acquire new
+    privileges by calling setuid/setgid programs or programs that have
+    file capabilities. For example, programs such as `sudo` or `ping`
+    will fail. (Note that in sandbox builds, no such programs are
+    available unless you bind-mount them into the sandbox via the
+    `sandbox-paths` option.) You can allow the use of such programs by
+    enabling this option. This is impure and usually undesirable, but
+    may be useful in certain scenarios (e.g. to spin up containers or
+    set up userspace network interfaces in tests).
+
+  - `allowed-users`  
+    A list of names of users (separated by whitespace) that are allowed
+    to connect to the Nix daemon. As with the `trusted-users` option,
+    you can specify groups by prefixing them with `@`. Also, you can
+    allow all users by specifying `*`. The default is `*`.
+    
+    Note that trusted users are always allowed to connect.
+
+  - `auto-optimise-store`  
+    If set to `true`, Nix automatically detects files in the store that
+    have identical contents, and replaces them with hard links to a
+    single copy. This saves disk space. If set to `false` (the default),
+    you can still run `nix-store
+                    --optimise` to get rid of duplicate files.
+
+  - `builders`  
+    A list of machines on which to perform builds. See
+    [???](#chap-distributed-builds) for details.
+
+  - `builders-use-substitutes`  
+    If set to `true`, Nix will instruct remote build machines to use
+    their own binary substitutes if available. In practical terms, this
+    means that remote hosts will fetch as many build dependencies as
+    possible from their own substitutes (e.g, from `cache.nixos.org`),
+    instead of waiting for this host to upload them all. This can
+    drastically reduce build times if the network connection between
+    this computer and the remote build host is slow. Defaults to
+    `false`.
+
+  - `build-users-group`  
+    This options specifies the Unix group containing the Nix build user
+    accounts. In multi-user Nix installations, builds should not be
+    performed by the Nix account since that would allow users to
+    arbitrarily modify the Nix store and database by supplying specially
+    crafted builders; and they cannot be performed by the calling user
+    since that would allow him/her to influence the build result.
+    
+    Therefore, if this option is non-empty and specifies a valid group,
+    builds will be performed under the user accounts that are a member
+    of the group specified here (as listed in `/etc/group`). Those user
+    accounts should not be used for any other purpose\!
+    
+    Nix will never run two builds under the same user account at the
+    same time. This is to prevent an obvious security hole: a malicious
+    user writing a Nix expression that modifies the build result of a
+    legitimate Nix expression being built by another user. Therefore it
+    is good to have as many Nix build user accounts as you can spare.
+    (Remember: uids are cheap.)
+    
+    The build users should have permission to create files in the Nix
+    store, but not delete them. Therefore, `/nix/store` should be owned
+    by the Nix account, its group should be the group specified here,
+    and its mode should be `1775`.
+    
+    If the build users group is empty, builds will be performed under
+    the uid of the Nix process (that is, the uid of the caller if
+    `NIX_REMOTE` is empty, the uid under which the Nix daemon runs if
+    `NIX_REMOTE` is `daemon`). Obviously, this should not be used in
+    multi-user settings with untrusted users.
+
+  - `compress-build-log`  
+    If set to `true` (the default), build logs written to
+    `/nix/var/log/nix/drvs` will be compressed on the fly using bzip2.
+    Otherwise, they will not be compressed.
+
+  - `connect-timeout`  
+    The timeout (in seconds) for establishing connections in the binary
+    cache substituter. It corresponds to `curl`’s `--connect-timeout`
+    option.
+
+  - `cores`  
+    Sets the value of the `NIX_BUILD_CORES` environment variable in the
+    invocation of builders. Builders can use this variable at their
+    discretion to control the maximum amount of parallelism. For
+    instance, in Nixpkgs, if the derivation attribute
+    `enableParallelBuilding` is set to `true`, the builder passes the
+    `-jN` flag to GNU Make. It can be overridden using the `--cores`
+    command line switch and defaults to `1`. The value `0` means that
+    the builder should use all available CPU cores in the system.
+    
+    See also [???](#chap-tuning-cores-and-jobs).
+
+  - `diff-hook`  
+    Absolute path to an executable capable of diffing build results. The
+    hook executes if [varlistentry\_title](#conf-run-diff-hook) is true,
+    and the output of a build is known to not be the same. This program
+    is not executed to determine if two results are the same.
+    
+    The diff hook is executed by the same user and group who ran the
+    build. However, the diff hook does not have write access to the
+    store path just built.
+    
+    The diff hook program receives three parameters:
+    
+    1.  A path to the previous build's results
+    
+    2.  A path to the current build's results
+    
+    3.  The path to the build's derivation
+    
+    4.  The path to the build's scratch directory. This directory will
+        exist only if the build was run with `--keep-failed`.
+    
+    The stderr and stdout output from the diff hook will not be
+    displayed to the user. Instead, it will print to the nix-daemon's
+    log.
+    
+    When using the Nix daemon, `diff-hook` must be set in the `nix.conf`
+    configuration file, and cannot be passed at the command line.
+
+  - `enforce-determinism`  
+    See [varlistentry\_title](#conf-repeat).
+
+  - `extra-sandbox-paths`  
+    A list of additional paths appended to `sandbox-paths`. Useful if
+    you want to extend its default value.
+
+  - `extra-platforms`  
+    Platforms other than the native one which this machine is capable of
+    building for. This can be useful for supporting additional
+    architectures on compatible machines: i686-linux can be built on
+    x86\_64-linux machines (and the default for this setting reflects
+    this); armv7 is backwards-compatible with armv6 and armv5tel; some
+    aarch64 machines can also natively run 32-bit ARM code; and
+    qemu-user may be used to support non-native platforms (though this
+    may be slow and buggy). Most values for this are not enabled by
+    default because build systems will often misdetect the target
+    platform and generate incompatible code, so you may wish to
+    cross-check the results of using this option against proper
+    natively-built versions of your derivations.
+
+  - `extra-substituters`  
+    Additional binary caches appended to those specified in
+    `substituters`. When used by unprivileged users, untrusted
+    substituters (i.e. those not listed in `trusted-substituters`) are
+    silently ignored.
+
+  - `fallback`  
+    If set to `true`, Nix will fall back to building from source if a
+    binary substitute fails. This is equivalent to the `--fallback`
+    flag. The default is `false`.
+
+  - `fsync-metadata`  
+    If set to `true`, changes to the Nix store metadata (in
+    `/nix/var/nix/db`) are synchronously flushed to disk. This improves
+    robustness in case of system crashes, but reduces performance. The
+    default is `true`.
+
+  - `hashed-mirrors`  
+    A list of web servers used by `builtins.fetchurl` to obtain files by
+    hash. The default is `http://tarballs.nixos.org/`. Given a hash type
+    ht and a base-16 hash h, Nix will try to download the file from
+    `hashed-mirror/ht/h`. This allows files to be downloaded even if
+    they have disappeared from their original URI. For example, given
+    the default mirror `http://tarballs.nixos.org/`, when building the
+    derivation
+    
+        builtins.fetchurl {
+          url = "https://example.org/foo-1.2.3.tar.xz";
+          sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
+        }
+    
+    Nix will attempt to download this file from
+    `http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae`
+    first. If it is not available there, if will try the original URI.
+
+  - `http-connections`  
+    The maximum number of parallel TCP connections used to fetch files
+    from binary caches and by other downloads. It defaults to 25. 0
+    means no limit.
+
+  - `keep-build-log`  
+    If set to `true` (the default), Nix will write the build log of a
+    derivation (i.e. the standard output and error of its builder) to
+    the directory `/nix/var/log/nix/drvs`. The build log can be
+    retrieved using the command `nix-store -l
+                    path`.
+
+  - `keep-derivations`  
+    If `true` (default), the garbage collector will keep the derivations
+    from which non-garbage store paths were built. If `false`, they will
+    be deleted unless explicitly registered as a root (or reachable from
+    other roots).
+    
+    Keeping derivation around is useful for querying and traceability
+    (e.g., it allows you to ask with what dependencies or options a
+    store path was built), so by default this option is on. Turn it off
+    to save a bit of disk space (or a lot if `keep-outputs` is also
+    turned on).
+
+  - `keep-env-derivations`  
+    If `false` (default), derivations are not stored in Nix user
+    environments. That is, the derivations of any build-time-only
+    dependencies may be garbage-collected.
+    
+    If `true`, when you add a Nix derivation to a user environment, the
+    path of the derivation is stored in the user environment. Thus, the
+    derivation will not be garbage-collected until the user environment
+    generation is deleted (`nix-env --delete-generations`). To prevent
+    build-time-only dependencies from being collected, you should also
+    turn on `keep-outputs`.
+    
+    The difference between this option and `keep-derivations` is that
+    this one is “sticky”: it applies to any user environment created
+    while this option was enabled, while `keep-derivations` only applies
+    at the moment the garbage collector is run.
+
+  - `keep-outputs`  
+    If `true`, the garbage collector will keep the outputs of
+    non-garbage derivations. If `false` (default), outputs will be
+    deleted unless they are GC roots themselves (or reachable from other
+    roots).
+    
+    In general, outputs must be registered as roots separately. However,
+    even if the output of a derivation is registered as a root, the
+    collector will still delete store paths that are used only at build
+    time (e.g., the C compiler, or source tarballs downloaded from the
+    network). To prevent it from doing so, set this option to `true`.
+
+  - `max-build-log-size`  
+    This option defines the maximum number of bytes that a builder can
+    write to its stdout/stderr. If the builder exceeds this limit, it’s
+    killed. A value of `0` (the default) means that there is no limit.
+
+  - `max-free`  
+    When a garbage collection is triggered by the `min-free` option, it
+    stops as soon as `max-free` bytes are available. The default is
+    infinity (i.e. delete all garbage).
+
+  - `max-jobs`  
+    This option defines the maximum number of jobs that Nix will try to
+    build in parallel. The default is `1`. The special value `auto`
+    causes Nix to use the number of CPUs in your system. `0` is useful
+    when using remote builders to prevent any local builds (except for
+    `preferLocalBuild` derivation attribute which executes locally
+    regardless). It can be overridden using the `--max-jobs` (`-j`)
+    command line switch.
+    
+    See also [???](#chap-tuning-cores-and-jobs).
+
+  - `max-silent-time`  
+    This option defines the maximum number of seconds that a builder can
+    go without producing any data on standard output or standard error.
+    This is useful (for instance in an automated build system) to catch
+    builds that are stuck in an infinite loop, or to catch remote builds
+    that are hanging due to network problems. It can be overridden using
+    the `--max-silent-time` command line switch.
+    
+    The value `0` means that there is no timeout. This is also the
+    default.
+
+  - `min-free`  
+    When free disk space in `/nix/store` drops below `min-free` during a
+    build, Nix performs a garbage-collection until `max-free` bytes are
+    available or there is no more garbage. A value of `0` (the default)
+    disables this feature.
+
+  - `narinfo-cache-negative-ttl`  
+    The TTL in seconds for negative lookups. If a store path is queried
+    from a substituter but was not found, there will be a negative
+    lookup cached in the local disk cache database for the specified
+    duration.
+
+  - `narinfo-cache-positive-ttl`  
+    The TTL in seconds for positive lookups. If a store path is queried
+    from a substituter, the result of the query will be cached in the
+    local disk cache database including some of the NAR metadata. The
+    default TTL is a month, setting a shorter TTL for positive lookups
+    can be useful for binary caches that have frequent garbage
+    collection, in which case having a more frequent cache invalidation
+    would prevent trying to pull the path again and failing with a hash
+    mismatch if the build isn't reproducible.
+
+  - `netrc-file`  
+    If set to an absolute path to a `netrc` file, Nix will use the HTTP
+    authentication credentials in this file when trying to download from
+    a remote host through HTTP or HTTPS. Defaults to
+    `$NIX_CONF_DIR/netrc`.
+    
+    The `netrc` file consists of a list of accounts in the following
+    format:
+    
+        machine my-machine
+        login my-username
+        password my-password
+    
+    For the exact syntax, see [the `curl`
+    documentation.](https://ec.haxx.se/usingcurl-netrc.html)
+    
+    > **Note**
+    > 
+    > This must be an absolute path, and `~` is not resolved. For
+    > example, `~/.netrc` won't resolve to your home directory's
+    > `.netrc`.
+
+  - `plugin-files`  
+    A list of plugin files to be loaded by Nix. Each of these files will
+    be dlopened by Nix, allowing them to affect execution through static
+    initialization. In particular, these plugins may construct static
+    instances of RegisterPrimOp to add new primops or constants to the
+    expression language, RegisterStoreImplementation to add new store
+    implementations, RegisterCommand to add new subcommands to the `nix`
+    command, and RegisterSetting to add new nix config settings. See the
+    constructors for those types for more details.
+    
+    Since these files are loaded into the same address space as Nix
+    itself, they must be DSOs compatible with the instance of Nix
+    running at the time (i.e. compiled against the same headers, not
+    linked to any incompatible libraries). They should not be linked to
+    any Nix libs directly, as those will be available already at load
+    time.
+    
+    If an entry in the list is a directory, all files in the directory
+    are loaded as plugins (non-recursively).
+
+  - `pre-build-hook`  
+    If set, the path to a program that can set extra derivation-specific
+    settings for this system. This is used for settings that can't be
+    captured by the derivation model itself and are too variable between
+    different versions of the same system to be hard-coded into nix.
+    
+    The hook is passed the derivation path and, if sandboxes are
+    enabled, the sandbox directory. It can then modify the sandbox and
+    send a series of commands to modify various settings to stdout. The
+    currently recognized commands are:
+    
+      - `extra-sandbox-paths`  
+        Pass a list of files and directories to be included in the
+        sandbox for this build. One entry per line, terminated by an
+        empty line. Entries have the same format as `sandbox-paths`.
+
+  - `post-build-hook`  
+    Optional. The path to a program to execute after each build.
+    
+    This option is only settable in the global `nix.conf`, or on the
+    command line by trusted users.
+    
+    When using the nix-daemon, the daemon executes the hook as `root`.
+    If the nix-daemon is not involved, the hook runs as the user
+    executing the nix-build.
+    
+      - The hook executes after an evaluation-time build.
+    
+      - The hook does not execute on substituted paths.
+    
+      - The hook's output always goes to the user's terminal.
+    
+      - If the hook fails, the build succeeds but no further builds
+        execute.
+    
+      - The hook executes synchronously, and blocks other builds from
+        progressing while it runs.
+    
+    The program executes with no arguments. The program's environment
+    contains the following environment variables:
+    
+      - `DRV_PATH`  
+        The derivation for the built paths.
+        
+        Example:
+        `/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3f-bash-4.4-p23.drv`
+    
+      - `OUT_PATHS`  
+        Output paths of the built derivation, separated by a space
+        character.
+        
+        Example:
+        `/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev
+                                                                                                        /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
+                                                                                                        /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
+                                                                                                        /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
+                                                                                                        /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`.
+    
+    See [???](#chap-post-build-hook) for an example implementation.
+
+  - `repeat`  
+    How many times to repeat builds to check whether they are
+    deterministic. The default value is 0. If the value is non-zero,
+    every build is repeated the specified number of times. If the
+    contents of any of the runs differs from the previous ones and
+    [varlistentry\_title](#conf-enforce-determinism) is true, the build
+    is rejected and the resulting store paths are not registered as
+    “valid” in Nix’s database.
+
+  - `require-sigs`  
+    If set to `true` (the default), any non-content-addressed path added
+    or copied to the Nix store (e.g. when substituting from a binary
+    cache) must have a valid signature, that is, be signed using one of
+    the keys listed in `trusted-public-keys` or `secret-key-files`. Set
+    to `false` to disable signature checking.
+
+  - `restrict-eval`  
+    If set to `true`, the Nix evaluator will not allow access to any
+    files outside of the Nix search path (as set via the `NIX_PATH`
+    environment variable or the `-I` option), or to URIs outside of
+    `allowed-uri`. The default is `false`.
+
+  - `run-diff-hook`  
+    If true, enable the execution of
+    [varlistentry\_title](#conf-diff-hook).
+    
+    When using the Nix daemon, `run-diff-hook` must be set in the
+    `nix.conf` configuration file, and cannot be passed at the command
+    line.
+
+  - `sandbox`  
+    If set to `true`, builds will be performed in a *sandboxed
+    environment*, i.e., they’re isolated from the normal file system
+    hierarchy and will only see their dependencies in the Nix store, the
+    temporary build directory, private versions of `/proc`, `/dev`,
+    `/dev/shm` and `/dev/pts` (on Linux), and the paths configured with
+    the [`sandbox-paths` option](#conf-sandbox-paths). This is useful to
+    prevent undeclared dependencies on files in directories such as
+    `/usr/bin`. In addition, on Linux, builds run in private PID, mount,
+    network, IPC and UTS namespaces to isolate them from other processes
+    in the system (except that fixed-output derivations do not run in
+    private network namespace to ensure they can access the network).
+    
+    Currently, sandboxing only work on Linux and macOS. The use of a
+    sandbox requires that Nix is run as root (so you should use the
+    [“build users” feature](#conf-build-users-group) to perform the
+    actual builds under different users than root).
+    
+    If this option is set to `relaxed`, then fixed-output derivations
+    and derivations that have the `__noChroot` attribute set to `true`
+    do not run in sandboxes.
+    
+    The default is `true` on Linux and `false` on all other platforms.
+
+  - `sandbox-dev-shm-size`  
+    This option determines the maximum size of the `tmpfs` filesystem
+    mounted on `/dev/shm` in Linux sandboxes. For the format, see the
+    description of the `size` option of `tmpfs` in mount8. The default
+    is `50%`.
+
+  - `sandbox-paths`  
+    A list of paths bind-mounted into Nix sandbox environments. You can
+    use the syntax `target=source` to mount a path in a different
+    location in the sandbox; for instance, `/bin=/nix-bin` will mount
+    the path `/nix-bin` as `/bin` inside the sandbox. If source is
+    followed by `?`, then it is not an error if source does not exist;
+    for example, `/dev/nvidiactl?` specifies that `/dev/nvidiactl` will
+    only be mounted in the sandbox if it exists in the host filesystem.
+    
+    Depending on how Nix was built, the default value for this option
+    may be empty or provide `/bin/sh` as a bind-mount of `bash`.
+
+  - `secret-key-files`  
+    A whitespace-separated list of files containing secret (private)
+    keys. These are used to sign locally-built paths. They can be
+    generated using `nix-store
+                    --generate-binary-cache-key`. The corresponding public key can be
+    distributed to other users, who can add it to `trusted-public-keys`
+    in their `nix.conf`.
+
+  - `show-trace`  
+    Causes Nix to print out a stack trace in case of Nix expression
+    evaluation errors.
+
+  - `substitute`  
+    If set to `true` (default), Nix will use binary substitutes if
+    available. This option can be disabled to force building from
+    source.
+
+  - `stalled-download-timeout`  
+    The timeout (in seconds) for receiving data from servers during
+    download. Nix cancels idle downloads after this timeout's duration.
+
+  - `substituters`  
+    A list of URLs of substituters, separated by whitespace. The default
+    is `https://cache.nixos.org`.
+
+  - `system`  
+    This option specifies the canonical Nix system name of the current
+    installation, such as `i686-linux` or `x86_64-darwin`. Nix can only
+    build derivations whose `system` attribute equals the value
+    specified here. In general, it never makes sense to modify this
+    value from its default, since you can use it to ‘lie’ about the
+    platform you are building on (e.g., perform a Mac OS build on a
+    Linux machine; the result would obviously be wrong). It only makes
+    sense if the Nix binaries can run on multiple platforms, e.g.,
+    ‘universal binaries’ that run on `x86_64-linux` and `i686-linux`.
+    
+    It defaults to the canonical Nix system name detected by `configure`
+    at build time.
+
+  - `system-features`  
+    A set of system “features” supported by this machine, e.g. `kvm`.
+    Derivations can express a dependency on such features through the
+    derivation attribute `requiredSystemFeatures`. For example, the
+    attribute
+    
+        requiredSystemFeatures = [ "kvm" ];
+    
+    ensures that the derivation can only be built on a machine with the
+    `kvm` feature.
+    
+    This setting by default includes `kvm` if `/dev/kvm` is accessible,
+    and the pseudo-features `nixos-test`, `benchmark` and `big-parallel`
+    that are used in Nixpkgs to route builds to specific machines.
+
+  - `tarball-ttl`  
+    Default: `3600` seconds.
+    
+    The number of seconds a downloaded tarball is considered fresh. If
+    the cached tarball is stale, Nix will check whether it is still up
+    to date using the ETag header. Nix will download a new version if
+    the ETag header is unsupported, or the cached ETag doesn't match.
+    
+    Setting the TTL to `0` forces Nix to always check if the tarball is
+    up to date.
+    
+    Nix caches tarballs in `$XDG_CACHE_HOME/nix/tarballs`.
+    
+    Files fetched via `NIX_PATH`, `fetchGit`, `fetchMercurial`,
+    `fetchTarball`, and `fetchurl` respect this TTL.
+
+  - `timeout`  
+    This option defines the maximum number of seconds that a builder can
+    run. This is useful (for instance in an automated build system) to
+    catch builds that are stuck in an infinite loop but keep writing to
+    their standard output or standard error. It can be overridden using
+    the `--timeout` command line switch.
+    
+    The value `0` means that there is no timeout. This is also the
+    default.
+
+  - `trace-function-calls`  
+    Default: `false`.
+    
+    If set to `true`, the Nix evaluator will trace every function call.
+    Nix will print a log message at the "vomit" level for every function
+    entrance and function exit.
+    
+    <div class="informalexample">
+    
+        function-trace entered undefined position at 1565795816999559622
+        function-trace exited undefined position at 1565795816999581277
+        function-trace entered /nix/store/.../example.nix:226:41 at 1565795253249935150
+        function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
+    
+    </div>
+    
+    The `undefined position` means the function call is a builtin.
+    
+    Use the `contrib/stack-collapse.py` script distributed with the Nix
+    source code to convert the trace logs in to a format suitable for
+    `flamegraph.pl`.
+
+  - `trusted-public-keys`  
+    A whitespace-separated list of public keys. When paths are copied
+    from another Nix store (such as a binary cache), they must be signed
+    with one of these keys. For example:
+    `cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+                    hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=`.
+
+  - `trusted-substituters`  
+    A list of URLs of substituters, separated by whitespace. These are
+    not used by default, but can be enabled by users of the Nix daemon
+    by specifying `--option
+                    substituters urls` on the command line. Unprivileged users are only
+    allowed to pass a subset of the URLs listed in `substituters` and
+    `trusted-substituters`.
+
+  - `trusted-users`  
+    A list of names of users (separated by whitespace) that have
+    additional rights when connecting to the Nix daemon, such as the
+    ability to specify additional binary caches, or to import unsigned
+    NARs. You can also specify groups by prefixing them with `@`; for
+    instance, `@wheel` means all users in the `wheel` group. The default
+    is `root`.
+    
+    > **Warning**
+    > 
+    > Adding a user to `trusted-users` is essentially equivalent to
+    > giving that user root access to the system. For example, the user
+    > can set `sandbox-paths` and thereby obtain read access to
+    > directories that are otherwise inacessible to them.
+
+## Deprecated Settings
+
+  - `binary-caches`  
+    *Deprecated:* `binary-caches` is now an alias to
+    [varlistentry\_title](#conf-substituters).
+
+  - `binary-cache-public-keys`  
+    *Deprecated:* `binary-cache-public-keys` is now an alias to
+    [varlistentry\_title](#conf-trusted-public-keys).
+
+  - `build-compress-log`  
+    *Deprecated:* `build-compress-log` is now an alias to
+    [varlistentry\_title](#conf-compress-build-log).
+
+  - `build-cores`  
+    *Deprecated:* `build-cores` is now an alias to
+    [varlistentry\_title](#conf-cores).
+
+  - `build-extra-chroot-dirs`  
+    *Deprecated:* `build-extra-chroot-dirs` is now an alias to
+    [varlistentry\_title](#conf-extra-sandbox-paths).
+
+  - `build-extra-sandbox-paths`  
+    *Deprecated:* `build-extra-sandbox-paths` is now an alias to
+    [varlistentry\_title](#conf-extra-sandbox-paths).
+
+  - `build-fallback`  
+    *Deprecated:* `build-fallback` is now an alias to
+    [varlistentry\_title](#conf-fallback).
+
+  - `build-max-jobs`  
+    *Deprecated:* `build-max-jobs` is now an alias to
+    [varlistentry\_title](#conf-max-jobs).
+
+  - `build-max-log-size`  
+    *Deprecated:* `build-max-log-size` is now an alias to
+    [varlistentry\_title](#conf-max-build-log-size).
+
+  - `build-max-silent-time`  
+    *Deprecated:* `build-max-silent-time` is now an alias to
+    [varlistentry\_title](#conf-max-silent-time).
+
+  - `build-repeat`  
+    *Deprecated:* `build-repeat` is now an alias to
+    [varlistentry\_title](#conf-repeat).
+
+  - `build-timeout`  
+    *Deprecated:* `build-timeout` is now an alias to
+    [varlistentry\_title](#conf-timeout).
+
+  - `build-use-chroot`  
+    *Deprecated:* `build-use-chroot` is now an alias to
+    [varlistentry\_title](#conf-sandbox).
+
+  - `build-use-sandbox`  
+    *Deprecated:* `build-use-sandbox` is now an alias to
+    [varlistentry\_title](#conf-sandbox).
+
+  - `build-use-substitutes`  
+    *Deprecated:* `build-use-substitutes` is now an alias to
+    [varlistentry\_title](#conf-substitute).
+
+  - `gc-keep-derivations`  
+    *Deprecated:* `gc-keep-derivations` is now an alias to
+    [varlistentry\_title](#conf-keep-derivations).
+
+  - `gc-keep-outputs`  
+    *Deprecated:* `gc-keep-outputs` is now an alias to
+    [varlistentry\_title](#conf-keep-outputs).
+
+  - `env-keep-derivations`  
+    *Deprecated:* `env-keep-derivations` is now an alias to
+    [varlistentry\_title](#conf-keep-env-derivations).
+
+  - `extra-binary-caches`  
+    *Deprecated:* `extra-binary-caches` is now an alias to
+    [varlistentry\_title](#conf-extra-substituters).
+
+  - `trusted-binary-caches`  
+    *Deprecated:* `trusted-binary-caches` is now an alias to
+    [varlistentry\_title](#conf-trusted-substituters).
diff --git a/doc/manual/src/command-ref/files.md b/doc/manual/src/command-ref/files.md
new file mode 100644
index 000000000..df5646c05
--- /dev/null
+++ b/doc/manual/src/command-ref/files.md
@@ -0,0 +1,4 @@
+# Files
+
+This section lists configuration files that you can use when you work
+with Nix.

From 504b7abc452936b3118a18efea05026083ed8cdd Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 12:58:42 +0200
Subject: [PATCH 017/176] Convert commands

---
 doc/manual/src/SUMMARY.md                     |  11 +
 doc/manual/src/command-ref/command-ref.md     |   6 +-
 doc/manual/src/command-ref/main-commands.md   |   4 +
 doc/manual/src/command-ref/nix-build.md       | 130 +++
 doc/manual/src/command-ref/nix-channel.md     | 116 +++
 .../src/command-ref/nix-collect-garbage.md    |  46 +
 doc/manual/src/command-ref/nix-daemon.md      |  17 +
 doc/manual/src/command-ref/nix-env.md         | 926 +++++++++++++++++
 doc/manual/src/command-ref/nix-hash.md        | 120 +++
 doc/manual/src/command-ref/nix-instantiate.md | 184 ++++
 .../src/command-ref/nix-prefetch-url.md       |  87 ++
 doc/manual/src/command-ref/nix-shell.md       | 291 ++++++
 doc/manual/src/command-ref/nix-store.md       | 954 ++++++++++++++++++
 doc/manual/src/command-ref/opt-common-syn.md  |  57 ++
 doc/manual/src/command-ref/opt-inst-syn.md    |  15 +
 15 files changed, 2960 insertions(+), 4 deletions(-)
 create mode 100644 doc/manual/src/command-ref/main-commands.md
 create mode 100644 doc/manual/src/command-ref/nix-build.md
 create mode 100644 doc/manual/src/command-ref/nix-channel.md
 create mode 100644 doc/manual/src/command-ref/nix-collect-garbage.md
 create mode 100644 doc/manual/src/command-ref/nix-daemon.md
 create mode 100644 doc/manual/src/command-ref/nix-env.md
 create mode 100644 doc/manual/src/command-ref/nix-hash.md
 create mode 100644 doc/manual/src/command-ref/nix-instantiate.md
 create mode 100644 doc/manual/src/command-ref/nix-prefetch-url.md
 create mode 100644 doc/manual/src/command-ref/nix-shell.md
 create mode 100644 doc/manual/src/command-ref/nix-store.md
 create mode 100644 doc/manual/src/command-ref/opt-common-syn.md
 create mode 100644 doc/manual/src/command-ref/opt-inst-syn.md

diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index e8baf489b..80a41f8d7 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -47,8 +47,19 @@
 - [Command Reference](command-ref/command-ref.md)
   - [Common Options](command-ref/opt-common.md)
   - [Common Environment Variables](command-ref/env-common.md)
+  - [Main Commands](command-ref/main-commands.md)
+    - [nix-env](command-ref/nix-env.md)
+    - [nix-build](command-ref/nix-build.md)
+    - [nix-shell](command-ref/nix-shell.md)
+    - [nix-store](command-ref/nix-store.md)
   - [Utilities](command-ref/utilities.md)
+    - [nix-channel](command-ref/nix-channel.md)
+    - [nix-collect-garbage](command-ref/nix-collect-garbage.md)
     - [nix-copy-closure](command-ref/nix-copy-closure.md)
+    - [nix-daemon](command-ref/nix-daemon.md)
+    - [nix-hash](command-ref/nix-hash.md)
+    - [nix-instantiate](command-ref/nix-instantiate.md)
+    - [nix-prefetch-url](command-ref/nix-prefetch-url.md)
   - [Files](command-ref/files.md)
     - [nix.conf](command-ref/conf-file.md)
 - [Glossary](glossary.md)
diff --git a/doc/manual/src/command-ref/command-ref.md b/doc/manual/src/command-ref/command-ref.md
index 2c7dbf22e..6a78075db 100644
--- a/doc/manual/src/command-ref/command-ref.md
+++ b/doc/manual/src/command-ref/command-ref.md
@@ -1,4 +1,2 @@
-# Command Reference
-
-This section lists commands and options that you can use when you
-work with Nix.
+This section lists commands and options that you can use when you work
+with Nix.
diff --git a/doc/manual/src/command-ref/main-commands.md b/doc/manual/src/command-ref/main-commands.md
new file mode 100644
index 000000000..e4f1f1d0e
--- /dev/null
+++ b/doc/manual/src/command-ref/main-commands.md
@@ -0,0 +1,4 @@
+# Main Commands
+
+This section lists commands and options that you can use when you work
+with Nix.
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
new file mode 100644
index 000000000..7d0567760
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -0,0 +1,130 @@
+nix-build
+
+1
+
+Nix
+
+nix-build
+
+build a Nix expression
+
+nix-build
+
+\--arg
+
+name
+
+value
+
+\--argstr
+
+name
+
+value
+
+\--attr
+
+\-A
+
+attrPath
+
+\--no-out-link
+
+\--dry-run
+
+\--out-link
+
+\-o
+
+outlink
+
+paths
+
+# Description
+
+The `nix-build` command builds the derivations described by the Nix
+expressions in paths. If the build succeeds, it places a symlink to the
+result in the current directory. The symlink is called `result`. If
+there are multiple Nix expressions, or the Nix expressions evaluate to
+multiple derivations, multiple sequentially numbered symlinks are
+created (`result`, `result-2`, and so on).
+
+If no paths are specified, then `nix-build` will use `default.nix` in
+the current directory, if it exists.
+
+If an element of paths starts with `http://` or `https://`, it is
+interpreted as the URL of a tarball that will be downloaded and unpacked
+to a temporary location. The tarball must include a single top-level
+directory containing at least a file named `default.nix`.
+
+`nix-build` is essentially a wrapper around
+[`nix-instantiate`](#sec-nix-instantiate) (to translate a high-level Nix
+expression to a low-level store derivation) and [`nix-store
+--realise`](#rsec-nix-store-realise) (to build the store derivation).
+
+> **Warning**
+> 
+> The result of the build is automatically registered as a root of the
+> Nix garbage collector. This root disappears automatically when the
+> `result` symlink is deleted or renamed. So don’t rename the symlink.
+
+# Options
+
+All options not listed here are passed to `nix-store
+--realise`, except for `--arg` and `--attr` / `-A` which are passed to
+`nix-instantiate`. See also [???](#sec-common-options).
+
+  - `--no-out-link`  
+    Do not create a symlink to the output path. Note that as a result
+    the output does not become a root of the garbage collector, and so
+    might be deleted by `nix-store
+                    --gc`.
+
+  - `--dry-run`  
+    Show what store paths would be built or downloaded.
+
+  - `--out-link` / `-o` outlink  
+    Change the name of the symlink to the output path created from
+    `result` to outlink.
+
+The following common options are supported:
+
+# Examples
+
+    $ nix-build '<nixpkgs>' -A firefox
+    store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
+    /nix/store/d18hyl92g30l...-firefox-1.5.0.7
+    
+    $ ls -l result
+    lrwxrwxrwx  ...  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
+    
+    $ ls ./result/bin/
+    firefox  firefox-config
+
+If a derivation has multiple outputs, `nix-build` will build the default
+(first) output. You can also build all outputs:
+
+    $ nix-build '<nixpkgs>' -A openssl.all
+
+This will create a symlink for each output named `result-outputname`.
+The suffix is omitted if the output name is `out`. So if `openssl` has
+outputs `out`, `bin` and `man`, `nix-build` will create symlinks
+`result`, `result-bin` and `result-man`. It’s also possible to build a
+specific output:
+
+    $ nix-build '<nixpkgs>' -A openssl.man
+
+This will create a symlink `result-man`.
+
+Build a Nix expression given on the command line:
+
+    $ nix-build -E 'with import <nixpkgs> { }; runCommand "foo" { } "echo bar > $out"'
+    $ cat ./result
+    bar
+
+Build the GNU Hello package from the latest revision of the master
+branch of Nixpkgs:
+
+    $ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
+
+# Environment variables
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/src/command-ref/nix-channel.md
new file mode 100644
index 000000000..d427151a0
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-channel.md
@@ -0,0 +1,116 @@
+nix-channel
+
+1
+
+Nix
+
+nix-channel
+
+manage Nix channels
+
+nix-channel
+
+\--add
+
+url
+
+name
+
+\--remove
+
+name
+
+\--list
+
+\--update
+
+names
+
+\--rollback
+
+generation
+
+# Description
+
+A Nix channel is a mechanism that allows you to automatically stay
+up-to-date with a set of pre-built Nix expressions. A Nix channel is
+just a URL that points to a place containing a set of Nix expressions.
+See also [???](#sec-channels).
+
+To see the list of official NixOS channels, visit
+<https://nixos.org/channels>.
+
+This command has the following operations:
+
+  - `--add` url \[name\]  
+    Adds a channel named name with URL url to the list of subscribed
+    channels. If name is omitted, it defaults to the last component of
+    url, with the suffixes `-stable` or `-unstable` removed.
+
+  - `--remove` name  
+    Removes the channel named name from the list of subscribed channels.
+
+  - `--list`  
+    Prints the names and URLs of all subscribed channels on standard
+    output.
+
+  - `--update` \[names…\]  
+    Downloads the Nix expressions of all subscribed channels (or only
+    those included in names if specified) and makes them the default for
+    `nix-env` operations (by symlinking them from the directory
+    `~/.nix-defexpr`).
+
+  - `--rollback` \[generation\]  
+    Reverts the previous call to `nix-channel
+                    --update`. Optionally, you can specify a specific channel generation
+    number to restore.
+
+Note that `--add` does not automatically perform an update.
+
+The list of subscribed channels is stored in `~/.nix-channels`.
+
+# Examples
+
+To subscribe to the Nixpkgs channel and install the GNU Hello package:
+
+    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+    $ nix-channel --update
+    $ nix-env -iA nixpkgs.hello
+
+You can revert channel updates using `--rollback`:
+
+    $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
+    "14.04.527.0e935f1"
+    
+    $ nix-channel --rollback
+    switching from generation 483 to 482
+    
+    $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
+    "14.04.526.dbadfad"
+
+# Files
+
+  - `/nix/var/nix/profiles/per-user/username/channels`  
+    `nix-channel` uses a `nix-env` profile to keep track of previous
+    versions of the subscribed channels. Every time you run `nix-channel
+    --update`, a new channel generation (that is, a symlink to the
+    channel Nix expressions in the Nix store) is created. This enables
+    `nix-channel --rollback` to revert to previous versions.
+
+  - `~/.nix-defexpr/channels`  
+    This is a symlink to
+    `/nix/var/nix/profiles/per-user/username/channels`. It ensures that
+    `nix-env` can find your channels. In a multi-user installation, you
+    may also have `~/.nix-defexpr/channels_root`, which links to the
+    channels of the root user.
+
+# Channel format
+
+A channel URL should point to a directory containing the following
+files:
+
+  - `nixexprs.tar.xz`  
+    A tarball containing Nix expressions and files referenced by them
+    (such as build scripts and patches). At the top level, the tarball
+    should contain a single directory. That directory must contain a
+    file `default.nix` that serves as the channel’s “entry point”.
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md
new file mode 100644
index 000000000..7946dc875
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-collect-garbage.md
@@ -0,0 +1,46 @@
+nix-collect-garbage
+
+1
+
+Nix
+
+nix-collect-garbage
+
+delete unreachable store paths
+
+nix-collect-garbage
+
+\--delete-old
+
+\-d
+
+\--delete-older-than
+
+period
+
+\--max-freed
+
+bytes
+
+\--dry-run
+
+# Description
+
+The command `nix-collect-garbage` is mostly an alias of [`nix-store
+--gc`](#rsec-nix-store-gc), that is, it deletes all unreachable paths in
+the Nix store to clean up your system. However, it provides two
+additional options: `-d` (`--delete-old`), which deletes all old
+generations of all profiles in `/nix/var/nix/profiles` by invoking
+`nix-env --delete-generations old` on all profiles (of course, this
+makes rollbacks to previous configurations impossible); and
+`--delete-older-than` period, where period is a value such as `30d`,
+which deletes all generations older than the specified number of days in
+all profiles in `/nix/var/nix/profiles` (except for the generations that
+were active at that point in time).
+
+# Example
+
+To delete from the Nix store everything that is not used by the current
+generations of each profile, do
+
+    $ nix-collect-garbage -d
diff --git a/doc/manual/src/command-ref/nix-daemon.md b/doc/manual/src/command-ref/nix-daemon.md
new file mode 100644
index 000000000..b0570789c
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-daemon.md
@@ -0,0 +1,17 @@
+nix-daemon
+
+8
+
+Nix
+
+nix-daemon
+
+Nix multi-user support daemon
+
+nix-daemon
+
+# Description
+
+The Nix daemon is necessary in multi-user Nix installations. It performs
+build actions and other operations on the Nix store on behalf of
+unprivileged users.
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
new file mode 100644
index 000000000..90bf6ea08
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -0,0 +1,926 @@
+nix-env
+
+1
+
+Nix
+
+nix-env
+
+manipulate or query Nix user environments
+
+nix-env
+
+\--arg
+
+name
+
+value
+
+\--argstr
+
+name
+
+value
+
+\--file
+
+\-f
+
+path
+
+\--profile
+
+\-p
+
+path
+
+\--system-filter
+
+system
+
+\--dry-run
+
+operation
+
+options
+
+arguments
+
+# Description
+
+The command `nix-env` is used to manipulate Nix user environments. User
+environments are sets of software packages available to a user at some
+point in time. In other words, they are a synthesised view of the
+programs available in the Nix store. There may be many user
+environments: different users can have different environments, and
+individual users can switch between different environments.
+
+`nix-env` takes exactly one *operation* flag which indicates the
+subcommand to be performed. These are documented below.
+
+# Selectors
+
+Several commands, such as `nix-env -q` and `nix-env -i`, take a list of
+arguments that specify the packages on which to operate. These are
+extended regular expressions that must match the entire name of the
+package. (For details on regular expressions, see regex7.) The match is
+case-sensitive. The regular expression can optionally be followed by a
+dash and a version number; if omitted, any version of the package will
+match. Here are some examples:
+
+  - `firefox`  
+    Matches the package name `firefox` and any version.
+
+  - `firefox-32.0`  
+    Matches the package name `firefox` and version `32.0`.
+
+  - `gtk\\+`  
+    Matches the package name `gtk+`. The `+` character must be escaped
+    using a backslash to prevent it from being interpreted as a
+    quantifier, and the backslash must be escaped in turn with another
+    backslash to ensure that the shell passes it on.
+
+  - `.\*`  
+    Matches any package name. This is the default for most commands.
+
+  - `'.*zip.*'`  
+    Matches any package name containing the string `zip`. Note the dots:
+    `'*zip*'` does not work, because in a regular expression, the
+    character `*` is interpreted as a quantifier.
+
+  - `'.*(firefox|chromium).*'`  
+    Matches any package name containing the strings `firefox` or
+    `chromium`.
+
+# Common options
+
+This section lists the options that are common to all operations. These
+options are allowed for every subcommand, though they may not always
+have an effect. See also [???](#sec-common-options).
+
+  - `--file` / `-f` path  
+    Specifies the Nix expression (designated below as the *active Nix
+    expression*) used by the `--install`, `--upgrade`, and `--query
+    --available` operations to obtain derivations. The default is
+    `~/.nix-defexpr`.
+    
+    If the argument starts with `http://` or `https://`, it is
+    interpreted as the URL of a tarball that will be downloaded and
+    unpacked to a temporary location. The tarball must include a single
+    top-level directory containing at least a file named `default.nix`.
+
+  - `--profile` / `-p` path  
+    Specifies the profile to be used by those operations that operate on
+    a profile (designated below as the *active profile*). A profile is a
+    sequence of user environments called *generations*, one of which is
+    the *current generation*.
+
+  - `--dry-run`  
+    For the `--install`, `--upgrade`, `--uninstall`,
+    `--switch-generation`, `--delete-generations` and `--rollback`
+    operations, this flag will cause `nix-env` to print what *would* be
+    done if this flag had not been specified, without actually doing it.
+    
+    `--dry-run` also prints out which paths will be
+    [substituted](#gloss-substitute) (i.e., downloaded) and which paths
+    will be built from source (because no substitute is available).
+
+  - `--system-filter` system  
+    By default, operations such as `--query
+                    --available` show derivations matching any platform. This option
+    allows you to use derivations for the specified platform system.
+
+<!-- end list -->
+
+# Files
+
+  - `~/.nix-defexpr`  
+    The source for the default Nix expressions used by the `--install`,
+    `--upgrade`, and `--query
+                    --available` operations to obtain derivations. The `--file` option
+    may be used to override this default.
+    
+    If `~/.nix-defexpr` is a file, it is loaded as a Nix expression. If
+    the expression is a set, it is used as the default Nix expression.
+    If the expression is a function, an empty set is passed as argument
+    and the return value is used as the default Nix expression.
+    
+    If `~/.nix-defexpr` is a directory containing a `default.nix` file,
+    that file is loaded as in the above paragraph.
+    
+    If `~/.nix-defexpr` is a directory without a `default.nix` file,
+    then its contents (both files and subdirectories) are loaded as Nix
+    expressions. The expressions are combined into a single set, each
+    expression under an attribute with the same name as the original
+    file or subdirectory.
+    
+    For example, if `~/.nix-defexpr` contains two files, `foo.nix` and
+    `bar.nix`, then the default Nix expression will essentially be
+    
+        {
+          foo = import ~/.nix-defexpr/foo.nix;
+          bar = import ~/.nix-defexpr/bar.nix;
+        }
+    
+    The file `manifest.nix` is always ignored. Subdirectories without a
+    `default.nix` file are traversed recursively in search of more Nix
+    expressions, but the names of these intermediate directories are not
+    added to the attribute paths of the default Nix expression.
+    
+    The command `nix-channel` places symlinks to the downloaded Nix
+    expressions from each subscribed channel in this directory.
+
+  - `~/.nix-profile`  
+    A symbolic link to the user's current profile. By default, this
+    symlink points to `prefix/var/nix/profiles/default`. The `PATH`
+    environment variable should include `~/.nix-profile/bin` for the
+    user environment to be visible to the user.
+
+# Operation `--install`
+
+## Synopsis
+
+nix-env
+
+\--install
+
+\-i
+
+\--preserve-installed
+
+\-P
+
+\--remove-all
+
+\-r
+
+args
+
+## Description
+
+The install operation creates a new user environment, based on the
+current generation of the active profile, to which a set of store paths
+described by args is added. The arguments args map to store paths in a
+number of possible ways:
+
+  - By default, args is a set of derivation names denoting derivations
+    in the active Nix expression. These are realised, and the resulting
+    output paths are installed. Currently installed derivations with a
+    name equal to the name of a derivation being added are removed
+    unless the option `--preserve-installed` is specified.
+    
+    If there are multiple derivations matching a name in args that have
+    the same name (e.g., `gcc-3.3.6` and `gcc-4.1.1`), then the
+    derivation with the highest *priority* is used. A derivation can
+    define a priority by declaring the `meta.priority` attribute. This
+    attribute should be a number, with a higher value denoting a lower
+    priority. The default priority is `0`.
+    
+    If there are multiple matching derivations with the same priority,
+    then the derivation with the highest version will be installed.
+    
+    You can force the installation of multiple derivations with the same
+    name by being specific about the versions. For instance, `nix-env -i
+    gcc-3.3.6 gcc-4.1.1` will install both version of GCC (and will
+    probably cause a user environment conflict\!).
+
+  - If [`--attr`](#opt-attr) (`-A`) is specified, the arguments are
+    *attribute paths* that select attributes from the top-level Nix
+    expression. This is faster than using derivation names and
+    unambiguous. To find out the attribute paths of available packages,
+    use `nix-env -qaP`.
+
+  - If `--from-profile` path is given, args is a set of names denoting
+    installed store paths in the profile path. This is an easy way to
+    copy user environment elements from one profile to another.
+
+  - If `--from-expression` is given, args are Nix
+    [functions](#ss-functions) that are called with the active Nix
+    expression as their single argument. The derivations returned by
+    those function calls are installed. This allows derivations to be
+    specified in an unambiguous way, which is necessary if there are
+    multiple derivations with the same name.
+
+  - If args are store derivations, then these are
+    [realised](#rsec-nix-store-realise), and the resulting output paths
+    are installed.
+
+  - If args are store paths that are not store derivations, then these
+    are [realised](#rsec-nix-store-realise) and installed.
+
+  - By default all outputs are installed for each derivation. That can
+    be reduced by setting `meta.outputsToInstall`.
+
+## Flags
+
+  - `--prebuilt-only` / `-b`  
+    Use only derivations for which a substitute is registered, i.e.,
+    there is a pre-built binary available that can be downloaded in lieu
+    of building the derivation. Thus, no packages will be built from
+    source.
+
+  - `--preserve-installed`; `-P`  
+    Do not remove derivations with a name matching one of the
+    derivations being installed. Usually, trying to have two versions of
+    the same package installed in the same generation of a profile will
+    lead to an error in building the generation, due to file name
+    clashes between the two versions. However, this is not the case for
+    all packages.
+
+  - `--remove-all`; `-r`  
+    Remove all previously installed packages first. This is equivalent
+    to running `nix-env -e '.*'` first, except that everything happens
+    in a single transaction.
+
+## Examples
+
+To install a specific version of `gcc` from the active Nix expression:
+
+    $ nix-env --install gcc-3.3.2
+    installing `gcc-3.3.2'
+    uninstalling `gcc-3.1'
+
+Note the previously installed version is removed, since
+`--preserve-installed` was not specified.
+
+To install an arbitrary version:
+
+    $ nix-env --install gcc
+    installing `gcc-3.3.2'
+
+To install using a specific attribute:
+
+    $ nix-env -i -A gcc40mips
+    $ nix-env -i -A xorg.xorgserver
+
+To install all derivations in the Nix expression `foo.nix`:
+
+    $ nix-env -f ~/foo.nix -i '.*'
+
+To copy the store path with symbolic name `gcc` from another profile:
+
+    $ nix-env -i --from-profile /nix/var/nix/profiles/foo gcc
+
+To install a specific store derivation (typically created by
+`nix-instantiate`):
+
+    $ nix-env -i /nix/store/fibjb1bfbpm5mrsxc4mh2d8n37sxh91i-gcc-3.4.3.drv
+
+To install a specific output path:
+
+    $ nix-env -i /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vk-gcc-3.4.3
+
+To install from a Nix expression specified on the command-line:
+
+    $ nix-env -f ./foo.nix -i -E \
+        'f: (f {system = "i686-linux";}).subversionWithJava'
+
+I.e., this evaluates to `(f: (f {system =
+"i686-linux";}).subversionWithJava) (import ./foo.nix)`, thus selecting
+the `subversionWithJava` attribute from the set returned by calling the
+function defined in `./foo.nix`.
+
+A dry-run tells you which paths will be downloaded or built from source:
+
+    $ nix-env -f '<nixpkgs>' -iA hello --dry-run
+    (dry run; not doing anything)
+    installing ‘hello-2.10’
+    this path will be fetched (0.04 MiB download, 0.19 MiB unpacked):
+      /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10
+      ...
+
+To install Firefox from the latest revision in the Nixpkgs/NixOS 14.12
+channel:
+
+    $ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA firefox
+
+# Operation `--upgrade`
+
+## Synopsis
+
+nix-env
+
+\--upgrade
+
+\-u
+
+\--lt
+
+\--leq
+
+\--eq
+
+\--always
+
+args
+
+## Description
+
+The upgrade operation creates a new user environment, based on the
+current generation of the active profile, in which all store paths are
+replaced for which there are newer versions in the set of paths
+described by args. Paths for which there are no newer versions are left
+untouched; this is not an error. It is also not an error if an element
+of args matches no installed derivations.
+
+For a description of how args is mapped to a set of store paths, see
+[`--install`](#rsec-nix-env-install). If args describes multiple store
+paths with the same symbolic name, only the one with the highest version
+is installed.
+
+## Flags
+
+  - `--lt`  
+    Only upgrade a derivation to newer versions. This is the default.
+
+  - `--leq`  
+    In addition to upgrading to newer versions, also “upgrade” to
+    derivations that have the same version. Version are not a unique
+    identification of a derivation, so there may be many derivations
+    that have the same version. This flag may be useful to force
+    “synchronisation” between the installed and available derivations.
+
+  - `--eq`  
+    *Only* “upgrade” to derivations that have the same version. This may
+    not seem very useful, but it actually is, e.g., when there is a new
+    release of Nixpkgs and you want to replace installed applications
+    with the same versions built against newer dependencies (to reduce
+    the number of dependencies floating around on your system).
+
+  - `--always`  
+    In addition to upgrading to newer versions, also “upgrade” to
+    derivations that have the same or a lower version. I.e., derivations
+    may actually be downgraded depending on what is available in the
+    active Nix expression.
+
+For the other flags, see `--install`.
+
+## Examples
+
+    $ nix-env --upgrade gcc
+    upgrading `gcc-3.3.1' to `gcc-3.4'
+    
+    $ nix-env -u gcc-3.3.2 --always (switch to a specific version)
+    upgrading `gcc-3.4' to `gcc-3.3.2'
+    
+    $ nix-env --upgrade pan
+    (no upgrades available, so nothing happens)
+    
+    $ nix-env -u (try to upgrade everything)
+    upgrading `hello-2.1.2' to `hello-2.1.3'
+    upgrading `mozilla-1.2' to `mozilla-1.4'
+
+## Versions
+
+The upgrade operation determines whether a derivation `y` is an upgrade
+of a derivation `x` by looking at their respective `name` attributes.
+The names (e.g., `gcc-3.3.1` are split into two parts: the package name
+(`gcc`), and the version (`3.3.1`). The version part starts after the
+first dash not followed by a letter. `x` is considered an upgrade of `y`
+if their package names match, and the version of `y` is higher that that
+of `x`.
+
+The versions are compared by splitting them into contiguous components
+of numbers and letters. E.g., `3.3.1pre5` is split into `[3, 3, 1,
+"pre", 5]`. These lists are then compared lexicographically (from left
+to right). Corresponding components `a` and `b` are compared as follows.
+If they are both numbers, integer comparison is used. If `a` is an empty
+string and `b` is a number, `a` is considered less than `b`. The special
+string component `pre` (for *pre-release*) is considered to be less than
+other components. String components are considered less than number
+components. Otherwise, they are compared lexicographically (i.e., using
+case-sensitive string comparison).
+
+This is illustrated by the following examples:
+
+    1.0 < 2.3
+    2.1 < 2.3
+    2.3 = 2.3
+    2.5 > 2.3
+    3.1 > 2.3
+    2.3.1 > 2.3
+    2.3.1 > 2.3a
+    2.3pre1 < 2.3
+    2.3pre3 < 2.3pre12
+    2.3a < 2.3c
+    2.3pre1 < 2.3c
+    2.3pre1 < 2.3q
+
+# Operation `--uninstall`
+
+## Synopsis
+
+nix-env
+
+\--uninstall
+
+\-e
+
+drvnames
+
+## Description
+
+The uninstall operation creates a new user environment, based on the
+current generation of the active profile, from which the store paths
+designated by the symbolic names names are removed.
+
+## Examples
+
+    $ nix-env --uninstall gcc
+    $ nix-env -e '.*' (remove everything)
+
+# Operation `--set`
+
+## Synopsis
+
+nix-env
+
+\--set
+
+drvname
+
+## Description
+
+The `--set` operation modifies the current generation of a profile so
+that it contains exactly the specified derivation, and nothing else.
+
+## Examples
+
+The following updates a profile such that its current generation will
+contain just Firefox:
+
+    $ nix-env -p /nix/var/nix/profiles/browser --set firefox
+
+# Operation `--set-flag`
+
+## Synopsis
+
+nix-env
+
+\--set-flag
+
+name
+
+value
+
+drvnames
+
+## Description
+
+The `--set-flag` operation allows meta attributes of installed packages
+to be modified. There are several attributes that can be usefully
+modified, because they affect the behaviour of `nix-env` or the user
+environment build script:
+
+  - `priority` can be changed to resolve filename clashes. The user
+    environment build script uses the `meta.priority` attribute of
+    derivations to resolve filename collisions between packages. Lower
+    priority values denote a higher priority. For instance, the GCC
+    wrapper package and the Binutils package in Nixpkgs both have a file
+    `bin/ld`, so previously if you tried to install both you would get a
+    collision. Now, on the other hand, the GCC wrapper declares a higher
+    priority than Binutils, so the former’s `bin/ld` is symlinked in the
+    user environment.
+
+  - `keep` can be set to `true` to prevent the package from being
+    upgraded or replaced. This is useful if you want to hang on to an
+    older version of a package.
+
+  - `active` can be set to `false` to “disable” the package. That is, no
+    symlinks will be generated to the files of the package, but it
+    remains part of the profile (so it won’t be garbage-collected). It
+    can be set back to `true` to re-enable the package.
+
+## Examples
+
+To prevent the currently installed Firefox from being upgraded:
+
+    $ nix-env --set-flag keep true firefox
+
+After this, `nix-env -u` will ignore Firefox.
+
+To disable the currently installed Firefox, then install a new Firefox
+while the old remains part of the profile:
+
+    $ nix-env -q
+    firefox-2.0.0.9 (the current one)
+    
+    $ nix-env --preserve-installed -i firefox-2.0.0.11
+    installing `firefox-2.0.0.11'
+    building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
+    collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox'
+      and `/nix/store/...-firefox-2.0.0.9/bin/firefox'.
+    (i.e., can’t have two active at the same time)
+    
+    $ nix-env --set-flag active false firefox
+    setting flag on `firefox-2.0.0.9'
+    
+    $ nix-env --preserve-installed -i firefox-2.0.0.11
+    installing `firefox-2.0.0.11'
+    
+    $ nix-env -q
+    firefox-2.0.0.11 (the enabled one)
+    firefox-2.0.0.9 (the disabled one)
+
+To make files from `binutils` take precedence over files from `gcc`:
+
+    $ nix-env --set-flag priority 5 binutils
+    $ nix-env --set-flag priority 10 gcc
+
+# Operation `--query`
+
+## Synopsis
+
+nix-env
+
+\--query
+
+\-q
+
+\--installed
+
+\--available
+
+\-a
+
+\--status
+
+\-s
+
+\--attr-path
+
+\-P
+
+\--no-name
+
+\--compare-versions
+
+\-c
+
+\--system
+
+\--drv-path
+
+\--out-path
+
+\--description
+
+\--meta
+
+\--xml
+
+\--json
+
+\--prebuilt-only
+
+\-b
+
+\--attr
+
+\-A
+
+attribute-path
+
+names
+
+## Description
+
+The query operation displays information about either the store paths
+that are installed in the current generation of the active profile
+(`--installed`), or the derivations that are available for installation
+in the active Nix expression (`--available`). It only prints information
+about derivations whose symbolic name matches one of names.
+
+The derivations are sorted by their `name` attributes.
+
+## Source selection
+
+The following flags specify the set of things on which the query
+operates.
+
+  - `--installed`  
+    The query operates on the store paths that are installed in the
+    current generation of the active profile. This is the default.
+
+  - `--available`; `-a`  
+    The query operates on the derivations that are available in the
+    active Nix expression.
+
+## Queries
+
+The following flags specify what information to display about the
+selected derivations. Multiple flags may be specified, in which case the
+information is shown in the order given here. Note that the name of the
+derivation is shown unless `--no-name` is specified.
+
+  - `--xml`  
+    Print the result in an XML representation suitable for automatic
+    processing by other tools. The root element is called `items`, which
+    contains a `item` element for each available or installed
+    derivation. The fields discussed below are all stored in attributes
+    of the `item` elements.
+
+  - `--json`  
+    Print the result in a JSON representation suitable for automatic
+    processing by other tools.
+
+  - `--prebuilt-only` / `-b`  
+    Show only derivations for which a substitute is registered, i.e.,
+    there is a pre-built binary available that can be downloaded in lieu
+    of building the derivation. Thus, this shows all packages that
+    probably can be installed quickly.
+
+  - `--status`; `-s`  
+    Print the *status* of the derivation. The status consists of three
+    characters. The first is `I` or `-`, indicating whether the
+    derivation is currently installed in the current generation of the
+    active profile. This is by definition the case for `--installed`,
+    but not for `--available`. The second is `P` or `-`, indicating
+    whether the derivation is present on the system. This indicates
+    whether installation of an available derivation will require the
+    derivation to be built. The third is `S` or `-`, indicating whether
+    a substitute is available for the derivation.
+
+  - `--attr-path`; `-P`  
+    Print the *attribute path* of the derivation, which can be used to
+    unambiguously select it using the [`--attr` option](#opt-attr)
+    available in commands that install derivations like `nix-env
+    --install`. This option only works together with `--available`
+
+  - `--no-name`  
+    Suppress printing of the `name` attribute of each derivation.
+
+  - `--compare-versions` / `-c`  
+    Compare installed versions to available versions, or vice versa (if
+    `--available` is given). This is useful for quickly seeing whether
+    upgrades for installed packages are available in a Nix expression. A
+    column is added with the following meaning:
+    
+      - `<` version  
+        A newer version of the package is available or installed.
+    
+      - `=` version  
+        At most the same version of the package is available or
+        installed.
+    
+      - `>` version  
+        Only older versions of the package are available or installed.
+    
+      - `- ?`  
+        No version of the package is available or installed.
+
+  - `--system`  
+    Print the `system` attribute of the derivation.
+
+  - `--drv-path`  
+    Print the path of the store derivation.
+
+  - `--out-path`  
+    Print the output path of the derivation.
+
+  - `--description`  
+    Print a short (one-line) description of the derivation, if
+    available. The description is taken from the `meta.description`
+    attribute of the derivation.
+
+  - `--meta`  
+    Print all of the meta-attributes of the derivation. This option is
+    only available with `--xml` or `--json`.
+
+## Examples
+
+To show installed packages:
+
+    $ nix-env -q
+    bison-1.875c
+    docbook-xml-4.2
+    firefox-1.0.4
+    MPlayer-1.0pre7
+    ORBit2-2.8.3
+    …
+
+To show available packages:
+
+    $ nix-env -qa
+    firefox-1.0.7
+    GConf-2.4.0.1
+    MPlayer-1.0pre7
+    ORBit2-2.8.3
+    …
+
+To show the status of available packages:
+
+    $ nix-env -qas
+    -P- firefox-1.0.7   (not installed but present)
+    --S GConf-2.4.0.1   (not present, but there is a substitute for fast installation)
+    --S MPlayer-1.0pre3 (i.e., this is not the installed MPlayer, even though the version is the same!)
+    IP- ORBit2-2.8.3    (installed and by definition present)
+    …
+
+To show available packages in the Nix expression `foo.nix`:
+
+    $ nix-env -f ./foo.nix -qa
+    foo-1.2.3
+
+To compare installed versions to what’s available:
+
+    $ nix-env -qc
+    ...
+    acrobat-reader-7.0 - ?      (package is not available at all)
+    autoconf-2.59      = 2.59   (same version)
+    firefox-1.0.4      < 1.0.7  (a more recent version is available)
+    ...
+
+To show all packages with “`zip`” in the name:
+
+    $ nix-env -qa '.*zip.*'
+    bzip2-1.0.6
+    gzip-1.6
+    zip-3.0
+    …
+
+To show all packages with “`firefox`” or “`chromium`” in the name:
+
+    $ nix-env -qa '.*(firefox|chromium).*'
+    chromium-37.0.2062.94
+    chromium-beta-38.0.2125.24
+    firefox-32.0.3
+    firefox-with-plugins-13.0.1
+    …
+
+To show all packages in the latest revision of the Nixpkgs repository:
+
+    $ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
+
+# Operation `--switch-profile`
+
+## Synopsis
+
+nix-env
+
+\--switch-profile
+
+\-S
+
+path
+
+## Description
+
+This operation makes path the current profile for the user. That is, the
+symlink `~/.nix-profile` is made to point to path.
+
+## Examples
+
+    $ nix-env -S ~/my-profile
+
+# Operation `--list-generations`
+
+## Synopsis
+
+nix-env
+
+\--list-generations
+
+## Description
+
+This operation print a list of all the currently existing generations
+for the active profile. These may be switched to using the
+`--switch-generation` operation. It also prints the creation date of the
+generation, and indicates the current generation.
+
+## Examples
+
+    $ nix-env --list-generations
+      95   2004-02-06 11:48:24
+      96   2004-02-06 11:49:01
+      97   2004-02-06 16:22:45
+      98   2004-02-06 16:24:33   (current)
+
+# Operation `--delete-generations`
+
+## Synopsis
+
+nix-env
+
+\--delete-generations
+
+generations
+
+## Description
+
+This operation deletes the specified generations of the current profile.
+The generations can be a list of generation numbers, the special value
+`old` to delete all non-current generations, a value such as `30d` to
+delete all generations older than the specified number of days (except
+for the generation that was active at that point in time), or a value
+such as `+5` to keep the last `5` generations ignoring any newer than
+current, e.g., if `30` is the current generation `+5` will delete
+generation `25` and all older generations. Periodically deleting old
+generations is important to make garbage collection effective.
+
+## Examples
+
+    $ nix-env --delete-generations 3 4 8
+    
+    $ nix-env --delete-generations +5
+    
+    $ nix-env --delete-generations 30d
+    
+    $ nix-env -p other_profile --delete-generations old
+
+# Operation `--switch-generation`
+
+## Synopsis
+
+nix-env
+
+\--switch-generation
+
+\-G
+
+generation
+
+## Description
+
+This operation makes generation number generation the current generation
+of the active profile. That is, if the `profile` is the path to the
+active profile, then the symlink `profile` is made to point to
+`profile-generation-link`, which is in turn a symlink to the actual user
+environment in the Nix store.
+
+Switching will fail if the specified generation does not exist.
+
+## Examples
+
+    $ nix-env -G 42
+    switching from generation 50 to 42
+
+# Operation `--rollback`
+
+## Synopsis
+
+nix-env
+
+\--rollback
+
+## Description
+
+This operation switches to the “previous” generation of the active
+profile, that is, the highest numbered generation lower than the current
+generation, if it exists. It is just a convenience wrapper around
+`--list-generations` and `--switch-generation`.
+
+## Examples
+
+    $ nix-env --rollback
+    switching from generation 92 to 91
+    
+    $ nix-env --rollback
+    error: no generation older than the current (91) exists
+
+# Environment variables
+
+  - `NIX_PROFILE`  
+    Location of the Nix profile. Defaults to the target of the symlink
+    `~/.nix-profile`, if it exists, or `/nix/var/nix/profiles/default`
+    otherwise.
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/src/command-ref/nix-hash.md
new file mode 100644
index 000000000..d433cbc5b
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-hash.md
@@ -0,0 +1,120 @@
+nix-hash
+
+1
+
+Nix
+
+nix-hash
+
+compute the cryptographic hash of a path
+
+nix-hash
+
+\--flat
+
+\--base32
+
+\--truncate
+
+\--type
+
+hashAlgo
+
+path
+
+nix-hash
+
+\--to-base16
+
+hash
+
+nix-hash
+
+\--to-base32
+
+hash
+
+# Description
+
+The command `nix-hash` computes the cryptographic hash of the contents
+of each path and prints it on standard output. By default, it computes
+an MD5 hash, but other hash algorithms are available as well. The hash
+is printed in hexadecimal. To generate the same hash as
+`nix-prefetch-url` you have to specify multiple arguments, see below for
+an example.
+
+The hash is computed over a *serialisation* of each path: a dump of the
+file system tree rooted at the path. This allows directories and
+symlinks to be hashed as well as regular files. The dump is in the *NAR
+format* produced by [`nix-store` `--dump`](#refsec-nix-store-dump).
+Thus, `nix-hash
+path` yields the same cryptographic hash as `nix-store --dump
+path | md5sum`.
+
+# Options
+
+  - `--flat`  
+    Print the cryptographic hash of the contents of each regular file
+    path. That is, do not compute the hash over the dump of path. The
+    result is identical to that produced by the GNU commands `md5sum`
+    and `sha1sum`.
+
+  - `--base32`  
+    Print the hash in a base-32 representation rather than hexadecimal.
+    This base-32 representation is more compact and can be used in Nix
+    expressions (such as in calls to `fetchurl`).
+
+  - `--truncate`  
+    Truncate hashes longer than 160 bits (such as SHA-256) to 160 bits.
+
+  - `--type` hashAlgo  
+    Use the specified cryptographic hash algorithm, which can be one of
+    `md5`, `sha1`, and `sha256`.
+
+  - `--to-base16`  
+    Don’t hash anything, but convert the base-32 hash representation
+    hash to hexadecimal.
+
+  - `--to-base32`  
+    Don’t hash anything, but convert the hexadecimal hash representation
+    hash to base-32.
+
+# Examples
+
+Computing the same hash as `nix-prefetch-url`:
+
+    $ nix-prefetch-url file://<(echo test)
+    1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
+    $ nix-hash --type sha256 --flat --base32 <(echo test)
+    1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
+
+Computing hashes:
+
+    $ mkdir test
+    $ echo "hello" > test/world
+    
+    $ nix-hash test/ (MD5 hash; default)
+    8179d3caeff1869b5ba1744e5a245c04
+    
+    $ nix-store --dump test/ | md5sum (for comparison)
+    8179d3caeff1869b5ba1744e5a245c04  -
+    
+    $ nix-hash --type sha1 test/
+    e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+    
+    $ nix-hash --type sha1 --base32 test/
+    nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+    
+    $ nix-hash --type sha256 --flat test/
+    error: reading file `test/': Is a directory
+    
+    $ nix-hash --type sha256 --flat test/world
+    5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
+
+Converting between hexadecimal and base-32:
+
+    $ nix-hash --type sha1 --to-base32 e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+    nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+    
+    $ nix-hash --type sha1 --to-base16 nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+    e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
new file mode 100644
index 000000000..449f5f70f
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -0,0 +1,184 @@
+nix-instantiate
+
+1
+
+Nix
+
+nix-instantiate
+
+instantiate store derivations from Nix expressions
+
+nix-instantiate
+
+\--parse
+
+\--eval
+
+\--strict
+
+\--json
+
+\--xml
+
+\--read-write-mode
+
+\--arg
+
+name
+
+value
+
+\--attr
+
+\-A
+
+attrPath
+
+\--add-root
+
+path
+
+\--indirect
+
+\--expr
+
+\-E
+
+files
+
+nix-instantiate
+
+\--find-file
+
+files
+
+# Description
+
+The command `nix-instantiate` generates [store
+derivations](#gloss-derivation) from (high-level) Nix expressions. It
+evaluates the Nix expressions in each of files (which defaults to
+./default.nix). Each top-level expression should evaluate to a
+derivation, a list of derivations, or a set of derivations. The paths of
+the resulting store derivations are printed on standard output.
+
+If files is the character `-`, then a Nix expression will be read from
+standard input.
+
+See also [???](#sec-common-options) for a list of common options.
+
+# Options
+
+  - `--add-root` path; `--indirect`  
+    See the [corresponding options](#opt-add-root) in `nix-store`.
+
+  - `--parse`  
+    Just parse the input files, and print their abstract syntax trees on
+    standard output in ATerm format.
+
+  - `--eval`  
+    Just parse and evaluate the input files, and print the resulting
+    values on standard output. No instantiation of store derivations
+    takes place.
+
+  - `--find-file`  
+    Look up the given files in Nix’s search path (as specified by the
+    NIX\_PATH\</literal\> environment variable). If found, print the
+    corresponding absolute paths on standard output. For instance, if
+    `NIX_PATH` is `nixpkgs=/home/alice/nixpkgs`, then `nix-instantiate
+    --find-file nixpkgs/default.nix` will print
+    `/home/alice/nixpkgs/default.nix`.
+
+  - `--strict`  
+    When used with `--eval`, recursively evaluate list elements and
+    attributes. Normally, such sub-expressions are left unevaluated
+    (since the Nix expression language is lazy).
+    
+    > **Warning**
+    > 
+    > This option can cause non-termination, because lazy data
+    > structures can be infinitely large.
+
+  - `--json`  
+    When used with `--eval`, print the resulting value as an JSON
+    representation of the abstract syntax tree rather than as an ATerm.
+
+  - `--xml`  
+    When used with `--eval`, print the resulting value as an XML
+    representation of the abstract syntax tree rather than as an ATerm.
+    The schema is the same as that used by the [`toXML`
+    built-in](#builtin-toXML).
+
+  - `--read-write-mode`  
+    When used with `--eval`, perform evaluation in read/write mode so
+    nix language features that require it will still work (at the cost
+    of needing to do instantiation of every evaluated derivation). If
+    this option is not enabled, there may be uninstantiated store paths
+    in the final output.
+
+<!-- end list -->
+
+# Examples
+
+Instantiating store derivations from a Nix expression, and building them
+using `nix-store`:
+
+    $ nix-instantiate test.nix (instantiate)
+    /nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
+    
+    $ nix-store -r $(nix-instantiate test.nix) (build)
+    ...
+    /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 (output path)
+    
+    $ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
+    dr-xr-xr-x    2 eelco    users        4096 1970-01-01 01:00 lib
+    ...
+
+You can also give a Nix expression on the command line:
+
+    $ nix-instantiate -E 'with import <nixpkgs> { }; hello'
+    /nix/store/j8s4zyv75a724q38cb0r87rlczaiag4y-hello-2.8.drv
+
+This is equivalent to:
+
+    $ nix-instantiate '<nixpkgs>' -A hello
+
+Parsing and evaluating Nix expressions:
+
+    $ nix-instantiate --parse -E '1 + 2'
+    1 + 2
+    
+    $ nix-instantiate --eval -E '1 + 2'
+    3
+    
+    $ nix-instantiate --eval --xml -E '1 + 2'
+    <?xml version='1.0' encoding='utf-8'?>
+    <expr>
+      <int value="3" />
+    </expr>
+
+The difference between non-strict and strict evaluation:
+
+    $ nix-instantiate --eval --xml -E 'rec { x = "foo"; y = x; }'
+    ...
+      <attr name="x">
+        <string value="foo" />
+      </attr>
+      <attr name="y">
+        <unevaluated />
+      </attr>
+    ...
+
+Note that `y` is left unevaluated (the XML representation doesn’t
+attempt to show non-normal forms).
+
+    $ nix-instantiate --eval --xml --strict -E 'rec { x = "foo"; y = x; }'
+    ...
+      <attr name="x">
+        <string value="foo" />
+      </attr>
+      <attr name="y">
+        <string value="foo" />
+      </attr>
+    ...
+
+# Environment variables
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/src/command-ref/nix-prefetch-url.md
new file mode 100644
index 000000000..bf8084e45
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-prefetch-url.md
@@ -0,0 +1,87 @@
+nix-prefetch-url
+
+1
+
+Nix
+
+nix-prefetch-url
+
+copy a file from a URL into the store and print its hash
+
+nix-prefetch-url
+
+\--version
+
+\--type
+
+hashAlgo
+
+\--print-path
+
+\--unpack
+
+\--name
+
+name
+
+url
+
+hash
+
+# Description
+
+The command `nix-prefetch-url` downloads the file referenced by the URL
+url, prints its cryptographic hash, and copies it into the Nix store.
+The file name in the store is `hash-baseName`, where baseName is
+everything following the final slash in url.
+
+This command is just a convenience for Nix expression writers. Often a
+Nix expression fetches some source distribution from the network using
+the `fetchurl` expression contained in Nixpkgs. However, `fetchurl`
+requires a cryptographic hash. If you don't know the hash, you would
+have to download the file first, and then `fetchurl` would download it
+again when you build your Nix expression. Since `fetchurl` uses the same
+name for the downloaded file as `nix-prefetch-url`, the redundant
+download can be avoided.
+
+If hash is specified, then a download is not performed if the Nix store
+already contains a file with the same hash and base name. Otherwise, the
+file is downloaded, and an error is signaled if the actual hash of the
+file does not match the specified hash.
+
+This command prints the hash on standard output. Additionally, if the
+option `--print-path` is used, the path of the downloaded file in the
+Nix store is also printed.
+
+# Options
+
+  - `--type` hashAlgo  
+    Use the specified cryptographic hash algorithm, which can be one of
+    `md5`, `sha1`, and `sha256`.
+
+  - `--print-path`  
+    Print the store path of the downloaded file on standard output.
+
+  - `--unpack`  
+    Unpack the archive (which must be a tarball or zip file) and add the
+    result to the Nix store. The resulting hash can be used with
+    functions such as Nixpkgs’s `fetchzip` or `fetchFromGitHub`.
+
+  - `--name` name  
+    Override the name of the file in the Nix store. By default, this is
+    `hash-basename`, where basename is the last component of url.
+    Overriding the name is necessary when basename contains characters
+    that are not allowed in Nix store paths.
+
+# Examples
+
+    $ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz
+    0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+    
+    $ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz
+    0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+    /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+    
+    $ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz
+    079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7
+    /nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
new file mode 100644
index 000000000..c6910e3f5
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -0,0 +1,291 @@
+nix-shell
+
+1
+
+Nix
+
+nix-shell
+
+start an interactive shell based on a Nix expression
+
+nix-shell
+
+\--arg
+
+name
+
+value
+
+\--argstr
+
+name
+
+value
+
+\--attr
+
+\-A
+
+attrPath
+
+\--command
+
+cmd
+
+\--run
+
+cmd
+
+\--exclude
+
+regexp
+
+\--pure
+
+\--keep
+
+name
+
+\--packages
+
+\-p
+
+packages
+
+expressions
+
+path
+
+# Description
+
+The command `nix-shell` will build the dependencies of the specified
+derivation, but not the derivation itself. It will then start an
+interactive shell in which all environment variables defined by the
+derivation path have been set to their corresponding values, and the
+script `$stdenv/setup` has been sourced. This is useful for reproducing
+the environment of a derivation for development.
+
+If path is not given, `nix-shell` defaults to `shell.nix` if it exists,
+and `default.nix` otherwise.
+
+If path starts with `http://` or `https://`, it is interpreted as the
+URL of a tarball that will be downloaded and unpacked to a temporary
+location. The tarball must include a single top-level directory
+containing at least a file named `default.nix`.
+
+If the derivation defines the variable `shellHook`, it will be evaluated
+after `$stdenv/setup` has been sourced. Since this hook is not executed
+by regular Nix builds, it allows you to perform initialisation specific
+to `nix-shell`. For example, the derivation attribute
+
+    shellHook =
+      ''
+        echo "Hello shell"
+      '';
+
+will cause `nix-shell` to print `Hello shell`.
+
+# Options
+
+All options not listed here are passed to `nix-store
+--realise`, except for `--arg` and `--attr` / `-A` which are passed to
+`nix-instantiate`. See also [???](#sec-common-options).
+
+  - `--command` cmd  
+    In the environment of the derivation, run the shell command cmd.
+    This command is executed in an interactive shell. (Use `--run` to
+    use a non-interactive shell instead.) However, a call to `exit` is
+    implicitly added to the command, so the shell will exit after
+    running the command. To prevent this, add `return` at the end; e.g.
+    `--command
+                    "echo Hello; return"` will print `Hello` and then drop you into the
+    interactive shell. This can be useful for doing any additional
+    initialisation.
+
+  - `--run` cmd  
+    Like `--command`, but executes the command in a non-interactive
+    shell. This means (among other things) that if you hit Ctrl-C while
+    the command is running, the shell exits.
+
+  - `--exclude` regexp  
+    Do not build any dependencies whose store path matches the regular
+    expression regexp. This option may be specified multiple times.
+
+  - `--pure`  
+    If this flag is specified, the environment is almost entirely
+    cleared before the interactive shell is started, so you get an
+    environment that more closely corresponds to the “real” Nix build. A
+    few variables, in particular `HOME`, `USER` and `DISPLAY`, are
+    retained. Note that `~/.bashrc` and (depending on your Bash
+    installation) `/etc/bashrc` are still sourced, so any variables set
+    there will affect the interactive shell.
+
+  - `--packages` / `-p` packages…  
+    Set up an environment in which the specified packages are present.
+    The command line arguments are interpreted as attribute names inside
+    the Nix Packages collection. Thus, `nix-shell -p libjpeg openjdk`
+    will start a shell in which the packages denoted by the attribute
+    names `libjpeg` and `openjdk` are present.
+
+  - `-i` interpreter  
+    The chained script interpreter to be invoked by `nix-shell`. Only
+    applicable in `#!`-scripts (described
+    [below](#ssec-nix-shell-shebang)).
+
+  - `--keep` name  
+    When a `--pure` shell is started, keep the listed environment
+    variables.
+
+The following common options are supported:
+
+# Environment variables
+
+  - `NIX_BUILD_SHELL`  
+    Shell used to start the interactive environment. Defaults to the
+    `bash` found in `PATH`.
+
+# Examples
+
+To build the dependencies of the package Pan, and start an interactive
+shell in which to build it:
+
+    $ nix-shell '<nixpkgs>' -A pan
+    [nix-shell]$ unpackPhase
+    [nix-shell]$ cd pan-*
+    [nix-shell]$ configurePhase
+    [nix-shell]$ buildPhase
+    [nix-shell]$ ./pan/gui/pan
+
+To clear the environment first, and do some additional automatic
+initialisation of the interactive shell:
+
+    $ nix-shell '<nixpkgs>' -A pan --pure \
+        --command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
+
+Nix expressions can also be given on the command line using the `-E` and
+`-p` flags. For instance, the following starts a shell containing the
+packages `sqlite` and `libX11`:
+
+    $ nix-shell -E 'with import <nixpkgs> { }; runCommand "dummy" { buildInputs = [ sqlite xorg.libX11 ]; } ""'
+
+A shorter way to do the same is:
+
+    $ nix-shell -p sqlite xorg.libX11
+    [nix-shell]$ echo $NIX_LDFLAGS
+    … -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
+
+Note that `-p` accepts multiple full nix expressions that are valid in
+the `buildInputs = [ ... ]` shown above, not only package names. So the
+following is also legal:
+
+    $ nix-shell -p sqlite 'git.override { withManual = false; }'
+
+The `-p` flag looks up Nixpkgs in the Nix search path. You can override
+it by passing `-I` or setting `NIX_PATH`. For example, the following
+gives you a shell containing the Pan package from a specific revision of
+Nixpkgs:
+
+    $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
+    
+    [nix-shell:~]$ pan --version
+    Pan 0.139
+
+# Use as a `#!`-interpreter
+
+You can use `nix-shell` as a script interpreter to allow scripts written
+in arbitrary languages to obtain their own dependencies via Nix. This is
+done by starting the script with the following lines:
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell -i real-interpreter -p packages
+
+where real-interpreter is the “real” script interpreter that will be
+invoked by `nix-shell` after it has obtained the dependencies and
+initialised the environment, and packages are the attribute names of the
+dependencies in Nixpkgs.
+
+The lines starting with `#! nix-shell` specify `nix-shell` options (see
+above). Note that you cannot write `#! /usr/bin/env nix-shell -i ...`
+because many operating systems only allow one argument in `#!` lines.
+
+For example, here is a Python script that depends on Python and the
+`prettytable` package:
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell -i python -p python pythonPackages.prettytable
+    
+    import prettytable
+    
+    # Print a simple table.
+    t = prettytable.PrettyTable(["N", "N^2"])
+    for n in range(1, 10): t.add_row([n, n * n])
+    print t
+
+Similarly, the following is a Perl script that specifies that it
+requires Perl and the `HTML::TokeParser::Simple` and `LWP` packages:
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell -i perl -p perl perlPackages.HTMLTokeParserSimple perlPackages.LWP
+    
+    use HTML::TokeParser::Simple;
+    
+    # Fetch nixos.org and print all hrefs.
+    my $p = HTML::TokeParser::Simple->new(url => 'http://nixos.org/');
+    
+    while (my $token = $p->get_tag("a")) {
+        my $href = $token->get_attr("href");
+        print "$href\n" if $href;
+    }
+
+Sometimes you need to pass a simple Nix expression to customize a
+package like Terraform:
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell -i bash -p "terraform.withPlugins (plugins: [ plugins.openstack ])"
+    
+    terraform apply
+
+> **Note**
+> 
+> You must use double quotes (`"`) when passing a simple Nix expression
+> in a nix-shell shebang.
+
+Finally, using the merging of multiple nix-shell shebangs the following
+Haskell script uses a specific branch of Nixpkgs/NixOS (the 18.03 stable
+branch):
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell -i runghc -p "haskellPackages.ghcWithPackages (ps: [ps.HTTP ps.tagsoup])"
+    #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-18.03.tar.gz
+    
+    import Network.HTTP
+    import Text.HTML.TagSoup
+    
+    -- Fetch nixos.org and print all hrefs.
+    main = do
+      resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
+      body <- getResponseBody resp
+      let tags = filter (isTagOpenName "a") $ parseTags body
+      let tags' = map (fromAttrib "href") tags
+      mapM_ putStrLn $ filter (/= "") tags'
+
+If you want to be even more precise, you can specify a specific revision
+of Nixpkgs:
+
+    #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/0672315759b3e15e2121365f067c1c8c56bb4722.tar.gz
+
+The examples above all used `-p` to get dependencies from Nixpkgs. You
+can also use a Nix expression to build your own dependencies. For
+example, the Python example could have been written as:
+
+    #! /usr/bin/env nix-shell
+    #! nix-shell deps.nix -i python
+
+where the file `deps.nix` in the same directory as the `#!`-script
+contains:
+
+    with import <nixpkgs> {};
+    
+    runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
+
+# Environment variables
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
new file mode 100644
index 000000000..703e71076
--- /dev/null
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -0,0 +1,954 @@
+nix-store
+
+1
+
+Nix
+
+nix-store
+
+manipulate or query the Nix store
+
+nix-store
+
+\--add-root
+
+path
+
+\--indirect
+
+operation
+
+options
+
+arguments
+
+# Description
+
+The command `nix-store` performs primitive operations on the Nix store.
+You generally do not need to run this command manually.
+
+`nix-store` takes exactly one *operation* flag which indicates the
+subcommand to be performed. These are documented below.
+
+# Common options
+
+This section lists the options that are common to all operations. These
+options are allowed for every subcommand, though they may not always
+have an effect. See also [???](#sec-common-options) for a list of common
+options.
+
+  - `--add-root` path  
+    Causes the result of a realisation (`--realise` and
+    `--force-realise`) to be registered as a root of the garbage
+    collector(see [???](#ssec-gc-roots)). The root is stored in path,
+    which must be inside a directory that is scanned for roots by the
+    garbage collector (i.e., typically in a subdirectory of
+    `/nix/var/nix/gcroots/`) *unless* the `--indirect` flag is used.
+    
+    If there are multiple results, then multiple symlinks will be
+    created by sequentially numbering symlinks beyond the first one
+    (e.g., `foo`, `foo-2`, `foo-3`, and so on).
+
+  - `--indirect`  
+    In conjunction with `--add-root`, this option allows roots to be
+    stored *outside* of the GC roots directory. This is useful for
+    commands such as `nix-build` that place a symlink to the build
+    result in the current directory; such a build result should not be
+    garbage-collected unless the symlink is removed.
+    
+    The `--indirect` flag causes a uniquely named symlink to path to be
+    stored in `/nix/var/nix/gcroots/auto/`. For instance,
+    
+        $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
+        
+        $ ls -l /nix/var/nix/gcroots/auto
+        lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
+        
+        $ ls -l /home/eelco/bla/result
+        lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r11343n6qd4...-f-spot-0.0.10
+    
+    Thus, when `/home/eelco/bla/result` is removed, the GC root in the
+    `auto` directory becomes a dangling symlink and will be ignored by
+    the collector.
+    
+    > **Warning**
+    > 
+    > Note that it is not possible to move or rename indirect GC roots,
+    > since the symlink in the `auto` directory will still point to the
+    > old location.
+
+<!-- end list -->
+
+# Operation `--realise`
+
+## Synopsis
+
+nix-store
+
+\--realise
+
+\-r
+
+paths
+
+\--dry-run
+
+## Description
+
+The operation `--realise` essentially “builds” the specified store
+paths. Realisation is a somewhat overloaded term:
+
+  - If the store path is a *derivation*, realisation ensures that the
+    output paths of the derivation are [valid](#gloss-validity) (i.e.,
+    the output path and its closure exist in the file system). This can
+    be done in several ways. First, it is possible that the outputs are
+    already valid, in which case we are done immediately. Otherwise,
+    there may be [substitutes](#gloss-substitute) that produce the
+    outputs (e.g., by downloading them). Finally, the outputs can be
+    produced by performing the build action described by the derivation.
+
+  - If the store path is not a derivation, realisation ensures that the
+    specified path is valid (i.e., it and its closure exist in the file
+    system). If the path is already valid, we are done immediately.
+    Otherwise, the path and any missing paths in its closure may be
+    produced through substitutes. If there are no (successful)
+    subsitutes, realisation fails.
+
+The output path of each derivation is printed on standard output. (For
+non-derivations argument, the argument itself is printed.)
+
+The following flags are available:
+
+  - `--dry-run`  
+    Print on standard error a description of what packages would be
+    built or downloaded, without actually performing the operation.
+
+  - `--ignore-unknown`  
+    If a non-derivation path does not have a substitute, then silently
+    ignore it.
+
+  - `--check`  
+    This option allows you to check whether a derivation is
+    deterministic. It rebuilds the specified derivation and checks
+    whether the result is bitwise-identical with the existing outputs,
+    printing an error if that’s not the case. The outputs of the
+    specified derivation must already exist. When used with `-K`, if an
+    output path is not identical to the corresponding output from the
+    previous build, the new output path is left in
+    `/nix/store/name.check.`
+    
+    See also the `build-repeat` configuration option, which repeats a
+    derivation a number of times and prevents its outputs from being
+    registered as “valid” in the Nix store unless they are identical.
+
+Special exit codes:
+
+  - `100`  
+    Generic build failure, the builder process returned with a non-zero
+    exit code.
+
+  - `101`  
+    Build timeout, the build was aborted because it did not complete
+    within the specified [`timeout`](#conf-timeout).
+
+  - `102`  
+    Hash mismatch, the build output was rejected because it does not
+    match the specified [`outputHash`](#fixed-output-drvs).
+
+  - `104`  
+    Not deterministic, the build succeeded in check mode but the
+    resulting output is not binary reproducable.
+
+With the `--keep-going` flag it's possible for multiple failures to
+occur, in this case the 1xx status codes are or combined using binary
+or.
+
+    1100100
+       ^^^^
+       |||`- timeout
+       ||`-- output hash mismatch
+       |`--- build failure
+       `---- not deterministic
+
+## Examples
+
+This operation is typically used to build store derivations produced by
+[`nix-instantiate`](#sec-nix-instantiate):
+
+    $ nix-store -r $(nix-instantiate ./test.nix)
+    /nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1
+
+This is essentially what [`nix-build`](#sec-nix-build) does.
+
+To test whether a previously-built derivation is deterministic:
+
+    $ nix-build '<nixpkgs>' -A hello --check -K
+
+# Operation `--serve`
+
+## Synopsis
+
+nix-store
+
+\--serve
+
+\--write
+
+## Description
+
+The operation `--serve` provides access to the Nix store over stdin and
+stdout, and is intended to be used as a means of providing Nix store
+access to a restricted ssh user.
+
+The following flags are available:
+
+  - `--write`  
+    Allow the connected client to request the realization of
+    derivations. In effect, this can be used to make the host act as a
+    remote builder.
+
+## Examples
+
+To turn a host into a build server, the `authorized_keys` file can be
+used to provide build access to a given SSH public key:
+
+    $ cat <<EOF >>/root/.ssh/authorized_keys
+    command="nice -n20 nix-store --serve --write" ssh-rsa AAAAB3NzaC1yc2EAAAA...
+    EOF
+
+# Operation `--gc`
+
+## Synopsis
+
+nix-store
+
+\--gc
+
+\--print-roots
+
+\--print-live
+
+\--print-dead
+
+\--max-freed
+
+bytes
+
+## Description
+
+Without additional flags, the operation `--gc` performs a garbage
+collection on the Nix store. That is, all paths in the Nix store not
+reachable via file system references from a set of “roots”, are deleted.
+
+The following suboperations may be specified:
+
+  - `--print-roots`  
+    This operation prints on standard output the set of roots used by
+    the garbage collector. What constitutes a root is described in
+    [???](#ssec-gc-roots).
+
+  - `--print-live`  
+    This operation prints on standard output the set of “live” store
+    paths, which are all the store paths reachable from the roots. Live
+    paths should never be deleted, since that would break consistency —
+    it would become possible that applications are installed that
+    reference things that are no longer present in the store.
+
+  - `--print-dead`  
+    This operation prints out on standard output the set of “dead” store
+    paths, which is just the opposite of the set of live paths: any path
+    in the store that is not live (with respect to the roots) is dead.
+
+By default, all unreachable paths are deleted. The following options
+control what gets deleted and in what order:
+
+  - `--max-freed` bytes  
+    Keep deleting paths until at least bytes bytes have been deleted,
+    then stop. The argument bytes can be followed by the multiplicative
+    suffix `K`, `M`, `G` or `T`, denoting KiB, MiB, GiB or TiB units.
+
+The behaviour of the collector is also influenced by the
+[`keep-outputs`](#conf-keep-outputs) and
+[`keep-derivations`](#conf-keep-derivations) variables in the Nix
+configuration file.
+
+By default, the collector prints the total number of freed bytes when it
+finishes (or when it is interrupted). With `--print-dead`, it prints the
+number of bytes that would be freed.
+
+## Examples
+
+To delete all unreachable paths, just do:
+
+    $ nix-store --gc
+    deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv'
+    ...
+    8825586 bytes freed (8.42 MiB)
+
+To delete at least 100 MiBs of unreachable paths:
+
+    $ nix-store --gc --max-freed $((100 * 1024 * 1024))
+
+# Operation `--delete`
+
+## Synopsis
+
+nix-store
+
+\--delete
+
+\--ignore-liveness
+
+paths
+
+## Description
+
+The operation `--delete` deletes the store paths paths from the Nix
+store, but only if it is safe to do so; that is, when the path is not
+reachable from a root of the garbage collector. This means that you can
+only delete paths that would also be deleted by `nix-store --gc`. Thus,
+`--delete` is a more targeted version of `--gc`.
+
+With the option `--ignore-liveness`, reachability from the roots is
+ignored. However, the path still won’t be deleted if there are other
+paths in the store that refer to it (i.e., depend on it).
+
+## Example
+
+    $ nix-store --delete /nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4
+    0 bytes freed (0.00 MiB)
+    error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4' since it is still alive
+
+# Operation `--query`
+
+## Synopsis
+
+nix-store
+
+\--query
+
+\-q
+
+\--outputs
+
+\--requisites
+
+\-R
+
+\--references
+
+\--referrers
+
+\--referrers-closure
+
+\--deriver
+
+\-d
+
+\--graph
+
+\--tree
+
+\--binding
+
+name
+
+\-b
+
+name
+
+\--hash
+
+\--size
+
+\--roots
+
+\--use-output
+
+\-u
+
+\--force-realise
+
+\-f
+
+paths
+
+## Description
+
+The operation `--query` displays various bits of information about the
+store paths . The queries are described below. At most one query can be
+specified. The default query is `--outputs`.
+
+The paths paths may also be symlinks from outside of the Nix store, to
+the Nix store. In that case, the query is applied to the target of the
+symlink.
+
+## Common query options
+
+  - `--use-output`; `-u`  
+    For each argument to the query that is a store derivation, apply the
+    query to the output path of the derivation instead.
+
+  - `--force-realise`; `-f`  
+    Realise each argument to the query first (see [`nix-store
+                    --realise`](#rsec-nix-store-realise)).
+
+## Queries
+
+  - `--outputs`  
+    Prints out the [output paths](#gloss-output-path) of the store
+    derivations paths. These are the paths that will be produced when
+    the derivation is built.
+
+  - `--requisites`; `-R`  
+    Prints out the [closure](#gloss-closure) of the store path paths.
+    
+    This query has one option:
+    
+      - `--include-outputs`  
+        Also include the output path of store derivations, and their
+        closures.
+    
+    This query can be used to implement various kinds of deployment. A
+    *source deployment* is obtained by distributing the closure of a
+    store derivation. A *binary deployment* is obtained by distributing
+    the closure of an output path. A *cache deployment* (combined
+    source/binary deployment, including binaries of build-time-only
+    dependencies) is obtained by distributing the closure of a store
+    derivation and specifying the option `--include-outputs`.
+
+  - `--references`  
+    Prints the set of [references](#gloss-reference) of the store paths
+    paths, that is, their immediate dependencies. (For *all*
+    dependencies, use `--requisites`.)
+
+  - `--referrers`  
+    Prints the set of *referrers* of the store paths paths, that is, the
+    store paths currently existing in the Nix store that refer to one of
+    paths. Note that contrary to the references, the set of referrers is
+    not constant; it can change as store paths are added or removed.
+
+  - `--referrers-closure`  
+    Prints the closure of the set of store paths paths under the
+    referrers relation; that is, all store paths that directly or
+    indirectly refer to one of paths. These are all the path currently
+    in the Nix store that are dependent on paths.
+
+  - `--deriver`; `-d`  
+    Prints the [deriver](#gloss-deriver) of the store paths paths. If
+    the path has no deriver (e.g., if it is a source file), or if the
+    deriver is not known (e.g., in the case of a binary-only
+    deployment), the string `unknown-deriver` is printed.
+
+  - `--graph`  
+    Prints the references graph of the store paths paths in the format
+    of the `dot` tool of AT\&T's [Graphviz
+    package](http://www.graphviz.org/). This can be used to visualise
+    dependency graphs. To obtain a build-time dependency graph, apply
+    this to a store derivation. To obtain a runtime dependency graph,
+    apply it to an output path.
+
+  - `--tree`  
+    Prints the references graph of the store paths paths as a nested
+    ASCII tree. References are ordered by descending closure size; this
+    tends to flatten the tree, making it more readable. The query only
+    recurses into a store path when it is first encountered; this
+    prevents a blowup of the tree representation of the graph.
+
+  - `--graphml`  
+    Prints the references graph of the store paths paths in the
+    [GraphML](http://graphml.graphdrawing.org/) file format. This can be
+    used to visualise dependency graphs. To obtain a build-time
+    dependency graph, apply this to a store derivation. To obtain a
+    runtime dependency graph, apply it to an output path.
+
+  - `--binding` name; `-b` name  
+    Prints the value of the attribute name (i.e., environment variable)
+    of the store derivations paths. It is an error for a derivation to
+    not have the specified attribute.
+
+  - `--hash`  
+    Prints the SHA-256 hash of the contents of the store paths paths
+    (that is, the hash of the output of `nix-store --dump` on the given
+    paths). Since the hash is stored in the Nix database, this is a fast
+    operation.
+
+  - `--size`  
+    Prints the size in bytes of the contents of the store paths paths —
+    to be precise, the size of the output of `nix-store --dump` on the
+    given paths. Note that the actual disk space required by the store
+    paths may be higher, especially on filesystems with large cluster
+    sizes.
+
+  - `--roots`  
+    Prints the garbage collector roots that point, directly or
+    indirectly, at the store paths paths.
+
+## Examples
+
+Print the closure (runtime dependencies) of the `svn` program in the
+current user environment:
+
+    $ nix-store -qR $(which svn)
+    /nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
+    /nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
+    ...
+
+Print the build-time dependencies of `svn`:
+
+    $ nix-store -qR $(nix-store -qd $(which svn))
+    /nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv
+    /nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh
+    /nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv
+    ... lots of other paths ...
+
+The difference with the previous example is that we ask the closure of
+the derivation (`-qd`), not the closure of the output path that contains
+`svn`.
+
+Show the build-time dependencies as a tree:
+
+    $ nix-store -q --tree $(nix-store -qd $(which svn))
+    /nix/store/7i5082kfb6yjbqdbiwdhhza0am2xvh6c-subversion-1.1.4.drv
+    +---/nix/store/d8afh10z72n8l1cr5w42366abiblgn54-builder.sh
+    +---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv
+    |   +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash
+    |   +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh
+    ...
+
+Show all paths that depend on the same OpenSSL library as `svn`:
+
+    $ nix-store -q --referrers $(nix-store -q --binding openssl $(nix-store -qd $(which svn)))
+    /nix/store/23ny9l9wixx21632y2wi4p585qhva1q8-sylpheed-1.0.0
+    /nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
+    /nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3
+    /nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fx-lynx-2.8.5
+
+Show all paths that directly or indirectly depend on the Glibc (C
+library) used by `svn`:
+
+    $ nix-store -q --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}')
+    /nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2
+    /nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4
+    ...
+
+Note that `ldd` is a command that prints out the dynamic libraries used
+by an ELF executable.
+
+Make a picture of the runtime dependency graph of the current user
+environment:
+
+    $ nix-store -q --graph ~/.nix-profile | dot -Tps > graph.ps
+    $ gv graph.ps
+
+Show every garbage collector root that points to a store path that
+depends on `svn`:
+
+    $ nix-store -q --roots $(which svn)
+    /nix/var/nix/profiles/default-81-link
+    /nix/var/nix/profiles/default-82-link
+    /nix/var/nix/profiles/per-user/eelco/profile-97-link
+
+# Operation `--add`
+
+## Synopsis
+
+nix-store
+
+\--add
+
+paths
+
+## Description
+
+The operation `--add` adds the specified paths to the Nix store. It
+prints the resulting paths in the Nix store on standard output.
+
+## Example
+
+    $ nix-store --add ./foo.c
+    /nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zf-foo.c
+
+# Operation `--add-fixed`
+
+## Synopsis
+
+nix-store
+
+\--recursive
+
+\--add-fixed
+
+algorithm
+
+paths
+
+## Description
+
+The operation `--add-fixed` adds the specified paths to the Nix store.
+Unlike `--add` paths are registered using the specified hashing
+algorithm, resulting in the same output path as a fixed-output
+derivation. This can be used for sources that are not available from a
+public url or broke since the download expression was written.
+
+This operation has the following options:
+
+  - `--recursive`  
+    Use recursive instead of flat hashing mode, used when adding
+    directories to the store.
+
+## Example
+
+    $ nix-store --add-fixed sha256 ./hello-2.10.tar.gz
+    /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+
+# Operation `--verify`
+
+## Synopsis
+
+nix-store
+
+\--verify
+
+\--check-contents
+
+\--repair
+
+## Description
+
+The operation `--verify` verifies the internal consistency of the Nix
+database, and the consistency between the Nix database and the Nix
+store. Any inconsistencies encountered are automatically repaired.
+Inconsistencies are generally the result of the Nix store or database
+being modified by non-Nix tools, or of bugs in Nix itself.
+
+This operation has the following options:
+
+  - `--check-contents`  
+    Checks that the contents of every valid store path has not been
+    altered by computing a SHA-256 hash of the contents and comparing it
+    with the hash stored in the Nix database at build time. Paths that
+    have been modified are printed out. For large stores,
+    `--check-contents` is obviously quite slow.
+
+  - `--repair`  
+    If any valid path is missing from the store, or (if
+    `--check-contents` is given) the contents of a valid path has been
+    modified, then try to repair the path by redownloading it. See
+    `nix-store --repair-path` for details.
+
+# Operation `--verify-path`
+
+## Synopsis
+
+nix-store
+
+\--verify-path
+
+paths
+
+## Description
+
+The operation `--verify-path` compares the contents of the given store
+paths to their cryptographic hashes stored in Nix’s database. For every
+changed path, it prints a warning message. The exit status is 0 if no
+path has changed, and 1 otherwise.
+
+## Example
+
+To verify the integrity of the `svn` command and all its dependencies:
+
+    $ nix-store --verify-path $(nix-store -qR $(which svn))
+
+# Operation `--repair-path`
+
+## Synopsis
+
+nix-store
+
+\--repair-path
+
+paths
+
+## Description
+
+The operation `--repair-path` attempts to “repair” the specified paths
+by redownloading them using the available substituters. If no
+substitutes are available, then repair is not possible.
+
+> **Warning**
+> 
+> During repair, there is a very small time window during which the old
+> path (if it exists) is moved out of the way and replaced with the new
+> path. If repair is interrupted in between, then the system may be left
+> in a broken state (e.g., if the path contains a critical system
+> component like the GNU C Library).
+
+## Example
+
+    $ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
+    path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified!
+      expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588',
+      got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4'
+    
+    $ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
+    fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
+    …
+
+# Operation `--dump`
+
+## Synopsis
+
+nix-store
+
+\--dump
+
+path
+
+## Description
+
+The operation `--dump` produces a NAR (Nix ARchive) file containing the
+contents of the file system tree rooted at path. The archive is written
+to standard output.
+
+A NAR archive is like a TAR or Zip archive, but it contains only the
+information that Nix considers important. For instance, timestamps are
+elided because all files in the Nix store have their timestamp set to 0
+anyway. Likewise, all permissions are left out except for the execute
+bit, because all files in the Nix store have 444 or 555 permission.
+
+Also, a NAR archive is *canonical*, meaning that “equal” paths always
+produce the same NAR archive. For instance, directory entries are always
+sorted so that the actual on-disk order doesn’t influence the result.
+This means that the cryptographic hash of a NAR dump of a path is usable
+as a fingerprint of the contents of the path. Indeed, the hashes of
+store paths stored in Nix’s database (see [`nix-store -q
+--hash`](#refsec-nix-store-query)) are SHA-256 hashes of the NAR dump of
+each store path.
+
+NAR archives support filenames of unlimited length and 64-bit file
+sizes. They can contain regular files, directories, and symbolic links,
+but not other types of files (such as device nodes).
+
+A Nix archive can be unpacked using `nix-store
+--restore`.
+
+# Operation `--restore`
+
+## Synopsis
+
+nix-store
+
+\--restore
+
+path
+
+## Description
+
+The operation `--restore` unpacks a NAR archive to path, which must not
+already exist. The archive is read from standard input.
+
+# Operation `--export`
+
+## Synopsis
+
+nix-store
+
+\--export
+
+paths
+
+## Description
+
+The operation `--export` writes a serialisation of the specified store
+paths to standard output in a format that can be imported into another
+Nix store with `nix-store --import`. This is like `nix-store
+--dump`, except that the NAR archive produced by that command doesn’t
+contain the necessary meta-information to allow it to be imported into
+another Nix store (namely, the set of references of the path).
+
+This command does not produce a *closure* of the specified paths, so if
+a store path references other store paths that are missing in the target
+Nix store, the import will fail. To copy a whole closure, do something
+like:
+
+    $ nix-store --export $(nix-store -qR paths) > out
+
+To import the whole closure again, run:
+
+    $ nix-store --import < out
+
+# Operation `--import`
+
+## Synopsis
+
+nix-store
+
+\--import
+
+## Description
+
+The operation `--import` reads a serialisation of a set of store paths
+produced by `nix-store --export` from standard input and adds those
+store paths to the Nix store. Paths that already exist in the Nix store
+are ignored. If a path refers to another path that doesn’t exist in the
+Nix store, the import fails.
+
+# Operation `--optimise`
+
+## Synopsis
+
+nix-store
+
+\--optimise
+
+## Description
+
+The operation `--optimise` reduces Nix store disk space usage by finding
+identical files in the store and hard-linking them to each other. It
+typically reduces the size of the store by something like 25-35%. Only
+regular files and symlinks are hard-linked in this manner. Files are
+considered identical when they have the same NAR archive serialisation:
+that is, regular files must have the same contents and permission
+(executable or non-executable), and symlinks must have the same
+contents.
+
+After completion, or when the command is interrupted, a report on the
+achieved savings is printed on standard error.
+
+Use `-vv` or `-vvv` to get some progress indication.
+
+## Example
+
+    $ nix-store --optimise
+    hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
+    ...
+    541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
+    there are 114486 files with equal contents out of 215894 files in total
+
+# Operation `--read-log`
+
+## Synopsis
+
+nix-store
+
+\--read-log
+
+\-l
+
+paths
+
+## Description
+
+The operation `--read-log` prints the build log of the specified store
+paths on standard output. The build log is whatever the builder of a
+derivation wrote to standard output and standard error. If a store path
+is not a derivation, the deriver of the store path is used.
+
+Build logs are kept in `/nix/var/log/nix/drvs`. However, there is no
+guarantee that a build log is available for any particular store path.
+For instance, if the path was downloaded as a pre-built binary through a
+substitute, then the log is unavailable.
+
+## Example
+
+    $ nix-store -l $(which ktorrent)
+    building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66ph1-ktorrent-2.2.1
+    unpacking sources
+    unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz
+    ktorrent-2.2.1/
+    ktorrent-2.2.1/NEWS
+    ...
+
+# Operation `--dump-db`
+
+## Synopsis
+
+nix-store
+
+\--dump-db
+
+paths
+
+## Description
+
+The operation `--dump-db` writes a dump of the Nix database to standard
+output. It can be loaded into an empty Nix store using `--load-db`. This
+is useful for making backups and when migrating to different database
+schemas.
+
+By default, `--dump-db` will dump the entire Nix database. When one or
+more store paths is passed, only the subset of the Nix database for
+those store paths is dumped. As with `--export`, the user is responsible
+for passing all the store paths for a closure. See `--export` for an
+example.
+
+# Operation `--load-db`
+
+## Synopsis
+
+nix-store
+
+\--load-db
+
+## Description
+
+The operation `--load-db` reads a dump of the Nix database created by
+`--dump-db` from standard input and loads it into the Nix database.
+
+# Operation `--print-env`
+
+## Synopsis
+
+nix-store
+
+\--print-env
+
+drvpath
+
+## Description
+
+The operation `--print-env` prints out the environment of a derivation
+in a format that can be evaluated by a shell. The command line arguments
+of the builder are placed in the variable `_args`.
+
+## Example
+
+    $ nix-store --print-env $(nix-instantiate '<nixpkgs>' -A firefox)
+    …
+    export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2'
+    export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
+    export system; system='x86_64-linux'
+    export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh'
+
+# Operation `--generate-binary-cache-key`
+
+## Synopsis
+
+nix-store
+
+\--generate-binary-cache-key
+
+key-name
+
+secret-key-file
+
+public-key-file
+
+## Description
+
+This command generates an [Ed25519 key pair](http://ed25519.cr.yp.to/)
+that can be used to create a signed binary cache. It takes three
+mandatory parameters:
+
+1.  A key name, such as `cache.example.org-1`, that is used to look up
+    keys on the client when it verifies signatures. It can be anything,
+    but it’s suggested to use the host name of your cache (e.g.
+    `cache.example.org`) with a suffix denoting the number of the key
+    (to be incremented every time you need to revoke a key).
+
+2.  The file name where the secret key is to be stored.
+
+3.  The file name where the public key is to be stored.
+
+# Environment variables
diff --git a/doc/manual/src/command-ref/opt-common-syn.md b/doc/manual/src/command-ref/opt-common-syn.md
new file mode 100644
index 000000000..b66d318c2
--- /dev/null
+++ b/doc/manual/src/command-ref/opt-common-syn.md
@@ -0,0 +1,57 @@
+\--help
+
+\--version
+
+\--verbose
+
+\-v
+
+\--quiet
+
+\--log-format
+
+format
+
+\--no-build-output
+
+\-Q
+
+\--max-jobs
+
+\-j
+
+number
+
+\--cores
+
+number
+
+\--max-silent-time
+
+number
+
+\--timeout
+
+number
+
+\--keep-going
+
+\-k
+
+\--keep-failed
+
+\-K
+
+\--fallback
+
+\--readonly-mode
+
+\-I
+
+path
+
+\--option
+
+name
+
+value
diff --git a/doc/manual/src/command-ref/opt-inst-syn.md b/doc/manual/src/command-ref/opt-inst-syn.md
new file mode 100644
index 000000000..1703c40e3
--- /dev/null
+++ b/doc/manual/src/command-ref/opt-inst-syn.md
@@ -0,0 +1,15 @@
+\--prebuilt-only
+
+\-b
+
+\--attr
+
+\-A
+
+\--from-expression
+
+\-E
+
+\--from-profile
+
+path

From efff6cf163fb911689b41d7c2970efd8b17876e1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 13:09:30 +0200
Subject: [PATCH 018/176] Install all manpages

---
 doc/manual/local.mk | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 80c517702..13d937f8d 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -12,20 +12,21 @@ dist-files += $(d)/version.txt
 
 # Generate man pages.
 man-pages := $(foreach n, \
-  nix-copy-closure.1 \
-  nix.conf.5, \
+  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
+  nix-collect-garbage.1 \
+  nix-prefetch-url.1 nix-channel.1 \
+  nix-hash.1 nix-copy-closure.1 \
+  nix.conf.5 nix-daemon.8, \
   $(d)/$(n))
-#  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
-#  nix-collect-garbage.1, \
-#  nix-prefetch-url.1 nix-channel.1 \
-#  nix-hash.1 nix-copy-closure.1 \
-#  nix.conf.5 nix-daemon.8, \
 
 clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
 dist-files += $(man-pages)
 
-$(d)/nix-copy-closure.1: $(d)/src/command-ref/nix-copy-closure.md
+$(d)/%.1: $(d)/src/command-ref/%.md
+	$(trace-gen) lowdown -sT man $^ -o $@
+
+$(d)/%.8: $(d)/src/command-ref/%.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
 $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md

From 13df1faf25769924dae07e65f3ef3ffdd66f10ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 13:58:49 +0200
Subject: [PATCH 019/176] Get rid of callouts since Markdown doesn't support
 them

---
 .../expressions/arguments-variables.xml       | 51 ++++++-------
 doc/manual/expressions/build-script.xml       | 58 ++++++++-------
 doc/manual/expressions/builtins.xml           | 72 ++++++++-----------
 doc/manual/expressions/expression-syntax.xml  | 50 +++++++------
 doc/manual/expressions/generic-builder.xml    | 34 ++++-----
 .../expressions/language-constructs.xml       | 36 +++++-----
 .../src/expressions/arguments-variables.md    | 28 ++++----
 doc/manual/src/expressions/build-script.md    | 32 ++++-----
 doc/manual/src/expressions/builtins.md        | 54 +++++++-------
 .../src/expressions/expression-syntax.md      | 29 ++++----
 doc/manual/src/expressions/generic-builder.md | 18 ++---
 .../src/expressions/language-constructs.md    | 22 +++---
 12 files changed, 233 insertions(+), 251 deletions(-)

diff --git a/doc/manual/expressions/arguments-variables.xml b/doc/manual/expressions/arguments-variables.xml
index bf60cb7ee..a4375c777 100644
--- a/doc/manual/expressions/arguments-variables.xml
+++ b/doc/manual/expressions/arguments-variables.xml
@@ -6,20 +6,25 @@
 
 <title>Arguments and Variables</title>
 
-<example xml:id='ex-hello-composition'>
+<para>The Nix expression in <xref linkend='ex-hello-nix' /> is a
+function; it is missing some arguments that have to be filled in
+somewhere.  In the Nix Packages collection this is done in the file
+<filename>pkgs/top-level/all-packages.nix</filename>, where all Nix
+expressions for packages are imported and called with the appropriate
+arguments. Here are some fragments of
+<filename>all-packages.nix</filename>, with annotations of what they
+mean:</para>
 
-<title>Composing GNU Hello
-(<filename>all-packages.nix</filename>)</title>
 <programlisting>
 ...
 
-rec { <co xml:id='ex-hello-composition-co-1' />
+rec { ①
 
-  hello = import ../applications/misc/hello/ex-1 <co xml:id='ex-hello-composition-co-2' /> { <co xml:id='ex-hello-composition-co-3' />
+  hello = import ../applications/misc/hello/ex-1 ② { ③
     inherit fetchurl stdenv perl;
   };
 
-  perl = import ../development/interpreters/perl { <co xml:id='ex-hello-composition-co-4' />
+  perl = import ../development/interpreters/perl { ④
     inherit fetchurl stdenv;
   };
 
@@ -31,31 +36,19 @@ rec { <co xml:id='ex-hello-composition-co-1' />
 
 }
 </programlisting>
-</example>
 
-<para>The Nix expression in <xref linkend='ex-hello-nix' /> is a
-function; it is missing some arguments that have to be filled in
-somewhere.  In the Nix Packages collection this is done in the file
-<filename>pkgs/top-level/all-packages.nix</filename>, where all
-Nix expressions for packages are imported and called with the
-appropriate arguments.  <xref linkend='ex-hello-composition' /> shows
-some fragments of
-<filename>all-packages.nix</filename>.</para>
-
-<calloutlist>
-
-  <callout arearefs='ex-hello-composition-co-1'>
+<orderedlist>
 
+  <listitem>
     <para>This file defines a set of attributes, all of which are
     concrete derivations (i.e., not functions).  In fact, we define a
     <emphasis>mutually recursive</emphasis> set of attributes.  That
     is, the attributes can refer to each other.  This is precisely
     what we want since we want to <quote>plug</quote> the
     various packages into each other.</para>
+  </listitem>
 
-  </callout>
-
-  <callout arearefs='ex-hello-composition-co-2'>
+  <listitem>
 
     <para>Here we <emphasis>import</emphasis> the Nix expression for
     GNU Hello.  The import operation just loads and returns the
@@ -71,9 +64,9 @@ some fragments of
     When you try to import a directory, Nix automatically appends
     <filename>/default.nix</filename> to the file name.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-composition-co-3'>
+  <listitem>
 
     <para>This is where the actual composition takes place.  Here we
     <emphasis>call</emphasis> the function imported from
@@ -107,15 +100,15 @@ hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
 
     </para></note>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-composition-co-4'>
+  <listitem>
 
     <para>Likewise, we have to instantiate Perl,
     <varname>fetchurl</varname>, and the standard environment.</para>
 
-  </callout>
+  </listitem>
 
-</calloutlist>
+</orderedlist>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/manual/expressions/build-script.xml b/doc/manual/expressions/build-script.xml
index 44264239d..892274f50 100644
--- a/doc/manual/expressions/build-script.xml
+++ b/doc/manual/expressions/build-script.xml
@@ -6,32 +6,30 @@
 
 <title>Build Script</title>
 
-<example xml:id='ex-hello-builder'><title>Build script for GNU Hello
-(<filename>builder.sh</filename>)</title>
-<programlisting>
-source $stdenv/setup <co xml:id='ex-hello-builder-co-1' />
-
-PATH=$perl/bin:$PATH <co xml:id='ex-hello-builder-co-2' />
-
-tar xvfz $src <co xml:id='ex-hello-builder-co-3' />
-cd hello-*
-./configure --prefix=$out <co xml:id='ex-hello-builder-co-4' />
-make <co xml:id='ex-hello-builder-co-5' />
-make install</programlisting>
-</example>
-
-<para><xref linkend='ex-hello-builder' /> shows the builder referenced
+<para>Here is the builder referenced
 from Hello's Nix expression (stored in
-<filename>pkgs/applications/misc/hello/ex-1/builder.sh</filename>).
-The builder can actually be made a lot shorter by using the
+<filename>pkgs/applications/misc/hello/ex-1/builder.sh</filename>):</para>
+
+<programlisting>
+source $stdenv/setup ①
+
+PATH=$perl/bin:$PATH ②
+
+tar xvfz $src ③
+cd hello-*
+./configure --prefix=$out ④
+make ⑤
+make install</programlisting>
+
+<para>The builder can actually be made a lot shorter by using the
 <emphasis>generic builder</emphasis> functions provided by
 <varname>stdenv</varname>, but here we write out the build steps to
 elucidate what a builder does.  It performs the following
 steps:</para>
 
-<calloutlist>
+<orderedlist>
 
-  <callout arearefs='ex-hello-builder-co-1'>
+  <listitem>
 
     <para>When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the
@@ -52,9 +50,9 @@ steps:</para>
     attribute in <xref linkend='ex-hello-nix' />, but
     <varname>mkDerivation</varname> adds it automatically.)</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder-co-2'>
+  <listitem>
 
     <para>Since Hello needs Perl, we have to make sure that Perl is in
     the <literal>PATH</literal>.  The <literal>perl</literal> environment
@@ -63,9 +61,9 @@ steps:</para>
     <filename><replaceable>$perl</replaceable>/bin</filename> is the
     directory containing the Perl interpreter.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder-co-3'>
+  <listitem>
 
     <para>Now we have to unpack the sources.  The
     <varname>src</varname> attribute was bound to the result of
@@ -82,9 +80,9 @@ steps:</para>
     always newly created, so you don't have to worry about files from
     previous builds interfering with the current build.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder-co-4'>
+  <listitem>
 
     <para>GNU Hello is a typical Autoconf-based package, so we first
     have to run its <filename>configure</filename> script.  In Nix
@@ -98,17 +96,17 @@ steps:</para>
     <literal>--prefix=$out</literal> to cause Hello to be installed in
     the expected location.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder-co-5'>
+  <listitem>
 
     <para>Finally we build Hello (<literal>make</literal>) and install
     it into the location specified by <literal>out</literal>
     (<literal>make install</literal>).</para>
 
-  </callout>
+  </listitem>
 
-</calloutlist>
+</orderedlist>
 
 <para>If you are wondering about the absence of error checking on the
 result of various commands called in the builder: this is because the
@@ -116,4 +114,4 @@ shell script is evaluated with Bash's <option>-e</option> option,
 which causes the script to be aborted if any command fails without an
 error check.</para>
 
-</section>
\ No newline at end of file
+</section>
diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml
index a18c5801a..478b67ce8 100644
--- a/doc/manual/expressions/builtins.xml
+++ b/doc/manual/expressions/builtins.xml
@@ -1511,39 +1511,9 @@ in foo</programlisting>
     <!-- TODO: more formally describe the schema of the XML
     representation -->
 
-    <para><xref linkend='ex-toxml' /> shows an example where this is
-    the case.  The builder is supposed to generate the configuration
-    file for a <link xlink:href='http://jetty.mortbay.org/'>Jetty
-    servlet container</link>.  A servlet container contains a number
-    of servlets (<filename>*.war</filename> files) each exported under
-    a specific URI prefix.  So the servlet configuration is a list of
-    sets containing the <varname>path</varname> and
-    <varname>war</varname> of the servlet (<xref
-    linkend='ex-toxml-co-servlets' />).  This kind of information is
-    difficult to communicate with the normal method of passing
-    information through an environment variable, which just
-    concatenates everything together into a string (which might just
-    work in this case, but wouldn’t work if fields are optional or
-    contain lists themselves).  Instead the Nix expression is
-    converted to an XML representation with
-    <function>toXML</function>, which is unambiguous and can easily be
-    processed with the appropriate tools.  For instance, in the
-    example an XSLT stylesheet (<xref linkend='ex-toxml-co-stylesheet'
-    />) is applied to it (<xref linkend='ex-toxml-co-apply' />) to
-    generate the XML configuration file for the Jetty server.  The XML
-    representation produced from <xref linkend='ex-toxml-co-servlets'
-    /> by <function>toXML</function> is shown in <xref
-    linkend='ex-toxml-result' />.</para>
-
-    <para>Note that <xref linkend='ex-toxml' /> uses the <function
-    linkend='builtin-toFile'>toFile</function> built-in to write the
-    builder and the stylesheet “inline” in the Nix expression.  The
-    path of the stylesheet is spliced into the builder at
-    <literal>xsltproc ${stylesheet}
-    <replaceable>...</replaceable></literal>.</para>
-
-    <example xml:id='ex-toxml'><title>Passing information to a builder
-    using <function>toXML</function></title>
+    <para>Here is an example where this is
+    the case:
+    </para>
 
 <programlisting><![CDATA[
 { stdenv, fetchurl, libxslt, jira, uberwiki }:
@@ -1556,10 +1526,10 @@ stdenv.mkDerivation (rec {
   builder = builtins.toFile "builder.sh" "
     source $stdenv/setup
     mkdir $out
-    echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml]]> <co xml:id='ex-toxml-co-apply' /> <![CDATA[
+    echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml]]> ① <![CDATA[
   ";
 
-  stylesheet = builtins.toFile "stylesheet.xsl"]]> <co xml:id='ex-toxml-co-stylesheet' /> <![CDATA[
+  stylesheet = builtins.toFile "stylesheet.xsl"]]> ② <![CDATA[
    "<?xml version='1.0' encoding='UTF-8'?>
     <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
       <xsl:template match='/'>
@@ -1575,16 +1545,32 @@ stdenv.mkDerivation (rec {
     </xsl:stylesheet>
   ";
 
-  servlets = builtins.toXML []]> <co xml:id='ex-toxml-co-servlets' /> <![CDATA[
+  servlets = builtins.toXML []]> ③ <![CDATA[
     { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
     { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
   ];
 })]]></programlisting>
 
-    </example>
-
-    <example xml:id='ex-toxml-result'><title>XML representation produced by
-    <function>toXML</function></title>
+    <para>The builder is supposed to generate the configuration file
+    for a <link xlink:href='http://jetty.mortbay.org/'>Jetty servlet
+    container</link>.  A servlet container contains a number of
+    servlets (<filename>*.war</filename> files) each exported under a
+    specific URI prefix.  So the servlet configuration is a list of
+    sets containing the <varname>path</varname> and
+    <varname>war</varname> of the servlet (<xref
+    linkend='ex-toxml-co-servlets' />).  This kind of information is
+    difficult to communicate with the normal method of passing
+    information through an environment variable, which just
+    concatenates everything together into a string (which might just
+    work in this case, but wouldn’t work if fields are optional or
+    contain lists themselves).  Instead the Nix expression is
+    converted to an XML representation with
+    <function>toXML</function>, which is unambiguous and can easily be
+    processed with the appropriate tools.  For instance, in the
+    example an XSLT stylesheet (at point ②) is applied to it (at point
+    ①) to generate the XML configuration file for the Jetty server.
+    The XML representation produced at point ③ by
+    <function>toXML</function> is as follows:</para>
 
 <programlisting><![CDATA[<?xml version='1.0' encoding='utf-8'?>
 <expr>
@@ -1608,7 +1594,11 @@ stdenv.mkDerivation (rec {
   </list>
 </expr>]]></programlisting>
 
-    </example>
+    <para>Note that <xref linkend='ex-toxml' /> uses the <function
+    linkend='builtin-toFile'>toFile</function> built-in to write the
+    builder and the stylesheet “inline” in the Nix expression.  The
+    path of the stylesheet is spliced into the builder using the
+    syntax <literal>xsltproc ${stylesheet}</literal>.</para>
 
     </listitem>
 
diff --git a/doc/manual/expressions/expression-syntax.xml b/doc/manual/expressions/expression-syntax.xml
index a3de20713..562a9e9f4 100644
--- a/doc/manual/expressions/expression-syntax.xml
+++ b/doc/manual/expressions/expression-syntax.xml
@@ -6,33 +6,31 @@
 
 <title>Expression Syntax</title>
 
-<example xml:id='ex-hello-nix'><title>Nix expression for GNU Hello
-(<filename>default.nix</filename>)</title>
-<programlisting>
-{ stdenv, fetchurl, perl }: <co xml:id='ex-hello-nix-co-1' />
+<para>Here is a Nix expression for GNU Hello:</para>
 
-stdenv.mkDerivation { <co xml:id='ex-hello-nix-co-2' />
-  name = "hello-2.1.1"; <co xml:id='ex-hello-nix-co-3' />
-  builder = ./builder.sh; <co xml:id='ex-hello-nix-co-4' />
-  src = fetchurl { <co xml:id='ex-hello-nix-co-5' />
+<programlisting>
+{ stdenv, fetchurl, perl }: ①
+
+stdenv.mkDerivation { ②
+  name = "hello-2.1.1"; ③
+  builder = ./builder.sh; ④
+  src = fetchurl { ⑤
     url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
     sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
   };
-  inherit perl; <co xml:id='ex-hello-nix-co-6' />
+  inherit perl; ⑥
 }</programlisting>
-</example>
 
-<para><xref linkend='ex-hello-nix' /> shows a Nix expression for GNU
-Hello.  It's actually already in the Nix Packages collection in
+<para>This file is actually already in the Nix Packages collection in
 <filename>pkgs/applications/misc/hello/ex-1/default.nix</filename>.
 It is customary to place each package in a separate directory and call
 the single Nix expression in that directory
 <filename>default.nix</filename>.  The file has the following elements
 (referenced from the figure by number):
 
-<calloutlist>
+<orderedlist>
 
-  <callout arearefs='ex-hello-nix-co-1'>
+  <listitem>
 
     <para>This states that the expression is a
     <emphasis>function</emphasis> that expects to be called with three
@@ -57,9 +55,9 @@ the single Nix expression in that directory
     function; when given the required arguments, the body should
     describe how to build an instance of the Hello package.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-nix-co-2'>
+  <listitem>
 
     <para>So we have to build a package.  Building something from
     other stuff is called a <emphasis>derivation</emphasis> in Nix (as
@@ -76,9 +74,9 @@ the single Nix expression in that directory
     <replaceable>nameN</replaceable> =
     <replaceable>exprN</replaceable>; }</literal>.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-nix-co-3'>
+  <listitem>
 
     <para>The attribute <varname>name</varname> specifies the symbolic
     name and version of the package.  Nix doesn't really care about
@@ -87,9 +85,9 @@ the single Nix expression in that directory
     packages.  This attribute is required by
     <varname>mkDerivation</varname>.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-nix-co-4'>
+  <listitem>
 
     <para>The attribute <varname>builder</varname> specifies the
     builder.  This attribute can sometimes be omitted, in which case
@@ -101,9 +99,9 @@ the single Nix expression in that directory
     <command>./builder.sh</command> refers to the shell script shown
     in <xref linkend='ex-hello-builder' />, discussed below.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-nix-co-5'>
+  <listitem>
 
     <para>The builder has to know what the sources of the package
     are.  Here, the attribute <varname>src</varname> is bound to the
@@ -120,9 +118,9 @@ the single Nix expression in that directory
     customary, and it's also expected by the default builder (which we
     don't use in this example).</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-nix-co-6'>
+  <listitem>
 
     <para>Since the derivation requires Perl, we have to pass the
     value of the <varname>perl</varname> function argument to the
@@ -139,9 +137,9 @@ perl = perl;</programlisting>
     causes the specified attributes to be bound to whatever variables
     with the same name happen to be in scope.</para>
 
-  </callout>
+  </listitem>
 
-</calloutlist>
+</orderedlist>
 
 </para>
 
diff --git a/doc/manual/expressions/generic-builder.xml b/doc/manual/expressions/generic-builder.xml
index 16b0268a7..71b342f99 100644
--- a/doc/manual/expressions/generic-builder.xml
+++ b/doc/manual/expressions/generic-builder.xml
@@ -20,23 +20,21 @@ make install</programlisting>
 The builders for almost all Unix packages look like this — set up some
 environment variables, unpack the sources, configure, build, and
 install.  For this reason the standard environment provides some Bash
-functions that automate the build process.  A builder using the
-generic build facilities in shown in <xref linkend='ex-hello-builder2'
-/>.</para>
+functions that automate the build process.  Here is what a builder
+using the generic build facilities looks like:</para>
 
-<example xml:id='ex-hello-builder2'><title>Build script using the generic
-build functions</title>
 <programlisting>
-buildInputs="$perl" <co xml:id='ex-hello-builder2-co-1' />
+buildInputs="$perl" ①
 
-source $stdenv/setup <co xml:id='ex-hello-builder2-co-2' />
+source $stdenv/setup ②
 
-genericBuild <co xml:id='ex-hello-builder2-co-3' /></programlisting>
-</example>
+genericBuild ③</programlisting>
 
-<calloutlist>
+<para>Here is what each line means:
 
-  <callout arearefs='ex-hello-builder2-co-1'>
+<orderedlist>
+
+  <listitem>
 
     <para>The <literal>buildInputs</literal> variable tells
     <filename>setup</filename> to use the indicated packages as
@@ -54,16 +52,16 @@ genericBuild <co xml:id='ex-hello-builder2-co-3' /></programlisting>
     inputs.</para></footnote>
     </para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder2-co-2'>
+  <listitem arearefs='ex-hello-builder2-co-2'>
 
     <para>The function <function>genericBuild</function> is defined in
     the file <literal>$stdenv/setup</literal>.</para>
 
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-hello-builder2-co-3'>
+  <listitem arearefs='ex-hello-builder2-co-3'>
 
     <para>The final step calls the shell function
     <function>genericBuild</function>, which performs the steps that
@@ -73,9 +71,11 @@ genericBuild <co xml:id='ex-hello-builder2-co-3' /></programlisting>
     <command>bzip2</command>, etc.  It can be customised in many ways;
     see the Nixpkgs manual for details.</para>
 
-  </callout>
+  </listitem>
 
-</calloutlist>
+</orderedlist>
+
+</para>
 
 <para>Discerning readers will note that the
 <literal>buildInputs</literal> could just as well have been set in the Nix
diff --git a/doc/manual/expressions/language-constructs.xml b/doc/manual/expressions/language-constructs.xml
index 0d0cbbe15..4d316609c 100644
--- a/doc/manual/expressions/language-constructs.xml
+++ b/doc/manual/expressions/language-constructs.xml
@@ -278,7 +278,9 @@ evaluate to a Boolean value.  If it evaluates to
 <literal>true</literal>, <replaceable>e2</replaceable> is returned;
 otherwise expression evaluation is aborted and a backtrace is printed.</para>
 
-<example xml:id='ex-subversion-nix'><title>Nix expression for Subversion</title>
+<para>Here is a Nix expression for the Subversion package that shows
+how assertions can be used:.</para>
+
 <programlisting>
 { localServer ? false
 , httpServer ? false
@@ -290,9 +292,9 @@ otherwise expression evaluation is aborted and a backtrace is printed.</para>
 , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
 }:
 
-assert localServer -> db4 != null; <co xml:id='ex-subversion-nix-co-1' />
-assert httpServer -> httpd != null &amp;&amp; httpd.expat == expat; <co xml:id='ex-subversion-nix-co-2' />
-assert sslSupport -> openssl != null &amp;&amp; (httpServer -> httpd.openssl == openssl); <co xml:id='ex-subversion-nix-co-3' />
+assert localServer -> db4 != null; ①
+assert httpServer -> httpd != null &amp;&amp; httpd.expat == expat; ②
+assert sslSupport -> openssl != null &amp;&amp; (httpServer -> httpd.openssl == openssl); ③
 assert pythonBindings -> swig != null &amp;&amp; swig.pythonSupport;
 assert javaSwigBindings -> swig != null &amp;&amp; swig.javaSupport;
 assert javahlBindings -> j2sdk != null;
@@ -300,26 +302,24 @@ assert javahlBindings -> j2sdk != null;
 stdenv.mkDerivation {
   name = "subversion-1.1.1";
   ...
-  openssl = if sslSupport then openssl else null; <co xml:id='ex-subversion-nix-co-4' />
+  openssl = if sslSupport then openssl else null; ④
   ...
 }</programlisting>
-</example>
 
-<para><xref linkend='ex-subversion-nix' /> show how assertions are
-used in the Nix expression for Subversion.</para>
+<para>The points of interest are:</para>
 
-<calloutlist>
+<orderedlist>
 
-  <callout arearefs='ex-subversion-nix-co-1'>
+  <listitem>
     <para>This assertion states that if Subversion is to have support
     for local repositories, then Berkeley DB is needed.  So if the
     Subversion function is called with the
     <varname>localServer</varname> argument set to
     <literal>true</literal> but the <varname>db4</varname> argument
     set to <literal>null</literal>, then the evaluation fails.</para>
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-subversion-nix-co-2'>
+  <listitem>
     <para>This is a more subtle condition: if Subversion is built with
     Apache (<literal>httpServer</literal>) support, then the Expat
     library (an XML library) used by Subversion should be same as the
@@ -327,27 +327,27 @@ used in the Nix expression for Subversion.</para>
     Subversion code ends up being linked with Apache code, and if the
     Expat libraries do not match, a build- or runtime link error or
     incompatibility might occur.</para>
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-subversion-nix-co-3'>
+  <listitem>
     <para>This assertion says that in order for Subversion to have SSL
     support (so that it can access <literal>https</literal> URLs), an
     OpenSSL library must be passed.  Additionally, it says that
     <emphasis>if</emphasis> Apache support is enabled, then Apache's
     OpenSSL should match Subversion's.  (Note that if Apache support
     is not enabled, we don't care about Apache's OpenSSL.)</para>
-  </callout>
+  </listitem>
 
-  <callout arearefs='ex-subversion-nix-co-4'>
+  <listitem>
     <para>The conditional here is not really related to assertions,
     but is worth pointing out: it ensures that if SSL support is
     disabled, then the Subversion derivation is not dependent on
     OpenSSL, even if a non-<literal>null</literal> value was passed.
     This prevents an unnecessary rebuild of Subversion if OpenSSL
     changes.</para>
-  </callout>
+  </listitem>
 
-</calloutlist>
+</orderedlist>
 
 </simplesect>
 
diff --git a/doc/manual/src/expressions/arguments-variables.md b/doc/manual/src/expressions/arguments-variables.md
index 9a373d94d..436ae559d 100644
--- a/doc/manual/src/expressions/arguments-variables.md
+++ b/doc/manual/src/expressions/arguments-variables.md
@@ -1,14 +1,21 @@
 # Arguments and Variables
 
+The Nix expression in [???](#ex-hello-nix) is a function; it is missing
+some arguments that have to be filled in somewhere. In the Nix Packages
+collection this is done in the file `pkgs/top-level/all-packages.nix`,
+where all Nix expressions for packages are imported and called with the
+appropriate arguments. Here are some fragments of `all-packages.nix`,
+with annotations of what they mean:
+
     ...
     
-    rec { 
+    rec { ①
     
-      hello = import ../applications/misc/hello/ex-1  { 
+      hello = import ../applications/misc/hello/ex-1 ② { ③
         inherit fetchurl stdenv perl;
       };
     
-      perl = import ../development/interpreters/perl { 
+      perl = import ../development/interpreters/perl { ④
         inherit fetchurl stdenv;
       };
     
@@ -20,20 +27,13 @@
     
     }
 
-The Nix expression in [???](#ex-hello-nix) is a function; it is missing
-some arguments that have to be filled in somewhere. In the Nix Packages
-collection this is done in the file `pkgs/top-level/all-packages.nix`,
-where all Nix expressions for packages are imported and called with the
-appropriate arguments. [example\_title](#ex-hello-composition) shows
-some fragments of `all-packages.nix`.
-
-  - This file defines a set of attributes, all of which are concrete
+1.  This file defines a set of attributes, all of which are concrete
     derivations (i.e., not functions). In fact, we define a *mutually
     recursive* set of attributes. That is, the attributes can refer to
     each other. This is precisely what we want since we want to “plug”
     the various packages into each other.
 
-  - Here we *import* the Nix expression for GNU Hello. The import
+2.  Here we *import* the Nix expression for GNU Hello. The import
     operation just loads and returns the specified Nix expression. In
     fact, we could just have put the contents of [???](#ex-hello-nix) in
     `all-packages.nix` at this point. That would be completely
@@ -44,7 +44,7 @@ some fragments of `all-packages.nix`.
     import a directory, Nix automatically appends `/default.nix` to the
     file name.
 
-  - This is where the actual composition takes place. Here we *call* the
+3.  This is where the actual composition takes place. Here we *call* the
     function imported from `../applications/misc/hello/ex-1` with a set
     containing the things that the function expects, namely `fetchurl`,
     `stdenv`, and `perl`. We use inherit again to use the attributes
@@ -68,5 +68,5 @@ some fragments of `all-packages.nix`.
     > 
     >     hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
 
-  - Likewise, we have to instantiate Perl, `fetchurl`, and the standard
+4.  Likewise, we have to instantiate Perl, `fetchurl`, and the standard
     environment.
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
index a359ebc46..f922182c2 100644
--- a/doc/manual/src/expressions/build-script.md
+++ b/doc/manual/src/expressions/build-script.md
@@ -1,23 +1,23 @@
 # Build Script
 
-    source $stdenv/setup 
+Here is the builder referenced from Hello's Nix expression (stored in
+`pkgs/applications/misc/hello/ex-1/builder.sh`):
+
+    source $stdenv/setup ①
     
-    PATH=$perl/bin:$PATH 
+    PATH=$perl/bin:$PATH ②
     
-    tar xvfz $src 
+    tar xvfz $src ③
     cd hello-*
-    ./configure --prefix=$out 
-    make 
+    ./configure --prefix=$out ④
+    make ⑤
     make install
 
-[example\_title](#ex-hello-builder) shows the builder referenced from
-Hello's Nix expression (stored in
-`pkgs/applications/misc/hello/ex-1/builder.sh`). The builder can
-actually be made a lot shorter by using the *generic builder* functions
-provided by `stdenv`, but here we write out the build steps to elucidate
-what a builder does. It performs the following steps:
+The builder can actually be made a lot shorter by using the *generic
+builder* functions provided by `stdenv`, but here we write out the build
+steps to elucidate what a builder does. It performs the following steps:
 
-  - When Nix runs a builder, it initially completely clears the
+1.  When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the derivation).
     For instance, the `PATH` variable is empty\[1\]. This is done to
     prevent undeclared inputs from being used in the build process. If
@@ -31,13 +31,13 @@ what a builder does. It performs the following steps:
     attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
     automatically.)
 
-  - Since Hello needs Perl, we have to make sure that Perl is in the
+2.  Since Hello needs Perl, we have to make sure that Perl is in the
     `PATH`. The `perl` environment variable points to the location of
     the Perl package (since it was passed in as an attribute to the
     derivation), so `$perl/bin` is the directory containing the Perl
     interpreter.
 
-  - Now we have to unpack the sources. The `src` attribute was bound to
+3.  Now we have to unpack the sources. The `src` attribute was bound to
     the result of fetching the Hello source tarball from the network, so
     the `src` environment variable points to the location in the Nix
     store to which the tarball was downloaded. After unpacking, we `cd`
@@ -50,7 +50,7 @@ what a builder does. It performs the following steps:
     have to worry about files from previous builds interfering with the
     current build.
 
-  - GNU Hello is a typical Autoconf-based package, so we first have to
+4.  GNU Hello is a typical Autoconf-based package, so we first have to
     run its `configure` script. In Nix every package is stored in a
     separate location in the Nix store, for instance
     `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
@@ -60,7 +60,7 @@ what a builder does. It performs the following steps:
     `--prefix=$out` to cause Hello to be installed in the expected
     location.
 
-  - Finally we build Hello (`make`) and install it into the location
+5.  Finally we build Hello (`make`) and install it into the location
     specified by `out` (`make install`).
 
 If you are wondering about the absence of error checking on the result
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index a378fe8e4..f60af9d24 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -735,31 +735,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
     builder in a more structured format than plain environment
     variables.
     
-    [example\_title](#ex-toxml) shows an example where this is the case.
-    The builder is supposed to generate the configuration file for a
-    [Jetty servlet container](http://jetty.mortbay.org/). A servlet
-    container contains a number of servlets (`*.war` files) each
-    exported under a specific URI prefix. So the servlet configuration
-    is a list of sets containing the `path` and `war` of the servlet
-    ([co\_title](#ex-toxml-co-servlets)). This kind of information is
-    difficult to communicate with the normal method of passing
-    information through an environment variable, which just concatenates
-    everything together into a string (which might just work in this
-    case, but wouldn’t work if fields are optional or contain lists
-    themselves). Instead the Nix expression is converted to an XML
-    representation with `toXML`, which is unambiguous and can easily be
-    processed with the appropriate tools. For instance, in the example
-    an XSLT stylesheet ([co\_title](#ex-toxml-co-stylesheet)) is applied
-    to it ([co\_title](#ex-toxml-co-apply)) to generate the XML
-    configuration file for the Jetty server. The XML representation
-    produced from [co\_title](#ex-toxml-co-servlets) by `toXML` is shown
-    in [example\_title](#ex-toxml-result).
-    
-    Note that [example\_title](#ex-toxml) uses the `toFile` built-in to
-    write the builder and the stylesheet “inline” in the Nix expression.
-    The path of the stylesheet is spliced into the builder at `xsltproc
-    ${stylesheet}
-                    ...`.
+    Here is an example where this is the case:
     
         { stdenv, fetchurl, libxslt, jira, uberwiki }:
         
@@ -771,10 +747,10 @@ For instance, `derivation` is also available as `builtins.derivation`.
           builder = builtins.toFile "builder.sh" "
             source $stdenv/setup
             mkdir $out
-            echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml  
+            echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml ① 
           ";
         
-          stylesheet = builtins.toFile "stylesheet.xsl"  
+          stylesheet = builtins.toFile "stylesheet.xsl" ② 
            "<?xml version='1.0' encoding='UTF-8'?>
             <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
               <xsl:template match='/'>
@@ -790,12 +766,29 @@ For instance, `derivation` is also available as `builtins.derivation`.
             </xsl:stylesheet>
           ";
         
-          servlets = builtins.toXML [  
+          servlets = builtins.toXML [ ③ 
             { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
             { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
           ];
         })
     
+    The builder is supposed to generate the configuration file for a
+    [Jetty servlet container](http://jetty.mortbay.org/). A servlet
+    container contains a number of servlets (`*.war` files) each
+    exported under a specific URI prefix. So the servlet configuration
+    is a list of sets containing the `path` and `war` of the servlet
+    ([???](#ex-toxml-co-servlets)). This kind of information is
+    difficult to communicate with the normal method of passing
+    information through an environment variable, which just concatenates
+    everything together into a string (which might just work in this
+    case, but wouldn’t work if fields are optional or contain lists
+    themselves). Instead the Nix expression is converted to an XML
+    representation with `toXML`, which is unambiguous and can easily be
+    processed with the appropriate tools. For instance, in the example
+    an XSLT stylesheet (at point ②) is applied to it (at point ①) to
+    generate the XML configuration file for the Jetty server. The XML
+    representation produced at point ③ by `toXML` is as follows:
+    
         <?xml version='1.0' encoding='utf-8'?>
         <expr>
           <list>
@@ -817,6 +810,11 @@ For instance, `derivation` is also available as `builtins.derivation`.
             </attrs>
           </list>
         </expr>
+    
+    Note that [???](#ex-toxml) uses the `toFile` built-in to write the
+    builder and the stylesheet “inline” in the Nix expression. The path
+    of the stylesheet is spliced into the builder using the syntax
+    `xsltproc ${stylesheet}`.
 
   - `builtins.trace` e1 e2  
     Evaluate e1 and print its abstract syntax representation on standard
diff --git a/doc/manual/src/expressions/expression-syntax.md b/doc/manual/src/expressions/expression-syntax.md
index 935484c33..9e99a1f60 100644
--- a/doc/manual/src/expressions/expression-syntax.md
+++ b/doc/manual/src/expressions/expression-syntax.md
@@ -1,25 +1,26 @@
 # Expression Syntax
 
-    { stdenv, fetchurl, perl }: 
+Here is a Nix expression for GNU Hello:
+
+    { stdenv, fetchurl, perl }: ①
     
-    stdenv.mkDerivation { 
-      name = "hello-2.1.1"; 
-      builder = ./builder.sh; 
-      src = fetchurl { 
+    stdenv.mkDerivation { ②
+      name = "hello-2.1.1"; ③
+      builder = ./builder.sh; ④
+      src = fetchurl { ⑤
         url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
         sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
       };
-      inherit perl; 
+      inherit perl; ⑥
     }
 
-[example\_title](#ex-hello-nix) shows a Nix expression for GNU Hello.
-It's actually already in the Nix Packages collection in
+This file is actually already in the Nix Packages collection in
 `pkgs/applications/misc/hello/ex-1/default.nix`. It is customary to
 place each package in a separate directory and call the single Nix
 expression in that directory `default.nix`. The file has the following
 elements (referenced from the figure by number):
 
-  - This states that the expression is a *function* that expects to be
+1.  This states that the expression is a *function* that expects to be
     called with three arguments: `stdenv`, `fetchurl`, and `perl`. They
     are needed to build Hello, but we don't know how to build them here;
     that's why they are function arguments. `stdenv` is a package that
@@ -37,7 +38,7 @@ elements (referenced from the figure by number):
     the required arguments, the body should describe how to build an
     instance of the Hello package.
 
-  - So we have to build a package. Building something from other stuff
+2.  So we have to build a package. Building something from other stuff
     is called a *derivation* in Nix (as opposed to sources, which are
     built by humans instead of computers). We perform a derivation by
     calling `stdenv.mkDerivation`. `mkDerivation` is a function provided
@@ -50,13 +51,13 @@ elements (referenced from the figure by number):
                     nameN =
                     exprN; }`.
 
-  - The attribute `name` specifies the symbolic name and version of the
+3.  The attribute `name` specifies the symbolic name and version of the
     package. Nix doesn't really care about these things, but they are
     used by for instance `nix-env
                     -q` to show a “human-readable” name for packages. This attribute is
     required by `mkDerivation`.
 
-  - The attribute `builder` specifies the builder. This attribute can
+4.  The attribute `builder` specifies the builder. This attribute can
     sometimes be omitted, in which case `mkDerivation` will fill in a
     default builder (which does a `configure; make; make install`, in
     essence). Hello is sufficiently simple that the default builder
@@ -64,7 +65,7 @@ elements (referenced from the figure by number):
     educational purposes. The value `./builder.sh` refers to the shell
     script shown in [???](#ex-hello-builder), discussed below.
 
-  - The builder has to know what the sources of the package are. Here,
+5.  The builder has to know what the sources of the package are. Here,
     the attribute `src` is bound to the result of a call to the
     `fetchurl` function. Given a URL and a SHA-256 hash of the expected
     contents of the file at that URL, this function builds a derivation
@@ -77,7 +78,7 @@ elements (referenced from the figure by number):
     However, `src` is customary, and it's also expected by the default
     builder (which we don't use in this example).
 
-  - Since the derivation requires Perl, we have to pass the value of the
+6.  Since the derivation requires Perl, we have to pass the value of the
     `perl` function argument to the builder. All attributes in the set
     are actually passed as environment variables to the builder, so
     declaring an attribute
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
index a00b08b55..90bdc556b 100644
--- a/doc/manual/src/expressions/generic-builder.md
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -13,24 +13,26 @@ like this:
 The builders for almost all Unix packages look like this — set up some
 environment variables, unpack the sources, configure, build, and
 install. For this reason the standard environment provides some Bash
-functions that automate the build process. A builder using the generic
-build facilities in shown in [example\_title](#ex-hello-builder2).
+functions that automate the build process. Here is what a builder using
+the generic build facilities looks like:
 
-    buildInputs="$perl" 
+    buildInputs="$perl" ①
     
-    source $stdenv/setup 
+    source $stdenv/setup ②
     
-    genericBuild 
+    genericBuild ③
 
-  - The `buildInputs` variable tells `setup` to use the indicated
+Here is what each line means:
+
+1.  The `buildInputs` variable tells `setup` to use the indicated
     packages as “inputs”. This means that if a package provides a `bin`
     subdirectory, it's added to `PATH`; if it has a `include`
     subdirectory, it's added to GCC's header search path; and so
     on.\[1\]
 
-  - The function `genericBuild` is defined in the file `$stdenv/setup`.
+2.  The function `genericBuild` is defined in the file `$stdenv/setup`.
 
-  - The final step calls the shell function `genericBuild`, which
+3.  The final step calls the shell function `genericBuild`, which
     performs the steps that were done explicitly in
     [???](#ex-hello-builder). The generic builder is smart enough to
     figure out whether to unpack the sources using `gzip`, `bzip2`, etc.
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
index a773c239b..121e4d998 100644
--- a/doc/manual/src/expressions/language-constructs.md
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -203,6 +203,9 @@ where e1 is an expression that should evaluate to a Boolean value. If it
 evaluates to `true`, e2 is returned; otherwise expression evaluation is
 aborted and a backtrace is printed.
 
+Here is a Nix expression for the Subversion package that shows how
+assertions can be used:.
+
     { localServer ? false
     , httpServer ? false
     , sslSupport ? false
@@ -213,9 +216,9 @@ aborted and a backtrace is printed.
     , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
     }:
     
-    assert localServer -> db4 != null; 
-    assert httpServer -> httpd != null && httpd.expat == expat; 
-    assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); 
+    assert localServer -> db4 != null; ①
+    assert httpServer -> httpd != null && httpd.expat == expat; ②
+    assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); ③
     assert pythonBindings -> swig != null && swig.pythonSupport;
     assert javaSwigBindings -> swig != null && swig.javaSupport;
     assert javahlBindings -> j2sdk != null;
@@ -223,33 +226,32 @@ aborted and a backtrace is printed.
     stdenv.mkDerivation {
       name = "subversion-1.1.1";
       ...
-      openssl = if sslSupport then openssl else null; 
+      openssl = if sslSupport then openssl else null; ④
       ...
     }
 
-[example\_title](#ex-subversion-nix) show how assertions are used in the
-Nix expression for Subversion.
+The points of interest are:
 
-  - This assertion states that if Subversion is to have support for
+1.  This assertion states that if Subversion is to have support for
     local repositories, then Berkeley DB is needed. So if the Subversion
     function is called with the `localServer` argument set to `true` but
     the `db4` argument set to `null`, then the evaluation fails.
 
-  - This is a more subtle condition: if Subversion is built with Apache
+2.  This is a more subtle condition: if Subversion is built with Apache
     (`httpServer`) support, then the Expat library (an XML library) used
     by Subversion should be same as the one used by Apache. This is
     because in this configuration Subversion code ends up being linked
     with Apache code, and if the Expat libraries do not match, a build-
     or runtime link error or incompatibility might occur.
 
-  - This assertion says that in order for Subversion to have SSL support
+3.  This assertion says that in order for Subversion to have SSL support
     (so that it can access `https` URLs), an OpenSSL library must be
     passed. Additionally, it says that *if* Apache support is enabled,
     then Apache's OpenSSL should match Subversion's. (Note that if
     Apache support is not enabled, we don't care about Apache's
     OpenSSL.)
 
-  - The conditional here is not really related to assertions, but is
+4.  The conditional here is not really related to assertions, but is
     worth pointing out: it ensures that if SSL support is disabled, then
     the Subversion derivation is not dependent on OpenSSL, even if a
     non-`null` value was passed. This prevents an unnecessary rebuild of

From ca130b73a02f0fbe1d7ef2007d4cd82565eb5eff Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:10:59 +0200
Subject: [PATCH 020/176] Get rid of <example>

Markdown doesn't have floats so we can't have this.
---
 doc/manual/expressions/builtins.xml           | 117 +++++++++--------
 doc/manual/packages/copy-closure.xml          |   2 +-
 doc/manual/packages/s3-substituter.xml        |  29 +++--
 doc/manual/src/expressions/builtins.md        | 122 +++++++++---------
 .../src/package-management/copy-closure.md    |   2 +-
 .../src/package-management/s3-substituter.md  |  18 +--
 6 files changed, 156 insertions(+), 134 deletions(-)

diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml
index 478b67ce8..877fd3a1b 100644
--- a/doc/manual/expressions/builtins.xml
+++ b/doc/manual/expressions/builtins.xml
@@ -434,88 +434,93 @@ stdenv.mkDerivation { … }
         </varlistentry>
       </variablelist>
 
-      <example>
-        <title>Fetching a private repository over SSH</title>
-        <programlisting>builtins.fetchGit {
+      <para>Here are some examples of how to use
+      <literal>fetchGit</literal>.</para>
+
+      <itemizedlist>
+
+        <listitem>
+          <para>To fetch a private repository over SSH:</para>
+
+          <programlisting>builtins.fetchGit {
   url = "git@github.com:my-secret/repository.git";
   ref = "master";
   rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
 }</programlisting>
-      </example>
 
-      <example>
-        <title>Fetching an arbitrary ref</title>
-        <programlisting>builtins.fetchGit {
+        </listitem>
+
+        <listitem>
+          <para>To fetch an arbitrary reference:</para>
+
+          <programlisting>builtins.fetchGit {
   url = "https://github.com/NixOS/nix.git";
   ref = "refs/heads/0.5-release";
 }</programlisting>
-      </example>
+        </listitem>
 
-      <example>
-        <title>Fetching a repository's specific commit on an arbitrary branch</title>
-        <para>
-          If the revision you're looking for is in the default branch
-          of the git repository you don't strictly need to specify
-          the branch name in the <varname>ref</varname> attribute.
-        </para>
-        <para>
-          However, if the revision you're looking for is in a future
-          branch for the non-default branch you will need to specify
-          the the <varname>ref</varname> attribute as well.
-        </para>
-        <programlisting>builtins.fetchGit {
+        <listitem>
+          <para>
+            If the revision you're looking for is in the default branch
+            of the git repository you don't strictly need to specify
+            the branch name in the <varname>ref</varname> attribute.
+          </para>
+          <para>
+            However, if the revision you're looking for is in a future
+            branch for the non-default branch you will need to specify
+            the the <varname>ref</varname> attribute as well.
+          </para>
+
+          <programlisting>builtins.fetchGit {
   url = "https://github.com/nixos/nix.git";
   rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
   ref = "1.11-maintenance";
 }</programlisting>
-        <note>
-          <para>
-            It is nice to always specify the branch which a revision
-            belongs to. Without the branch being specified, the
-            fetcher might fail if the default branch changes.
-            Additionally, it can be confusing to try a commit from a
-            non-default branch and see the fetch fail. If the branch
-            is specified the fault is much more obvious.
-          </para>
-        </note>
-      </example>
 
-      <example>
-        <title>Fetching a repository's specific commit on the default branch</title>
-        <para>
-          If the revision you're looking for is in the default branch
-          of the git repository you may omit the
-          <varname>ref</varname> attribute.
-        </para>
-        <programlisting>builtins.fetchGit {
+          <note>
+            <para>
+              It is nice to always specify the branch which a revision
+              belongs to. Without the branch being specified, the
+              fetcher might fail if the default branch changes.
+              Additionally, it can be confusing to try a commit from a
+              non-default branch and see the fetch fail. If the branch
+              is specified the fault is much more obvious.
+            </para>
+          </note>
+        </listitem>
+
+        <listitem>
+          <para>
+            If the revision you're looking for is in the default branch
+            of the git repository you may omit the
+            <varname>ref</varname> attribute.
+          </para>
+          <programlisting>builtins.fetchGit {
   url = "https://github.com/nixos/nix.git";
   rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
 }</programlisting>
-      </example>
+        </listitem>
 
-      <example>
-        <title>Fetching a tag</title>
-        <programlisting>builtins.fetchGit {
+        <listitem>
+          <para>To fetch a specific tag:</para>
+          <programlisting>builtins.fetchGit {
   url = "https://github.com/nixos/nix.git";
   ref = "refs/tags/1.9";
 }</programlisting>
-      </example>
+        </listitem>
 
-      <example>
-        <title>Fetching the latest version of a remote branch</title>
-        <para>
-          <function>builtins.fetchGit</function> can behave impurely
-           fetch the latest version of a remote branch.
-        </para>
-        <note><para>Nix will refetch the branch in accordance to
-        <xref linkend="conf-tarball-ttl" />.</para></note>
-        <note><para>This behavior is disabled in
-        <emphasis>Pure evaluation mode</emphasis>.</para></note>
+        <listitem>
+          <para>To fetch the latest version of a remote branch:</para>
         <programlisting>builtins.fetchGit {
   url = "ssh://git@github.com/nixos/nix.git";
   ref = "master";
 }</programlisting>
-      </example>
+          <note><para>Nix will refetch the branch in accordance to
+          <xref linkend="conf-tarball-ttl" />.</para></note>
+          <note><para>This behavior is disabled in <emphasis>Pure
+          evaluation mode</emphasis>.</para></note>
+        </listitem>
+      </itemizedlist>
     </listitem>
   </varlistentry>
 
diff --git a/doc/manual/packages/copy-closure.xml b/doc/manual/packages/copy-closure.xml
index 012030e3e..a336fb293 100644
--- a/doc/manual/packages/copy-closure.xml
+++ b/doc/manual/packages/copy-closure.xml
@@ -4,7 +4,7 @@
          version="5.0"
          xml:id="ssec-copy-closure">
 
-<title>Copying Closures Via SSH</title>
+<title>Copying Closures via SSH</title>
 
 <para>The command <command
 linkend="sec-nix-copy-closure">nix-copy-closure</command> copies a Nix
diff --git a/doc/manual/packages/s3-substituter.xml b/doc/manual/packages/s3-substituter.xml
index 868b5a66d..aa5df2026 100644
--- a/doc/manual/packages/s3-substituter.xml
+++ b/doc/manual/packages/s3-substituter.xml
@@ -5,10 +5,10 @@
          version="5.0"
          xml:id="ssec-s3-substituter">
 
-<title>Serving a Nix store via AWS S3 or S3-compatible Service</title>
+<title>Serving a Nix store via S3</title>
 
 <para>Nix has built-in support for storing and fetching store paths
-from Amazon S3 and S3 compatible services. This uses the same
+from Amazon S3 and S3-compatible services. This uses the same
 <emphasis>binary</emphasis> cache mechanism that Nix usually uses to
 fetch prebuilt binaries from <uri>cache.nixos.org</uri>.</para>
 
@@ -170,13 +170,22 @@ the S3 URL:</para>
 }
 ]]></programlisting>
 
-
-  <example><title>Uploading with a specific credential profile for Amazon S3</title>
-    <para><command>nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;region=eu-west-2' nixpkgs.hello</command></para>
-  </example>
-
-  <example><title>Uploading to an S3-Compatible Binary Cache</title>
-    <para><command>nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;scheme=https&amp;endpoint=minio.example.com' nixpkgs.hello</command></para>
-  </example>
 </section>
+
+<section><title>Examples</title>
+
+<para>To upload with a specific credential profile for Amazon S3:</para>
+
+<screen>
+nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;region=eu-west-2' nixpkgs.hello
+</screen>
+
+<para>To upload to an S3-compatible binary cache:</para>
+
+<screen>
+nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;scheme=https&amp;endpoint=minio.example.com' nixpkgs.hello
+</screen>
+
+</section>
+
 </section>
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index f60af9d24..8faf4b939 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -169,70 +169,76 @@ For instance, `derivation` is also available as `builtins.derivation`.
         A Boolean parameter that specifies whether submodules should be
         checked out. Defaults to `false`.
     
-    <!-- end list -->
+    Here are some examples of how to use `fetchGit`.
     
-        builtins.fetchGit {
-          url = "git@github.com:my-secret/repository.git";
-          ref = "master";
-          rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
-        }
+      - To fetch a private repository over SSH:
+        
+            builtins.fetchGit {
+              url = "git@github.com:my-secret/repository.git";
+              ref = "master";
+              rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
+            }
     
-        builtins.fetchGit {
-          url = "https://github.com/NixOS/nix.git";
-          ref = "refs/heads/0.5-release";
-        }
+      - To fetch an arbitrary reference:
+        
+            builtins.fetchGit {
+              url = "https://github.com/NixOS/nix.git";
+              ref = "refs/heads/0.5-release";
+            }
     
-    If the revision you're looking for is in the default branch of the
-    git repository you don't strictly need to specify the branch name in
-    the `ref` attribute.
+      - If the revision you're looking for is in the default branch of
+        the git repository you don't strictly need to specify the branch
+        name in the `ref` attribute.
+        
+        However, if the revision you're looking for is in a future
+        branch for the non-default branch you will need to specify the
+        the `ref` attribute as well.
+        
+            builtins.fetchGit {
+              url = "https://github.com/nixos/nix.git";
+              rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+              ref = "1.11-maintenance";
+            }
+        
+        > **Note**
+        > 
+        > It is nice to always specify the branch which a revision
+        > belongs to. Without the branch being specified, the fetcher
+        > might fail if the default branch changes. Additionally, it can
+        > be confusing to try a commit from a non-default branch and see
+        > the fetch fail. If the branch is specified the fault is much
+        > more obvious.
     
-    However, if the revision you're looking for is in a future branch
-    for the non-default branch you will need to specify the the `ref`
-    attribute as well.
+      - If the revision you're looking for is in the default branch of
+        the git repository you may omit the `ref` attribute.
+        
+            builtins.fetchGit {
+              url = "https://github.com/nixos/nix.git";
+              rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+            }
     
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-          ref = "1.11-maintenance";
-        }
+      - To fetch a specific tag:
+        
+            builtins.fetchGit {
+              url = "https://github.com/nixos/nix.git";
+              ref = "refs/tags/1.9";
+            }
     
-    > **Note**
-    > 
-    > It is nice to always specify the branch which a revision belongs
-    > to. Without the branch being specified, the fetcher might fail if
-    > the default branch changes. Additionally, it can be confusing to
-    > try a commit from a non-default branch and see the fetch fail. If
-    > the branch is specified the fault is much more obvious.
-    
-    If the revision you're looking for is in the default branch of the
-    git repository you may omit the `ref` attribute.
-    
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-        }
-    
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          ref = "refs/tags/1.9";
-        }
-    
-    `builtins.fetchGit` can behave impurely fetch the latest version of
-    a remote branch.
-    
-    > **Note**
-    > 
-    > Nix will refetch the branch in accordance to
-    > [???](#conf-tarball-ttl).
-    
-    > **Note**
-    > 
-    > This behavior is disabled in *Pure evaluation mode*.
-    
-        builtins.fetchGit {
-          url = "ssh://git@github.com/nixos/nix.git";
-          ref = "master";
-        }
+      - To fetch the latest version of a remote branch:
+        
+            builtins.fetchGit {
+              url = "ssh://git@github.com/nixos/nix.git";
+              ref = "master";
+            }
+        
+        > **Note**
+        > 
+        > Nix will refetch the branch in accordance to
+        > [???](#conf-tarball-ttl).
+        
+        > **Note**
+        > 
+        > This behavior is disabled in *Pure evaluation mode*.
 
   - `builtins.filter` f xs  
     Return a list consisting of the elements of xs for which the
diff --git a/doc/manual/src/package-management/copy-closure.md b/doc/manual/src/package-management/copy-closure.md
index 6573862c0..d78b77e36 100644
--- a/doc/manual/src/package-management/copy-closure.md
+++ b/doc/manual/src/package-management/copy-closure.md
@@ -1,4 +1,4 @@
-# Copying Closures Via SSH
+# Copying Closures via SSH
 
 The command `nix-copy-closure` copies a Nix store path along with all
 its dependencies to or from another machine via the SSH protocol. It
diff --git a/doc/manual/src/package-management/s3-substituter.md b/doc/manual/src/package-management/s3-substituter.md
index 4740b8b1c..d96114e3c 100644
--- a/doc/manual/src/package-management/s3-substituter.md
+++ b/doc/manual/src/package-management/s3-substituter.md
@@ -1,7 +1,7 @@
-# Serving a Nix store via AWS S3 or S3-compatible Service
+# Serving a Nix store via S3
 
 Nix has built-in support for storing and fetching store paths from
-Amazon S3 and S3 compatible services. This uses the same *binary* cache
+Amazon S3 and S3-compatible services. This uses the same *binary* cache
 mechanism that Nix usually uses to fetch prebuilt binaries from
 [cache.nixos.org](cache.nixos.org).
 
@@ -124,10 +124,12 @@ Your account will need the following IAM policy to upload to the cache:
       ]
     }
 
-`nix copy --to
-'s3://example-nix-cache?profile=cache-upload&region=eu-west-2'
-nixpkgs.hello`
+## Examples
 
-`nix copy --to
-'s3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com'
-nixpkgs.hello`
+To upload with a specific credential profile for Amazon S3:
+
+    nix copy --to 's3://example-nix-cache?profile=cache-upload&region=eu-west-2' nixpkgs.hello
+
+To upload to an S3-compatible binary cache:
+
+    nix copy --to 's3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com' nixpkgs.hello

From 136fd55bb2f7c4f8e93992c6b662d54ce941a73a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:16:46 +0200
Subject: [PATCH 021/176] Get rid of <figure>

---
 doc/manual/packages/profiles.xml              | 29 +++++++++----------
 doc/manual/src/package-management/profiles.md | 15 +++++-----
 2 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml
index 15085ab58..2809def24 100644
--- a/doc/manual/packages/profiles.xml
+++ b/doc/manual/packages/profiles.xml
@@ -21,19 +21,16 @@ The long strings prefixed to the directory names are cryptographic
 hashes<footnote><para>160-bit truncations of SHA-256 hashes encoded in
 a base-32 notation, to be precise.</para></footnote> of
 <emphasis>all</emphasis> inputs involved in building the package —
-sources, dependencies, compiler flags, and so on.  So if two
-packages differ in any way, they end up in different locations in
-the file system, so they don’t interfere with each other.  <xref
-linkend='fig-user-environments' /> shows a part of a typical Nix
-store.</para>
+sources, dependencies, compiler flags, and so on.  So if two packages
+differ in any way, they end up in different locations in the file
+system, so they don’t interfere with each other.  Here is what a part
+of a typical Nix store looks like:</para>
 
-<figure xml:id='fig-user-environments'><title>User environments</title>
-  <mediaobject>
-    <imageobject>
-      <imagedata fileref='../figures/user-environments.png' format='PNG' />
-    </imageobject>
-  </mediaobject>
-</figure>
+<mediaobject>
+  <imageobject>
+    <imagedata fileref='../figures/user-environments.png' format='PNG' />
+  </imageobject>
+</mediaobject>
 
 <para>Of course, you wouldn’t want to type
 
@@ -50,10 +47,10 @@ uses is to create directory trees of symlinks to
 <emphasis>user environments</emphasis> and they are packages
 themselves (though automatically generated by
 <command>nix-env</command>), so they too reside in the Nix store.  For
-instance, in <xref linkend='fig-user-environments' /> the user
-environment <filename>/nix/store/0c1p5z4kda11...-user-env</filename>
-contains a symlink to just Subversion 1.1.2 (arrows in the figure
-indicate symlinks).  This would be what we would obtain if we had done
+instance, in the figure above, the user environment
+<filename>/nix/store/0c1p5z4kda11...-user-env</filename> contains a
+symlink to just Subversion 1.1.2 (arrows in the figure indicate
+symlinks).  This would be what we would obtain if we had done
 
 <screen>
 $ nix-env -i subversion</screen>
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
index 984afca55..9076033d7 100644
--- a/doc/manual/src/package-management/profiles.md
+++ b/doc/manual/src/package-management/profiles.md
@@ -14,10 +14,10 @@ strings prefixed to the directory names are cryptographic hashes\[1\] of
 *all* inputs involved in building the package — sources, dependencies,
 compiler flags, and so on. So if two packages differ in any way, they
 end up in different locations in the file system, so they don’t
-interfere with each other. [figure\_title](#fig-user-environments) shows
-a part of a typical Nix store.
+interfere with each other. Here is what a part of a typical Nix store
+looks like:
 
-![User environments](../figures/user-environments.png)
+![](../figures/user-environments.png)
 
 Of course, you wouldn’t want to type
 
@@ -30,11 +30,10 @@ package we want to use, but this is not very convenient since changing
 Nix uses is to create directory trees of symlinks to *activated*
 packages. These are called *user environments* and they are packages
 themselves (though automatically generated by `nix-env`), so they too
-reside in the Nix store. For instance, in
-[figure\_title](#fig-user-environments) the user environment
-`/nix/store/0c1p5z4kda11...-user-env` contains a symlink to just
-Subversion 1.1.2 (arrows in the figure indicate symlinks). This would be
-what we would obtain if we had done
+reside in the Nix store. For instance, in the figure above, the user
+environment `/nix/store/0c1p5z4kda11...-user-env` contains a symlink to
+just Subversion 1.1.2 (arrows in the figure indicate symlinks). This
+would be what we would obtain if we had done
 
     $ nix-env -i subversion
 

From ee051084723333fc5889c604c829669800e8b43c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:20:54 +0200
Subject: [PATCH 022/176] <simplesect> -> <section>

Pandoc silently ignores <simplesect>...
---
 .../expressions/language-constructs.xml       | 32 ++++++------
 doc/manual/expressions/language-values.xml    | 12 ++---
 doc/manual/installation/multi-user.xml        | 12 ++---
 doc/manual/introduction/about-nix.xml         | 52 +++++++++----------
 .../src/expressions/language-constructs.md    | 16 ++++++
 doc/manual/src/expressions/language-values.md |  6 +++
 doc/manual/src/installation/multi-user.md     |  6 +++
 7 files changed, 82 insertions(+), 54 deletions(-)

diff --git a/doc/manual/expressions/language-constructs.xml b/doc/manual/expressions/language-constructs.xml
index 4d316609c..82d3afed1 100644
--- a/doc/manual/expressions/language-constructs.xml
+++ b/doc/manual/expressions/language-constructs.xml
@@ -6,7 +6,7 @@
 
 <title>Language Constructs</title>
 
-<simplesect><title>Recursive sets</title>
+<section><title>Recursive sets</title>
 
 <para>Recursive sets are just normal sets, but the attributes can
 refer to each other.  For example,
@@ -38,10 +38,10 @@ does not terminate<footnote><para>Actually, Nix detects infinite
 recursion in this case and aborts (<quote>infinite recursion
 encountered</quote>).</para></footnote>.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect xml:id="sect-let-expressions"><title>Let-expressions</title>
+<section xml:id="sect-let-expressions"><title>Let-expressions</title>
 
 <para>A let-expression allows you to define local variables for an
 expression.  For instance,
@@ -56,10 +56,10 @@ evaluates to <literal>"foobar"</literal>.
 
 </para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Inheriting attributes</title>
+<section><title>Inheriting attributes</title>
 
 <para>When defining a set or in a let-expression it is often convenient to copy variables
 from the surrounding lexical scope (e.g., when you want to propagate
@@ -129,10 +129,10 @@ a = src-set.a; b = src-set.b; c = src-set.c;
 when used while defining local variables in a let-expression or
 while defining a set.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect xml:id="ss-functions"><title>Functions</title>
+<section xml:id="ss-functions"><title>Functions</title>
 
 <para>Functions have the following form:
 
@@ -248,10 +248,10 @@ in concat { x = "foo"; y = "bar"; }</programlisting>
 
 </para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Conditionals</title>
+<section><title>Conditionals</title>
 
 <para>Conditionals look like this:
 
@@ -262,10 +262,10 @@ where <replaceable>e1</replaceable> is an expression that should
 evaluate to a Boolean value (<literal>true</literal> or
 <literal>false</literal>).</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Assertions</title>
+<section><title>Assertions</title>
 
 <para>Assertions are generally used to check that certain requirements
 on or between features and dependencies hold.  They look like this:
@@ -349,11 +349,11 @@ stdenv.mkDerivation {
 
 </orderedlist>
 
-</simplesect>
+</section>
 
 
 
-<simplesect><title>With-expressions</title>
+<section><title>With-expressions</title>
 
 <para>A <emphasis>with-expression</emphasis>,
 
@@ -394,16 +394,16 @@ let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...</programlisting>
 
 </para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Comments</title>
+<section><title>Comments</title>
 
 <para>Comments can be single-line, started with a <literal>#</literal>
 character, or inline/multi-line, enclosed within <literal>/*
 ... */</literal>.</para>
 
-</simplesect>
+</section>
 
 
 </section>
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
index 4a72c67a8..6c0fcbacb 100644
--- a/doc/manual/expressions/language-values.xml
+++ b/doc/manual/expressions/language-values.xml
@@ -7,7 +7,7 @@
 <title>Values</title>
 
 
-<simplesect><title>Simple Values</title>
+<section><title>Simple Values</title>
 
 <para>Nix has the following basic data types:
 
@@ -193,10 +193,10 @@ stdenv.mkDerivation {
 
 </para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Lists</title>
+<section><title>Lists</title>
 
 <para>Lists are formed by enclosing a whitespace-separated list of
 values between square brackets.  For example,
@@ -217,10 +217,10 @@ function and the fifth being a set.</para>
 <para>Note that lists are only lazy in values, and they are strict in length.
 </para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Sets</title>
+<section><title>Sets</title>
 
 <para>Sets are really the core of the language, since ultimately the
 Nix language is all about creating derivations, which are really just
@@ -307,7 +307,7 @@ a form of object-oriented programming, for example.
 
 </para>
 
-</simplesect>
+</section>
 
 
 </section>
diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml
index 331b5f128..835bd3a52 100644
--- a/doc/manual/installation/multi-user.xml
+++ b/doc/manual/installation/multi-user.xml
@@ -30,7 +30,7 @@ arbitrary Nix expressions, they may not get pre-built
 binaries.</para></note>
 
 
-<simplesect>
+<section>
 
 <title>Setting up the build users</title>
 
@@ -52,10 +52,10 @@ This creates 10 build users. There can never be more concurrent builds
 than the number of build users, so you may want to increase this if
 you expect to do many builds at the same time.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect>
+<section>
 
 <title>Running the daemon</title>
 
@@ -78,10 +78,10 @@ export NIX_REMOTE=daemon</programlisting>
 
 into the users’ login scripts.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect>
+<section>
 
 <title>Restricting access</title>
 
@@ -101,7 +101,7 @@ cannot connect to the Unix domain socket
 <filename>/nix/var/nix/daemon-socket/socket</filename>, so they cannot
 perform Nix operations.</para>
 
-</simplesect>
+</section>
 
 
 </section>
diff --git a/doc/manual/introduction/about-nix.xml b/doc/manual/introduction/about-nix.xml
index ec6f1ca3f..dd09e2283 100644
--- a/doc/manual/introduction/about-nix.xml
+++ b/doc/manual/introduction/about-nix.xml
@@ -25,7 +25,7 @@ of the package’s build dependency graph).  This enables many powerful
 features.</para>
 
 
-<simplesect><title>Multiple versions</title>
+<section><title>Multiple versions</title>
 
 <para>You can have multiple versions or variants of a package
 installed at the same time.  This is especially important when
@@ -39,10 +39,10 @@ uninstalling an application cannot break other applications, since
 these operations never “destructively” update or delete files that are
 used by other packages.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Complete dependencies</title>
+<section><title>Complete dependencies</title>
 
 <para>Nix helps you make sure that package dependency specifications
 are complete.  In general, when you’re making a package for a package
@@ -68,10 +68,10 @@ scanning binaries for the hash parts of Nix store paths (such as
 <literal>r8vvq9kq…</literal>).  This sounds risky, but it works
 extremely well.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Multi-user support</title>
+<section><title>Multi-user support</title>
 
 <para>Nix has multi-user support.  This means that non-privileged
 users can securely install software.  Each user can have a different
@@ -82,10 +82,10 @@ package won’t be built or downloaded a second time.  At the same time,
 it is not possible for one user to inject a Trojan horse into a
 package that might be used by another user.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Atomic upgrades and rollbacks</title>
+<section><title>Atomic upgrades and rollbacks</title>
 
 <para>Since package management operations never overwrite packages in
 the Nix store but just add new versions in different paths, they are
@@ -103,10 +103,10 @@ $ nix-env --upgrade <replaceable>some-packages</replaceable>
 $ nix-env --rollback
 </screen>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Garbage collection</title>
+<section><title>Garbage collection</title>
 
 <para>When you uninstall a package like this…
 
@@ -126,10 +126,10 @@ $ nix-collect-garbage
 This deletes all packages that aren’t in use by any user profile or by
 a currently running program.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Functional package language</title>
+<section><title>Functional package language</title>
 
 <para>Packages are built from <emphasis>Nix expressions</emphasis>,
 which is a simple functional language.  A Nix expression describes
@@ -145,10 +145,10 @@ function and call it any number of times with the appropriate
 arguments.  Due to the hashing scheme, variants don’t conflict with
 each other in the Nix store.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Transparent source/binary deployment</title>
+<section><title>Transparent source/binary deployment</title>
 
 <para>Nix expressions generally describe how to build a package from
 source, so an installation action like
@@ -172,31 +172,31 @@ Nix would first check if the file
 if so, fetch the pre-built binary referenced from there; otherwise, it
 would fall back to building from source.</para>
 
-</simplesect>
+</section>
 
 
 <!--
-<simplesect><title>Binary patching</title>
+<section><title>Binary patching</title>
 
 <para>In addition to downloading binaries automatically if they’re
 available, Nix can download binary deltas that patch an existing
 package in the Nix store into a new version.  This speeds up
 upgrades.</para>
 
-</simplesect>
+</section>
 -->
 
 
-<simplesect><title>Nix Packages collection</title>
+<section><title>Nix Packages collection</title>
 
 <para>We provide a large set of Nix expressions containing hundreds of
 existing Unix packages, the <emphasis>Nix Packages
 collection</emphasis> (Nixpkgs).</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Managing build environments</title>
+<section><title>Managing build environments</title>
 
 <para>Nix is extremely useful for developers as it makes it easy to
 automatically set up the build environment for a package. Given a
@@ -232,17 +232,17 @@ specifications, Nix makes an excellent basis for <a
 href="[%root%]hydra">a continuous build system</a>.</para>
 -->
 
-</simplesect>
+</section>
 
 
-<simplesect><title>Portability</title>
+<section><title>Portability</title>
 
 <para>Nix runs on Linux and macOS.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>NixOS</title>
+<section><title>NixOS</title>
 
 <para>NixOS is a Linux distribution based on Nix.  It uses Nix not
 just for package management but also to manage the system
@@ -253,16 +253,16 @@ earlier state.  Also, users can install software without root
 privileges.  For more information and downloads, see the <link
 xlink:href="http://nixos.org/">NixOS homepage</link>.</para>
 
-</simplesect>
+</section>
 
 
-<simplesect><title>License</title>
+<section><title>License</title>
 
 <para>Nix is released under the terms of the <link
 xlink:href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
 LGPLv2.1 or (at your option) any later version</link>.</para>
 
-</simplesect>
+</section>
 
 
 </chapter>
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
index 121e4d998..20d003348 100644
--- a/doc/manual/src/expressions/language-constructs.md
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -1,5 +1,7 @@
 # Language Constructs
 
+## Recursive sets
+
 Recursive sets are just normal sets, but the attributes can refer to
 each other. For example,
 
@@ -24,6 +26,8 @@ example,
 
 does not terminate\[1\].
 
+## Let-expressions
+
 A let-expression allows you to define local variables for an expression.
 For instance,
 
@@ -34,6 +38,8 @@ For instance,
 
 evaluates to `"foobar"`.
 
+## Inheriting attributes
+
 When defining a set or in a let-expression it is often convenient to
 copy variables from the surrounding lexical scope (e.g., when you want
 to propagate attributes). This can be shortened using the `inherit`
@@ -95,6 +101,8 @@ is equivalent to
 when used while defining local variables in a let-expression or while
 defining a set.
 
+## Functions
+
 Functions have the following form:
 
     pattern: body
@@ -187,6 +195,8 @@ you can bind them to an attribute, e.g.,
     let concat = { x, y }: x + y;
     in concat { x = "foo"; y = "bar"; }
 
+## Conditionals
+
 Conditionals look like this:
 
     if e1 then e2 else e3
@@ -194,6 +204,8 @@ Conditionals look like this:
 where e1 is an expression that should evaluate to a Boolean value
 (`true` or `false`).
 
+## Assertions
+
 Assertions are generally used to check that certain requirements on or
 between features and dependencies hold. They look like this:
 
@@ -257,6 +269,8 @@ The points of interest are:
     non-`null` value was passed. This prevents an unnecessary rebuild of
     Subversion if OpenSSL changes.
 
+## With-expressions
+
 A *with-expression*,
 
     with e1; e2
@@ -285,6 +299,8 @@ establishes the same scope as
 
     let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...
 
+## Comments
+
 Comments can be single-line, started with a `#` character, or
 inline/multi-line, enclosed within `/*
 ... */`.
diff --git a/doc/manual/src/expressions/language-values.md b/doc/manual/src/expressions/language-values.md
index fac0be47e..8ffe2f0f9 100644
--- a/doc/manual/src/expressions/language-values.md
+++ b/doc/manual/src/expressions/language-values.md
@@ -1,5 +1,7 @@
 # Values
 
+## Simple Values
+
 Nix has the following basic data types:
 
   - *Strings* can be written in three ways.
@@ -127,6 +129,8 @@ Nix has the following basic data types:
 
   - The null value, denoted as `null`.
 
+## Lists
+
 Lists are formed by enclosing a whitespace-separated list of values
 between square brackets. For example,
 
@@ -143,6 +147,8 @@ function and the fifth being a set.
 
 Note that lists are only lazy in values, and they are strict in length.
 
+## Sets
+
 Sets are really the core of the language, since ultimately the Nix
 language is all about creating derivations, which are really just sets
 of attributes to be passed to build scripts.
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/src/installation/multi-user.md
index 6493e717b..4a861691d 100644
--- a/doc/manual/src/installation/multi-user.md
+++ b/doc/manual/src/installation/multi-user.md
@@ -20,6 +20,8 @@ Nix store/database that performs the operation.
 > caches. So while unprivileged users may install packages from
 > arbitrary Nix expressions, they may not get pre-built binaries.
 
+## Setting up the build users
+
 The *build users* are the special UIDs under which builds are performed.
 They should all be members of the *build users group* `nixbld`. This
 group should have no other members. The build users should not be
@@ -35,6 +37,8 @@ This creates 10 build users. There can never be more concurrent builds
 than the number of build users, so you may want to increase this if you
 expect to do many builds at the same time.
 
+## Running the daemon
+
 The [Nix daemon](#sec-nix-daemon) should be started as follows (as
 `root`):
 
@@ -50,6 +54,8 @@ should put a line like
 
 into the users’ login scripts.
 
+## Restricting access
+
 To limit which users can perform Nix operations, you can use the
 permissions on the directory `/nix/var/nix/daemon-socket`. For instance,
 if you want to restrict the use of Nix to the members of a group called

From 802150f987e720452920a3d1993c3b4b36861116 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:28:05 +0200
Subject: [PATCH 023/176] <replaceable> -> <emphasis>

Pandoc doesn't know <replaceable> so let's force it to be rendered as
italics.
---
 .../advanced-topics/distributed-builds.xml    |   4 +-
 doc/manual/command-ref/conf-file.xml          |  34 +-
 doc/manual/command-ref/env-common.xml         |  18 +-
 doc/manual/command-ref/nix-build.xml          |  24 +-
 doc/manual/command-ref/nix-channel.xml        |  32 +-
 .../command-ref/nix-collect-garbage.xml       |   6 +-
 doc/manual/command-ref/nix-copy-closure.xml   |  16 +-
 doc/manual/command-ref/nix-env.xml            | 120 ++---
 doc/manual/command-ref/nix-hash.xml           |  24 +-
 doc/manual/command-ref/nix-instantiate.xml    |  28 +-
 doc/manual/command-ref/nix-prefetch-url.xml   |  30 +-
 doc/manual/command-ref/nix-shell.xml          |  48 +-
 doc/manual/command-ref/nix-store.xml          | 122 ++---
 doc/manual/command-ref/opt-common-syn.xml     |  16 +-
 doc/manual/command-ref/opt-common.xml         |  46 +-
 doc/manual/command-ref/opt-inst-syn.xml       |   2 +-
 .../expressions/advanced-attributes.xml       |  18 +-
 doc/manual/expressions/build-script.xml       |   2 +-
 doc/manual/expressions/builtins.xml           | 420 +++++++++---------
 doc/manual/expressions/expression-syntax.xml  |  10 +-
 doc/manual/expressions/generic-builder.xml    |   2 +-
 .../expressions/language-constructs.xml       |  24 +-
 doc/manual/expressions/language-operators.xml |  78 ++--
 doc/manual/expressions/language-values.xml    |   8 +-
 .../expressions/simple-building-testing.xml   |   2 +-
 doc/manual/installation/building-source.xml   |  10 +-
 doc/manual/installation/env-variables.xml     |   6 +-
 doc/manual/installation/installing-binary.xml |   2 +-
 doc/manual/installation/single-user.xml       |   4 +-
 doc/manual/introduction/about-nix.xml         |   2 +-
 doc/manual/introduction/quick-start.xml       |   2 +-
 doc/manual/packages/basic-package-mgmt.xml    |   4 +-
 doc/manual/packages/channels.xml              |   2 +-
 .../packages/garbage-collector-roots.xml      |   4 +-
 doc/manual/packages/profiles.xml              |   2 +-
 doc/manual/release-notes/rl-0.10.xml          |  16 +-
 doc/manual/release-notes/rl-0.12.xml          |  16 +-
 doc/manual/release-notes/rl-0.13.xml          |   4 +-
 doc/manual/release-notes/rl-0.16.xml          |   8 +-
 doc/manual/release-notes/rl-0.6.xml           |   8 +-
 doc/manual/release-notes/rl-0.8.xml           |   4 +-
 doc/manual/release-notes/rl-1.1.xml           |   4 +-
 doc/manual/release-notes/rl-1.11.xml          |   8 +-
 doc/manual/release-notes/rl-1.2.xml           |   2 +-
 doc/manual/release-notes/rl-1.4.xml           |   4 +-
 doc/manual/release-notes/rl-1.6.1.xml         |   8 +-
 doc/manual/release-notes/rl-1.7.xml           |  12 +-
 doc/manual/release-notes/rl-1.8.xml           |   4 +-
 doc/manual/release-notes/rl-2.0.xml           |  12 +-
 doc/manual/src/command-ref/conf-file.md       |  10 +-
 doc/manual/src/command-ref/nix-build.md       |  12 +-
 doc/manual/src/command-ref/nix-channel.md     |  21 +-
 .../src/command-ref/nix-collect-garbage.md    |   2 +-
 doc/manual/src/command-ref/nix-env.md         |  61 +--
 doc/manual/src/command-ref/nix-hash.md        |  14 +-
 doc/manual/src/command-ref/nix-instantiate.md |   8 +-
 .../src/command-ref/nix-prefetch-url.md       |  22 +-
 doc/manual/src/command-ref/nix-shell.md       |  30 +-
 doc/manual/src/command-ref/nix-store.md       |  80 ++--
 doc/manual/src/command-ref/opt-common.md      |  26 +-
 .../src/expressions/advanced-attributes.md    |  10 +-
 doc/manual/src/expressions/builtins.md        | 372 ++++++++--------
 .../src/expressions/expression-syntax.md      |   2 +-
 .../src/expressions/language-constructs.md    |  14 +-
 .../src/expressions/language-operators.md     |  48 +-
 .../src/installation/building-source.md       |   2 +-
 .../package-management/basic-package-mgmt.md  |   3 +-
 doc/manual/src/release-notes/rl-0.10.md       |   2 +-
 doc/manual/src/release-notes/rl-0.12.md       |   4 +-
 doc/manual/src/release-notes/rl-0.13.md       |   4 +-
 doc/manual/src/release-notes/rl-0.16.md       |   2 +-
 doc/manual/src/release-notes/rl-0.6.md        |   4 +-
 doc/manual/src/release-notes/rl-1.11.md       |   2 +-
 doc/manual/src/release-notes/rl-1.4.md        |   2 +-
 doc/manual/src/release-notes/rl-1.6.1.md      |   4 +-
 doc/manual/src/release-notes/rl-1.7.md        |   6 +-
 76 files changed, 1029 insertions(+), 1020 deletions(-)

diff --git a/doc/manual/advanced-topics/distributed-builds.xml b/doc/manual/advanced-topics/distributed-builds.xml
index a649b6f8d..ec9e98e77 100644
--- a/doc/manual/advanced-topics/distributed-builds.xml
+++ b/doc/manual/advanced-topics/distributed-builds.xml
@@ -86,7 +86,7 @@ To leave a field at its default, set it to <literal>-</literal>.
 <orderedlist>
 
   <listitem><para>The URI of the remote store in the format
-  <literal>ssh://[<replaceable>username</replaceable>@]<replaceable>hostname</replaceable></literal>,
+  <literal>ssh://[<emphasis>username</emphasis>@]<emphasis>hostname</emphasis></literal>,
   e.g. <literal>ssh://nix@mac</literal> or
   <literal>ssh://mac</literal>. For backward compatibility,
   <literal>ssh://</literal> may be omitted. The hostname may be an
@@ -171,7 +171,7 @@ builders = ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd
 
 Finally, remote builders can be configured in a separate configuration
 file included in <option>builders</option> via the syntax
-<literal>@<replaceable>file</replaceable></literal>. For example,
+<literal>@<emphasis>file</emphasis></literal>. For example,
 
 <programlisting>
 builders = @/etc/nix/machines
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
index 4c103f505..62cc117b6 100644
--- a/doc/manual/command-ref/conf-file.xml
+++ b/doc/manual/command-ref/conf-file.xml
@@ -26,7 +26,7 @@
   <listitem>
     <para>
       The system-wide configuration file
-      <filename><replaceable>sysconfdir</replaceable>/nix/nix.conf</filename>
+      <filename><emphasis>sysconfdir</emphasis>/nix/nix.conf</filename>
       (i.e. <filename>/etc/nix/nix.conf</filename> on most systems),
       or <filename>$NIX_CONF_DIR/nix.conf</filename> if
       <literal>NIX_CONF_DIR</literal> is set. Values loaded in this
@@ -52,11 +52,11 @@
 </itemizedlist>
 
 <para>The configuration files consist of
-<literal><replaceable>name</replaceable> =
-<replaceable>value</replaceable></literal> pairs, one per line. Other
+<literal><emphasis>name</emphasis> =
+<emphasis>value</emphasis></literal> pairs, one per line. Other
 files can be included with a line like <literal>include
-<replaceable>path</replaceable></literal>, where
-<replaceable>path</replaceable> is interpreted relative to the current
+<emphasis>path</emphasis></literal>, where
+<emphasis>path</emphasis> is interpreted relative to the current
 conf file and a missing file is an error unless
 <literal>!include</literal> is used instead.
 Comments start with a <literal>#</literal> character.  Here is an
@@ -244,7 +244,7 @@ false</literal>.</para>
     instance, in Nixpkgs, if the derivation attribute
     <varname>enableParallelBuilding</varname> is set to
     <literal>true</literal>, the builder passes the
-    <option>-j<replaceable>N</replaceable></option> flag to GNU Make.
+    <option>-j<emphasis>N</emphasis></option> flag to GNU Make.
     It can be overridden using the <option
     linkend='opt-cores'>--cores</option> command line switch and
     defaults to <literal>1</literal>.  The value <literal>0</literal>
@@ -383,10 +383,10 @@ false</literal>.</para>
     <function>builtins.fetchurl</function> to obtain files by
     hash. The default is
     <literal>http://tarballs.nixos.org/</literal>. Given a hash type
-    <replaceable>ht</replaceable> and a base-16 hash
-    <replaceable>h</replaceable>, Nix will try to download the file
+    <emphasis>ht</emphasis> and a base-16 hash
+    <emphasis>h</emphasis>, Nix will try to download the file
     from
-    <literal>hashed-mirror/<replaceable>ht</replaceable>/<replaceable>h</replaceable></literal>.
+    <literal>hashed-mirror/<emphasis>ht</emphasis>/<emphasis>h</emphasis></literal>.
     This allows files to be downloaded even if they have disappeared
     from their original URI. For example, given the default mirror
     <literal>http://tarballs.nixos.org/</literal>, when building the derivation
@@ -421,7 +421,7 @@ builtins.fetchurl {
     output and error of its builder) to the directory
     <filename>/nix/var/log/nix/drvs</filename>.  The build log can be
     retrieved using the command <command>nix-store -l
-    <replaceable>path</replaceable></command>.</para></listitem>
+    <emphasis>path</emphasis></command>.</para></listitem>
 
   </varlistentry>
 
@@ -592,9 +592,9 @@ builtins.fetchurl {
     accounts in the following format:
 
 <screen>
-machine <replaceable>my-machine</replaceable>
-login <replaceable>my-username</replaceable>
-password <replaceable>my-password</replaceable>
+machine <emphasis>my-machine</emphasis>
+login <emphasis>my-username</emphasis>
+password <emphasis>my-password</emphasis>
 </screen>
 
     For the exact syntax, see <link
@@ -837,13 +837,13 @@ password <replaceable>my-password</replaceable>
 
     <listitem><para>A list of paths bind-mounted into Nix sandbox
     environments. You can use the syntax
-    <literal><replaceable>target</replaceable>=<replaceable>source</replaceable></literal>
+    <literal><emphasis>target</emphasis>=<emphasis>source</emphasis></literal>
     to mount a path in a different location in the sandbox; for
     instance, <literal>/bin=/nix-bin</literal> will mount the path
     <literal>/nix-bin</literal> as <literal>/bin</literal> inside the
-    sandbox. If <replaceable>source</replaceable> is followed by
+    sandbox. If <emphasis>source</emphasis> is followed by
     <literal>?</literal>, then it is not an error if
-    <replaceable>source</replaceable> does not exist; for example,
+    <emphasis>source</emphasis> does not exist; for example,
     <literal>/dev/nvidiactl?</literal> specifies that
     <filename>/dev/nvidiactl</filename> will only be mounted in the
     sandbox if it exists in the host filesystem.</para>
@@ -1035,7 +1035,7 @@ function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
     <listitem><para>A list of URLs of substituters, separated by
     whitespace.  These are not used by default, but can be enabled by
     users of the Nix daemon by specifying <literal>--option
-    substituters <replaceable>urls</replaceable></literal> on the
+    substituters <emphasis>urls</emphasis></literal> on the
     command line.  Unprivileged users are only allowed to pass a
     subset of the URLs listed in <literal>substituters</literal> and
     <literal>trusted-substituters</literal>.</para></listitem>
diff --git a/doc/manual/command-ref/env-common.xml b/doc/manual/command-ref/env-common.xml
index 3196cbbd2..ac40fccf7 100644
--- a/doc/manual/command-ref/env-common.xml
+++ b/doc/manual/command-ref/env-common.xml
@@ -25,7 +25,7 @@
 
     <para>A colon-separated list of directories used to look up Nix
     expressions enclosed in angle brackets (i.e.,
-    <literal>&lt;<replaceable>path</replaceable>></literal>).  For
+    <literal>&lt;<emphasis>path</emphasis>></literal>).  For
     instance, the value
 
     <screen>
@@ -40,10 +40,10 @@
 nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos</screen>
 
     will cause Nix to search for
-    <literal>&lt;nixpkgs/<replaceable>path</replaceable>></literal> in
-    <filename>/home/eelco/Dev/nixpkgs-branch/<replaceable>path</replaceable></filename>
+    <literal>&lt;nixpkgs/<emphasis>path</emphasis>></literal> in
+    <filename>/home/eelco/Dev/nixpkgs-branch/<emphasis>path</emphasis></filename>
     and
-    <filename>/etc/nixos/nixpkgs/<replaceable>path</replaceable></filename>.</para>
+    <filename>/etc/nixos/nixpkgs/<emphasis>path</emphasis></filename>.</para>
 
     <para>If a path in the Nix search path starts with
     <literal>http://</literal> or <literal>https://</literal>, it is
@@ -105,7 +105,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 <varlistentry><term><literal>NIX_STORE_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix store (default
-  <filename><replaceable>prefix</replaceable>/store</filename>).</para></listitem>
+  <filename><emphasis>prefix</emphasis>/store</filename>).</para></listitem>
 
 </varlistentry>
 
@@ -114,7 +114,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 
   <listitem><para>Overrides the location of the Nix static data
   directory (default
-  <filename><replaceable>prefix</replaceable>/share</filename>).</para></listitem>
+  <filename><emphasis>prefix</emphasis>/share</filename>).</para></listitem>
 
 </varlistentry>
 
@@ -122,7 +122,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 <varlistentry><term><literal>NIX_LOG_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix log directory
-  (default <filename><replaceable>prefix</replaceable>/var/log/nix</filename>).</para></listitem>
+  (default <filename><emphasis>prefix</emphasis>/var/log/nix</filename>).</para></listitem>
 
 </varlistentry>
 
@@ -130,7 +130,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 <varlistentry><term><literal>NIX_STATE_DIR</literal></term>
 
   <listitem><para>Overrides the location of the Nix state directory
-  (default <filename><replaceable>prefix</replaceable>/var/nix</filename>).</para></listitem>
+  (default <filename><emphasis>prefix</emphasis>/var/nix</filename>).</para></listitem>
 
 </varlistentry>
 
@@ -139,7 +139,7 @@ $ mount -o bind /mnt/otherdisk/nix /nix</screen>
 
   <listitem><para>Overrides the location of the system Nix configuration
   directory (default
-  <filename><replaceable>prefix</replaceable>/etc/nix</filename>).</para></listitem>
+  <filename><emphasis>prefix</emphasis>/etc/nix</filename>).</para></listitem>
 
 </varlistentry>
 
diff --git a/doc/manual/command-ref/nix-build.xml b/doc/manual/command-ref/nix-build.xml
index 886d25910..ec9145143 100644
--- a/doc/manual/command-ref/nix-build.xml
+++ b/doc/manual/command-ref/nix-build.xml
@@ -20,14 +20,14 @@
   <cmdsynopsis>
     <command>nix-build</command>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
-    <arg><option>--argstr</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
+    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
+    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--attr</option></arg>
         <arg choice='plain'><option>-A</option></arg>
       </group>
-      <replaceable>attrPath</replaceable>
+      <emphasis>attrPath</emphasis>
     </arg>
     <arg><option>--no-out-link</option></arg>
     <arg><option>--dry-run</option></arg>
@@ -36,16 +36,16 @@
         <arg choice='plain'><option>--out-link</option></arg>
         <arg choice='plain'><option>-o</option></arg>
       </group>
-      <replaceable>outlink</replaceable>
+      <emphasis>outlink</emphasis>
     </arg>
-    <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsection><title>Description</title>
 
 <para>The <command>nix-build</command> command builds the derivations
-described by the Nix expressions in <replaceable>paths</replaceable>.
+described by the Nix expressions in <emphasis>paths</emphasis>.
 If the build succeeds, it places a symlink to the result in the
 current directory.  The symlink is called <filename>result</filename>.
 If there are multiple Nix expressions, or the Nix expressions evaluate
@@ -53,11 +53,11 @@ to multiple derivations, multiple sequentially numbered symlinks are
 created (<filename>result</filename>, <filename>result-2</filename>,
 and so on).</para>
 
-<para>If no <replaceable>paths</replaceable> are specified, then
+<para>If no <emphasis>paths</emphasis> are specified, then
 <command>nix-build</command> will use <filename>default.nix</filename>
 in the current directory, if it exists.</para>
 
-<para>If an element of <replaceable>paths</replaceable> starts with
+<para>If an element of <emphasis>paths</emphasis> starts with
 <literal>http://</literal> or <literal>https://</literal>, it is
 interpreted as the URL of a tarball that will be downloaded and
 unpacked to a temporary location. The tarball must include a single
@@ -104,11 +104,11 @@ also <xref linkend="sec-common-options" />.</phrase></para>
   </varlistentry>
 
   <varlistentry xml:id='opt-out-link'><term><option>--out-link</option> /
-  <option>-o</option> <replaceable>outlink</replaceable></term>
+  <option>-o</option> <emphasis>outlink</emphasis></term>
 
     <listitem><para>Change the name of the symlink to the output path
     created from <filename>result</filename> to
-    <replaceable>outlink</replaceable>.</para></listitem>
+    <emphasis>outlink</emphasis>.</para></listitem>
 
   </varlistentry>
 
@@ -131,7 +131,7 @@ store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
 /nix/store/d18hyl92g30l...-firefox-1.5.0.7
 
 $ ls -l result
-lrwxrwxrwx  <replaceable>...</replaceable>  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
+lrwxrwxrwx  <emphasis>...</emphasis>  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
 
 $ ls ./result/bin/
 firefox  firefox-config</screen>
@@ -143,7 +143,7 @@ You can also build all outputs:
 $ nix-build '&lt;nixpkgs>' -A openssl.all
 </screen>
 This will create a symlink for each output named
-<filename>result-<replaceable>outputname</replaceable></filename>.
+<filename>result-<emphasis>outputname</emphasis></filename>.
 The suffix is omitted if the output name is <literal>out</literal>.
 So if <literal>openssl</literal> has outputs <literal>out</literal>,
 <literal>bin</literal> and <literal>man</literal>,
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml
index ebcf56aff..2abeca0a0 100644
--- a/doc/manual/command-ref/nix-channel.xml
+++ b/doc/manual/command-ref/nix-channel.xml
@@ -20,11 +20,11 @@
   <cmdsynopsis>
     <command>nix-channel</command>
     <group choice='req'>
-      <arg choice='plain'><option>--add</option> <replaceable>url</replaceable> <arg choice='opt'><replaceable>name</replaceable></arg></arg>
-      <arg choice='plain'><option>--remove</option> <replaceable>name</replaceable></arg>
+      <arg choice='plain'><option>--add</option> <emphasis>url</emphasis> <arg choice='opt'><emphasis>name</emphasis></arg></arg>
+      <arg choice='plain'><option>--remove</option> <emphasis>name</emphasis></arg>
       <arg choice='plain'><option>--list</option></arg>
-      <arg choice='plain'><option>--update</option> <arg rep='repeat'><replaceable>names</replaceable></arg></arg>
-      <arg choice='plain'><option>--rollback</option> <arg choice='opt'><replaceable>generation</replaceable></arg></arg>
+      <arg choice='plain'><option>--update</option> <arg rep='repeat'><emphasis>names</emphasis></arg></arg>
+      <arg choice='plain'><option>--rollback</option> <arg choice='opt'><emphasis>generation</emphasis></arg></arg>
     </group>
   </cmdsynopsis>
 </refsynopsisdiv>
@@ -44,22 +44,22 @@ xlink:href="https://nixos.org/channels" />.</para>
 
 <variablelist>
 
-  <varlistentry><term><option>--add</option> <replaceable>url</replaceable> [<replaceable>name</replaceable>]</term>
+  <varlistentry><term><option>--add</option> <emphasis>url</emphasis> [<emphasis>name</emphasis>]</term>
 
     <listitem><para>Adds a channel named
-    <replaceable>name</replaceable> with URL
-    <replaceable>url</replaceable> to the list of subscribed channels.
-    If <replaceable>name</replaceable> is omitted, it defaults to the
-    last component of <replaceable>url</replaceable>, with the
+    <emphasis>name</emphasis> with URL
+    <emphasis>url</emphasis> to the list of subscribed channels.
+    If <emphasis>name</emphasis> is omitted, it defaults to the
+    last component of <emphasis>url</emphasis>, with the
     suffixes <literal>-stable</literal> or
     <literal>-unstable</literal> removed.</para></listitem>
 
   </varlistentry>
 
-  <varlistentry><term><option>--remove</option> <replaceable>name</replaceable></term>
+  <varlistentry><term><option>--remove</option> <emphasis>name</emphasis></term>
 
     <listitem><para>Removes the channel named
-    <replaceable>name</replaceable> from the list of subscribed
+    <emphasis>name</emphasis> from the list of subscribed
     channels.</para></listitem>
 
   </varlistentry>
@@ -71,18 +71,18 @@ xlink:href="https://nixos.org/channels" />.</para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--update</option> [<replaceable>names</replaceable>…]</term>
+  <varlistentry><term><option>--update</option> [<emphasis>names</emphasis>…]</term>
 
     <listitem><para>Downloads the Nix expressions of all subscribed
     channels (or only those included in
-    <replaceable>names</replaceable> if specified) and makes them the
+    <emphasis>names</emphasis> if specified) and makes them the
     default for <command>nix-env</command> operations (by symlinking
     them from the directory
     <filename>~/.nix-defexpr</filename>).</para></listitem>
 
   </varlistentry>
 
-  <varlistentry><term><option>--rollback</option> [<replaceable>generation</replaceable>]</term>
+  <varlistentry><term><option>--rollback</option> [<emphasis>generation</emphasis>]</term>
 
     <listitem><para>Reverts the previous call to <command>nix-channel
     --update</command>. Optionally, you can specify a specific channel
@@ -130,7 +130,7 @@ $ nix-instantiate --eval -E '(import &lt;nixpkgs> {}).lib.version'
 
 <variablelist>
 
-  <varlistentry><term><filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/channels</filename></term>
+  <varlistentry><term><filename>/nix/var/nix/profiles/per-user/<emphasis>username</emphasis>/channels</filename></term>
 
     <listitem><para><command>nix-channel</command> uses a
     <command>nix-env</command> profile to keep track of previous
@@ -145,7 +145,7 @@ $ nix-instantiate --eval -E '(import &lt;nixpkgs> {}).lib.version'
   <varlistentry><term><filename>~/.nix-defexpr/channels</filename></term>
 
     <listitem><para>This is a symlink to
-    <filename>/nix/var/nix/profiles/per-user/<replaceable>username</replaceable>/channels</filename>. It
+    <filename>/nix/var/nix/profiles/per-user/<emphasis>username</emphasis>/channels</filename>. It
     ensures that <command>nix-env</command> can find your channels. In
     a multi-user installation, you may also have
     <filename>~/.nix-defexpr/channels_root</filename>, which links to
diff --git a/doc/manual/command-ref/nix-collect-garbage.xml b/doc/manual/command-ref/nix-collect-garbage.xml
index 43e068796..cbcb5add5 100644
--- a/doc/manual/command-ref/nix-collect-garbage.xml
+++ b/doc/manual/command-ref/nix-collect-garbage.xml
@@ -21,8 +21,8 @@
     <command>nix-collect-garbage</command>
     <arg><option>--delete-old</option></arg>
     <arg><option>-d</option></arg>
-    <arg><option>--delete-older-than</option> <replaceable>period</replaceable></arg>
-    <arg><option>--max-freed</option> <replaceable>bytes</replaceable></arg>
+    <arg><option>--delete-older-than</option> <emphasis>period</emphasis></arg>
+    <arg><option>--max-freed</option> <emphasis>bytes</emphasis></arg>
     <arg><option>--dry-run</option></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
@@ -39,7 +39,7 @@ which deletes all old generations of all profiles in
 <literal>nix-env --delete-generations old</literal> on all profiles
 (of course, this makes rollbacks to previous configurations
 impossible); and
-<option>--delete-older-than</option> <replaceable>period</replaceable>,
+<option>--delete-older-than</option> <emphasis>period</emphasis>,
 where period is a value such as <literal>30d</literal>, which deletes
 all generations older than the specified number of days in all profiles
 in <filename>/nix/var/nix/profiles</filename> (except for the generations
diff --git a/doc/manual/command-ref/nix-copy-closure.xml b/doc/manual/command-ref/nix-copy-closure.xml
index 8c07984fb..6fc8c312b 100644
--- a/doc/manual/command-ref/nix-copy-closure.xml
+++ b/doc/manual/command-ref/nix-copy-closure.xml
@@ -33,9 +33,9 @@
     </group>
     <arg><option>-v</option></arg>
     <arg choice='plain'>
-      <replaceable>user@</replaceable><replaceable>machine</replaceable>
+      <emphasis>user@</emphasis><emphasis>machine</emphasis>
     </arg>
-    <arg choice='plain'><replaceable>paths</replaceable></arg>
+    <arg choice='plain'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -44,13 +44,13 @@
 
 <para><command>nix-copy-closure</command> gives you an easy and
 efficient way to exchange software between machines.  Given one or
-more Nix store <replaceable>paths</replaceable> on the local
+more Nix store <emphasis>paths</emphasis> on the local
 machine, <command>nix-copy-closure</command> computes the closure of
 those paths (i.e. all their dependencies in the Nix store), and copies
 all paths in the closure to the remote machine via the
 <command>ssh</command> (Secure Shell) command.  With the
 <option>--from</option>, the direction is reversed:
-the closure of <replaceable>paths</replaceable> on a remote machine is
+the closure of <emphasis>paths</emphasis> on a remote machine is
 copied to the Nix store on the local machine.</para>
 
 <para>This command is efficient because it only sends the store paths
@@ -73,8 +73,8 @@ those paths.  If this bothers you, use
   <varlistentry><term><option>--to</option></term>
 
     <listitem><para>Copy the closure of
-    <replaceable>paths</replaceable> from the local Nix store to the
-    Nix store on <replaceable>machine</replaceable>.  This is the
+    <emphasis>paths</emphasis> from the local Nix store to the
+    Nix store on <emphasis>machine</emphasis>.  This is the
     default.</para></listitem>
 
   </varlistentry>
@@ -82,8 +82,8 @@ those paths.  If this bothers you, use
   <varlistentry><term><option>--from</option></term>
 
     <listitem><para>Copy the closure of
-    <replaceable>paths</replaceable> from the Nix store on
-    <replaceable>machine</replaceable> to the local Nix
+    <emphasis>paths</emphasis> from the Nix store on
+    <emphasis>machine</emphasis> to the local Nix
     store.</para></listitem>
 
   </varlistentry>
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml
index 4dedd90ca..6a97c7e37 100644
--- a/doc/manual/command-ref/nix-env.xml
+++ b/doc/manual/command-ref/nix-env.xml
@@ -20,30 +20,30 @@
   <cmdsynopsis>
     <command>nix-env</command>
     <xi:include href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
-    <arg><option>--argstr</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
+    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
+    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--file</option></arg>
         <arg choice='plain'><option>-f</option></arg>
       </group>
-      <replaceable>path</replaceable>
+      <emphasis>path</emphasis>
     </arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--profile</option></arg>
         <arg choice='plain'><option>-p</option></arg>
       </group>
-      <replaceable>path</replaceable>
+      <emphasis>path</emphasis>
     </arg>
     <arg>
       <arg choice='plain'><option>--system-filter</option></arg>
-      <replaceable>system</replaceable>
+      <emphasis>system</emphasis>
     </arg>
     <arg><option>--dry-run</option></arg>
-    <arg choice='plain'><replaceable>operation</replaceable></arg>
-    <arg rep='repeat'><replaceable>options</replaceable></arg>
-    <arg rep='repeat'><replaceable>arguments</replaceable></arg>
+    <arg choice='plain'><emphasis>operation</emphasis></arg>
+    <arg rep='repeat'><emphasis>options</emphasis></arg>
+    <arg rep='repeat'><emphasis>arguments</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -146,7 +146,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
 <variablelist>
 
-  <varlistentry><term><option>--file</option> / <option>-f</option> <replaceable>path</replaceable></term>
+  <varlistentry><term><option>--file</option> / <option>-f</option> <emphasis>path</emphasis></term>
 
     <listitem><para>Specifies the Nix expression (designated below as
     the <emphasis>active Nix expression</emphasis>) used by the
@@ -165,7 +165,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--profile</option> / <option>-p</option> <replaceable>path</replaceable></term>
+  <varlistentry><term><option>--profile</option> / <option>-p</option> <emphasis>path</emphasis></term>
 
     <listitem><para>Specifies the profile to be used by those
     operations that operate on a profile (designated below as the
@@ -194,12 +194,12 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--system-filter</option> <replaceable>system</replaceable></term>
+  <varlistentry><term><option>--system-filter</option> <emphasis>system</emphasis></term>
 
     <listitem><para>By default, operations such as <option>--query
     --available</option> show derivations matching any platform.  This
     option allows you to use derivations for the specified platform
-    <replaceable>system</replaceable>.</para></listitem>
+    <emphasis>system</emphasis>.</para></listitem>
 
   </varlistentry>
 
@@ -276,7 +276,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
     <listitem><para>A symbolic link to the user's current profile.  By
     default, this symlink points to
-    <filename><replaceable>prefix</replaceable>/var/nix/profiles/default</filename>.
+    <filename><emphasis>prefix</emphasis>/var/nix/profiles/default</filename>.
     The <literal>PATH</literal> environment variable should include
     <filename>~/.nix-profile/bin</filename> for the user environment
     to be visible to the user.</para></listitem>
@@ -310,7 +310,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
     <arg choice='plain'><option>--remove-all</option></arg>
     <arg choice='plain'><option>-r</option></arg>
   </group>
-  <arg choice='plain' rep='repeat'><replaceable>args</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>args</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -320,13 +320,13 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
 <para>The install operation creates a new user environment, based on
 the current generation of the active profile, to which a set of store
-paths described by <replaceable>args</replaceable> is added.  The
-arguments <replaceable>args</replaceable> map to store paths in a
+paths described by <emphasis>args</emphasis> is added.  The
+arguments <emphasis>args</emphasis> map to store paths in a
 number of possible ways:
 
 <itemizedlist>
 
-  <listitem><para>By default, <replaceable>args</replaceable> is a set
+  <listitem><para>By default, <emphasis>args</emphasis> is a set
   of derivation names denoting derivations in the active Nix
   expression.  These are realised, and the resulting output paths are
   installed.  Currently installed derivations with a name equal to the
@@ -335,7 +335,7 @@ number of possible ways:
   specified.</para>
 
   <para>If there are multiple derivations matching a name in
-  <replaceable>args</replaceable> that have the same name (e.g.,
+  <emphasis>args</emphasis> that have the same name (e.g.,
   <literal>gcc-3.3.6</literal> and <literal>gcc-4.1.1</literal>), then
   the derivation with the highest <emphasis>priority</emphasis> is
   used.  A derivation can define a priority by declaring the
@@ -362,14 +362,14 @@ number of possible ways:
   packages, use <literal>nix-env -qaP</literal>.</para></listitem>
 
   <listitem><para>If <option>--from-profile</option>
-  <replaceable>path</replaceable> is given,
-  <replaceable>args</replaceable> is a set of names denoting installed
-  store paths in the profile <replaceable>path</replaceable>.  This is
+  <emphasis>path</emphasis> is given,
+  <emphasis>args</emphasis> is a set of names denoting installed
+  store paths in the profile <emphasis>path</emphasis>.  This is
   an easy way to copy user environment elements from one profile to
   another.</para></listitem>
 
   <listitem><para>If <option>--from-expression</option> is given,
-  <replaceable>args</replaceable> are Nix <link
+  <emphasis>args</emphasis> are Nix <link
   linkend="ss-functions">functions</link> that are called with the
   active Nix expression as their single argument.  The derivations
   returned by those function calls are installed.  This allows
@@ -377,12 +377,12 @@ number of possible ways:
   if there are multiple derivations with the same
   name.</para></listitem>
 
-  <listitem><para>If <replaceable>args</replaceable> are store
+  <listitem><para>If <emphasis>args</emphasis> are store
   derivations, then these are <link
   linkend="rsec-nix-store-realise">realised</link>, and the resulting
   output paths are installed.</para></listitem>
 
-  <listitem><para>If <replaceable>args</replaceable> are store paths
+  <listitem><para>If <emphasis>args</emphasis> are store paths
   that are not store derivations, then these are <link
   linkend="rsec-nix-store-realise">realised</link> and
   installed.</para></listitem>
@@ -518,7 +518,7 @@ $ nix-env -f '&lt;nixpkgs>' -iA hello --dry-run
 installing ‘hello-2.10’
 this path will be fetched (0.04 MiB download, 0.19 MiB unpacked):
   /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10
-  <replaceable>...</replaceable></screen>
+  <emphasis>...</emphasis></screen>
 
 </para>
 
@@ -556,7 +556,7 @@ $ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA fir
     <arg choice='plain'><option>--eq</option></arg>
     <arg choice='plain'><option>--always</option></arg>
   </group>
-  <arg choice='plain' rep='repeat'><replaceable>args</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>args</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -566,15 +566,15 @@ $ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA fir
 <para>The upgrade operation creates a new user environment, based on
 the current generation of the active profile, in which all store paths
 are replaced for which there are newer versions in the set of paths
-described by <replaceable>args</replaceable>.  Paths for which there
+described by <emphasis>args</emphasis>.  Paths for which there
 are no newer versions are left untouched; this is not an error.  It is
-also not an error if an element of <replaceable>args</replaceable>
+also not an error if an element of <emphasis>args</emphasis>
 matches no installed derivations.</para>
 
-<para>For a description of how <replaceable>args</replaceable> is
+<para>For a description of how <emphasis>args</emphasis> is
 mapped to a set of store paths, see <link
 linkend="rsec-nix-env-install"><option>--install</option></link>.  If
-<replaceable>args</replaceable> describes multiple store paths with
+<emphasis>args</emphasis> describes multiple store paths with
 the same symbolic name, only the one with the highest version is
 installed.</para>
 
@@ -711,7 +711,7 @@ lexicographically (i.e., using case-sensitive string comparison).</para>
     <arg choice='plain'><option>--uninstall</option></arg>
     <arg choice='plain'><option>-e</option></arg>
   </group>
-  <arg choice='plain' rep='repeat'><replaceable>drvnames</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>drvnames</emphasis></arg>
 </cmdsynopsis>
 </refsection>
 
@@ -720,7 +720,7 @@ lexicographically (i.e., using case-sensitive string comparison).</para>
 <para>The uninstall operation creates a new user environment, based on
 the current generation of the active profile, from which the store
 paths designated by the symbolic names
-<replaceable>names</replaceable> are removed.</para>
+<emphasis>names</emphasis> are removed.</para>
 
 </refsection>
 
@@ -745,7 +745,7 @@ $ nix-env -e '.*' <lineannotation>(remove everything)</lineannotation></screen>
 <cmdsynopsis>
   <command>nix-env</command>
   <arg choice='plain'><option>--set</option></arg>
-  <arg choice='plain'><replaceable>drvname</replaceable></arg>
+  <arg choice='plain'><emphasis>drvname</emphasis></arg>
 </cmdsynopsis>
 </refsection>
 
@@ -783,9 +783,9 @@ $ nix-env -p /nix/var/nix/profiles/browser --set firefox</screen>
 <cmdsynopsis>
   <command>nix-env</command>
   <arg choice='plain'><option>--set-flag</option></arg>
-  <arg choice='plain'><replaceable>name</replaceable></arg>
-  <arg choice='plain'><replaceable>value</replaceable></arg>
-  <arg choice='plain' rep='repeat'><replaceable>drvnames</replaceable></arg>
+  <arg choice='plain'><emphasis>name</emphasis></arg>
+  <arg choice='plain'><emphasis>value</emphasis></arg>
+  <arg choice='plain' rep='repeat'><emphasis>drvnames</emphasis></arg>
 </cmdsynopsis>
 </refsection>
 
@@ -848,8 +848,8 @@ firefox-2.0.0.9 <lineannotation>(the current one)</lineannotation>
 $ nix-env --preserve-installed -i firefox-2.0.0.11
 installing `firefox-2.0.0.11'
 building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
-collision between `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.11/bin/firefox'
-  and `/nix/store/<replaceable>...</replaceable>-firefox-2.0.0.9/bin/firefox'.
+collision between `/nix/store/<emphasis>...</emphasis>-firefox-2.0.0.11/bin/firefox'
+  and `/nix/store/<emphasis>...</emphasis>-firefox-2.0.0.9/bin/firefox'.
 <lineannotation>(i.e., can’t have two active at the same time)</lineannotation>
 
 $ nix-env --set-flag active false firefox
@@ -940,12 +940,12 @@ $ nix-env --set-flag priority 10 gcc</screen>
       <arg choice='plain'><option>--attr</option></arg>
       <arg choice='plain'><option>-A</option></arg>
     </group>
-    <replaceable>attribute-path</replaceable>
+    <emphasis>attribute-path</emphasis>
   </arg>
 
   <sbr />
 
-  <arg choice='plain' rep='repeat'><replaceable>names</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>names</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -959,7 +959,7 @@ profile (<option>--installed</option>), or the derivations that are
 available for installation in the active Nix expression
 (<option>--available</option>).  It only prints information about
 derivations whose symbolic name matches one of
-<replaceable>names</replaceable>.</para>
+<emphasis>names</emphasis>.</para>
 
 <para>The derivations are sorted by their <literal>name</literal>
 attributes.</para>
@@ -1086,21 +1086,21 @@ user environment elements, etc. -->
 
     <variablelist>
 
-      <varlistentry><term><literal>&lt;</literal> <replaceable>version</replaceable></term>
+      <varlistentry><term><literal>&lt;</literal> <emphasis>version</emphasis></term>
 
         <listitem><para>A newer version of the package is available
         or installed.</para></listitem>
 
       </varlistentry>
 
-      <varlistentry><term><literal>=</literal> <replaceable>version</replaceable></term>
+      <varlistentry><term><literal>=</literal> <emphasis>version</emphasis></term>
 
         <listitem><para>At most the same version of the package is
         available or installed.</para></listitem>
 
       </varlistentry>
 
-      <varlistentry><term><literal>></literal> <replaceable>version</replaceable></term>
+      <varlistentry><term><literal>></literal> <emphasis>version</emphasis></term>
 
         <listitem><para>Only older versions of the package are
         available or installed.</para></listitem>
@@ -1174,7 +1174,7 @@ docbook-xml-4.2
 firefox-1.0.4
 MPlayer-1.0pre7
 ORBit2-2.8.3
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 </screen>
 
 </para>
@@ -1187,7 +1187,7 @@ firefox-1.0.7
 GConf-2.4.0.1
 MPlayer-1.0pre7
 ORBit2-2.8.3
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 </screen>
 
 </para>
@@ -1200,7 +1200,7 @@ $ nix-env -qas
 --S GConf-2.4.0.1   <lineannotation>(not present, but there is a substitute for fast installation)</lineannotation>
 --S MPlayer-1.0pre3 <lineannotation>(i.e., this is not the installed MPlayer, even though the version is the same!)</lineannotation>
 IP- ORBit2-2.8.3    <lineannotation>(installed and by definition present)</lineannotation>
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 </screen>
 
 </para>
@@ -1218,11 +1218,11 @@ foo-1.2.3
 
 <screen>
 $ nix-env -qc
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 acrobat-reader-7.0 - ?      <lineannotation>(package is not available at all)</lineannotation>
 autoconf-2.59      = 2.59   <lineannotation>(same version)</lineannotation>
 firefox-1.0.4      &lt; 1.0.7  <lineannotation>(a more recent version is available)</lineannotation>
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 </screen>
 
 </para>
@@ -1234,7 +1234,7 @@ $ nix-env -qa '.*zip.*'
 bzip2-1.0.6
 gzip-1.6
 zip-3.0
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 </screen>
 
 </para>
@@ -1248,7 +1248,7 @@ chromium-37.0.2062.94
 chromium-beta-38.0.2125.24
 firefox-32.0.3
 firefox-with-plugins-13.0.1
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 </screen>
 
 </para>
@@ -1280,7 +1280,7 @@ $ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
     <arg choice='plain'><option>--switch-profile</option></arg>
     <arg choice='plain'><option>-S</option></arg>
   </group>
-  <arg choice='req'><replaceable>path</replaceable></arg>
+  <arg choice='req'><emphasis>path</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -1288,10 +1288,10 @@ $ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
 
 <refsection><title>Description</title>
 
-<para>This operation makes <replaceable>path</replaceable> the current
+<para>This operation makes <emphasis>path</emphasis> the current
 profile for the user.  That is, the symlink
 <filename>~/.nix-profile</filename> is made to point to
-<replaceable>path</replaceable>.</para>
+<emphasis>path</emphasis>.</para>
 
 </refsection>
 
@@ -1355,7 +1355,7 @@ $ nix-env --list-generations
 <cmdsynopsis>
   <command>nix-env</command>
   <arg choice='plain'><option>--delete-generations</option></arg>
-  <arg choice='plain' rep='repeat'><replaceable>generations</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>generations</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -1407,7 +1407,7 @@ $ nix-env -p other_profile --delete-generations old</screen>
     <arg choice='plain'><option>--switch-generation</option></arg>
     <arg choice='plain'><option>-G</option></arg>
   </group>
-  <arg choice='req'><replaceable>generation</replaceable></arg>
+  <arg choice='req'><emphasis>generation</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -1416,13 +1416,13 @@ $ nix-env -p other_profile --delete-generations old</screen>
 <refsection><title>Description</title>
 
 <para>This operation makes generation number
-<replaceable>generation</replaceable> the current generation of the
+<emphasis>generation</emphasis> the current generation of the
 active profile.  That is, if the
-<filename><replaceable>profile</replaceable></filename> is the path to
+<filename><emphasis>profile</emphasis></filename> is the path to
 the active profile, then the symlink
-<filename><replaceable>profile</replaceable></filename> is made to
+<filename><emphasis>profile</emphasis></filename> is made to
 point to
-<filename><replaceable>profile</replaceable>-<replaceable>generation</replaceable>-link</filename>,
+<filename><emphasis>profile</emphasis>-<emphasis>generation</emphasis>-link</filename>,
 which is in turn a symlink to the actual user environment in the Nix
 store.</para>
 
diff --git a/doc/manual/command-ref/nix-hash.xml b/doc/manual/command-ref/nix-hash.xml
index 80263e18e..2f80dc568 100644
--- a/doc/manual/command-ref/nix-hash.xml
+++ b/doc/manual/command-ref/nix-hash.xml
@@ -22,18 +22,18 @@
     <arg><option>--flat</option></arg>
     <arg><option>--base32</option></arg>
     <arg><option>--truncate</option></arg>
-    <arg><option>--type</option> <replaceable>hashAlgo</replaceable></arg>
-    <arg choice='plain' rep='repeat'><replaceable>path</replaceable></arg>
+    <arg><option>--type</option> <emphasis>hashAlgo</emphasis></arg>
+    <arg choice='plain' rep='repeat'><emphasis>path</emphasis></arg>
   </cmdsynopsis>
   <cmdsynopsis>
     <command>nix-hash</command>
     <arg choice='plain'><option>--to-base16</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>hash</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>hash</emphasis></arg>
   </cmdsynopsis>
   <cmdsynopsis>
     <command>nix-hash</command>
     <arg choice='plain'><option>--to-base32</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>hash</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>hash</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -42,7 +42,7 @@
 
 <para>The command <command>nix-hash</command> computes the
 cryptographic hash of the contents of each
-<replaceable>path</replaceable> and prints it on standard output.  By
+<emphasis>path</emphasis> and prints it on standard output.  By
 default, it computes an MD5 hash, but other hash algorithms are
 available as well.  The hash is printed in hexadecimal.  To generate
 the same hash as <command>nix-prefetch-url</command> you have to
@@ -54,9 +54,9 @@ allows directories and symlinks to be hashed as well as regular files.
 The dump is in the <emphasis>NAR format</emphasis> produced by <link
 linkend="refsec-nix-store-dump"><command>nix-store</command>
 <option>--dump</option></link>.  Thus, <literal>nix-hash
-<replaceable>path</replaceable></literal> yields the same
+<emphasis>path</emphasis></literal> yields the same
 cryptographic hash as <literal>nix-store --dump
-<replaceable>path</replaceable> | md5sum</literal>.</para>
+<emphasis>path</emphasis> | md5sum</literal>.</para>
 
 </refsection>
 
@@ -68,9 +68,9 @@ cryptographic hash as <literal>nix-store --dump
   <varlistentry><term><option>--flat</option></term>
 
     <listitem><para>Print the cryptographic hash of the contents of
-    each regular file <replaceable>path</replaceable>.  That is, do
+    each regular file <emphasis>path</emphasis>.  That is, do
     not compute the hash over the dump of
-    <replaceable>path</replaceable>.  The result is identical to that
+    <emphasis>path</emphasis>.  The result is identical to that
     produced by the GNU commands <command>md5sum</command> and
     <command>sha1sum</command>.</para></listitem>
 
@@ -92,7 +92,7 @@ cryptographic hash as <literal>nix-store --dump
 
   </varlistentry>
 
-  <varlistentry><term><option>--type</option> <replaceable>hashAlgo</replaceable></term>
+  <varlistentry><term><option>--type</option> <emphasis>hashAlgo</emphasis></term>
 
     <listitem><para>Use the specified cryptographic hash algorithm,
     which can be one of <literal>md5</literal>,
@@ -104,7 +104,7 @@ cryptographic hash as <literal>nix-store --dump
   <varlistentry><term><option>--to-base16</option></term>
 
     <listitem><para>Don’t hash anything, but convert the base-32 hash
-    representation <replaceable>hash</replaceable> to
+    representation <emphasis>hash</emphasis> to
     hexadecimal.</para></listitem>
 
   </varlistentry>
@@ -112,7 +112,7 @@ cryptographic hash as <literal>nix-store --dump
   <varlistentry><term><option>--to-base32</option></term>
 
     <listitem><para>Don’t hash anything, but convert the hexadecimal
-    hash representation <replaceable>hash</replaceable> to
+    hash representation <emphasis>hash</emphasis> to
     base-32.</para></listitem>
 
   </varlistentry>
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
index 4ff967ecf..d67be4924 100644
--- a/doc/manual/command-ref/nix-instantiate.xml
+++ b/doc/manual/command-ref/nix-instantiate.xml
@@ -29,26 +29,26 @@
       </arg>
     </group>
     <arg><option>--read-write-mode</option></arg>
-    <arg><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
+    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--attr</option></arg>
         <arg choice='plain'><option>-A</option></arg>
       </group>
-      <replaceable>attrPath</replaceable>
+      <emphasis>attrPath</emphasis>
     </arg>
-    <arg><option>--add-root</option> <replaceable>path</replaceable></arg>
+    <arg><option>--add-root</option> <emphasis>path</emphasis></arg>
     <arg><option>--indirect</option></arg>
     <group>
       <arg choice='plain'><option>--expr</option></arg>
       <arg choice='plain'><option>-E</option></arg>
     </group>
-    <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>files</emphasis></arg>
   </cmdsynopsis>
   <cmdsynopsis>
     <command>nix-instantiate</command>
     <arg choice='plain'><option>--find-file</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>files</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>files</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -58,13 +58,13 @@
 <para>The command <command>nix-instantiate</command> generates <link
 linkend="gloss-derivation">store derivations</link> from (high-level)
 Nix expressions.  It evaluates the Nix expressions in each of
-<replaceable>files</replaceable> (which defaults to
-<replaceable>./default.nix</replaceable>).  Each top-level expression
+<emphasis>files</emphasis> (which defaults to
+<emphasis>./default.nix</emphasis>).  Each top-level expression
 should evaluate to a derivation, a list of derivations, or a set of
 derivations.  The paths of the resulting store derivations are printed
 on standard output.</para>
 
-<para>If <replaceable>files</replaceable> is the character
+<para>If <emphasis>files</emphasis> is the character
 <literal>-</literal>, then a Nix expression will be read from standard
 input.</para>
 
@@ -79,7 +79,7 @@ input.</para>
 <variablelist>
 
   <varlistentry>
-    <term><option>--add-root</option> <replaceable>path</replaceable></term>
+    <term><option>--add-root</option> <emphasis>path</emphasis></term>
     <term><option>--indirect</option></term>
 
     <listitem><para>See the <link linkend="opt-add-root">corresponding
@@ -181,7 +181,7 @@ $ nix-instantiate test.nix <lineannotation>(instantiate)</lineannotation>
 /nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
 
 $ nix-store -r $(nix-instantiate test.nix) <lineannotation>(build)</lineannotation>
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 <lineannotation>(output path)</lineannotation>
 
 $ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
@@ -226,28 +226,28 @@ $ nix-instantiate --eval --xml -E '1 + 2'
 
 <screen>
 $ nix-instantiate --eval --xml -E 'rec { x = "foo"; y = x; }'
-<replaceable>...</replaceable><![CDATA[
+<emphasis>...</emphasis><![CDATA[
   <attr name="x">
     <string value="foo" />
   </attr>
   <attr name="y">
     <unevaluated />
   </attr>]]>
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 Note that <varname>y</varname> is left unevaluated (the XML
 representation doesn’t attempt to show non-normal forms).
 
 <screen>
 $ nix-instantiate --eval --xml --strict -E 'rec { x = "foo"; y = x; }'
-<replaceable>...</replaceable><![CDATA[
+<emphasis>...</emphasis><![CDATA[
   <attr name="x">
     <string value="foo" />
   </attr>
   <attr name="y">
     <string value="foo" />
   </attr>]]>
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 </para>
 
diff --git a/doc/manual/command-ref/nix-prefetch-url.xml b/doc/manual/command-ref/nix-prefetch-url.xml
index 621ded72e..db2a6960a 100644
--- a/doc/manual/command-ref/nix-prefetch-url.xml
+++ b/doc/manual/command-ref/nix-prefetch-url.xml
@@ -20,24 +20,24 @@
   <cmdsynopsis>
     <command>nix-prefetch-url</command>
     <arg><option>--version</option></arg>
-    <arg><option>--type</option> <replaceable>hashAlgo</replaceable></arg>
+    <arg><option>--type</option> <emphasis>hashAlgo</emphasis></arg>
     <arg><option>--print-path</option></arg>
     <arg><option>--unpack</option></arg>
-    <arg><option>--name</option> <replaceable>name</replaceable></arg>
-    <arg choice='plain'><replaceable>url</replaceable></arg>
-    <arg><replaceable>hash</replaceable></arg>
+    <arg><option>--name</option> <emphasis>name</emphasis></arg>
+    <arg choice='plain'><emphasis>url</emphasis></arg>
+    <arg><emphasis>hash</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
 <refsection><title>Description</title>
 
 <para>The command <command>nix-prefetch-url</command> downloads the
-file referenced by the URL <replaceable>url</replaceable>, prints its
+file referenced by the URL <emphasis>url</emphasis>, prints its
 cryptographic hash, and copies it into the Nix store.  The file name
 in the store is
-<filename><replaceable>hash</replaceable>-<replaceable>baseName</replaceable></filename>,
-where <replaceable>baseName</replaceable> is everything following the
-final slash in <replaceable>url</replaceable>.</para>
+<filename><emphasis>hash</emphasis>-<emphasis>baseName</emphasis></filename>,
+where <emphasis>baseName</emphasis> is everything following the
+final slash in <emphasis>url</emphasis>.</para>
 
 <para>This command is just a convenience for Nix expression writers.
 Often a Nix expression fetches some source distribution from the
@@ -50,7 +50,7 @@ download it again when you build your Nix expression.  Since
 as <command>nix-prefetch-url</command>, the redundant download can be
 avoided.</para>
 
-<para>If <replaceable>hash</replaceable> is specified, then a download
+<para>If <emphasis>hash</emphasis> is specified, then a download
 is not performed if the Nix store already contains a file with the
 same hash and base name.  Otherwise, the file is downloaded, and an
 error is signaled if the actual hash of the file does not match the
@@ -67,7 +67,7 @@ downloaded file in the Nix store is also printed.</para>
 
 <variablelist>
 
-  <varlistentry><term><option>--type</option> <replaceable>hashAlgo</replaceable></term>
+  <varlistentry><term><option>--type</option> <emphasis>hashAlgo</emphasis></term>
 
     <listitem><para>Use the specified cryptographic hash algorithm,
     which can be one of <literal>md5</literal>,
@@ -93,14 +93,14 @@ downloaded file in the Nix store is also printed.</para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--name</option> <replaceable>name</replaceable></term>
+  <varlistentry><term><option>--name</option> <emphasis>name</emphasis></term>
 
     <listitem><para>Override the name of the file in the Nix store. By
     default, this is
-    <literal><replaceable>hash</replaceable>-<replaceable>basename</replaceable></literal>,
-    where <replaceable>basename</replaceable> is the last component of
-    <replaceable>url</replaceable>. Overriding the name is necessary
-    when <replaceable>basename</replaceable> contains characters that
+    <literal><emphasis>hash</emphasis>-<emphasis>basename</emphasis></literal>,
+    where <emphasis>basename</emphasis> is the last component of
+    <emphasis>url</emphasis>. Overriding the name is necessary
+    when <emphasis>basename</emphasis> contains characters that
     are not allowed in Nix store paths.</para></listitem>
 
   </varlistentry>
diff --git a/doc/manual/command-ref/nix-shell.xml b/doc/manual/command-ref/nix-shell.xml
index de9755d58..1d55b5622 100644
--- a/doc/manual/command-ref/nix-shell.xml
+++ b/doc/manual/command-ref/nix-shell.xml
@@ -19,20 +19,20 @@
 <refsynopsisdiv>
   <cmdsynopsis>
     <command>nix-shell</command>
-    <arg><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
-    <arg><option>--argstr</option> <replaceable>name</replaceable> <replaceable>value</replaceable></arg>
+    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
+    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
     <arg>
       <group choice='req'>
         <arg choice='plain'><option>--attr</option></arg>
         <arg choice='plain'><option>-A</option></arg>
       </group>
-      <replaceable>attrPath</replaceable>
+      <emphasis>attrPath</emphasis>
     </arg>
-    <arg><option>--command</option> <replaceable>cmd</replaceable></arg>
-    <arg><option>--run</option> <replaceable>cmd</replaceable></arg>
-    <arg><option>--exclude</option> <replaceable>regexp</replaceable></arg>
+    <arg><option>--command</option> <emphasis>cmd</emphasis></arg>
+    <arg><option>--run</option> <emphasis>cmd</emphasis></arg>
+    <arg><option>--exclude</option> <emphasis>regexp</emphasis></arg>
     <arg><option>--pure</option></arg>
-    <arg><option>--keep</option> <replaceable>name</replaceable></arg>
+    <arg><option>--keep</option> <emphasis>name</emphasis></arg>
     <group choice='req'>
       <arg choice='plain'>
         <group choice='req'>
@@ -41,12 +41,12 @@
         </group>
         <arg choice='plain' rep='repeat'>
           <group choice='req'>
-            <arg choice="plain"><replaceable>packages</replaceable></arg>
-            <arg choice="plain"><replaceable>expressions</replaceable></arg>
+            <arg choice="plain"><emphasis>packages</emphasis></arg>
+            <arg choice="plain"><emphasis>expressions</emphasis></arg>
           </group>
         </arg>
       </arg>
-      <arg><replaceable>path</replaceable></arg>
+      <arg><emphasis>path</emphasis></arg>
     </group>
   </cmdsynopsis>
 </refsynopsisdiv>
@@ -57,17 +57,17 @@
 dependencies of the specified derivation, but not the derivation
 itself.  It will then start an interactive shell in which all
 environment variables defined by the derivation
-<replaceable>path</replaceable> have been set to their corresponding
+<emphasis>path</emphasis> have been set to their corresponding
 values, and the script <literal>$stdenv/setup</literal> has been
 sourced.  This is useful for reproducing the environment of a
 derivation for development.</para>
 
-<para>If <replaceable>path</replaceable> is not given,
+<para>If <emphasis>path</emphasis> is not given,
 <command>nix-shell</command> defaults to
 <filename>shell.nix</filename> if it exists, and
 <filename>default.nix</filename> otherwise.</para>
 
-<para>If <replaceable>path</replaceable> starts with
+<para>If <emphasis>path</emphasis> starts with
 <literal>http://</literal> or <literal>https://</literal>, it is
 interpreted as the URL of a tarball that will be downloaded and
 unpacked to a temporary location. The tarball must include a single
@@ -103,10 +103,10 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
 <variablelist>
 
-  <varlistentry><term><option>--command</option> <replaceable>cmd</replaceable></term>
+  <varlistentry><term><option>--command</option> <emphasis>cmd</emphasis></term>
 
     <listitem><para>In the environment of the derivation, run the
-    shell command <replaceable>cmd</replaceable>. This command is
+    shell command <emphasis>cmd</emphasis>. This command is
     executed in an interactive shell. (Use <option>--run</option> to
     use a non-interactive shell instead.) However, a call to
     <literal>exit</literal> is implicitly added to the command, so the
@@ -118,7 +118,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--run</option> <replaceable>cmd</replaceable></term>
+  <varlistentry><term><option>--run</option> <emphasis>cmd</emphasis></term>
 
     <listitem><para>Like <option>--command</option>, but executes the
     command in a non-interactive shell. This means (among other
@@ -127,10 +127,10 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--exclude</option> <replaceable>regexp</replaceable></term>
+  <varlistentry><term><option>--exclude</option> <emphasis>regexp</emphasis></term>
 
     <listitem><para>Do not build any dependencies whose store path
-    matches the regular expression <replaceable>regexp</replaceable>.
+    matches the regular expression <emphasis>regexp</emphasis>.
     This option may be specified multiple times.</para></listitem>
 
   </varlistentry>
@@ -150,7 +150,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--packages</option> / <option>-p</option> <replaceable>packages</replaceable>…</term>
+  <varlistentry><term><option>--packages</option> / <option>-p</option> <emphasis>packages</emphasis>…</term>
 
     <listitem><para>Set up an environment in which the specified
     packages are present.  The command line arguments are interpreted
@@ -162,7 +162,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
   </varlistentry>
 
-  <varlistentry><term><option>-i</option> <replaceable>interpreter</replaceable></term>
+  <varlistentry><term><option>-i</option> <emphasis>interpreter</emphasis></term>
 
     <listitem><para>The chained script interpreter to be invoked by
     <command>nix-shell</command>. Only applicable in
@@ -171,7 +171,7 @@ also <xref linkend="sec-common-options" />.</phrase></para>
 
     </listitem></varlistentry>
 
-  <varlistentry><term><option>--keep</option> <replaceable>name</replaceable></term>
+  <varlistentry><term><option>--keep</option> <emphasis>name</emphasis></term>
 
     <listitem><para>When a <option>--pure</option> shell is started,
     keep the listed environment variables.</para></listitem>
@@ -278,13 +278,13 @@ following lines:
 
 <programlisting>
 #! /usr/bin/env nix-shell
-#! nix-shell -i <replaceable>real-interpreter</replaceable> -p <replaceable>packages</replaceable>
+#! nix-shell -i <emphasis>real-interpreter</emphasis> -p <emphasis>packages</emphasis>
 </programlisting>
 
-where <replaceable>real-interpreter</replaceable> is the “real” script
+where <emphasis>real-interpreter</emphasis> is the “real” script
 interpreter that will be invoked by <command>nix-shell</command> after
 it has obtained the dependencies and initialised the environment, and
-<replaceable>packages</replaceable> are the attribute names of the
+<emphasis>packages</emphasis> are the attribute names of the
 dependencies in Nixpkgs.</para>
 
 <para>The lines starting with <literal>#! nix-shell</literal> specify
diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml
index 459100984..352e716ae 100644
--- a/doc/manual/command-ref/nix-store.xml
+++ b/doc/manual/command-ref/nix-store.xml
@@ -20,11 +20,11 @@
   <cmdsynopsis>
     <command>nix-store</command>
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--add-root</option> <replaceable>path</replaceable></arg>
+    <arg><option>--add-root</option> <emphasis>path</emphasis></arg>
     <arg><option>--indirect</option></arg>
-    <arg choice='plain'><replaceable>operation</replaceable></arg>
-    <arg rep='repeat'><replaceable>options</replaceable></arg>
-    <arg rep='repeat'><replaceable>arguments</replaceable></arg>
+    <arg choice='plain'><emphasis>operation</emphasis></arg>
+    <arg rep='repeat'><emphasis>options</emphasis></arg>
+    <arg rep='repeat'><emphasis>arguments</emphasis></arg>
   </cmdsynopsis>
 </refsynopsisdiv>
 
@@ -55,14 +55,14 @@ options.</phrase></para>
 
 <variablelist>
 
-  <varlistentry xml:id="opt-add-root"><term><option>--add-root</option> <replaceable>path</replaceable></term>
+  <varlistentry xml:id="opt-add-root"><term><option>--add-root</option> <emphasis>path</emphasis></term>
 
     <listitem><para>Causes the result of a realisation
     (<option>--realise</option> and <option>--force-realise</option>)
     to be registered as a root of the garbage collector<phrase
     condition="manual"> (see <xref linkend="ssec-gc-roots"
     />)</phrase>.  The root is stored in
-    <replaceable>path</replaceable>, which must be inside a directory
+    <emphasis>path</emphasis>, which must be inside a directory
     that is scanned for roots by the garbage collector (i.e.,
     typically in a subdirectory of
     <filename>/nix/var/nix/gcroots/</filename>)
@@ -88,11 +88,11 @@ options.</phrase></para>
     garbage-collected unless the symlink is removed.</para>
 
     <para>The <option>--indirect</option> flag causes a uniquely named
-    symlink to <replaceable>path</replaceable> to be stored in
+    symlink to <emphasis>path</emphasis> to be stored in
     <filename>/nix/var/nix/gcroots/auto/</filename>.  For instance,
 
     <screen>
-$ nix-store --add-root /home/eelco/bla/result --indirect -r <replaceable>...</replaceable>
+$ nix-store --add-root /home/eelco/bla/result --indirect -r <emphasis>...</emphasis>
 
 $ ls -l /nix/var/nix/gcroots/auto
 lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
@@ -135,7 +135,7 @@ lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r1134
     <arg choice='plain'><option>--realise</option></arg>
     <arg choice='plain'><option>-r</option></arg>
   </group>
-  <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   <arg><option>--dry-run</option></arg>
 </cmdsynopsis>
 
@@ -204,7 +204,7 @@ printed.)</para>
     with <option>-K</option>, if an output path is not identical to
     the corresponding output from the previous build, the new output
     path is left in
-    <filename>/nix/store/<replaceable>name</replaceable>.check.</filename></para>
+    <filename>/nix/store/<emphasis>name</emphasis>.check.</filename></para>
 
     <para>See also the <option>build-repeat</option> configuration
     option, which repeats a derivation a number of times and prevents
@@ -361,7 +361,7 @@ EOF
     <arg choice='plain'><option>--print-live</option></arg>
     <arg choice='plain'><option>--print-dead</option></arg>
   </group>
-  <arg><option>--max-freed</option> <replaceable>bytes</replaceable></arg>
+  <arg><option>--max-freed</option> <emphasis>bytes</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -413,11 +413,11 @@ options control what gets deleted and in what order:
 
 <variablelist>
 
-  <varlistentry><term><option>--max-freed</option> <replaceable>bytes</replaceable></term>
+  <varlistentry><term><option>--max-freed</option> <emphasis>bytes</emphasis></term>
 
     <listitem><para>Keep deleting paths until at least
-    <replaceable>bytes</replaceable> bytes have been deleted, then
-    stop.  The argument <replaceable>bytes</replaceable> can be
+    <emphasis>bytes</emphasis> bytes have been deleted, then
+    stop.  The argument <emphasis>bytes</emphasis> can be
     followed by the multiplicative suffix <literal>K</literal>,
     <literal>M</literal>, <literal>G</literal> or
     <literal>T</literal>, denoting KiB, MiB, GiB or TiB
@@ -450,7 +450,7 @@ be freed.</para>
 <screen>
 $ nix-store --gc
 deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv'
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 8825586 bytes freed (8.42 MiB)</screen>
 
 </para>
@@ -479,7 +479,7 @@ $ nix-store --gc --max-freed $((100 * 1024 * 1024))</screen>
   <command>nix-store</command>
   <arg choice='plain'><option>--delete</option></arg>
   <arg><option>--ignore-liveness</option></arg>
-  <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -487,7 +487,7 @@ $ nix-store --gc --max-freed $((100 * 1024 * 1024))</screen>
 <refsection><title>Description</title>
 
 <para>The operation <option>--delete</option> deletes the store paths
-<replaceable>paths</replaceable> from the Nix store, but only if it is
+<emphasis>paths</emphasis> from the Nix store, but only if it is
 safe to do so; that is, when the path is not reachable from a root of
 the garbage collector.  This means that you can only delete paths that
 would also be deleted by <literal>nix-store --gc</literal>.  Thus,
@@ -537,8 +537,8 @@ error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4'
     <arg choice='plain'><option>-d</option></arg>
     <arg choice='plain'><option>--graph</option></arg>
     <arg choice='plain'><option>--tree</option></arg>
-    <arg choice='plain'><option>--binding</option> <replaceable>name</replaceable></arg>
-    <arg choice='plain'><option>-b</option> <replaceable>name</replaceable></arg>
+    <arg choice='plain'><option>--binding</option> <emphasis>name</emphasis></arg>
+    <arg choice='plain'><option>-b</option> <emphasis>name</emphasis></arg>
     <arg choice='plain'><option>--hash</option></arg>
     <arg choice='plain'><option>--size</option></arg>
     <arg choice='plain'><option>--roots</option></arg>
@@ -547,7 +547,7 @@ error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4'
   <arg><option>-u</option></arg>
   <arg><option>--force-realise</option></arg>
   <arg><option>-f</option></arg>
-  <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -560,7 +560,7 @@ information about the store paths .  The queries are described below.  At
 most one query can be specified.  The default query is
 <option>--outputs</option>.</para>
 
-<para>The paths <replaceable>paths</replaceable> may also be symlinks
+<para>The paths <emphasis>paths</emphasis> may also be symlinks
 from outside of the Nix store, to the Nix store.  In that case, the
 query is applied to the target of the symlink.</para>
 
@@ -603,7 +603,7 @@ query is applied to the target of the symlink.</para>
 
     <listitem><para>Prints out the <link
     linkend="gloss-output-path">output paths</link> of the store
-    derivations <replaceable>paths</replaceable>.  These are the paths
+    derivations <emphasis>paths</emphasis>.  These are the paths
     that will be produced when the derivation is
     built.</para></listitem>
 
@@ -614,7 +614,7 @@ query is applied to the target of the symlink.</para>
 
     <listitem><para>Prints out the <link
     linkend="gloss-closure">closure</link> of the store path
-    <replaceable>paths</replaceable>.</para>
+    <emphasis>paths</emphasis>.</para>
 
     <para>This query has one option:</para>
 
@@ -647,7 +647,7 @@ query is applied to the target of the symlink.</para>
 
     <listitem><para>Prints the set of <link
     linkend="gloss-reference">references</link> of the store paths
-    <replaceable>paths</replaceable>, that is, their immediate
+    <emphasis>paths</emphasis>, that is, their immediate
     dependencies.  (For <emphasis>all</emphasis> dependencies, use
     <option>--requisites</option>.)</para></listitem>
 
@@ -656,9 +656,9 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--referrers</option></term>
 
     <listitem><para>Prints the set of <emphasis>referrers</emphasis> of
-    the store paths <replaceable>paths</replaceable>, that is, the
+    the store paths <emphasis>paths</emphasis>, that is, the
     store paths currently existing in the Nix store that refer to one
-    of <replaceable>paths</replaceable>.  Note that contrary to the
+    of <emphasis>paths</emphasis>.  Note that contrary to the
     references, the set of referrers is not constant; it can change as
     store paths are added or removed.</para></listitem>
 
@@ -667,11 +667,11 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--referrers-closure</option></term>
 
     <listitem><para>Prints the closure of the set of store paths
-    <replaceable>paths</replaceable> under the referrers relation; that
+    <emphasis>paths</emphasis> under the referrers relation; that
     is, all store paths that directly or indirectly refer to one of
-    <replaceable>paths</replaceable>.  These are all the path currently
+    <emphasis>paths</emphasis>.  These are all the path currently
     in the Nix store that are dependent on
-    <replaceable>paths</replaceable>.</para></listitem>
+    <emphasis>paths</emphasis>.</para></listitem>
 
   </varlistentry>
 
@@ -680,7 +680,7 @@ query is applied to the target of the symlink.</para>
 
     <listitem><para>Prints the <link
     linkend="gloss-deriver">deriver</link> of the store paths
-    <replaceable>paths</replaceable>.  If the path has no deriver
+    <emphasis>paths</emphasis>.  If the path has no deriver
     (e.g., if it is a source file), or if the deriver is not known
     (e.g., in the case of a binary-only deployment), the string
     <literal>unknown-deriver</literal> is printed.</para></listitem>
@@ -690,7 +690,7 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--graph</option></term>
 
     <listitem><para>Prints the references graph of the store paths
-    <replaceable>paths</replaceable> in the format of the
+    <emphasis>paths</emphasis> in the format of the
     <command>dot</command> tool of AT&amp;T's <link
     xlink:href="http://www.graphviz.org/">Graphviz package</link>.
     This can be used to visualise dependency graphs.  To obtain a
@@ -703,7 +703,7 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--tree</option></term>
 
     <listitem><para>Prints the references graph of the store paths
-    <replaceable>paths</replaceable> as a nested ASCII tree.
+    <emphasis>paths</emphasis> as a nested ASCII tree.
     References are ordered by descending closure size; this tends to
     flatten the tree, making it more readable.  The query only
     recurses into a store path when it is first encountered; this
@@ -715,7 +715,7 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--graphml</option></term>
 
     <listitem><para>Prints the references graph of the store paths
-    <replaceable>paths</replaceable> in the <link
+    <emphasis>paths</emphasis> in the <link
     xlink:href="http://graphml.graphdrawing.org/">GraphML</link> file format.
     This can be used to visualise dependency graphs. To obtain a
     build-time dependency graph, apply this to a store derivation. To
@@ -724,12 +724,12 @@ query is applied to the target of the symlink.</para>
 
   </varlistentry>
 
-  <varlistentry><term><option>--binding</option> <replaceable>name</replaceable></term>
-    <term><option>-b</option> <replaceable>name</replaceable></term>
+  <varlistentry><term><option>--binding</option> <emphasis>name</emphasis></term>
+    <term><option>-b</option> <emphasis>name</emphasis></term>
 
     <listitem><para>Prints the value of the attribute
-    <replaceable>name</replaceable> (i.e., environment variable) of
-    the store derivations <replaceable>paths</replaceable>.  It is an
+    <emphasis>name</emphasis> (i.e., environment variable) of
+    the store derivations <emphasis>paths</emphasis>.  It is an
     error for a derivation to not have the specified
     attribute.</para></listitem>
 
@@ -738,7 +738,7 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--hash</option></term>
 
     <listitem><para>Prints the SHA-256 hash of the contents of the
-    store paths <replaceable>paths</replaceable> (that is, the hash of
+    store paths <emphasis>paths</emphasis> (that is, the hash of
     the output of <command>nix-store --dump</command> on the given
     paths).  Since the hash is stored in the Nix database, this is a
     fast operation.</para></listitem>
@@ -748,7 +748,7 @@ query is applied to the target of the symlink.</para>
   <varlistentry><term><option>--size</option></term>
 
     <listitem><para>Prints the size in bytes of the contents of the
-    store paths <replaceable>paths</replaceable> — to be precise, the
+    store paths <emphasis>paths</emphasis> — to be precise, the
     size of the output of <command>nix-store --dump</command> on the
     given paths.  Note that the actual disk space required by the
     store paths may be higher, especially on filesystems with large
@@ -760,7 +760,7 @@ query is applied to the target of the symlink.</para>
 
     <listitem><para>Prints the garbage collector roots that point,
     directly or indirectly, at the store paths
-    <replaceable>paths</replaceable>.</para></listitem>
+    <emphasis>paths</emphasis>.</para></listitem>
 
   </varlistentry>
 
@@ -778,7 +778,7 @@ query is applied to the target of the symlink.</para>
 $ nix-store -qR $(which svn)
 /nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
 /nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 </para>
 
@@ -789,7 +789,7 @@ $ nix-store -qR $(nix-store -qd $(which svn))
 /nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv
 /nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh
 /nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv
-<replaceable>... lots of other paths ...</replaceable></screen>
+<emphasis>... lots of other paths ...</emphasis></screen>
 
 The difference with the previous example is that we ask the closure of
 the derivation (<option>-qd</option>), not the closure of the output
@@ -804,7 +804,7 @@ $ nix-store -q --tree $(nix-store -qd $(which svn))
 +---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv
 |   +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash
 |   +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 </para>
 
@@ -827,7 +827,7 @@ $ nix-store -q --referrers $(nix-store -q --binding openssl $(nix-store -qd $(wh
 $ nix-store -q --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}')
 /nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2
 /nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 Note that <command>ldd</command> is a command that prints out the
 dynamic libraries used by an ELF executable.</para>
@@ -893,7 +893,7 @@ $ nix-store -q --roots $(which svn)
 <cmdsynopsis>
   <command>nix-store</command>
   <arg choice='plain'><option>--add</option></arg>
-  <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -926,8 +926,8 @@ $ nix-store --add ./foo.c
   <command>nix-store</command>
   <arg><option>--recursive</option></arg>
   <arg choice='plain'><option>--add-fixed</option></arg>
-  <arg choice='plain'><replaceable>algorithm</replaceable></arg>
-  <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+  <arg choice='plain'><emphasis>algorithm</emphasis></arg>
+  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
 </cmdsynopsis>
 
 </refsection>
@@ -1039,7 +1039,7 @@ in Nix itself.</para>
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--verify-path</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1077,7 +1077,7 @@ $ nix-store --verify-path $(nix-store -qR $(which svn))
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--repair-path</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1123,7 +1123,7 @@ fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--dump</option></arg>
-    <arg choice='plain'><replaceable>path</replaceable></arg>
+    <arg choice='plain'><emphasis>path</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1131,7 +1131,7 @@ fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
 
 <para>The operation <option>--dump</option> produces a NAR (Nix
 ARchive) file containing the contents of the file system tree rooted
-at <replaceable>path</replaceable>.  The archive is written to
+at <emphasis>path</emphasis>.  The archive is written to
 standard output.</para>
 
 <para>A NAR archive is like a TAR or Zip archive, but it contains only
@@ -1173,14 +1173,14 @@ links, but not other types of files (such as device nodes).</para>
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--restore</option></arg>
-    <arg choice='plain'><replaceable>path</replaceable></arg>
+    <arg choice='plain'><emphasis>path</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
 <refsection><title>Description</title>
 
 <para>The operation <option>--restore</option> unpacks a NAR archive
-to <replaceable>path</replaceable>, which must not already exist.  The
+to <emphasis>path</emphasis>, which must not already exist.  The
 archive is read from standard input.</para>
 
 </refsection>
@@ -1198,7 +1198,7 @@ archive is read from standard input.</para>
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--export</option></arg>
-    <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1220,7 +1220,7 @@ that are missing in the target Nix store, the import will fail.  To
 copy a whole closure, do something like:
 
 <screen>
-$ nix-store --export $(nix-store -qR <replaceable>paths</replaceable>) > out</screen>
+$ nix-store --export $(nix-store -qR <emphasis>paths</emphasis>) > out</screen>
 
 To import the whole closure again, run:
 
@@ -1299,7 +1299,7 @@ progress indication.</para>
 <screen>
 $ nix-store --optimise
 hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
 there are 114486 files with equal contents out of 215894 files in total
 </screen>
@@ -1322,7 +1322,7 @@ there are 114486 files with equal contents out of 215894 files in total
       <arg choice='plain'><option>--read-log</option></arg>
       <arg choice='plain'><option>-l</option></arg>
     </group>
-    <arg choice='plain' rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1351,7 +1351,7 @@ unpacking sources
 unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz
 ktorrent-2.2.1/
 ktorrent-2.2.1/NEWS
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 </screen>
 
 </refsection>
@@ -1369,7 +1369,7 @@ ktorrent-2.2.1/NEWS
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--dump-db</option></arg>
-    <arg rep='repeat'><replaceable>paths</replaceable></arg>
+    <arg rep='repeat'><emphasis>paths</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1424,7 +1424,7 @@ loads it into the Nix database.</para>
   <cmdsynopsis>
     <command>nix-store</command>
     <arg choice='plain'><option>--print-env</option></arg>
-    <arg choice='plain'><replaceable>drvpath</replaceable></arg>
+    <arg choice='plain'><emphasis>drvpath</emphasis></arg>
   </cmdsynopsis>
 </refsection>
 
@@ -1441,7 +1441,7 @@ variable <literal>_args</literal>.</para>
 
 <screen>
 $ nix-store --print-env $(nix-instantiate '&lt;nixpkgs>' -A firefox)
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2'
 export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
 export system; system='x86_64-linux'
diff --git a/doc/manual/command-ref/opt-common-syn.xml b/doc/manual/command-ref/opt-common-syn.xml
index 2660e3bb1..6b7b5c833 100644
--- a/doc/manual/command-ref/opt-common-syn.xml
+++ b/doc/manual/command-ref/opt-common-syn.xml
@@ -13,7 +13,7 @@
 </arg>
 <arg>
   <option>--log-format</option>
-  <replaceable>format</replaceable>
+  <emphasis>format</emphasis>
 </arg>
 <arg>
   <group choice='plain'>
@@ -26,19 +26,19 @@
     <arg choice='plain'><option>--max-jobs</option></arg>
     <arg choice='plain'><option>-j</option></arg>
   </group>
-  <replaceable>number</replaceable>
+  <emphasis>number</emphasis>
 </arg>
 <arg>
   <option>--cores</option>
-  <replaceable>number</replaceable>
+  <emphasis>number</emphasis>
 </arg>
 <arg>
   <option>--max-silent-time</option>
-  <replaceable>number</replaceable>
+  <emphasis>number</emphasis>
 </arg>
 <arg>
   <option>--timeout</option>
-  <replaceable>number</replaceable>
+  <emphasis>number</emphasis>
 </arg>
 <arg>
   <group choice='plain'>
@@ -56,12 +56,12 @@
 <arg><option>--readonly-mode</option></arg>
 <arg>
   <option>-I</option>
-  <replaceable>path</replaceable>
+  <emphasis>path</emphasis>
 </arg>
 <arg>
   <option>--option</option>
-  <replaceable>name</replaceable>
-  <replaceable>value</replaceable>
+  <emphasis>name</emphasis>
+  <emphasis>value</emphasis>
 </arg>
 <sbr />
 
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml
index 150e732ff..67950e94b 100644
--- a/doc/manual/command-ref/opt-common.xml
+++ b/doc/manual/command-ref/opt-common.xml
@@ -92,12 +92,12 @@
 </varlistentry>
 
 
-<varlistentry xml:id="opt-log-format"><term><option>--log-format</option> <replaceable>format</replaceable></term>
+<varlistentry xml:id="opt-log-format"><term><option>--log-format</option> <emphasis>format</emphasis></term>
 
   <listitem>
 
   <para>This option can be used to change the output of the log format, with
-  <replaceable>format</replaceable> being one of:</para>
+  <emphasis>format</emphasis> being one of:</para>
 
   <variablelist>
 
@@ -130,13 +130,13 @@
   error.  This option suppresses this behaviour.  Note that the
   builder's standard output and error are always written to a log file
   in
-  <filename><replaceable>prefix</replaceable>/nix/var/log/nix</filename>.</para></listitem>
+  <filename><emphasis>prefix</emphasis>/nix/var/log/nix</filename>.</para></listitem>
 
 </varlistentry>
 
 
 <varlistentry xml:id="opt-max-jobs"><term><option>--max-jobs</option> / <option>-j</option>
-<replaceable>number</replaceable></term>
+<emphasis>number</emphasis></term>
 
   <listitem>
 
@@ -166,7 +166,7 @@
   of parallelism.  For instance, in Nixpkgs, if the derivation
   attribute <varname>enableParallelBuilding</varname> is set to
   <literal>true</literal>, the builder passes the
-  <option>-j<replaceable>N</replaceable></option> flag to GNU Make.
+  <option>-j<emphasis>N</emphasis></option> flag to GNU Make.
   It defaults to the value of the <link
   linkend='conf-cores'><literal>cores</literal></link>
   configuration setting, if set, or <literal>1</literal> otherwise.
@@ -271,7 +271,7 @@
 </varlistentry>
 
 
-<varlistentry><term><option>--arg</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
+<varlistentry><term><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
 
   <listitem><para>This option is accepted by
   <command>nix-env</command>, <command>nix-instantiate</command>,
@@ -280,14 +280,14 @@
   automatically try to call functions that
   it encounters.  It can automatically call functions for which every
   argument has a <link linkend='ss-functions'>default value</link>
-  (e.g., <literal>{ <replaceable>argName</replaceable> ?
-  <replaceable>defaultValue</replaceable> }:
-  <replaceable>...</replaceable></literal>).  With
+  (e.g., <literal>{ <emphasis>argName</emphasis> ?
+  <emphasis>defaultValue</emphasis> }:
+  <emphasis>...</emphasis></literal>).  With
   <option>--arg</option>, you can also call functions that have
   arguments without a default value (or override a default value).
   That is, if the evaluator encounters a function with an argument
-  named <replaceable>name</replaceable>, it will call it with value
-  <replaceable>value</replaceable>.</para>
+  named <emphasis>name</emphasis>, it will call it with value
+  <emphasis>value</emphasis>.</para>
 
   <para>For instance, the top-level <literal>default.nix</literal> in
   Nixpkgs is actually a function:
@@ -295,23 +295,23 @@
 <programlisting>
 { # The system (e.g., `i686-linux') for which to build the packages.
   system ? builtins.currentSystem
-  <replaceable>...</replaceable>
-}: <replaceable>...</replaceable></programlisting>
+  <emphasis>...</emphasis>
+}: <emphasis>...</emphasis></programlisting>
 
   So if you call this Nix expression (e.g., when you do
-  <literal>nix-env -i <replaceable>pkgname</replaceable></literal>),
+  <literal>nix-env -i <emphasis>pkgname</emphasis></literal>),
   the function will be called automatically using the value <link
   linkend='builtin-currentSystem'><literal>builtins.currentSystem</literal></link>
   for the <literal>system</literal> argument.  You can override this
   using <option>--arg</option>, e.g., <literal>nix-env -i
-  <replaceable>pkgname</replaceable> --arg system
+  <emphasis>pkgname</emphasis> --arg system
   \"i686-freebsd\"</literal>.  (Note that since the argument is a Nix
   string literal, you have to escape the quotes.)</para></listitem>
 
 </varlistentry>
 
 
-<varlistentry><term><option>--argstr</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
+<varlistentry><term><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
 
   <listitem><para>This option is like <option>--arg</option>, only the
   value is not a Nix expression but a string.  So instead of
@@ -323,17 +323,17 @@
 
 
 <varlistentry xml:id="opt-attr"><term><option>--attr</option> / <option>-A</option>
-<replaceable>attrPath</replaceable></term>
+<emphasis>attrPath</emphasis></term>
 
   <listitem><para>Select an attribute from the top-level Nix
   expression being evaluated.  (<command>nix-env</command>,
   <command>nix-instantiate</command>, <command>nix-build</command> and
   <command>nix-shell</command> only.)  The <emphasis>attribute
-  path</emphasis> <replaceable>attrPath</replaceable> is a sequence of
+  path</emphasis> <emphasis>attrPath</emphasis> is a sequence of
   attribute names separated by dots.  For instance, given a top-level
-  Nix expression <replaceable>e</replaceable>, the attribute path
+  Nix expression <emphasis>e</emphasis>, the attribute path
   <literal>xorg.xorgserver</literal> would cause the expression
-  <literal><replaceable>e</replaceable>.xorg.xorgserver</literal> to
+  <literal><emphasis>e</emphasis>.xorg.xorgserver</literal> to
   be used.  See <link
   linkend='refsec-nix-env-install-examples'><command>nix-env
   --install</command></link> for some concrete examples.</para>
@@ -366,7 +366,7 @@
 </varlistentry>
 
 
-<varlistentry xml:id="opt-I"><term><option>-I</option> <replaceable>path</replaceable></term>
+<varlistentry xml:id="opt-I"><term><option>-I</option> <emphasis>path</emphasis></term>
 
   <listitem><para>Add a path to the Nix expression search path.  This
   option may be given multiple times.  See the <envar
@@ -378,10 +378,10 @@
 </varlistentry>
 
 
-<varlistentry><term><option>--option</option> <replaceable>name</replaceable> <replaceable>value</replaceable></term>
+<varlistentry><term><option>--option</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
 
   <listitem><para>Set the Nix configuration option
-  <replaceable>name</replaceable> to <replaceable>value</replaceable>.
+  <emphasis>name</emphasis> to <emphasis>value</emphasis>.
   This overrides settings in the Nix configuration file (see
   <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).</para></listitem>
 
diff --git a/doc/manual/command-ref/opt-inst-syn.xml b/doc/manual/command-ref/opt-inst-syn.xml
index e8c3f1ec6..e324a5e6d 100644
--- a/doc/manual/command-ref/opt-inst-syn.xml
+++ b/doc/manual/command-ref/opt-inst-syn.xml
@@ -17,6 +17,6 @@
   <arg><option>--from-expression</option></arg>
   <arg><option>-E</option></arg>
     
-  <arg><option>--from-profile</option> <replaceable>path</replaceable></arg>
+  <arg><option>--from-profile</option> <emphasis>path</emphasis></arg>
 
 </nop>
diff --git a/doc/manual/expressions/advanced-attributes.xml b/doc/manual/expressions/advanced-attributes.xml
index 3a0413ceb..794d020d9 100644
--- a/doc/manual/expressions/advanced-attributes.xml
+++ b/doc/manual/expressions/advanced-attributes.xml
@@ -91,12 +91,12 @@ disallowedRequisites = [ foobar ];
     references graph of their inputs.  The attribute is a list of
     inputs in the Nix store whose references graph the builder needs
     to know.  The value of this attribute should be a list of pairs
-    <literal>[ <replaceable>name1</replaceable>
-    <replaceable>path1</replaceable> <replaceable>name2</replaceable>
-    <replaceable>path2</replaceable> <replaceable>...</replaceable>
+    <literal>[ <emphasis>name1</emphasis>
+    <emphasis>path1</emphasis> <emphasis>name2</emphasis>
+    <emphasis>path2</emphasis> <emphasis>...</emphasis>
     ]</literal>.  The references graph of each
-    <replaceable>pathN</replaceable> will be stored in a text file
-    <replaceable>nameN</replaceable> in the temporary build directory.
+    <emphasis>pathN</emphasis> will be stored in a text file
+    <emphasis>nameN</emphasis> in the temporary build directory.
     The text files have the format used by <command>nix-store
     --register-validity</command> (with the deriver fields left
     empty).  For example, when the following derivation is built:
@@ -135,7 +135,7 @@ derivation {
     Nixpkgs has the line
 
 <programlisting>
-impureEnvVars = [ "http_proxy" "https_proxy" <replaceable>...</replaceable> ];
+impureEnvVars = [ "http_proxy" "https_proxy" <emphasis>...</emphasis> ];
 </programlisting>
 
     to make it use the proxy server configuration specified by the
@@ -297,11 +297,11 @@ big = "a very long string";
     <literal>bigPath</literal> will contain the absolute path to a
     temporary file containing <literal>a very long
     string</literal>. That is, for any attribute
-    <replaceable>x</replaceable> listed in
+    <emphasis>x</emphasis> listed in
     <varname>passAsFile</varname>, Nix will pass an environment
-    variable <literal><replaceable>x</replaceable>Path</literal> holding
+    variable <literal><emphasis>x</emphasis>Path</literal> holding
     the path of the file containing the value of attribute
-    <replaceable>x</replaceable>. This is useful when you need to pass
+    <emphasis>x</emphasis>. This is useful when you need to pass
     large strings to a builder, since most operating systems impose a
     limit on the size of the environment (typically, a few hundred
     kilobyte).</para></listitem>
diff --git a/doc/manual/expressions/build-script.xml b/doc/manual/expressions/build-script.xml
index 892274f50..c9af198f2 100644
--- a/doc/manual/expressions/build-script.xml
+++ b/doc/manual/expressions/build-script.xml
@@ -58,7 +58,7 @@ steps:</para>
     the <literal>PATH</literal>.  The <literal>perl</literal> environment
     variable points to the location of the Perl package (since it
     was passed in as an attribute to the derivation), so
-    <filename><replaceable>$perl</replaceable>/bin</filename> is the
+    <filename><emphasis>$perl</emphasis>/bin</filename> is the
     directory containing the Perl interpreter.</para>
 
   </listitem>
diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml
index 877fd3a1b..4ad481ad3 100644
--- a/doc/manual/expressions/builtins.xml
+++ b/doc/manual/expressions/builtins.xml
@@ -22,34 +22,34 @@ available as <function>builtins.derivation</function>.</para>
 
 
   <varlistentry xml:id='builtin-abort'>
-    <term><function>abort</function> <replaceable>s</replaceable></term>
-    <term><function>builtins.abort</function> <replaceable>s</replaceable></term>
+    <term><function>abort</function> <emphasis>s</emphasis></term>
+    <term><function>builtins.abort</function> <emphasis>s</emphasis></term>
 
     <listitem><para>Abort Nix expression evaluation, print error
-    message <replaceable>s</replaceable>.</para></listitem>
+    message <emphasis>s</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-add'>
     <term><function>builtins.add</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis>
     </term>
 
     <listitem><para>Return the sum of the numbers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-all'>
     <term><function>builtins.all</function>
-    <replaceable>pred</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>pred</emphasis> <emphasis>list</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if the function
-    <replaceable>pred</replaceable> returns <literal>true</literal>
-    for all elements of <replaceable>list</replaceable>,
+    <emphasis>pred</emphasis> returns <literal>true</literal>
+    for all elements of <emphasis>list</emphasis>,
     and <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -57,11 +57,11 @@ available as <function>builtins.derivation</function>.</para>
 
   <varlistentry xml:id='builtin-any'>
     <term><function>builtins.any</function>
-    <replaceable>pred</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>pred</emphasis> <emphasis>list</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if the function
-    <replaceable>pred</replaceable> returns <literal>true</literal>
-    for at least one element of <replaceable>list</replaceable>,
+    <emphasis>pred</emphasis> returns <literal>true</literal>
+    for at least one element of <emphasis>list</emphasis>,
     and <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -69,10 +69,10 @@ available as <function>builtins.derivation</function>.</para>
 
   <varlistentry xml:id='builtin-attrNames'>
     <term><function>builtins.attrNames</function>
-    <replaceable>set</replaceable></term>
+    <emphasis>set</emphasis></term>
 
     <listitem><para>Return the names of the attributes in the set
-    <replaceable>set</replaceable> in an alphabetically sorted list.  For instance,
+    <emphasis>set</emphasis> in an alphabetically sorted list.  For instance,
     <literal>builtins.attrNames { y = 1; x = "foo"; }</literal>
     evaluates to <literal>[ "x" "y" ]</literal>.</para></listitem>
 
@@ -81,20 +81,20 @@ available as <function>builtins.derivation</function>.</para>
 
   <varlistentry xml:id='builtin-attrValues'>
     <term><function>builtins.attrValues</function>
-    <replaceable>set</replaceable></term>
+    <emphasis>set</emphasis></term>
 
     <listitem><para>Return the values of the attributes in the set
-    <replaceable>set</replaceable> in the order corresponding to the
+    <emphasis>set</emphasis> in the order corresponding to the
     sorted attribute names.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-baseNameOf'>
-    <term><function>baseNameOf</function> <replaceable>s</replaceable></term>
+    <term><function>baseNameOf</function> <emphasis>s</emphasis></term>
 
     <listitem><para>Return the <emphasis>base name</emphasis> of the
-    string <replaceable>s</replaceable>, that is, everything following
+    string <emphasis>s</emphasis>, that is, everything following
     the final slash in the string.  This is similar to the GNU
     <command>basename</command> command.</para></listitem>
 
@@ -103,33 +103,33 @@ available as <function>builtins.derivation</function>.</para>
 
   <varlistentry xml:id='builtin-bitAnd'>
     <term><function>builtins.bitAnd</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the bitwise AND of the integers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-bitOr'>
     <term><function>builtins.bitOr</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the bitwise OR of the integers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-bitXor'>
     <term><function>builtins.bitXor</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the bitwise XOR of the integers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
@@ -154,15 +154,15 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-compareVersions'>
     <term><function>builtins.compareVersions</function>
-    <replaceable>s1</replaceable> <replaceable>s2</replaceable></term>
+    <emphasis>s1</emphasis> <emphasis>s2</emphasis></term>
 
     <listitem><para>Compare two strings representing versions and
     return <literal>-1</literal> if version
-    <replaceable>s1</replaceable> is older than version
-    <replaceable>s2</replaceable>, <literal>0</literal> if they are
+    <emphasis>s1</emphasis> is older than version
+    <emphasis>s2</emphasis>, <literal>0</literal> if they are
     the same, and <literal>1</literal> if
-    <replaceable>s1</replaceable> is newer than
-    <replaceable>s2</replaceable>.  The version comparison algorithm
+    <emphasis>s1</emphasis> is newer than
+    <emphasis>s2</emphasis>.  The version comparison algorithm
     is the same as the one used by <link
     linkend="ssec-version-comparisons"><command>nix-env
     -u</command></link>.</para></listitem>
@@ -172,7 +172,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-concatLists'>
     <term><function>builtins.concatLists</function>
-    <replaceable>lists</replaceable></term>
+    <emphasis>lists</emphasis></term>
 
     <listitem><para>Concatenate a list of lists into a single
     list.</para></listitem>
@@ -181,7 +181,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-concatStringsSep'>
     <term><function>builtins.concatStringsSep</function>
-    <replaceable>separator</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>separator</emphasis> <emphasis>list</emphasis></term>
 
     <listitem><para>Concatenate a list of strings with a separator
     between each element, e.g. <literal>concatStringsSep "/"
@@ -225,12 +225,12 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-deepSeq'>
     <term><function>builtins.deepSeq</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>This is like <literal>seq
-    <replaceable>e1</replaceable>
-    <replaceable>e2</replaceable></literal>, except that
-    <replaceable>e1</replaceable> is evaluated
+    <emphasis>e1</emphasis>
+    <emphasis>e2</emphasis></literal>, except that
+    <emphasis>e1</emphasis> is evaluated
     <emphasis>deeply</emphasis>: if it’s a list or set, its elements
     or attributes are also evaluated recursively.</para></listitem>
 
@@ -239,9 +239,9 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-derivation'>
     <term><function>derivation</function>
-    <replaceable>attrs</replaceable></term>
+    <emphasis>attrs</emphasis></term>
     <term><function>builtins.derivation</function>
-    <replaceable>attrs</replaceable></term>
+    <emphasis>attrs</emphasis></term>
 
     <listitem><para><function>derivation</function> is described in
     <xref linkend='ssec-derivation' />.</para></listitem>
@@ -250,11 +250,11 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
 
   <varlistentry xml:id='builtin-dirOf'>
-    <term><function>dirOf</function> <replaceable>s</replaceable></term>
-    <term><function>builtins.dirOf</function> <replaceable>s</replaceable></term>
+    <term><function>dirOf</function> <emphasis>s</emphasis></term>
+    <term><function>builtins.dirOf</function> <emphasis>s</emphasis></term>
 
     <listitem><para>Return the directory part of the string
-    <replaceable>s</replaceable>, that is, everything before the final
+    <emphasis>s</emphasis>, that is, everything before the final
     slash in the string.  This is similar to the GNU
     <command>dirname</command> command.</para></listitem>
 
@@ -263,21 +263,21 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-div'>
     <term><function>builtins.div</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the quotient of the numbers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
   <varlistentry xml:id='builtin-elem'>
     <term><function>builtins.elem</function>
-    <replaceable>x</replaceable> <replaceable>xs</replaceable></term>
+    <emphasis>x</emphasis> <emphasis>xs</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if a value equal to
-    <replaceable>x</replaceable> occurs in the list
-    <replaceable>xs</replaceable>, and <literal>false</literal>
+    <emphasis>x</emphasis> occurs in the list
+    <emphasis>xs</emphasis>, and <literal>false</literal>
     otherwise.</para></listitem>
 
   </varlistentry>
@@ -285,10 +285,10 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-elemAt'>
     <term><function>builtins.elemAt</function>
-    <replaceable>xs</replaceable> <replaceable>n</replaceable></term>
+    <emphasis>xs</emphasis> <emphasis>n</emphasis></term>
 
-    <listitem><para>Return element <replaceable>n</replaceable> from
-    the list <replaceable>xs</replaceable>.  Elements are counted
+    <listitem><para>Return element <emphasis>n</emphasis> from
+    the list <emphasis>xs</emphasis>.  Elements are counted
     starting from 0.  A fatal error occurs if the index is out of
     bounds.</para></listitem>
 
@@ -297,7 +297,7 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-fetchurl'>
     <term><function>builtins.fetchurl</function>
-    <replaceable>url</replaceable></term>
+    <emphasis>url</emphasis></term>
 
     <listitem><para>Download the specified URL and return the path of
     the downloaded file. This function is not available if <link
@@ -309,9 +309,9 @@ if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
 
   <varlistentry xml:id='builtin-fetchTarball'>
     <term><function>fetchTarball</function>
-    <replaceable>url</replaceable></term>
+    <emphasis>url</emphasis></term>
     <term><function>builtins.fetchTarball</function>
-    <replaceable>url</replaceable></term>
+    <emphasis>url</emphasis></term>
 
     <listitem><para>Download the specified URL, unpack it and return
     the path of the unpacked tree. The file must be a tape archive
@@ -333,9 +333,9 @@ stdenv.mkDerivation { … }
     <para>The fetched tarball is cached for a certain amount of time
     (1 hour by default) in <filename>~/.cache/nix/tarballs/</filename>.
     You can change the cache timeout either on the command line with
-    <option>--option tarball-ttl <replaceable>number of seconds</replaceable></option> or
+    <option>--option tarball-ttl <emphasis>number of seconds</emphasis></option> or
     in the Nix configuration file with this option:
-    <literal><xref linkend="conf-tarball-ttl" /> <replaceable>number of seconds to cache</replaceable></literal>.
+    <literal><xref linkend="conf-tarball-ttl" /> <emphasis>number of seconds to cache</emphasis></literal>.
     </para>
 
     <para>Note that when obtaining the hash with <varname>nix-prefetch-url
@@ -367,12 +367,12 @@ stdenv.mkDerivation { … }
   <varlistentry xml:id='builtin-fetchGit'>
     <term>
       <function>builtins.fetchGit</function>
-      <replaceable>args</replaceable>
+      <emphasis>args</emphasis>
     </term>
 
     <listitem>
       <para>
-        Fetch a path from git. <replaceable>args</replaceable> can be
+        Fetch a path from git. <emphasis>args</emphasis> can be
         a URL, in which case the HEAD of the repo at that URL is
         fetched. Otherwise, it can be an attribute with the following
         attributes (all except <varname>url</varname> optional):
@@ -526,11 +526,11 @@ stdenv.mkDerivation { … }
 
 
   <varlistentry><term><function>builtins.filter</function>
-  <replaceable>f</replaceable> <replaceable>xs</replaceable></term>
+  <emphasis>f</emphasis> <emphasis>xs</emphasis></term>
 
     <listitem><para>Return a list consisting of the elements of
-    <replaceable>xs</replaceable> for which the function
-    <replaceable>f</replaceable> returns
+    <emphasis>xs</emphasis> for which the function
+    <emphasis>f</emphasis> returns
     <literal>true</literal>.</para></listitem>
 
   </varlistentry>
@@ -538,7 +538,7 @@ stdenv.mkDerivation { … }
 
   <varlistentry xml:id='builtin-filterSource'>
     <term><function>builtins.filterSource</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem>
 
@@ -569,10 +569,10 @@ stdenv.mkDerivation {
 
       </para>
 
-      <para>Thus, the first argument <replaceable>e1</replaceable>
+      <para>Thus, the first argument <emphasis>e1</emphasis>
       must be a predicate function that is called for each regular
       file, directory or symlink in the source tree
-      <replaceable>e2</replaceable>.  If the function returns
+      <emphasis>e2</emphasis>.  If the function returns
       <literal>true</literal>, the file is copied to the Nix store,
       otherwise it is omitted.  The function is called with two
       arguments.  The first is the full path of the file.  The second
@@ -584,7 +584,7 @@ stdenv.mkDerivation {
       the Nix store, so if the predicate returns
       <literal>true</literal> for them, the copy will fail). If you
       exclude a directory, the entire corresponding subtree of
-      <replaceable>e2</replaceable> will be excluded.</para>
+      <emphasis>e2</emphasis> will be excluded.</para>
 
     </listitem>
 
@@ -593,7 +593,7 @@ stdenv.mkDerivation {
 
   <varlistentry xml:id='builtin-foldl-prime'>
     <term><function>builtins.foldl’</function>
-    <replaceable>op</replaceable> <replaceable>nul</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>op</emphasis> <emphasis>nul</emphasis> <emphasis>list</emphasis></term>
 
     <listitem><para>Reduce a list by applying a binary operator, from
     left to right, e.g. <literal>foldl’ op nul [x0 x1 x2 ...] = op (op
@@ -607,11 +607,11 @@ stdenv.mkDerivation {
 
   <varlistentry xml:id='builtin-functionArgs'>
     <term><function>builtins.functionArgs</function>
-    <replaceable>f</replaceable></term>
+    <emphasis>f</emphasis></term>
 
     <listitem><para>
     Return a set containing the names of the formal arguments expected
-    by the function <replaceable>f</replaceable>.
+    by the function <emphasis>f</emphasis>.
     The value of each attribute is a Boolean denoting whether the corresponding
     argument has a default value.  For instance,
     <literal>functionArgs ({ x, y ? 123}: ...)  =  { x = false; y = true; }</literal>.
@@ -625,7 +625,7 @@ stdenv.mkDerivation {
 
 
   <varlistentry xml:id='builtin-fromJSON'>
-    <term><function>builtins.fromJSON</function> <replaceable>e</replaceable></term>
+    <term><function>builtins.fromJSON</function> <emphasis>e</emphasis></term>
 
     <listitem><para>Convert a JSON string to a Nix
     value. For example,
@@ -642,12 +642,12 @@ builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
 
   <varlistentry xml:id='builtin-genList'>
     <term><function>builtins.genList</function>
-    <replaceable>generator</replaceable> <replaceable>length</replaceable></term>
+    <emphasis>generator</emphasis> <emphasis>length</emphasis></term>
 
     <listitem><para>Generate list of size
-    <replaceable>length</replaceable>, with each element
-    <replaceable>i</replaceable> equal to the value returned by
-    <replaceable>generator</replaceable> <literal>i</literal>. For
+    <emphasis>length</emphasis>, with each element
+    <emphasis>i</emphasis> equal to the value returned by
+    <emphasis>generator</emphasis> <literal>i</literal>. For
     example,
 
 <programlisting>
@@ -661,13 +661,13 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-getAttr'>
     <term><function>builtins.getAttr</function>
-    <replaceable>s</replaceable> <replaceable>set</replaceable></term>
+    <emphasis>s</emphasis> <emphasis>set</emphasis></term>
 
     <listitem><para><function>getAttr</function> returns the attribute
-    named <replaceable>s</replaceable> from
-    <replaceable>set</replaceable>.  Evaluation aborts if the
+    named <emphasis>s</emphasis> from
+    <emphasis>set</emphasis>.  Evaluation aborts if the
     attribute doesn’t exist.  This is a dynamic version of the
-    <literal>.</literal> operator, since <replaceable>s</replaceable>
+    <literal>.</literal> operator, since <emphasis>s</emphasis>
     is an expression rather than an identifier.</para></listitem>
 
   </varlistentry>
@@ -675,10 +675,10 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-getEnv'>
     <term><function>builtins.getEnv</function>
-    <replaceable>s</replaceable></term>
+    <emphasis>s</emphasis></term>
 
     <listitem><para><function>getEnv</function> returns the value of
-    the environment variable <replaceable>s</replaceable>, or an empty
+    the environment variable <emphasis>s</emphasis>, or an empty
     string if the variable doesn’t exist.  This function should be
     used with care, as it can introduce all sorts of nasty environment
     dependencies in your Nix expression.</para>
@@ -694,14 +694,14 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-hasAttr'>
     <term><function>builtins.hasAttr</function>
-    <replaceable>s</replaceable> <replaceable>set</replaceable></term>
+    <emphasis>s</emphasis> <emphasis>set</emphasis></term>
 
     <listitem><para><function>hasAttr</function> returns
-    <literal>true</literal> if <replaceable>set</replaceable> has an
-    attribute named <replaceable>s</replaceable>, and
+    <literal>true</literal> if <emphasis>set</emphasis> has an
+    attribute named <emphasis>s</emphasis>, and
     <literal>false</literal> otherwise.  This is a dynamic version of
     the <literal>?</literal>  operator, since
-    <replaceable>s</replaceable> is an expression rather than an
+    <emphasis>s</emphasis> is an expression rather than an
     identifier.</para></listitem>
 
   </varlistentry>
@@ -709,11 +709,11 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-hashString'>
     <term><function>builtins.hashString</function>
-    <replaceable>type</replaceable> <replaceable>s</replaceable></term>
+    <emphasis>type</emphasis> <emphasis>s</emphasis></term>
 
     <listitem><para>Return a base-16 representation of the
-    cryptographic hash of string <replaceable>s</replaceable>.  The
-    hash algorithm specified by <replaceable>type</replaceable> must
+    cryptographic hash of string <emphasis>s</emphasis>.  The
+    hash algorithm specified by <emphasis>type</emphasis> must
     be one of <literal>"md5"</literal>, <literal>"sha1"</literal>,
     <literal>"sha256"</literal> or <literal>"sha512"</literal>.</para></listitem>
 
@@ -722,11 +722,11 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-hashFile'>
     <term><function>builtins.hashFile</function>
-    <replaceable>type</replaceable> <replaceable>p</replaceable></term>
+    <emphasis>type</emphasis> <emphasis>p</emphasis></term>
 
     <listitem><para>Return a base-16 representation of the
-    cryptographic hash of the file at path <replaceable>p</replaceable>.  The
-    hash algorithm specified by <replaceable>type</replaceable> must
+    cryptographic hash of the file at path <emphasis>p</emphasis>.  The
+    hash algorithm specified by <emphasis>type</emphasis> must
     be one of <literal>"md5"</literal>, <literal>"sha1"</literal>,
     <literal>"sha256"</literal> or <literal>"sha512"</literal>.</para></listitem>
 
@@ -735,7 +735,7 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-head'>
     <term><function>builtins.head</function>
-    <replaceable>list</replaceable></term>
+    <emphasis>list</emphasis></term>
 
     <listitem><para>Return the first element of a list; abort
     evaluation if the argument isn’t a list or is an empty list.  You
@@ -747,13 +747,13 @@ builtins.genList (x: x * x) 5
 
   <varlistentry xml:id='builtin-import'>
     <term><function>import</function>
-    <replaceable>path</replaceable></term>
+    <emphasis>path</emphasis></term>
     <term><function>builtins.import</function>
-    <replaceable>path</replaceable></term>
+    <emphasis>path</emphasis></term>
 
     <listitem><para>Load, parse and return the Nix expression in the
-    file <replaceable>path</replaceable>.  If <replaceable>path
-    </replaceable> is a directory, the file <filename>default.nix
+    file <emphasis>path</emphasis>.  If <emphasis>path
+    </emphasis> is a directory, the file <filename>default.nix
     </filename> in that directory is loaded.  Evaluation aborts if the
     file doesn’t exist or contains an incorrect Nix expression.
     <function>import</function> implements Nix’s module system: you
@@ -763,7 +763,7 @@ builtins.genList (x: x * x) 5
 
     <note><para>Unlike some languages, <function>import</function> is a regular
     function in Nix. Paths using the angle bracket syntax (e.g., <function>
-    import</function> <replaceable>&lt;foo&gt;</replaceable>) are normal path
+    import</function> <emphasis>&lt;foo&gt;</emphasis>) are normal path
     values (see <xref linkend='ssec-values' />).</para></note>
 
     <para>A Nix expression loaded by <function>import</function> must
@@ -810,21 +810,21 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-intersectAttrs'>
     <term><function>builtins.intersectAttrs</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return a set consisting of the attributes in the
-    set <replaceable>e2</replaceable> that also exist in the set
-    <replaceable>e1</replaceable>.</para></listitem>
+    set <emphasis>e2</emphasis> that also exist in the set
+    <emphasis>e1</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-isAttrs'>
     <term><function>builtins.isAttrs</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a set, and
+    <emphasis>e</emphasis> evaluates to a set, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -832,20 +832,20 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-isList'>
     <term><function>builtins.isList</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a list, and
+    <emphasis>e</emphasis> evaluates to a list, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-isFunction'><term><function>builtins.isFunction</function>
-  <replaceable>e</replaceable></term>
+  <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a function, and
+    <emphasis>e</emphasis> evaluates to a function, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -853,10 +853,10 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-isString'>
     <term><function>builtins.isString</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a string, and
+    <emphasis>e</emphasis> evaluates to a string, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -864,10 +864,10 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-isInt'>
     <term><function>builtins.isInt</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to an int, and
+    <emphasis>e</emphasis> evaluates to an int, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -875,10 +875,10 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-isFloat'>
     <term><function>builtins.isFloat</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a float, and
+    <emphasis>e</emphasis> evaluates to a float, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
@@ -886,31 +886,31 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-isBool'>
     <term><function>builtins.isBool</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a bool, and
+    <emphasis>e</emphasis> evaluates to a bool, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
 
   <varlistentry><term><function>builtins.isPath</function>
-  <replaceable>e</replaceable></term>
+  <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to a path, and
+    <emphasis>e</emphasis> evaluates to a path, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
 
   <varlistentry xml:id='builtin-isNull'>
     <term><function>isNull</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
     <term><function>builtins.isNull</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if
-    <replaceable>e</replaceable> evaluates to <literal>null</literal>,
+    <emphasis>e</emphasis> evaluates to <literal>null</literal>,
     and <literal>false</literal> otherwise.</para>
 
     <warning><para>This function is <emphasis>deprecated</emphasis>;
@@ -923,23 +923,23 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-length'>
     <term><function>builtins.length</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return the length of the list
-    <replaceable>e</replaceable>.</para></listitem>
+    <emphasis>e</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-lessThan'>
     <term><function>builtins.lessThan</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if the number
-    <replaceable>e1</replaceable> is less than the number
-    <replaceable>e2</replaceable>, and <literal>false</literal>
+    <emphasis>e1</emphasis> is less than the number
+    <emphasis>e2</emphasis>, and <literal>false</literal>
     otherwise.  Evaluation aborts if either
-    <replaceable>e1</replaceable> or <replaceable>e2</replaceable>
+    <emphasis>e1</emphasis> or <emphasis>e2</emphasis>
     does not evaluate to a number.</para></listitem>
 
   </varlistentry>
@@ -947,7 +947,7 @@ x: x + 456</programlisting>
 
   <varlistentry xml:id='builtin-listToAttrs'>
     <term><function>builtins.listToAttrs</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Construct a set from a list specifying the names
     and values of each attribute.  Each element of the list should be
@@ -975,12 +975,12 @@ builtins.listToAttrs
 
   <varlistentry xml:id='builtin-map'>
     <term><function>map</function>
-    <replaceable>f</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>f</emphasis> <emphasis>list</emphasis></term>
     <term><function>builtins.map</function>
-    <replaceable>f</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>f</emphasis> <emphasis>list</emphasis></term>
 
-    <listitem><para>Apply the function <replaceable>f</replaceable> to
-    each element in the list <replaceable>list</replaceable>.  For
+    <listitem><para>Apply the function <emphasis>f</emphasis> to
+    each element in the list <emphasis>list</emphasis>.  For
     example,
 
 <programlisting>
@@ -994,12 +994,12 @@ map (x: "foo" + x) [ "bar" "bla" "abc" ]</programlisting>
 
   <varlistentry xml:id='builtin-match'>
     <term><function>builtins.match</function>
-    <replaceable>regex</replaceable> <replaceable>str</replaceable></term>
+    <emphasis>regex</emphasis> <emphasis>str</emphasis></term>
 
     <listitem><para>Returns a list if the <link
     xlink:href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04">extended
-    POSIX regular expression</link> <replaceable>regex</replaceable>
-    matches <replaceable>str</replaceable> precisely, otherwise returns
+    POSIX regular expression</link> <emphasis>regex</emphasis>
+    matches <emphasis>str</emphasis> precisely, otherwise returns
     <literal>null</literal>.  Each item in the list is a regex group.
 
 <programlisting>
@@ -1031,20 +1031,20 @@ Evaluates to <literal>[ "foo" ]</literal>.
 
   <varlistentry xml:id='builtin-mul'>
     <term><function>builtins.mul</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the product of the numbers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-parseDrvName'>
     <term><function>builtins.parseDrvName</function>
-    <replaceable>s</replaceable></term>
+    <emphasis>s</emphasis></term>
 
-    <listitem><para>Split the string <replaceable>s</replaceable> into
+    <listitem><para>Split the string <emphasis>s</emphasis> into
     a package name and version.  The package name is everything up to
     but not including the first dash followed by a digit, and the
     version is everything following that dash.  The result is returned
@@ -1058,13 +1058,13 @@ Evaluates to <literal>[ "foo" ]</literal>.
   <varlistentry xml:id='builtin-path'>
     <term>
       <function>builtins.path</function>
-      <replaceable>args</replaceable>
+      <emphasis>args</emphasis>
     </term>
 
     <listitem>
       <para>
         An enrichment of the built-in path type, based on the attributes
-        present in <replaceable>args</replaceable>. All are optional
+        present in <emphasis>args</emphasis>. All are optional
         except <varname>path</varname>:
       </para>
 
@@ -1127,20 +1127,20 @@ Evaluates to <literal>[ "foo" ]</literal>.
 
   <varlistentry xml:id='builtin-pathExists'>
     <term><function>builtins.pathExists</function>
-    <replaceable>path</replaceable></term>
+    <emphasis>path</emphasis></term>
 
     <listitem><para>Return <literal>true</literal> if the path
-    <replaceable>path</replaceable> exists at evaluation time, and
+    <emphasis>path</emphasis> exists at evaluation time, and
     <literal>false</literal> otherwise.</para></listitem>
 
   </varlistentry>
 
   <varlistentry xml:id='builtin-placeholder'>
     <term><function>builtins.placeholder</function>
-    <replaceable>output</replaceable></term>
+    <emphasis>output</emphasis></term>
 
     <listitem><para>Return a placeholder string for the specified
-    <replaceable>output</replaceable> that will be substituted by the
+    <emphasis>output</emphasis> that will be substituted by the
     corresponding output path at build time. Typical outputs would be
     <literal>"out"</literal>, <literal>"bin"</literal> or
     <literal>"dev"</literal>.</para></listitem>
@@ -1148,10 +1148,10 @@ Evaluates to <literal>[ "foo" ]</literal>.
 
   <varlistentry xml:id='builtin-readDir'>
     <term><function>builtins.readDir</function>
-    <replaceable>path</replaceable></term>
+    <emphasis>path</emphasis></term>
 
     <listitem><para>Return the contents of the directory
-    <replaceable>path</replaceable> as a set mapping directory entries
+    <emphasis>path</emphasis> as a set mapping directory entries
     to the corresponding file type. For instance, if directory
     <filename>A</filename> contains a regular file
     <filename>B</filename> and another directory
@@ -1171,24 +1171,24 @@ Evaluates to <literal>[ "foo" ]</literal>.
 
   <varlistentry xml:id='builtin-readFile'>
     <term><function>builtins.readFile</function>
-    <replaceable>path</replaceable></term>
+    <emphasis>path</emphasis></term>
 
     <listitem><para>Return the contents of the file
-    <replaceable>path</replaceable> as a string.</para></listitem>
+    <emphasis>path</emphasis> as a string.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-removeAttrs'>
     <term><function>removeAttrs</function>
-    <replaceable>set</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>set</emphasis> <emphasis>list</emphasis></term>
     <term><function>builtins.removeAttrs</function>
-    <replaceable>set</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>set</emphasis> <emphasis>list</emphasis></term>
 
     <listitem><para>Remove the attributes listed in
-    <replaceable>list</replaceable> from
-    <replaceable>set</replaceable>.  The attributes don’t have to
-    exist in <replaceable>set</replaceable>. For instance,
+    <emphasis>list</emphasis> from
+    <emphasis>set</emphasis>.  The attributes don’t have to
+    exist in <emphasis>set</emphasis>. For instance,
 
 <programlisting>
 removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]</programlisting>
@@ -1200,12 +1200,12 @@ removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]</programlisting>
 
   <varlistentry xml:id='builtin-replaceStrings'>
     <term><function>builtins.replaceStrings</function>
-    <replaceable>from</replaceable> <replaceable>to</replaceable> <replaceable>s</replaceable></term>
+    <emphasis>from</emphasis> <emphasis>to</emphasis> <emphasis>s</emphasis></term>
 
-    <listitem><para>Given string <replaceable>s</replaceable>, replace
-    every occurrence of the strings in <replaceable>from</replaceable>
+    <listitem><para>Given string <emphasis>s</emphasis>, replace
+    every occurrence of the strings in <emphasis>from</emphasis>
     with the corresponding string in
-    <replaceable>to</replaceable>. For example,
+    <emphasis>to</emphasis>. For example,
 
 <programlisting>
 builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
@@ -1218,23 +1218,23 @@ builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
 
   <varlistentry xml:id='builtin-seq'>
     <term><function>builtins.seq</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
-    <listitem><para>Evaluate <replaceable>e1</replaceable>, then
-    evaluate and return <replaceable>e2</replaceable>. This ensures
+    <listitem><para>Evaluate <emphasis>e1</emphasis>, then
+    evaluate and return <emphasis>e2</emphasis>. This ensures
     that a computation is strict in the value of
-    <replaceable>e1</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-sort'>
     <term><function>builtins.sort</function>
-    <replaceable>comparator</replaceable> <replaceable>list</replaceable></term>
+    <emphasis>comparator</emphasis> <emphasis>list</emphasis></term>
 
-    <listitem><para>Return <replaceable>list</replaceable> in sorted
+    <listitem><para>Return <emphasis>list</emphasis> in sorted
     order. It repeatedly calls the function
-    <replaceable>comparator</replaceable> with two elements. The
+    <emphasis>comparator</emphasis> with two elements. The
     comparator should return <literal>true</literal> if the first
     element is less than the second, and <literal>false</literal>
     otherwise. For example,
@@ -1254,13 +1254,13 @@ builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
 
   <varlistentry xml:id='builtin-split'>
     <term><function>builtins.split</function>
-    <replaceable>regex</replaceable> <replaceable>str</replaceable></term>
+    <emphasis>regex</emphasis> <emphasis>str</emphasis></term>
 
     <listitem><para>Returns a list composed of non matched strings interleaved
     with the lists of the <link
     xlink:href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04">extended
-    POSIX regular expression</link> <replaceable>regex</replaceable> matches
-    of <replaceable>str</replaceable>. Each item in the lists of matched
+    POSIX regular expression</link> <emphasis>regex</emphasis> matches
+    of <emphasis>str</emphasis>. Each item in the lists of matched
     sequences is a regex group.
 
 <programlisting>
@@ -1293,7 +1293,7 @@ Evaluates to <literal>[ "  " [ "FOO" ] "   " ]</literal>.
 
   <varlistentry xml:id='builtin-splitVersion'>
     <term><function>builtins.splitVersion</function>
-    <replaceable>s</replaceable></term>
+    <emphasis>s</emphasis></term>
 
     <listitem><para>Split a string representing a version into its
     components, by the same version splitting logic underlying the
@@ -1305,10 +1305,10 @@ Evaluates to <literal>[ "  " [ "FOO" ] "   " ]</literal>.
 
   <varlistentry xml:id='builtin-stringLength'>
     <term><function>builtins.stringLength</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return the length of the string
-    <replaceable>e</replaceable>.  If <replaceable>e</replaceable> is
+    <emphasis>e</emphasis>.  If <emphasis>e</emphasis> is
     not a string, evaluation is aborted.</para></listitem>
 
   </varlistentry>
@@ -1316,29 +1316,29 @@ Evaluates to <literal>[ "  " [ "FOO" ] "   " ]</literal>.
 
   <varlistentry xml:id='builtin-sub'>
     <term><function>builtins.sub</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
     <listitem><para>Return the difference between the numbers
-    <replaceable>e1</replaceable> and
-    <replaceable>e2</replaceable>.</para></listitem>
+    <emphasis>e1</emphasis> and
+    <emphasis>e2</emphasis>.</para></listitem>
 
   </varlistentry>
 
 
   <varlistentry xml:id='builtin-substring'>
     <term><function>builtins.substring</function>
-    <replaceable>start</replaceable> <replaceable>len</replaceable>
-    <replaceable>s</replaceable></term>
+    <emphasis>start</emphasis> <emphasis>len</emphasis>
+    <emphasis>s</emphasis></term>
 
     <listitem><para>Return the substring of
-    <replaceable>s</replaceable> from character position
-    <replaceable>start</replaceable> (zero-based) up to but not
-    including <replaceable>start + len</replaceable>.  If
-    <replaceable>start</replaceable> is greater than the length of the
-    string, an empty string is returned, and if <replaceable>start +
-    len</replaceable> lies beyond the end of the string, only the
+    <emphasis>s</emphasis> from character position
+    <emphasis>start</emphasis> (zero-based) up to but not
+    including <emphasis>start + len</emphasis>.  If
+    <emphasis>start</emphasis> is greater than the length of the
+    string, an empty string is returned, and if <emphasis>start +
+    len</emphasis> lies beyond the end of the string, only the
     substring up to the end of the string is returned.
-    <replaceable>start</replaceable> must be
+    <emphasis>start</emphasis> must be
     non-negative. For example,
 
 <programlisting>
@@ -1353,7 +1353,7 @@ builtins.substring 0 3 "nixos"
 
   <varlistentry xml:id='builtin-tail'>
     <term><function>builtins.tail</function>
-    <replaceable>list</replaceable></term>
+    <emphasis>list</emphasis></term>
 
     <listitem><para>Return the second to last elements of a list;
     abort evaluation if the argument isn’t a list or is an empty
@@ -1364,12 +1364,12 @@ builtins.substring 0 3 "nixos"
 
   <varlistentry xml:id='builtin-throw'>
     <term><function>throw</function>
-    <replaceable>s</replaceable></term>
+    <emphasis>s</emphasis></term>
     <term><function>builtins.throw</function>
-    <replaceable>s</replaceable></term>
+    <emphasis>s</emphasis></term>
 
     <listitem><para>Throw an error message
-    <replaceable>s</replaceable>.  This usually aborts Nix expression
+    <emphasis>s</emphasis>.  This usually aborts Nix expression
     evaluation, but in <command>nix-env -qa</command> and other
     commands that try to evaluate a set of derivations to get
     information about those derivations, a derivation that throws an
@@ -1381,12 +1381,12 @@ builtins.substring 0 3 "nixos"
 
   <varlistentry xml:id='builtin-toFile'>
     <term><function>builtins.toFile</function>
-    <replaceable>name</replaceable>
-    <replaceable>s</replaceable></term>
+    <emphasis>name</emphasis>
+    <emphasis>s</emphasis></term>
 
-    <listitem><para>Store the string <replaceable>s</replaceable> in a
+    <listitem><para>Store the string <emphasis>s</emphasis> in a
     file in the Nix store and return its path.  The file has suffix
-    <replaceable>name</replaceable>.  This file can be used as an
+    <emphasis>name</emphasis>.  This file can be used as an
     input to derivations.  One application is to write builders
     “inline”.  For instance, the following Nix expression combines
     <xref linkend='ex-hello-nix' /> and <xref
@@ -1425,11 +1425,11 @@ stdenv.mkDerivation {
   builder = let
     configFile = builtins.toFile "foo.conf" "
       # This is some dummy configuration file.
-      <replaceable>...</replaceable>
+      <emphasis>...</emphasis>
     ";
   in builtins.toFile "builder.sh" "
     source $stdenv/setup
-    <replaceable>...</replaceable>
+    <emphasis>...</emphasis>
     cp ${configFile} $out/etc/foo.conf
   ";</programlisting>
 
@@ -1459,10 +1459,10 @@ in foo</programlisting>
 
 
   <varlistentry xml:id='builtin-toJSON'>
-    <term><function>builtins.toJSON</function> <replaceable>e</replaceable></term>
+    <term><function>builtins.toJSON</function> <emphasis>e</emphasis></term>
 
     <listitem><para>Return a string containing a JSON representation
-    of <replaceable>e</replaceable>.  Strings, integers, floats, booleans,
+    of <emphasis>e</emphasis>.  Strings, integers, floats, booleans,
     nulls and lists are mapped to their JSON equivalents.  Sets
     (except derivations) are represented as objects.  Derivations are
     translated to a JSON string containing the derivation’s output
@@ -1473,7 +1473,7 @@ in foo</programlisting>
 
 
   <varlistentry xml:id='builtin-toPath'>
-    <term><function>builtins.toPath</function> <replaceable>s</replaceable></term>
+    <term><function>builtins.toPath</function> <emphasis>s</emphasis></term>
 
     <listitem><para> DEPRECATED. Use <literal>/. + "/path"</literal>
     to convert a string into an absolute path. For relative paths,
@@ -1484,12 +1484,12 @@ in foo</programlisting>
 
 
   <varlistentry xml:id='builtin-toString'>
-    <term><function>toString</function> <replaceable>e</replaceable></term>
-    <term><function>builtins.toString</function> <replaceable>e</replaceable></term>
+    <term><function>toString</function> <emphasis>e</emphasis></term>
+    <term><function>builtins.toString</function> <emphasis>e</emphasis></term>
 
     <listitem><para>Convert the expression
-    <replaceable>e</replaceable> to a string.
-    <replaceable>e</replaceable> can be:</para>
+    <emphasis>e</emphasis> to a string.
+    <emphasis>e</emphasis> can be:</para>
     <itemizedlist>
       <listitem><para>A string (in which case the string is returned unmodified).</para></listitem>
       <listitem><para>A path (e.g., <literal>toString /foo/bar</literal> yields <literal>"/foo/bar"</literal>.</para></listitem>
@@ -1505,10 +1505,10 @@ in foo</programlisting>
 
 
   <varlistentry xml:id='builtin-toXML'>
-    <term><function>builtins.toXML</function> <replaceable>e</replaceable></term>
+    <term><function>builtins.toXML</function> <emphasis>e</emphasis></term>
 
     <listitem><para>Return a string containing an XML representation
-    of <replaceable>e</replaceable>.  The main application for
+    of <emphasis>e</emphasis>.  The main application for
     <function>toXML</function> is to communicate information with the
     builder in a more structured format than plain environment
     variables.</para>
@@ -1612,26 +1612,26 @@ stdenv.mkDerivation (rec {
 
   <varlistentry xml:id='builtin-trace'>
     <term><function>builtins.trace</function>
-    <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
+    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
 
-    <listitem><para>Evaluate <replaceable>e1</replaceable> and print its
+    <listitem><para>Evaluate <emphasis>e1</emphasis> and print its
     abstract syntax representation on standard error.  Then return
-    <replaceable>e2</replaceable>.  This function is useful for
+    <emphasis>e2</emphasis>.  This function is useful for
     debugging.</para></listitem>
 
   </varlistentry>
 
   <varlistentry xml:id='builtin-tryEval'>
     <term><function>builtins.tryEval</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
-    <listitem><para>Try to shallowly evaluate <replaceable>e</replaceable>.
+    <listitem><para>Try to shallowly evaluate <emphasis>e</emphasis>.
     Return a set containing the attributes <literal>success</literal>
-    (<literal>true</literal> if <replaceable>e</replaceable> evaluated
+    (<literal>true</literal> if <emphasis>e</emphasis> evaluated
     successfully, <literal>false</literal> if an error was thrown) and
-    <literal>value</literal>, equalling <replaceable>e</replaceable>
+    <literal>value</literal>, equalling <emphasis>e</emphasis>
     if successful and <literal>false</literal> otherwise. Note that this
-    doesn't evaluate <replaceable>e</replaceable> deeply, so
+    doesn't evaluate <emphasis>e</emphasis> deeply, so
     <literal>let e = { x = throw ""; }; in (builtins.tryEval e).success
     </literal> will be <literal>true</literal>. Using <literal>builtins.deepSeq
     </literal> one can get the expected result: <literal>let e = { x = throw "";
@@ -1644,10 +1644,10 @@ stdenv.mkDerivation (rec {
 
   <varlistentry xml:id='builtin-typeOf'>
     <term><function>builtins.typeOf</function>
-    <replaceable>e</replaceable></term>
+    <emphasis>e</emphasis></term>
 
     <listitem><para>Return a string representing the type of the value
-    <replaceable>e</replaceable>, namely <literal>"int"</literal>,
+    <emphasis>e</emphasis>, namely <literal>"int"</literal>,
     <literal>"bool"</literal>, <literal>"string"</literal>,
     <literal>"path"</literal>, <literal>"null"</literal>,
     <literal>"set"</literal>, <literal>"list"</literal>,
diff --git a/doc/manual/expressions/expression-syntax.xml b/doc/manual/expressions/expression-syntax.xml
index 562a9e9f4..853e40b58 100644
--- a/doc/manual/expressions/expression-syntax.xml
+++ b/doc/manual/expressions/expression-syntax.xml
@@ -50,7 +50,7 @@ the single Nix expression in that directory
     <para>Nix functions generally have the form <literal>{ x, y, ...,
     z }: e</literal> where <varname>x</varname>, <varname>y</varname>,
     etc. are the names of the expected arguments, and where
-    <replaceable>e</replaceable> is the body of the function.  So
+    <emphasis>e</emphasis> is the body of the function.  So
     here, the entire remainder of the file is the body of the
     function; when given the required arguments, the body should
     describe how to build an instance of the Hello package.</para>
@@ -69,10 +69,10 @@ the single Nix expression in that directory
     <emphasis>attributes</emphasis>.  A set is just a list of
     key/value pairs where each key is a string and each value is an
     arbitrary Nix expression.  They take the general form <literal>{
-    <replaceable>name1</replaceable> =
-    <replaceable>expr1</replaceable>; <replaceable>...</replaceable>
-    <replaceable>nameN</replaceable> =
-    <replaceable>exprN</replaceable>; }</literal>.</para>
+    <emphasis>name1</emphasis> =
+    <emphasis>expr1</emphasis>; <emphasis>...</emphasis>
+    <emphasis>nameN</emphasis> =
+    <emphasis>exprN</emphasis>; }</literal>.</para>
 
   </listitem>
 
diff --git a/doc/manual/expressions/generic-builder.xml b/doc/manual/expressions/generic-builder.xml
index 71b342f99..f6e67813d 100644
--- a/doc/manual/expressions/generic-builder.xml
+++ b/doc/manual/expressions/generic-builder.xml
@@ -44,7 +44,7 @@ genericBuild ③</programlisting>
     subdirectory, it's added to GCC's header search path; and so
     on.<footnote><para>How does it work? <filename>setup</filename>
     tries to source the file
-    <filename><replaceable>pkg</replaceable>/nix-support/setup-hook</filename>
+    <filename><emphasis>pkg</emphasis>/nix-support/setup-hook</filename>
     of all dependencies.  These “setup hooks” can then set up whatever
     environment variables they want; for instance, the setup hook for
     Perl sets the <literal>PERL5LIB</literal> environment variable to
diff --git a/doc/manual/expressions/language-constructs.xml b/doc/manual/expressions/language-constructs.xml
index 82d3afed1..86c25d723 100644
--- a/doc/manual/expressions/language-constructs.xml
+++ b/doc/manual/expressions/language-constructs.xml
@@ -137,7 +137,7 @@ while defining a set.</para>
 <para>Functions have the following form:
 
 <programlisting>
-<replaceable>pattern</replaceable>: <replaceable>body</replaceable></programlisting>
+<emphasis>pattern</emphasis>: <emphasis>body</emphasis></programlisting>
 
 The pattern specifies what the argument of the function must look
 like, and binds variables in the body to (parts of) the
@@ -190,9 +190,9 @@ map (concat "foo") [ "bar" "bla" "abc" ]</programlisting>
   <para>It is possible to provide <emphasis>default values</emphasis>
   for attributes, in which case they are allowed to be missing.  A
   default value is specified by writing
-  <literal><replaceable>name</replaceable> ?
-  <replaceable>e</replaceable></literal>, where
-  <replaceable>e</replaceable> is an arbitrary expression.  For example,
+  <literal><emphasis>name</emphasis> ?
+  <emphasis>e</emphasis></literal>, where
+  <emphasis>e</emphasis> is an arbitrary expression.  For example,
 
 <programlisting>
 { x, y ? "foo", z ? "bar" }: z + y + x</programlisting>
@@ -256,9 +256,9 @@ in concat { x = "foo"; y = "bar"; }</programlisting>
 <para>Conditionals look like this:
 
 <programlisting>
-if <replaceable>e1</replaceable> then <replaceable>e2</replaceable> else <replaceable>e3</replaceable></programlisting>
+if <emphasis>e1</emphasis> then <emphasis>e2</emphasis> else <emphasis>e3</emphasis></programlisting>
 
-where <replaceable>e1</replaceable> is an expression that should
+where <emphasis>e1</emphasis> is an expression that should
 evaluate to a Boolean value (<literal>true</literal> or
 <literal>false</literal>).</para>
 
@@ -271,11 +271,11 @@ evaluate to a Boolean value (<literal>true</literal> or
 on or between features and dependencies hold.  They look like this:
 
 <programlisting>
-assert <replaceable>e1</replaceable>; <replaceable>e2</replaceable></programlisting>
+assert <emphasis>e1</emphasis>; <emphasis>e2</emphasis></programlisting>
 
-where <replaceable>e1</replaceable> is an expression that should
+where <emphasis>e1</emphasis> is an expression that should
 evaluate to a Boolean value.  If it evaluates to
-<literal>true</literal>, <replaceable>e2</replaceable> is returned;
+<literal>true</literal>, <emphasis>e2</emphasis> is returned;
 otherwise expression evaluation is aborted and a backtrace is printed.</para>
 
 <para>Here is a Nix expression for the Subversion package that shows
@@ -358,10 +358,10 @@ stdenv.mkDerivation {
 <para>A <emphasis>with-expression</emphasis>,
 
 <programlisting>
-with <replaceable>e1</replaceable>; <replaceable>e2</replaceable></programlisting>
+with <emphasis>e1</emphasis>; <emphasis>e2</emphasis></programlisting>
 
-introduces the set <replaceable>e1</replaceable> into the lexical
-scope of the expression <replaceable>e2</replaceable>.  For instance,
+introduces the set <emphasis>e1</emphasis> into the lexical
+scope of the expression <emphasis>e2</emphasis>.  For instance,
 
 <programlisting>
 let as = { x = "foo"; y = "bar"; };
diff --git a/doc/manual/expressions/language-operators.xml b/doc/manual/expressions/language-operators.xml
index 4f11bf529..7f69bfcef 100644
--- a/doc/manual/expressions/language-operators.xml
+++ b/doc/manual/expressions/language-operators.xml
@@ -25,48 +25,48 @@ weakest binding).</para>
     <tbody>
       <row>
         <entry>Select</entry>
-        <entry><replaceable>e</replaceable> <literal>.</literal>
-        <replaceable>attrpath</replaceable>
-        [ <literal>or</literal> <replaceable>def</replaceable> ]
+        <entry><emphasis>e</emphasis> <literal>.</literal>
+        <emphasis>attrpath</emphasis>
+        [ <literal>or</literal> <emphasis>def</emphasis> ]
         </entry>
         <entry>none</entry>
         <entry>Select attribute denoted by the attribute path
-        <replaceable>attrpath</replaceable> from set
-        <replaceable>e</replaceable>.  (An attribute path is a
+        <emphasis>attrpath</emphasis> from set
+        <emphasis>e</emphasis>.  (An attribute path is a
         dot-separated list of attribute names.)  If the attribute
-        doesn’t exist, return <replaceable>def</replaceable> if
+        doesn’t exist, return <emphasis>def</emphasis> if
         provided, otherwise abort evaluation.</entry>
         <entry>1</entry>
       </row>
       <row>
         <entry>Application</entry>
-        <entry><replaceable>e1</replaceable> <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <emphasis>e2</emphasis></entry>
         <entry>left</entry>
-        <entry>Call function <replaceable>e1</replaceable> with
-        argument <replaceable>e2</replaceable>.</entry>
+        <entry>Call function <emphasis>e1</emphasis> with
+        argument <emphasis>e2</emphasis>.</entry>
         <entry>2</entry>
       </row>
       <row>
         <entry>Arithmetic Negation</entry>
-        <entry><literal>-</literal> <replaceable>e</replaceable></entry>
+        <entry><literal>-</literal> <emphasis>e</emphasis></entry>
         <entry>none</entry>
         <entry>Arithmetic negation.</entry>
         <entry>3</entry>
       </row>
       <row>
         <entry>Has Attribute</entry>
-        <entry><replaceable>e</replaceable> <literal>?</literal>
-        <replaceable>attrpath</replaceable></entry>
+        <entry><emphasis>e</emphasis> <literal>?</literal>
+        <emphasis>attrpath</emphasis></entry>
         <entry>none</entry>
-        <entry>Test whether set <replaceable>e</replaceable> contains
-        the attribute denoted by <replaceable>attrpath</replaceable>;
+        <entry>Test whether set <emphasis>e</emphasis> contains
+        the attribute denoted by <emphasis>attrpath</emphasis>;
         return <literal>true</literal> or
         <literal>false</literal>.</entry>
         <entry>4</entry>
       </row>
       <row>
         <entry>List Concatenation</entry>
-        <entry><replaceable>e1</replaceable> <literal>++</literal> <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <literal>++</literal> <emphasis>e2</emphasis></entry>
         <entry>right</entry>
         <entry>List concatenation.</entry>
         <entry>5</entry>
@@ -74,7 +74,7 @@ weakest binding).</para>
       <row>
         <entry>Multiplication</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>*</literal> <replaceable>e2</replaceable>,
+          <emphasis>e1</emphasis> <literal>*</literal> <emphasis>e2</emphasis>,
         </entry>
         <entry>left</entry>
         <entry>Arithmetic multiplication.</entry>
@@ -83,7 +83,7 @@ weakest binding).</para>
       <row>
         <entry>Division</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>/</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>/</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>left</entry>
         <entry>Arithmetic division.</entry>
@@ -92,7 +92,7 @@ weakest binding).</para>
       <row>
         <entry>Addition</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>+</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>+</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>left</entry>
         <entry>Arithmetic addition.</entry>
@@ -101,7 +101,7 @@ weakest binding).</para>
       <row>
         <entry>Subtraction</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>-</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>-</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>left</entry>
         <entry>Arithmetic subtraction.</entry>
@@ -110,7 +110,7 @@ weakest binding).</para>
       <row>
         <entry>String Concatenation</entry>
         <entry>
-          <replaceable>string1</replaceable> <literal>+</literal> <replaceable>string2</replaceable>
+          <emphasis>string1</emphasis> <literal>+</literal> <emphasis>string2</emphasis>
         </entry>
         <entry>left</entry>
         <entry>String concatenation.</entry>
@@ -118,19 +118,19 @@ weakest binding).</para>
       </row>
       <row>
         <entry>Not</entry>
-        <entry><literal>!</literal> <replaceable>e</replaceable></entry>
+        <entry><literal>!</literal> <emphasis>e</emphasis></entry>
         <entry>none</entry>
         <entry>Boolean negation.</entry>
         <entry>8</entry>
       </row>
       <row>
         <entry>Update</entry>
-        <entry><replaceable>e1</replaceable> <literal>//</literal>
-        <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <literal>//</literal>
+        <emphasis>e2</emphasis></entry>
         <entry>right</entry>
         <entry>Return a set consisting of the attributes in
-        <replaceable>e1</replaceable> and
-        <replaceable>e2</replaceable> (with the latter taking
+        <emphasis>e1</emphasis> and
+        <emphasis>e2</emphasis> (with the latter taking
         precedence over the former in case of equally named
         attributes).</entry>
         <entry>9</entry>
@@ -138,7 +138,7 @@ weakest binding).</para>
       <row>
         <entry>Less Than</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>&lt;</literal> <replaceable>e2</replaceable>,
+          <emphasis>e1</emphasis> <literal>&lt;</literal> <emphasis>e2</emphasis>,
         </entry>
         <entry>none</entry>
         <entry>Arithmetic comparison.</entry>
@@ -147,7 +147,7 @@ weakest binding).</para>
       <row>
         <entry>Less Than or Equal To</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>&lt;=</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>&lt;=</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>none</entry>
         <entry>Arithmetic comparison.</entry>
@@ -156,7 +156,7 @@ weakest binding).</para>
       <row>
         <entry>Greater Than</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>&gt;</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>&gt;</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>none</entry>
         <entry>Arithmetic comparison.</entry>
@@ -165,7 +165,7 @@ weakest binding).</para>
       <row>
         <entry>Greater Than or Equal To</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>&gt;=</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>&gt;=</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>none</entry>
         <entry>Arithmetic comparison.</entry>
@@ -174,7 +174,7 @@ weakest binding).</para>
       <row>
         <entry>Equality</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>==</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>==</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>none</entry>
         <entry>Equality.</entry>
@@ -183,7 +183,7 @@ weakest binding).</para>
       <row>
         <entry>Inequality</entry>
         <entry>
-          <replaceable>e1</replaceable> <literal>!=</literal> <replaceable>e2</replaceable>
+          <emphasis>e1</emphasis> <literal>!=</literal> <emphasis>e2</emphasis>
         </entry>
         <entry>none</entry>
         <entry>Inequality.</entry>
@@ -191,28 +191,28 @@ weakest binding).</para>
       </row>
       <row>
         <entry>Logical AND</entry>
-        <entry><replaceable>e1</replaceable> <literal>&amp;&amp;</literal>
-        <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <literal>&amp;&amp;</literal>
+        <emphasis>e2</emphasis></entry>
         <entry>left</entry>
         <entry>Logical AND.</entry>
         <entry>12</entry>
       </row>
       <row>
         <entry>Logical OR</entry>
-        <entry><replaceable>e1</replaceable> <literal>||</literal>
-        <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <literal>||</literal>
+        <emphasis>e2</emphasis></entry>
         <entry>left</entry>
         <entry>Logical OR.</entry>
         <entry>13</entry>
       </row>
       <row>
         <entry>Logical Implication</entry>
-        <entry><replaceable>e1</replaceable> <literal>-></literal>
-        <replaceable>e2</replaceable></entry>
+        <entry><emphasis>e1</emphasis> <literal>-></literal>
+        <emphasis>e2</emphasis></entry>
         <entry>none</entry>
         <entry>Logical implication (equivalent to
-        <literal>!<replaceable>e1</replaceable> ||
-        <replaceable>e2</replaceable></literal>).</entry>
+        <literal>!<emphasis>e1</emphasis> ||
+        <emphasis>e2</emphasis></literal>).</entry>
         <entry>14</entry>
       </row>
     </tbody>
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
index 6c0fcbacb..cebafb1f5 100644
--- a/doc/manual/expressions/language-values.xml
+++ b/doc/manual/expressions/language-values.xml
@@ -30,7 +30,7 @@
 
     <para>You can include the result of an expression into a string by
     enclosing it in
-    <literal>${<replaceable>...</replaceable>}</literal>, a feature
+    <literal>${<emphasis>...</emphasis>}</literal>, a feature
     known as <emphasis>antiquotation</emphasis>.  The enclosed
     expression must evaluate to something that can be coerced into a
     string (meaning that it must be a string, a path, or a
@@ -93,7 +93,7 @@ configureFlags = "
     text on the initial line.</para>
 
     <para>Antiquotation
-    (<literal>${<replaceable>expr</replaceable>}</literal>) is
+    (<literal>${<emphasis>expr</emphasis>}</literal>) is
     supported in indented strings.</para>
 
     <para>Since <literal>${</literal> and <literal>''</literal> have
@@ -119,7 +119,7 @@ configureFlags = "
 
 <programlisting>
 stdenv.mkDerivation {
-  <replaceable>...</replaceable>
+  <emphasis>...</emphasis>
   postInstall =
     ''
       mkdir $out/bin $out/etc
@@ -127,7 +127,7 @@ stdenv.mkDerivation {
       echo "Hello World" > $out/etc/foo.conf
       ${if enableBar then "cp bar $out/bin" else ""}
     '';
-  <replaceable>...</replaceable>
+  <emphasis>...</emphasis>
 }
 </programlisting>
 
diff --git a/doc/manual/expressions/simple-building-testing.xml b/doc/manual/expressions/simple-building-testing.xml
index 33a802e83..f82223df9 100644
--- a/doc/manual/expressions/simple-building-testing.xml
+++ b/doc/manual/expressions/simple-building-testing.xml
@@ -19,7 +19,7 @@ building path `/nix/store/632d2b22514d...-hello-2.1.1'
 hello-2.1.1/
 hello-2.1.1/intl/
 hello-2.1.1/intl/ChangeLog
-<replaceable>...</replaceable>
+<emphasis>...</emphasis>
 
 $ ls -l result
 lrwxrwxrwx ... 2006-09-29 10:43 result -> /nix/store/632d2b22514d...-hello-2.1.1
diff --git a/doc/manual/installation/building-source.xml b/doc/manual/installation/building-source.xml
index 772cda9cc..469aaebe9 100644
--- a/doc/manual/installation/building-source.xml
+++ b/doc/manual/installation/building-source.xml
@@ -10,7 +10,7 @@
 following commands:
 
 <screen>
-$ ./configure <replaceable>options...</replaceable>
+$ ./configure <emphasis>options...</emphasis>
 $ make
 $ make install</screen>
 
@@ -26,16 +26,16 @@ $ ./bootstrap.sh</screen>
 </para>
 
 <para>The installation path can be specified by passing the
-<option>--prefix=<replaceable>prefix</replaceable></option> to
+<option>--prefix=<emphasis>prefix</emphasis></option> to
 <command>configure</command>.  The default installation directory is
 <filename>/usr/local</filename>.  You can change this to any location
 you like.  You must have write permission to the
-<replaceable>prefix</replaceable> path.</para>
+<emphasis>prefix</emphasis> path.</para>
 
 <para>Nix keeps its <emphasis>store</emphasis> (the place where
 packages are stored) in <filename>/nix/store</filename> by default.
 This can be changed using
-<option>--with-store-dir=<replaceable>path</replaceable></option>.</para>
+<option>--with-store-dir=<emphasis>path</emphasis></option>.</para>
 
 <warning><para>It is best <emphasis>not</emphasis> to change the Nix
 store from its default, since doing so makes it impossible to use
@@ -44,6 +44,6 @@ packages will need to be built from source.</para></warning>
 
 <para>Nix keeps state (such as its database and log files) in
 <filename>/nix/var</filename> by default.  This can be changed using
-<option>--localstatedir=<replaceable>path</replaceable></option>.</para>
+<option>--localstatedir=<emphasis>path</emphasis></option>.</para>
 
 </section>
diff --git a/doc/manual/installation/env-variables.xml b/doc/manual/installation/env-variables.xml
index 436f15f31..cbce8559a 100644
--- a/doc/manual/installation/env-variables.xml
+++ b/doc/manual/installation/env-variables.xml
@@ -8,18 +8,18 @@
 
 <para>To use Nix, some environment variables should be set.  In
 particular, <literal>PATH</literal> should contain the directories
-<filename><replaceable>prefix</replaceable>/bin</filename> and
+<filename><emphasis>prefix</emphasis>/bin</filename> and
 <filename>~/.nix-profile/bin</filename>.  The first directory contains
 the Nix tools themselves, while <filename>~/.nix-profile</filename> is
 a symbolic link to the current <emphasis>user environment</emphasis>
 (an automatically generated package consisting of symlinks to
 installed packages).  The simplest way to set the required environment
 variables is to include the file
-<filename><replaceable>prefix</replaceable>/etc/profile.d/nix.sh</filename>
+<filename><emphasis>prefix</emphasis>/etc/profile.d/nix.sh</filename>
 in your <filename>~/.profile</filename> (or similar), like this:</para>
 
 <screen>
-source <replaceable>prefix</replaceable>/etc/profile.d/nix.sh</screen>
+source <emphasis>prefix</emphasis>/etc/profile.d/nix.sh</screen>
 
 <section xml:id="sec-nix-ssl-cert-file">
 
diff --git a/doc/manual/installation/installing-binary.xml b/doc/manual/installation/installing-binary.xml
index ad47ce8b9..439198e6c 100644
--- a/doc/manual/installation/installing-binary.xml
+++ b/doc/manual/installation/installing-binary.xml
@@ -421,7 +421,7 @@ LABEL=Nix\040Store /nix apfs rw,nobrowse
   <para>
     NixOS.org hosts version-specific installation URLs for all Nix
     versions since 1.11.16, at
-    <literal>https://releases.nixos.org/nix/nix-<replaceable>version</replaceable>/install</literal>.
+    <literal>https://releases.nixos.org/nix/nix-<emphasis>version</emphasis>/install</literal>.
   </para>
 
   <para>
diff --git a/doc/manual/installation/single-user.xml b/doc/manual/installation/single-user.xml
index 09cdaa5d4..e9a761af3 100644
--- a/doc/manual/installation/single-user.xml
+++ b/doc/manual/installation/single-user.xml
@@ -7,9 +7,9 @@
 <title>Single-User Mode</title>
 
 <para>In single-user mode, all Nix operations that access the database
-in <filename><replaceable>prefix</replaceable>/var/nix/db</filename>
+in <filename><emphasis>prefix</emphasis>/var/nix/db</filename>
 or modify the Nix store in
-<filename><replaceable>prefix</replaceable>/store</filename> must be
+<filename><emphasis>prefix</emphasis>/store</filename> must be
 performed under the user ID that owns those directories.  This is
 typically <systemitem class="username">root</systemitem>.  (If you
 install from RPM packages, that’s in fact the default ownership.)
diff --git a/doc/manual/introduction/about-nix.xml b/doc/manual/introduction/about-nix.xml
index dd09e2283..039185703 100644
--- a/doc/manual/introduction/about-nix.xml
+++ b/doc/manual/introduction/about-nix.xml
@@ -99,7 +99,7 @@ there after an upgrade.  This means that you can <emphasis>roll
 back</emphasis> to the old version:</para>
 
 <screen>
-$ nix-env --upgrade <replaceable>some-packages</replaceable>
+$ nix-env --upgrade <emphasis>some-packages</emphasis>
 $ nix-env --rollback
 </screen>
 
diff --git a/doc/manual/introduction/quick-start.xml b/doc/manual/introduction/quick-start.xml
index 1992c14ed..5d9a55e4e 100644
--- a/doc/manual/introduction/quick-start.xml
+++ b/doc/manual/introduction/quick-start.xml
@@ -33,7 +33,7 @@ docbook-xml-4.5
 firefox-33.0.2
 hello-2.9
 libxslt-1.1.28
-<replaceable>...</replaceable></screen>
+<emphasis>...</emphasis></screen>
 
 </para></step>
 
diff --git a/doc/manual/packages/basic-package-mgmt.xml b/doc/manual/packages/basic-package-mgmt.xml
index 758a4500d..b8a2c7ab3 100644
--- a/doc/manual/packages/basic-package-mgmt.xml
+++ b/doc/manual/packages/basic-package-mgmt.xml
@@ -74,10 +74,10 @@ then you need to pass the path to your Nixpkgs tree using the
 <option>-f</option> flag:
 
 <screen>
-$ nix-env -qaf <replaceable>/path/to/nixpkgs</replaceable>
+$ nix-env -qaf <emphasis>/path/to/nixpkgs</emphasis>
 </screen>
 
-where <replaceable>/path/to/nixpkgs</replaceable> is where you’ve
+where <emphasis>/path/to/nixpkgs</emphasis> is where you’ve
 unpacked or checked out Nixpkgs.</para>
 
 <para>You can select specific packages by name:
diff --git a/doc/manual/packages/channels.xml b/doc/manual/packages/channels.xml
index 1ed2bba52..494a81966 100644
--- a/doc/manual/packages/channels.xml
+++ b/doc/manual/packages/channels.xml
@@ -45,7 +45,7 @@ $ nix-channel --remove nixpkgs
 $ nix-channel --update</screen>
 
 This downloads and unpacks the Nix expressions in every channel
-(downloaded from <literal><replaceable>url</replaceable>/nixexprs.tar.bz2</literal>).
+(downloaded from <literal><emphasis>url</emphasis>/nixexprs.tar.bz2</literal>).
 It also makes the union of each channel’s Nix expressions available by
 default to <command>nix-env</command> operations (via the symlink
 <filename>~/.nix-defexpr/channels</filename>).  Consequently, you can
diff --git a/doc/manual/packages/garbage-collector-roots.xml b/doc/manual/packages/garbage-collector-roots.xml
index 8338e5392..9c91862b0 100644
--- a/doc/manual/packages/garbage-collector-roots.xml
+++ b/doc/manual/packages/garbage-collector-roots.xml
@@ -8,7 +8,7 @@
 
 <para>The roots of the garbage collector are all store paths to which
 there are symlinks in the directory
-<filename><replaceable>prefix</replaceable>/nix/var/nix/gcroots</filename>.
+<filename><emphasis>prefix</emphasis>/nix/var/nix/gcroots</filename>.
 For instance, the following command makes the path
 <filename>/nix/store/d718ef...-foo</filename> a root of the collector:
 
@@ -20,7 +20,7 @@ That is, after this command, the garbage collector will not remove
 dependencies.</para>
 
 <para>Subdirectories of
-<filename><replaceable>prefix</replaceable>/nix/var/nix/gcroots</filename>
+<filename><emphasis>prefix</emphasis>/nix/var/nix/gcroots</filename>
 are also searched for symlinks.  Symlinks to non-store paths are
 followed and searched for roots, but symlinks to non-store paths
 <emphasis>inside</emphasis> the paths reached in that way are not
diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml
index 2809def24..d7529d56c 100644
--- a/doc/manual/packages/profiles.xml
+++ b/doc/manual/packages/profiles.xml
@@ -118,7 +118,7 @@ can also see all available generations:
 $ nix-env --list-generations</screen></para>
 
 <para>You generally wouldn’t have
-<filename>/nix/var/nix/profiles/<replaceable>some-profile</replaceable>/bin</filename>
+<filename>/nix/var/nix/profiles/<emphasis>some-profile</emphasis>/bin</filename>
 in your <literal>PATH</literal>.  Rather, there is a symlink
 <filename>~/.nix-profile</filename> that points to your current
 profile.  This means that you should put
diff --git a/doc/manual/release-notes/rl-0.10.xml b/doc/manual/release-notes/rl-0.10.xml
index 9b4233546..01f70acfd 100644
--- a/doc/manual/release-notes/rl-0.10.xml
+++ b/doc/manual/release-notes/rl-0.10.xml
@@ -46,9 +46,9 @@ irreversible.</para></warning>
       <literal>\*</literal>.</para></listitem>
 
       <listitem><para><literal>nix-env -i
-      <replaceable>pkgname</replaceable></literal> will now install
+      <emphasis>pkgname</emphasis></literal> will now install
       the highest available version of
-      <replaceable>pkgname</replaceable>, rather than installing all
+      <emphasis>pkgname</emphasis>, rather than installing all
       available versions (which would probably give collisions)
       (<literal>NIX-31</literal>).</para></listitem>
 
@@ -85,7 +85,7 @@ irreversible.</para></warning>
 "--with-freetype2-library=${freetype}/lib"</programlisting>
 
       You can write arbitrary expressions within
-      <literal>${<replaceable>...</replaceable>}</literal>, not just
+      <literal>${<emphasis>...</emphasis>}</literal>, not just
       identifiers.</para></listitem>
 
       <listitem><para>Multi-line string literals.</para></listitem>
@@ -163,7 +163,7 @@ irreversible.</para></warning>
   attribute set are unique.)  For instance, a quick way to perform a
   test build of a package in Nixpkgs is <literal>nix-build
   pkgs/top-level/all-packages.nix -A
-  <replaceable>foo</replaceable></literal>.  <literal>nix-env -q
+  <emphasis>foo</emphasis></literal>.  <literal>nix-env -q
   --attr</literal> shows the attribute names corresponding to each
   derivation.</para></listitem>
 
@@ -173,13 +173,13 @@ irreversible.</para></warning>
   <command>nix-build</command> evaluates to a function whose arguments
   all have default values, the function will be called automatically.
   Also, the new command-line switch <option>--arg
-  <replaceable>name</replaceable>
-  <replaceable>value</replaceable></option> can be used to specify
+  <emphasis>name</emphasis>
+  <emphasis>value</emphasis></option> can be used to specify
   function arguments on the command line.</para></listitem>
 
 
   <listitem><para><literal>nix-install-package --url
-  <replaceable>URL</replaceable></literal> allows a package to be
+  <emphasis>URL</emphasis></literal> allows a package to be
   installed directly from the given URL.</para></listitem>
 
 
@@ -192,7 +192,7 @@ irreversible.</para></warning>
 
 
   <listitem><para><literal>nix-build -o
-  <replaceable>symlink</replaceable></literal> allows the symlink to
+  <emphasis>symlink</emphasis></literal> allows the symlink to
   the build result to be named something other than
   <literal>result</literal>.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-0.12.xml b/doc/manual/release-notes/rl-0.12.xml
index 18978ac4b..c30124786 100644
--- a/doc/manual/release-notes/rl-0.12.xml
+++ b/doc/manual/release-notes/rl-0.12.xml
@@ -59,17 +59,17 @@ $ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG</sc
 
   <listitem><para>The garbage collector has a number of new options to
   allow only some of the garbage to be deleted.  The option
-  <option>--max-freed <replaceable>N</replaceable></option> tells the
-  collector to stop after at least <replaceable>N</replaceable> bytes
+  <option>--max-freed <emphasis>N</emphasis></option> tells the
+  collector to stop after at least <emphasis>N</emphasis> bytes
   have been deleted.  The option <option>--max-links
-  <replaceable>N</replaceable></option> tells it to stop after the
+  <emphasis>N</emphasis></option> tells it to stop after the
   link count on <filename>/nix/store</filename> has dropped below
-  <replaceable>N</replaceable>.  This is useful for very large Nix
+  <emphasis>N</emphasis>.  This is useful for very large Nix
   stores on filesystems with a 32000 subdirectories limit (like
   <literal>ext3</literal>).  The option <option>--use-atime</option>
   causes store paths to be deleted in order of ascending last access
   time.  This allows non-recently used stuff to be deleted.  The
-  option <option>--max-atime <replaceable>time</replaceable></option>
+  option <option>--max-atime <emphasis>time</emphasis></option>
   specifies an upper limit to the last accessed time of paths that may
   be deleted.  For instance,
 
@@ -119,7 +119,7 @@ the following paths will be downloaded/copied (30.02 MiB):
       <listitem><para>@-patterns as in Haskell.  For instance, in a
       function definition
 
-      <programlisting>f = args @ {x, y, z}: <replaceable>...</replaceable>;</programlisting>
+      <programlisting>f = args @ {x, y, z}: <emphasis>...</emphasis>;</programlisting>
 
       <varname>args</varname> refers to the argument as a whole, which
       is further pattern-matched against the attribute set pattern
@@ -131,7 +131,7 @@ the following paths will be downloaded/copied (30.02 MiB):
       takes <emphasis>at least</emphasis> the listed attributes, while
       ignoring additional attributes.  For instance,
 
-      <programlisting>{stdenv, fetchurl, fuse, ...}: <replaceable>...</replaceable></programlisting>
+      <programlisting>{stdenv, fetchurl, fuse, ...}: <emphasis>...</emphasis></programlisting>
 
       defines a function that accepts any attribute set that includes
       at least the three listed attributes.</para></listitem>
@@ -163,7 +163,7 @@ the following paths will be downloaded/copied (30.02 MiB):
   <command>nix-pack-closure</command> and
   <command>nix-unpack-closure</command>.   You can do almost the same
   thing but much more efficiently by doing <literal>nix-store --export
-  $(nix-store -qR <replaceable>paths</replaceable>) > closure</literal> and
+  $(nix-store -qR <emphasis>paths</emphasis>) > closure</literal> and
   <literal>nix-store --import &lt;
   closure</literal>.</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-0.13.xml b/doc/manual/release-notes/rl-0.13.xml
index cce2e4a26..8cb0ae9a5 100644
--- a/doc/manual/release-notes/rl-0.13.xml
+++ b/doc/manual/release-notes/rl-0.13.xml
@@ -95,9 +95,9 @@ features:</para>
 
   <listitem>
     <para>The scoping rules for <literal>inherit
-    (<replaceable>e</replaceable>) ...</literal> in recursive
+    (<emphasis>e</emphasis>) ...</literal> in recursive
     attribute sets have changed.  The expression
-    <replaceable>e</replaceable> can now refer to the attributes
+    <emphasis>e</emphasis> can now refer to the attributes
     defined in the containing set.</para>
   </listitem>
 
diff --git a/doc/manual/release-notes/rl-0.16.xml b/doc/manual/release-notes/rl-0.16.xml
index 43b7622c6..7039d4b0b 100644
--- a/doc/manual/release-notes/rl-0.16.xml
+++ b/doc/manual/release-notes/rl-0.16.xml
@@ -27,14 +27,14 @@
       2</command>), but this was not desirable because the number of
       actions to be performed in parallel was not configurable.  Nix
       now has an option <option>--cores
-      <replaceable>N</replaceable></option> as well as a configuration
+      <emphasis>N</emphasis></option> as well as a configuration
       setting <varname>build-cores =
-      <replaceable>N</replaceable></varname> that causes the
+      <emphasis>N</emphasis></varname> that causes the
       environment variable <literal>NIX_BUILD_CORES</literal> to be set to
-      <replaceable>N</replaceable> when the builder is invoked.  The
+      <emphasis>N</emphasis> when the builder is invoked.  The
       builder can use this at its discretion to perform a parallel
       build, e.g., by calling <command>make -j
-      <replaceable>N</replaceable></command>.  In Nixpkgs, this can be
+      <emphasis>N</emphasis></command>.  In Nixpkgs, this can be
       enabled on a per-package basis by setting the derivation
       attribute <varname>enableParallelBuilding</varname> to
       <literal>true</literal>.
diff --git a/doc/manual/release-notes/rl-0.6.xml b/doc/manual/release-notes/rl-0.6.xml
index 6dc6521d3..23fbee173 100644
--- a/doc/manual/release-notes/rl-0.6.xml
+++ b/doc/manual/release-notes/rl-0.6.xml
@@ -91,10 +91,10 @@
     <itemizedlist>
 
       <listitem><para>New language construct: <literal>with
-      <replaceable>E1</replaceable>;
-      <replaceable>E2</replaceable></literal> brings all attributes
-      defined in the attribute set <replaceable>E1</replaceable> in
-      scope in <replaceable>E2</replaceable>.</para></listitem>
+      <emphasis>E1</emphasis>;
+      <emphasis>E2</emphasis></literal> brings all attributes
+      defined in the attribute set <emphasis>E1</emphasis> in
+      scope in <emphasis>E2</emphasis>.</para></listitem>
 
       <listitem><para>Added a <function>map</function>
       function.</para></listitem>
diff --git a/doc/manual/release-notes/rl-0.8.xml b/doc/manual/release-notes/rl-0.8.xml
index 825798fa9..1adb91a23 100644
--- a/doc/manual/release-notes/rl-0.8.xml
+++ b/doc/manual/release-notes/rl-0.8.xml
@@ -33,7 +33,7 @@ is too old (i.e., for Nix &lt;= 0.7)</screen>
 
 then you should unsubscribe from the offending channel
 (<command>nix-channel --remove
-<replaceable>URL</replaceable></command>; leave out
+<emphasis>URL</emphasis></command>; leave out
 <literal>/MANIFEST</literal>), and subscribe to the same URL, with
 <literal>channels</literal> replaced by <literal>channels-v3</literal>
 (e.g., <link
@@ -118,7 +118,7 @@ $ nix-store -q --referrers-closure \
   subscribing to a channel.</para></listitem>
 
   <listitem><para><command>nix-store -r
-  <replaceable>PATHS</replaceable></command> now builds all the
+  <emphasis>PATHS</emphasis></command> now builds all the
   derivations PATHS in parallel.  Previously it did them sequentially
   (though exploiting possible parallelism between subderivations).
   This is nice for build farms.</para></listitem>
diff --git a/doc/manual/release-notes/rl-1.1.xml b/doc/manual/release-notes/rl-1.1.xml
index 2f26e7a24..f7dadb7cb 100644
--- a/doc/manual/release-notes/rl-1.1.xml
+++ b/doc/manual/release-notes/rl-1.1.xml
@@ -72,8 +72,8 @@
     to get rid of the bootstrap binaries in the Nixpkgs source tree
     and download them instead.  You can use it by doing
     <literal>import &lt;nix/fetchurl.nix> { url =
-    <replaceable>url</replaceable>; sha256 =
-    "<replaceable>hash</replaceable>"; }</literal>. (Shea Levy)</para>
+    <emphasis>url</emphasis>; sha256 =
+    "<emphasis>hash</emphasis>"; }</literal>. (Shea Levy)</para>
   </listitem>
 
   <listitem>
diff --git a/doc/manual/release-notes/rl-1.11.xml b/doc/manual/release-notes/rl-1.11.xml
index fe422dd1f..28f6d4ac8 100644
--- a/doc/manual/release-notes/rl-1.11.xml
+++ b/doc/manual/release-notes/rl-1.11.xml
@@ -62,8 +62,8 @@ $ nix-prefetch-url -A nix-repl.src
   <listitem>
     <para>
       The new flag <option>--option build-repeat
-      <replaceable>N</replaceable></option> will cause every build to
-      be executed <replaceable>N</replaceable>+1 times. If the build
+      <emphasis>N</emphasis></option> will cause every build to
+      be executed <emphasis>N</emphasis>+1 times. If the build
       output differs between any round, the build is rejected, and the
       output paths are not registered as valid. This is primarily
       useful to verify build determinism. (We already had a
@@ -78,11 +78,11 @@ $ nix-prefetch-url -A nix-repl.src
   <listitem>
     <para>
       The options <option>--check</option> and <option>--option
-      build-repeat <replaceable>N</replaceable></option>, if they
+      build-repeat <emphasis>N</emphasis></option>, if they
       detect a difference between two runs of the same derivation and
       <option>-K</option> is given, will make the output of the other
       run available under
-      <filename><replaceable>store-path</replaceable>-check</filename>. This
+      <filename><emphasis>store-path</emphasis>-check</filename>. This
       makes it easier to investigate the non-determinism using tools
       like <command>diffoscope</command>, e.g.,
 
diff --git a/doc/manual/release-notes/rl-1.2.xml b/doc/manual/release-notes/rl-1.2.xml
index 29bd5bf81..f065f3ccc 100644
--- a/doc/manual/release-notes/rl-1.2.xml
+++ b/doc/manual/release-notes/rl-1.2.xml
@@ -56,7 +56,7 @@ outputs = [ "lib" "headers" "doc" ];
     <literal>lib</literal>, <literal>headers</literal> and
     <literal>doc</literal>.  Other packages can refer to a specific
     output by referring to
-    <literal><replaceable>pkg</replaceable>.<replaceable>output</replaceable></literal>,
+    <literal><emphasis>pkg</emphasis>.<emphasis>output</emphasis></literal>,
     e.g.
 <programlisting>
 buildInputs = [ pkg.lib pkg.headers ];
diff --git a/doc/manual/release-notes/rl-1.4.xml b/doc/manual/release-notes/rl-1.4.xml
index aefb22f2b..8114ce6b5 100644
--- a/doc/manual/release-notes/rl-1.4.xml
+++ b/doc/manual/release-notes/rl-1.4.xml
@@ -20,8 +20,8 @@ xlink:href="https://github.com/NixOS/nix/commit/5526a282b5b44e9296e61e07d7d2626a
   <function>builtins.hashString</function>.</para></listitem>
 
   <listitem><para>Build logs are now stored in
-  <filename>/nix/var/log/nix/drvs/<replaceable>XX</replaceable>/</filename>,
-  where <replaceable>XX</replaceable> is the first two characters of
+  <filename>/nix/var/log/nix/drvs/<emphasis>XX</emphasis>/</filename>,
+  where <emphasis>XX</emphasis> is the first two characters of
   the derivation.  This is useful on machines that keep a lot of build
   logs (such as Hydra servers).</para></listitem>
 
diff --git a/doc/manual/release-notes/rl-1.6.1.xml b/doc/manual/release-notes/rl-1.6.1.xml
index 9ecc52734..982871b51 100644
--- a/doc/manual/release-notes/rl-1.6.1.xml
+++ b/doc/manual/release-notes/rl-1.6.1.xml
@@ -19,15 +19,15 @@ are:</para>
 
   <listitem>
     <para>Previously, Nix optimised expressions such as
-    <literal>"${<replaceable>expr</replaceable>}"</literal> to
-    <replaceable>expr</replaceable>.  Thus it neither checked whether
-    <replaceable>expr</replaceable> could be coerced to a string, nor
+    <literal>"${<emphasis>expr</emphasis>}"</literal> to
+    <emphasis>expr</emphasis>.  Thus it neither checked whether
+    <emphasis>expr</emphasis> could be coerced to a string, nor
     applied such coercions.  This meant that
     <literal>"${123}"</literal> evaluatued to <literal>123</literal>,
     and <literal>"${./foo}"</literal> evaluated to
     <literal>./foo</literal> (even though
     <literal>"${./foo} "</literal> evaluates to
-    <literal>"/nix/store/<replaceable>hash</replaceable>-foo "</literal>).
+    <literal>"/nix/store/<emphasis>hash</emphasis>-foo "</literal>).
     Nix now checks the type of antiquoted expressions and
     applies coercions.</para>
   </listitem>
diff --git a/doc/manual/release-notes/rl-1.7.xml b/doc/manual/release-notes/rl-1.7.xml
index 44ecaa78d..e736c15a2 100644
--- a/doc/manual/release-notes/rl-1.7.xml
+++ b/doc/manual/release-notes/rl-1.7.xml
@@ -34,7 +34,7 @@ following new features:</para>
     <command>download-via-ssh</command>, that fetches binaries from
     remote machines via SSH.  Specifying the flags <literal>--option
     use-ssh-substituter true --option ssh-substituter-hosts
-    <replaceable>user@hostname</replaceable></literal> will cause Nix
+    <emphasis>user@hostname</emphasis></literal> will cause Nix
     to download binaries from the specified machine, if it has
     them.</para>
   </listitem>
@@ -49,9 +49,9 @@ following new features:</para>
 
 <screen>
 $ nix-build '&lt;nixpkgs>' -A patchelf
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 $ nix-build '&lt;nixpkgs>' -A patchelf --check
-<replaceable>…</replaceable>
+<emphasis>…</emphasis>
 error: derivation `/nix/store/1ipvxs…-patchelf-0.6' may not be deterministic:
   hash mismatch in output `/nix/store/4pc1dm…-patchelf-0.6.drv'
 </screen>
@@ -173,11 +173,11 @@ $ nix-instantiate --eval '&lt;nixos>' -A 'config.systemd.units."nscd.service".te
   <listitem>
     <para><command>nix-collect-garbage</command> has a new flag
     <option>--delete-older-than</option>
-    <replaceable>N</replaceable><literal>d</literal>, which deletes
+    <emphasis>N</emphasis><literal>d</literal>, which deletes
     all user environment generations older than
-    <replaceable>N</replaceable> days.  Likewise, <command>nix-env
+    <emphasis>N</emphasis> days.  Likewise, <command>nix-env
     --delete-generations</command> accepts a
-    <replaceable>N</replaceable><literal>d</literal> age limit.</para>
+    <emphasis>N</emphasis><literal>d</literal> age limit.</para>
   </listitem>
 
   <listitem>
diff --git a/doc/manual/release-notes/rl-1.8.xml b/doc/manual/release-notes/rl-1.8.xml
index 326990774..d7e2e99ad 100644
--- a/doc/manual/release-notes/rl-1.8.xml
+++ b/doc/manual/release-notes/rl-1.8.xml
@@ -38,8 +38,8 @@ log-servers = http://hydra.nixos.org/log
 </programlisting>
 
 then it will try to get logs from
-<literal>http://hydra.nixos.org/log/<replaceable>base name of the
-store path</replaceable></literal>. This allows you to do things like:
+<literal>http://hydra.nixos.org/log/<emphasis>base name of the
+store path</emphasis></literal>. This allows you to do things like:
 
 <screen>
 $ nix-store -l $(which xterm)
diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml
index 57acfd0ba..6bef003ca 100644
--- a/doc/manual/release-notes/rl-2.0.xml
+++ b/doc/manual/release-notes/rl-2.0.xml
@@ -42,7 +42,7 @@
     <para>The command <command>nix-push</command> has been removed as
     part of the effort to eliminate Nix's dependency on Perl. You can
     use <command>nix copy</command> instead, e.g. <literal>nix copy
-    --to file:///tmp/my-binary-cache <replaceable>paths…</replaceable></literal></para>
+    --to file:///tmp/my-binary-cache <emphasis>paths…</emphasis></literal></para>
   </listitem>
 
   <listitem>
@@ -136,8 +136,8 @@
         http-connections 100</literal> you can write
         <literal>--http-connections 100</literal>. Boolean options can
         be written as
-        <literal>--<replaceable>foo</replaceable></literal> or
-        <literal>--no-<replaceable>foo</replaceable></literal>
+        <literal>--<emphasis>foo</emphasis></literal> or
+        <literal>--no-<emphasis>foo</emphasis></literal>
         (e.g. <option>--no-auto-optimise-store</option>).</para>
       </listitem>
 
@@ -551,7 +551,7 @@
     is still supported for compatibility, but it is also possible to
     specify builders in <command>nix.conf</command> by setting the
     option <literal>builders =
-    @<replaceable>path</replaceable></literal>.</para>
+    @<emphasis>path</emphasis></literal>.</para>
   </listitem>
 
   <listitem>
@@ -580,9 +580,9 @@
 
   <listitem>
     <para>You can now use
-    <uri>channel:<replaceable>channel-name</replaceable></uri> as a
+    <uri>channel:<emphasis>channel-name</emphasis></uri> as a
     short-hand for
-    <uri>https://nixos.org/channels/<replaceable>channel-name</replaceable>/nixexprs.tar.xz</uri>. For
+    <uri>https://nixos.org/channels/<emphasis>channel-name</emphasis>/nixexprs.tar.xz</uri>. For
     example, <literal>nix-build channel:nixos-15.09 -A hello</literal>
     will build the GNU Hello package from the
     <literal>nixos-15.09</literal> channel. In the future, this may
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
index 3f84373e2..92abeb73e 100644
--- a/doc/manual/src/command-ref/conf-file.md
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -28,8 +28,8 @@ By default Nix reads settings from the following places:
 The configuration files consist of `name =
 value` pairs, one per line. Other files can be included with a line like
 `include
-path`, where path is interpreted relative to the current conf file and a
-missing file is an error unless `!include` is used instead. Comments
+path`, where *path* is interpreted relative to the current conf file and
+a missing file is an error unless `!include` is used instead. Comments
 start with a `#` character. Here is an example configuration file:
 
     keep-outputs = true       # Nice for developers
@@ -216,7 +216,7 @@ The following settings are currently available:
   - `hashed-mirrors`  
     A list of web servers used by `builtins.fetchurl` to obtain files by
     hash. The default is `http://tarballs.nixos.org/`. Given a hash type
-    ht and a base-16 hash h, Nix will try to download the file from
+    *ht* and a base-16 hash *h*, Nix will try to download the file from
     `hashed-mirror/ht/h`. This allows files to be downloaded even if
     they have disappeared from their original URI. For example, given
     the default mirror `http://tarballs.nixos.org/`, when building the
@@ -504,8 +504,8 @@ The following settings are currently available:
     A list of paths bind-mounted into Nix sandbox environments. You can
     use the syntax `target=source` to mount a path in a different
     location in the sandbox; for instance, `/bin=/nix-bin` will mount
-    the path `/nix-bin` as `/bin` inside the sandbox. If source is
-    followed by `?`, then it is not an error if source does not exist;
+    the path `/nix-bin` as `/bin` inside the sandbox. If *source* is
+    followed by `?`, then it is not an error if *source* does not exist;
     for example, `/dev/nvidiactl?` specifies that `/dev/nvidiactl` will
     only be mounted in the sandbox if it exists in the host filesystem.
     
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
index 7d0567760..ddebc4b1b 100644
--- a/doc/manual/src/command-ref/nix-build.md
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -43,16 +43,16 @@ paths
 # Description
 
 The `nix-build` command builds the derivations described by the Nix
-expressions in paths. If the build succeeds, it places a symlink to the
-result in the current directory. The symlink is called `result`. If
+expressions in *paths*. If the build succeeds, it places a symlink to
+the result in the current directory. The symlink is called `result`. If
 there are multiple Nix expressions, or the Nix expressions evaluate to
 multiple derivations, multiple sequentially numbered symlinks are
 created (`result`, `result-2`, and so on).
 
-If no paths are specified, then `nix-build` will use `default.nix` in
+If no *paths* are specified, then `nix-build` will use `default.nix` in
 the current directory, if it exists.
 
-If an element of paths starts with `http://` or `https://`, it is
+If an element of *paths* starts with `http://` or `https://`, it is
 interpreted as the URL of a tarball that will be downloaded and unpacked
 to a temporary location. The tarball must include a single top-level
 directory containing at least a file named `default.nix`.
@@ -83,9 +83,9 @@ All options not listed here are passed to `nix-store
   - `--dry-run`  
     Show what store paths would be built or downloaded.
 
-  - `--out-link` / `-o` outlink  
+  - `--out-link` / `-o` *outlink*  
     Change the name of the symlink to the output path created from
-    `result` to outlink.
+    `result` to *outlink*.
 
 The following common options are supported:
 
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/src/command-ref/nix-channel.md
index d427151a0..0c20788f0 100644
--- a/doc/manual/src/command-ref/nix-channel.md
+++ b/doc/manual/src/command-ref/nix-channel.md
@@ -42,25 +42,26 @@ To see the list of official NixOS channels, visit
 
 This command has the following operations:
 
-  - `--add` url \[name\]  
-    Adds a channel named name with URL url to the list of subscribed
-    channels. If name is omitted, it defaults to the last component of
-    url, with the suffixes `-stable` or `-unstable` removed.
+  - `--add` *url* \[*name*\]  
+    Adds a channel named *name* with URL *url* to the list of subscribed
+    channels. If *name* is omitted, it defaults to the last component of
+    *url*, with the suffixes `-stable` or `-unstable` removed.
 
-  - `--remove` name  
-    Removes the channel named name from the list of subscribed channels.
+  - `--remove` *name*  
+    Removes the channel named *name* from the list of subscribed
+    channels.
 
   - `--list`  
     Prints the names and URLs of all subscribed channels on standard
     output.
 
-  - `--update` \[names…\]  
+  - `--update` \[*names*…\]  
     Downloads the Nix expressions of all subscribed channels (or only
-    those included in names if specified) and makes them the default for
-    `nix-env` operations (by symlinking them from the directory
+    those included in *names* if specified) and makes them the default
+    for `nix-env` operations (by symlinking them from the directory
     `~/.nix-defexpr`).
 
-  - `--rollback` \[generation\]  
+  - `--rollback` \[*generation*\]  
     Reverts the previous call to `nix-channel
                     --update`. Optionally, you can specify a specific channel generation
     number to restore.
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md
index 7946dc875..77b5d42d3 100644
--- a/doc/manual/src/command-ref/nix-collect-garbage.md
+++ b/doc/manual/src/command-ref/nix-collect-garbage.md
@@ -33,7 +33,7 @@ additional options: `-d` (`--delete-old`), which deletes all old
 generations of all profiles in `/nix/var/nix/profiles` by invoking
 `nix-env --delete-generations old` on all profiles (of course, this
 makes rollbacks to previous configurations impossible); and
-`--delete-older-than` period, where period is a value such as `30d`,
+`--delete-older-than` *period*, where period is a value such as `30d`,
 which deletes all generations older than the specified number of days in
 all profiles in `/nix/var/nix/profiles` (except for the generations that
 were active at that point in time).
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index 90bf6ea08..90a2bd351 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -98,7 +98,7 @@ This section lists the options that are common to all operations. These
 options are allowed for every subcommand, though they may not always
 have an effect. See also [???](#sec-common-options).
 
-  - `--file` / `-f` path  
+  - `--file` / `-f` *path*  
     Specifies the Nix expression (designated below as the *active Nix
     expression*) used by the `--install`, `--upgrade`, and `--query
     --available` operations to obtain derivations. The default is
@@ -109,7 +109,7 @@ have an effect. See also [???](#sec-common-options).
     unpacked to a temporary location. The tarball must include a single
     top-level directory containing at least a file named `default.nix`.
 
-  - `--profile` / `-p` path  
+  - `--profile` / `-p` *path*  
     Specifies the profile to be used by those operations that operate on
     a profile (designated below as the *active profile*). A profile is a
     sequence of user environments called *generations*, one of which is
@@ -125,10 +125,10 @@ have an effect. See also [???](#sec-common-options).
     [substituted](#gloss-substitute) (i.e., downloaded) and which paths
     will be built from source (because no substitute is available).
 
-  - `--system-filter` system  
+  - `--system-filter` *system*  
     By default, operations such as `--query
                     --available` show derivations matching any platform. This option
-    allows you to use derivations for the specified platform system.
+    allows you to use derivations for the specified platform *system*.
 
 <!-- end list -->
 
@@ -200,17 +200,17 @@ args
 
 The install operation creates a new user environment, based on the
 current generation of the active profile, to which a set of store paths
-described by args is added. The arguments args map to store paths in a
-number of possible ways:
+described by *args* is added. The arguments *args* map to store paths in
+a number of possible ways:
 
-  - By default, args is a set of derivation names denoting derivations
+  - By default, *args* is a set of derivation names denoting derivations
     in the active Nix expression. These are realised, and the resulting
     output paths are installed. Currently installed derivations with a
     name equal to the name of a derivation being added are removed
     unless the option `--preserve-installed` is specified.
     
-    If there are multiple derivations matching a name in args that have
-    the same name (e.g., `gcc-3.3.6` and `gcc-4.1.1`), then the
+    If there are multiple derivations matching a name in *args* that
+    have the same name (e.g., `gcc-3.3.6` and `gcc-4.1.1`), then the
     derivation with the highest *priority* is used. A derivation can
     define a priority by declaring the `meta.priority` attribute. This
     attribute should be a number, with a higher value denoting a lower
@@ -230,22 +230,23 @@ number of possible ways:
     unambiguous. To find out the attribute paths of available packages,
     use `nix-env -qaP`.
 
-  - If `--from-profile` path is given, args is a set of names denoting
-    installed store paths in the profile path. This is an easy way to
-    copy user environment elements from one profile to another.
+  - If `--from-profile` *path* is given, *args* is a set of names
+    denoting installed store paths in the profile *path*. This is an
+    easy way to copy user environment elements from one profile to
+    another.
 
-  - If `--from-expression` is given, args are Nix
+  - If `--from-expression` is given, *args* are Nix
     [functions](#ss-functions) that are called with the active Nix
     expression as their single argument. The derivations returned by
     those function calls are installed. This allows derivations to be
     specified in an unambiguous way, which is necessary if there are
     multiple derivations with the same name.
 
-  - If args are store derivations, then these are
+  - If *args* are store derivations, then these are
     [realised](#rsec-nix-store-realise), and the resulting output paths
     are installed.
 
-  - If args are store paths that are not store derivations, then these
+  - If *args* are store paths that are not store derivations, then these
     are [realised](#rsec-nix-store-realise) and installed.
 
   - By default all outputs are installed for each derivation. That can
@@ -359,12 +360,12 @@ args
 The upgrade operation creates a new user environment, based on the
 current generation of the active profile, in which all store paths are
 replaced for which there are newer versions in the set of paths
-described by args. Paths for which there are no newer versions are left
-untouched; this is not an error. It is also not an error if an element
-of args matches no installed derivations.
+described by *args*. Paths for which there are no newer versions are
+left untouched; this is not an error. It is also not an error if an
+element of *args* matches no installed derivations.
 
-For a description of how args is mapped to a set of store paths, see
-[`--install`](#rsec-nix-env-install). If args describes multiple store
+For a description of how *args* is mapped to a set of store paths, see
+[`--install`](#rsec-nix-env-install). If *args* describes multiple store
 paths with the same symbolic name, only the one with the highest version
 is installed.
 
@@ -462,7 +463,7 @@ drvnames
 
 The uninstall operation creates a new user environment, based on the
 current generation of the active profile, from which the store paths
-designated by the symbolic names names are removed.
+designated by the symbolic names *names* are removed.
 
 ## Examples
 
@@ -629,7 +630,7 @@ The query operation displays information about either the store paths
 that are installed in the current generation of the active profile
 (`--installed`), or the derivations that are available for installation
 in the active Nix expression (`--available`). It only prints information
-about derivations whose symbolic name matches one of names.
+about derivations whose symbolic name matches one of *names*.
 
 The derivations are sorted by their `name` attributes.
 
@@ -696,14 +697,14 @@ derivation is shown unless `--no-name` is specified.
     upgrades for installed packages are available in a Nix expression. A
     column is added with the following meaning:
     
-      - `<` version  
+      - `<` *version*  
         A newer version of the package is available or installed.
     
-      - `=` version  
+      - `=` *version*  
         At most the same version of the package is available or
         installed.
     
-      - `>` version  
+      - `>` *version*  
         Only older versions of the package are available or installed.
     
       - `- ?`  
@@ -806,8 +807,8 @@ path
 
 ## Description
 
-This operation makes path the current profile for the user. That is, the
-symlink `~/.nix-profile` is made to point to path.
+This operation makes *path* the current profile for the user. That is,
+the symlink `~/.nix-profile` is made to point to *path*.
 
 ## Examples
 
@@ -882,9 +883,9 @@ generation
 
 ## Description
 
-This operation makes generation number generation the current generation
-of the active profile. That is, if the `profile` is the path to the
-active profile, then the symlink `profile` is made to point to
+This operation makes generation number *generation* the current
+generation of the active profile. That is, if the `profile` is the path
+to the active profile, then the symlink `profile` is made to point to
 `profile-generation-link`, which is in turn a symlink to the actual user
 environment in the Nix store.
 
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/src/command-ref/nix-hash.md
index d433cbc5b..3b8bbf740 100644
--- a/doc/manual/src/command-ref/nix-hash.md
+++ b/doc/manual/src/command-ref/nix-hash.md
@@ -37,7 +37,7 @@ hash
 # Description
 
 The command `nix-hash` computes the cryptographic hash of the contents
-of each path and prints it on standard output. By default, it computes
+of each *path* and prints it on standard output. By default, it computes
 an MD5 hash, but other hash algorithms are available as well. The hash
 is printed in hexadecimal. To generate the same hash as
 `nix-prefetch-url` you have to specify multiple arguments, see below for
@@ -55,9 +55,9 @@ path | md5sum`.
 
   - `--flat`  
     Print the cryptographic hash of the contents of each regular file
-    path. That is, do not compute the hash over the dump of path. The
-    result is identical to that produced by the GNU commands `md5sum`
-    and `sha1sum`.
+    *path*. That is, do not compute the hash over the dump of *path*.
+    The result is identical to that produced by the GNU commands
+    `md5sum` and `sha1sum`.
 
   - `--base32`  
     Print the hash in a base-32 representation rather than hexadecimal.
@@ -67,17 +67,17 @@ path | md5sum`.
   - `--truncate`  
     Truncate hashes longer than 160 bits (such as SHA-256) to 160 bits.
 
-  - `--type` hashAlgo  
+  - `--type` *hashAlgo*  
     Use the specified cryptographic hash algorithm, which can be one of
     `md5`, `sha1`, and `sha256`.
 
   - `--to-base16`  
     Don’t hash anything, but convert the base-32 hash representation
-    hash to hexadecimal.
+    *hash* to hexadecimal.
 
   - `--to-base32`  
     Don’t hash anything, but convert the hexadecimal hash representation
-    hash to base-32.
+    *hash* to base-32.
 
 # Examples
 
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index 449f5f70f..179fbf5ba 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -56,19 +56,19 @@ files
 
 The command `nix-instantiate` generates [store
 derivations](#gloss-derivation) from (high-level) Nix expressions. It
-evaluates the Nix expressions in each of files (which defaults to
-./default.nix). Each top-level expression should evaluate to a
+evaluates the Nix expressions in each of *files* (which defaults to
+*./default.nix*). Each top-level expression should evaluate to a
 derivation, a list of derivations, or a set of derivations. The paths of
 the resulting store derivations are printed on standard output.
 
-If files is the character `-`, then a Nix expression will be read from
+If *files* is the character `-`, then a Nix expression will be read from
 standard input.
 
 See also [???](#sec-common-options) for a list of common options.
 
 # Options
 
-  - `--add-root` path; `--indirect`  
+  - `--add-root` *path*; `--indirect`  
     See the [corresponding options](#opt-add-root) in `nix-store`.
 
   - `--parse`  
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/src/command-ref/nix-prefetch-url.md
index bf8084e45..f7de27402 100644
--- a/doc/manual/src/command-ref/nix-prefetch-url.md
+++ b/doc/manual/src/command-ref/nix-prefetch-url.md
@@ -31,9 +31,9 @@ hash
 # Description
 
 The command `nix-prefetch-url` downloads the file referenced by the URL
-url, prints its cryptographic hash, and copies it into the Nix store.
-The file name in the store is `hash-baseName`, where baseName is
-everything following the final slash in url.
+*url*, prints its cryptographic hash, and copies it into the Nix store.
+The file name in the store is `hash-baseName`, where *baseName* is
+everything following the final slash in *url*.
 
 This command is just a convenience for Nix expression writers. Often a
 Nix expression fetches some source distribution from the network using
@@ -44,10 +44,10 @@ again when you build your Nix expression. Since `fetchurl` uses the same
 name for the downloaded file as `nix-prefetch-url`, the redundant
 download can be avoided.
 
-If hash is specified, then a download is not performed if the Nix store
-already contains a file with the same hash and base name. Otherwise, the
-file is downloaded, and an error is signaled if the actual hash of the
-file does not match the specified hash.
+If *hash* is specified, then a download is not performed if the Nix
+store already contains a file with the same hash and base name.
+Otherwise, the file is downloaded, and an error is signaled if the
+actual hash of the file does not match the specified hash.
 
 This command prints the hash on standard output. Additionally, if the
 option `--print-path` is used, the path of the downloaded file in the
@@ -55,7 +55,7 @@ Nix store is also printed.
 
 # Options
 
-  - `--type` hashAlgo  
+  - `--type` *hashAlgo*  
     Use the specified cryptographic hash algorithm, which can be one of
     `md5`, `sha1`, and `sha256`.
 
@@ -67,10 +67,10 @@ Nix store is also printed.
     result to the Nix store. The resulting hash can be used with
     functions such as Nixpkgs’s `fetchzip` or `fetchFromGitHub`.
 
-  - `--name` name  
+  - `--name` *name*  
     Override the name of the file in the Nix store. By default, this is
-    `hash-basename`, where basename is the last component of url.
-    Overriding the name is necessary when basename contains characters
+    `hash-basename`, where *basename* is the last component of *url*.
+    Overriding the name is necessary when *basename* contains characters
     that are not allowed in Nix store paths.
 
 # Examples
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
index c6910e3f5..9e2b781ab 100644
--- a/doc/manual/src/command-ref/nix-shell.md
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -61,14 +61,14 @@ path
 The command `nix-shell` will build the dependencies of the specified
 derivation, but not the derivation itself. It will then start an
 interactive shell in which all environment variables defined by the
-derivation path have been set to their corresponding values, and the
+derivation *path* have been set to their corresponding values, and the
 script `$stdenv/setup` has been sourced. This is useful for reproducing
 the environment of a derivation for development.
 
-If path is not given, `nix-shell` defaults to `shell.nix` if it exists,
-and `default.nix` otherwise.
+If *path* is not given, `nix-shell` defaults to `shell.nix` if it
+exists, and `default.nix` otherwise.
 
-If path starts with `http://` or `https://`, it is interpreted as the
+If *path* starts with `http://` or `https://`, it is interpreted as the
 URL of a tarball that will be downloaded and unpacked to a temporary
 location. The tarball must include a single top-level directory
 containing at least a file named `default.nix`.
@@ -91,8 +91,8 @@ All options not listed here are passed to `nix-store
 --realise`, except for `--arg` and `--attr` / `-A` which are passed to
 `nix-instantiate`. See also [???](#sec-common-options).
 
-  - `--command` cmd  
-    In the environment of the derivation, run the shell command cmd.
+  - `--command` *cmd*  
+    In the environment of the derivation, run the shell command *cmd*.
     This command is executed in an interactive shell. (Use `--run` to
     use a non-interactive shell instead.) However, a call to `exit` is
     implicitly added to the command, so the shell will exit after
@@ -102,14 +102,14 @@ All options not listed here are passed to `nix-store
     interactive shell. This can be useful for doing any additional
     initialisation.
 
-  - `--run` cmd  
+  - `--run` *cmd*  
     Like `--command`, but executes the command in a non-interactive
     shell. This means (among other things) that if you hit Ctrl-C while
     the command is running, the shell exits.
 
-  - `--exclude` regexp  
+  - `--exclude` *regexp*  
     Do not build any dependencies whose store path matches the regular
-    expression regexp. This option may be specified multiple times.
+    expression *regexp*. This option may be specified multiple times.
 
   - `--pure`  
     If this flag is specified, the environment is almost entirely
@@ -120,19 +120,19 @@ All options not listed here are passed to `nix-store
     installation) `/etc/bashrc` are still sourced, so any variables set
     there will affect the interactive shell.
 
-  - `--packages` / `-p` packages…  
+  - `--packages` / `-p` *packages*…  
     Set up an environment in which the specified packages are present.
     The command line arguments are interpreted as attribute names inside
     the Nix Packages collection. Thus, `nix-shell -p libjpeg openjdk`
     will start a shell in which the packages denoted by the attribute
     names `libjpeg` and `openjdk` are present.
 
-  - `-i` interpreter  
+  - `-i` *interpreter*  
     The chained script interpreter to be invoked by `nix-shell`. Only
     applicable in `#!`-scripts (described
     [below](#ssec-nix-shell-shebang)).
 
-  - `--keep` name  
+  - `--keep` *name*  
     When a `--pure` shell is started, keep the listed environment
     variables.
 
@@ -199,10 +199,10 @@ done by starting the script with the following lines:
     #! /usr/bin/env nix-shell
     #! nix-shell -i real-interpreter -p packages
 
-where real-interpreter is the “real” script interpreter that will be
+where *real-interpreter* is the “real” script interpreter that will be
 invoked by `nix-shell` after it has obtained the dependencies and
-initialised the environment, and packages are the attribute names of the
-dependencies in Nixpkgs.
+initialised the environment, and *packages* are the attribute names of
+the dependencies in Nixpkgs.
 
 The lines starting with `#! nix-shell` specify `nix-shell` options (see
 above). Note that you cannot write `#! /usr/bin/env nix-shell -i ...`
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index 703e71076..a666de49b 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -37,10 +37,10 @@ options are allowed for every subcommand, though they may not always
 have an effect. See also [???](#sec-common-options) for a list of common
 options.
 
-  - `--add-root` path  
+  - `--add-root` *path*  
     Causes the result of a realisation (`--realise` and
     `--force-realise`) to be registered as a root of the garbage
-    collector(see [???](#ssec-gc-roots)). The root is stored in path,
+    collector(see [???](#ssec-gc-roots)). The root is stored in *path*,
     which must be inside a directory that is scanned for roots by the
     garbage collector (i.e., typically in a subdirectory of
     `/nix/var/nix/gcroots/`) *unless* the `--indirect` flag is used.
@@ -56,8 +56,8 @@ options.
     result in the current directory; such a build result should not be
     garbage-collected unless the symlink is removed.
     
-    The `--indirect` flag causes a uniquely named symlink to path to be
-    stored in `/nix/var/nix/gcroots/auto/`. For instance,
+    The `--indirect` flag causes a uniquely named symlink to *path* to
+    be stored in `/nix/var/nix/gcroots/auto/`. For instance,
     
         $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
         
@@ -262,10 +262,11 @@ The following suboperations may be specified:
 By default, all unreachable paths are deleted. The following options
 control what gets deleted and in what order:
 
-  - `--max-freed` bytes  
-    Keep deleting paths until at least bytes bytes have been deleted,
-    then stop. The argument bytes can be followed by the multiplicative
-    suffix `K`, `M`, `G` or `T`, denoting KiB, MiB, GiB or TiB units.
+  - `--max-freed` *bytes*  
+    Keep deleting paths until at least *bytes* bytes have been deleted,
+    then stop. The argument *bytes* can be followed by the
+    multiplicative suffix `K`, `M`, `G` or `T`, denoting KiB, MiB, GiB
+    or TiB units.
 
 The behaviour of the collector is also influenced by the
 [`keep-outputs`](#conf-keep-outputs) and
@@ -303,7 +304,7 @@ paths
 
 ## Description
 
-The operation `--delete` deletes the store paths paths from the Nix
+The operation `--delete` deletes the store paths *paths* from the Nix
 store, but only if it is safe to do so; that is, when the path is not
 reachable from a root of the garbage collector. This means that you can
 only delete paths that would also be deleted by `nix-store --gc`. Thus,
@@ -379,7 +380,7 @@ The operation `--query` displays various bits of information about the
 store paths . The queries are described below. At most one query can be
 specified. The default query is `--outputs`.
 
-The paths paths may also be symlinks from outside of the Nix store, to
+The paths *paths* may also be symlinks from outside of the Nix store, to
 the Nix store. In that case, the query is applied to the target of the
 symlink.
 
@@ -397,11 +398,11 @@ symlink.
 
   - `--outputs`  
     Prints out the [output paths](#gloss-output-path) of the store
-    derivations paths. These are the paths that will be produced when
+    derivations *paths*. These are the paths that will be produced when
     the derivation is built.
 
   - `--requisites`; `-R`  
-    Prints out the [closure](#gloss-closure) of the store path paths.
+    Prints out the [closure](#gloss-closure) of the store path *paths*.
     
     This query has one option:
     
@@ -419,29 +420,30 @@ symlink.
 
   - `--references`  
     Prints the set of [references](#gloss-reference) of the store paths
-    paths, that is, their immediate dependencies. (For *all*
+    *paths*, that is, their immediate dependencies. (For *all*
     dependencies, use `--requisites`.)
 
   - `--referrers`  
-    Prints the set of *referrers* of the store paths paths, that is, the
-    store paths currently existing in the Nix store that refer to one of
-    paths. Note that contrary to the references, the set of referrers is
-    not constant; it can change as store paths are added or removed.
+    Prints the set of *referrers* of the store paths *paths*, that is,
+    the store paths currently existing in the Nix store that refer to
+    one of *paths*. Note that contrary to the references, the set of
+    referrers is not constant; it can change as store paths are added or
+    removed.
 
   - `--referrers-closure`  
-    Prints the closure of the set of store paths paths under the
+    Prints the closure of the set of store paths *paths* under the
     referrers relation; that is, all store paths that directly or
-    indirectly refer to one of paths. These are all the path currently
-    in the Nix store that are dependent on paths.
+    indirectly refer to one of *paths*. These are all the path currently
+    in the Nix store that are dependent on *paths*.
 
   - `--deriver`; `-d`  
-    Prints the [deriver](#gloss-deriver) of the store paths paths. If
+    Prints the [deriver](#gloss-deriver) of the store paths *paths*. If
     the path has no deriver (e.g., if it is a source file), or if the
     deriver is not known (e.g., in the case of a binary-only
     deployment), the string `unknown-deriver` is printed.
 
   - `--graph`  
-    Prints the references graph of the store paths paths in the format
+    Prints the references graph of the store paths *paths* in the format
     of the `dot` tool of AT\&T's [Graphviz
     package](http://www.graphviz.org/). This can be used to visualise
     dependency graphs. To obtain a build-time dependency graph, apply
@@ -449,40 +451,40 @@ symlink.
     apply it to an output path.
 
   - `--tree`  
-    Prints the references graph of the store paths paths as a nested
+    Prints the references graph of the store paths *paths* as a nested
     ASCII tree. References are ordered by descending closure size; this
     tends to flatten the tree, making it more readable. The query only
     recurses into a store path when it is first encountered; this
     prevents a blowup of the tree representation of the graph.
 
   - `--graphml`  
-    Prints the references graph of the store paths paths in the
+    Prints the references graph of the store paths *paths* in the
     [GraphML](http://graphml.graphdrawing.org/) file format. This can be
     used to visualise dependency graphs. To obtain a build-time
     dependency graph, apply this to a store derivation. To obtain a
     runtime dependency graph, apply it to an output path.
 
-  - `--binding` name; `-b` name  
-    Prints the value of the attribute name (i.e., environment variable)
-    of the store derivations paths. It is an error for a derivation to
-    not have the specified attribute.
+  - `--binding` *name*; `-b` *name*  
+    Prints the value of the attribute *name* (i.e., environment
+    variable) of the store derivations *paths*. It is an error for a
+    derivation to not have the specified attribute.
 
   - `--hash`  
-    Prints the SHA-256 hash of the contents of the store paths paths
+    Prints the SHA-256 hash of the contents of the store paths *paths*
     (that is, the hash of the output of `nix-store --dump` on the given
     paths). Since the hash is stored in the Nix database, this is a fast
     operation.
 
   - `--size`  
-    Prints the size in bytes of the contents of the store paths paths —
-    to be precise, the size of the output of `nix-store --dump` on the
-    given paths. Note that the actual disk space required by the store
-    paths may be higher, especially on filesystems with large cluster
-    sizes.
+    Prints the size in bytes of the contents of the store paths *paths*
+    — to be precise, the size of the output of `nix-store --dump` on
+    the given paths. Note that the actual disk space required by the
+    store paths may be higher, especially on filesystems with large
+    cluster sizes.
 
   - `--roots`  
     Prints the garbage collector roots that point, directly or
-    indirectly, at the store paths paths.
+    indirectly, at the store paths *paths*.
 
 ## Examples
 
@@ -708,8 +710,8 @@ path
 ## Description
 
 The operation `--dump` produces a NAR (Nix ARchive) file containing the
-contents of the file system tree rooted at path. The archive is written
-to standard output.
+contents of the file system tree rooted at *path*. The archive is
+written to standard output.
 
 A NAR archive is like a TAR or Zip archive, but it contains only the
 information that Nix considers important. For instance, timestamps are
@@ -745,8 +747,8 @@ path
 
 ## Description
 
-The operation `--restore` unpacks a NAR archive to path, which must not
-already exist. The archive is read from standard input.
+The operation `--restore` unpacks a NAR archive to *path*, which must
+not already exist. The archive is read from standard input.
 
 # Operation `--export`
 
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
index ac9d996c3..dce95773a 100644
--- a/doc/manual/src/command-ref/opt-common.md
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -44,9 +44,9 @@ Most Nix commands accept the following command-line options:
     This option may be specified repeatedly. See the previous verbosity
     levels list.
 
-  - `--log-format` format  
+  - `--log-format` *format*  
     This option can be used to change the output of the log format, with
-    format being one of:
+    *format* being one of:
     
       - raw  
         This is the raw format, as outputted by nix-build.
@@ -68,7 +68,7 @@ Most Nix commands accept the following command-line options:
     output and error are always written to a log file in
     `prefix/nix/var/log/nix`.
 
-  - `--max-jobs` / `-j` number  
+  - `--max-jobs` / `-j` *number*  
     Sets the maximum number of build jobs that Nix will perform in
     parallel to the specified number. Specify `auto` to use the number
     of CPUs in the system. The default is specified by the
@@ -144,7 +144,7 @@ Most Nix commands accept the following command-line options:
     database. Most Nix operations do need database access, so those
     operations will fail.
 
-  - `--arg` name value  
+  - `--arg` *name* *value*  
     This option is accepted by `nix-env`, `nix-instantiate`, `nix-shell`
     and `nix-build`. When evaluating Nix expressions, the expression
     evaluator will automatically try to call functions that it
@@ -153,8 +153,8 @@ Most Nix commands accept the following command-line options:
             defaultValue }:
             ...`). With `--arg`, you can also call functions that have arguments
     without a default value (or override a default value). That is, if
-    the evaluator encounters a function with an argument named name, it
-    will call it with value value.
+    the evaluator encounters a function with an argument named *name*,
+    it will call it with value *value*.
     
     For instance, the top-level `default.nix` in Nixpkgs is actually a
     function:
@@ -172,18 +172,18 @@ Most Nix commands accept the following command-line options:
             \"i686-freebsd\"`. (Note that since the argument is a Nix string
     literal, you have to escape the quotes.)
 
-  - `--argstr` name value  
+  - `--argstr` *name* *value*  
     This option is like `--arg`, only the value is not a Nix expression
     but a string. So instead of `--arg system \"i686-linux\"` (the outer
     quotes are to keep the shell happy) you can say `--argstr system
             i686-linux`.
 
-  - `--attr` / `-A` attrPath  
+  - `--attr` / `-A` *attrPath*  
     Select an attribute from the top-level Nix expression being
     evaluated. (`nix-env`, `nix-instantiate`, `nix-build` and
-    `nix-shell` only.) The *attribute path* attrPath is a sequence of
+    `nix-shell` only.) The *attribute path* *attrPath* is a sequence of
     attribute names separated by dots. For instance, given a top-level
-    Nix expression e, the attribute path `xorg.xorgserver` would cause
+    Nix expression *e*, the attribute path `xorg.xorgserver` would cause
     the expression `e.xorg.xorgserver` to be used. See [`nix-env
             --install`](#refsec-nix-env-install-examples) for some concrete
     examples.
@@ -204,14 +204,14 @@ Most Nix commands accept the following command-line options:
     use, give your expression to the `nix-shell -p` convenience flag
     instead.
 
-  - `-I` path  
+  - `-I` *path*  
     Add a path to the Nix expression search path. This option may be
     given multiple times. See the NIX\_PATH\</literal\> environment
     variable for information on the semantics of the Nix search path.
     Paths added through `-I` take precedence over `NIX_PATH`.
 
-  - `--option` name value  
-    Set the Nix configuration option name to value. This overrides
+  - `--option` *name* *value*  
+    Set the Nix configuration option *name* to *value*. This overrides
     settings in the Nix configuration file (see nix.conf5).
 
   - `--repair`  
diff --git a/doc/manual/src/expressions/advanced-attributes.md b/doc/manual/src/expressions/advanced-attributes.md
index 01e18513d..3582fa268 100644
--- a/doc/manual/src/expressions/advanced-attributes.md
+++ b/doc/manual/src/expressions/advanced-attributes.md
@@ -54,9 +54,9 @@ Derivations can declare some infrequently used optional attributes.
     attribute should be a list of pairs `[ name1
                     path1 name2
                     path2 ...
-                    ]`. The references graph of each pathN will be stored in a text file
-    nameN in the temporary build directory. The text files have the
-    format used by `nix-store
+                    ]`. The references graph of each *pathN* will be stored in a text
+    file *nameN* in the temporary build directory. The text files have
+    the format used by `nix-store
                     --register-validity` (with the deriver fields left empty). For
     example, when the following derivation is built:
     
@@ -204,9 +204,9 @@ Derivations can declare some infrequently used optional attributes.
     then when the builder runs, the environment variable `bigPath` will
     contain the absolute path to a temporary file containing `a very
     long
-                    string`. That is, for any attribute x listed in `passAsFile`, Nix
+                    string`. That is, for any attribute *x* listed in `passAsFile`, Nix
     will pass an environment variable `xPath` holding the path of the
-    file containing the value of attribute x. This is useful when you
+    file containing the value of attribute *x*. This is useful when you
     need to pass large strings to a builder, since most operating
     systems impose a limit on the size of the environment (typically, a
     few hundred kilobyte).
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index 8faf4b939..8f19c692a 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -9,42 +9,42 @@ scope. Instead, you can access them through the `builtins` built-in
 value, which is a set that contains all built-in functions and values.
 For instance, `derivation` is also available as `builtins.derivation`.
 
-  - `abort` s; `builtins.abort` s  
-    Abort Nix expression evaluation, print error message s.
+  - `abort` *s*; `builtins.abort` *s*  
+    Abort Nix expression evaluation, print error message *s*.
 
-  - `builtins.add` e1 e2  
-    Return the sum of the numbers e1 and e2.
+  - `builtins.add` *e1* *e2*  
+    Return the sum of the numbers *e1* and *e2*.
 
-  - `builtins.all` pred list  
-    Return `true` if the function pred returns `true` for all elements
-    of list, and `false` otherwise.
+  - `builtins.all` *pred* *list*  
+    Return `true` if the function *pred* returns `true` for all elements
+    of *list*, and `false` otherwise.
 
-  - `builtins.any` pred list  
-    Return `true` if the function pred returns `true` for at least one
-    element of list, and `false` otherwise.
+  - `builtins.any` *pred* *list*  
+    Return `true` if the function *pred* returns `true` for at least one
+    element of *list*, and `false` otherwise.
 
-  - `builtins.attrNames` set  
-    Return the names of the attributes in the set set in an
+  - `builtins.attrNames` *set*  
+    Return the names of the attributes in the set *set* in an
     alphabetically sorted list. For instance, `builtins.attrNames { y
     = 1; x = "foo"; }` evaluates to `[ "x" "y" ]`.
 
-  - `builtins.attrValues` set  
-    Return the values of the attributes in the set set in the order
+  - `builtins.attrValues` *set*  
+    Return the values of the attributes in the set *set* in the order
     corresponding to the sorted attribute names.
 
-  - `baseNameOf` s  
-    Return the *base name* of the string s, that is, everything
+  - `baseNameOf` *s*  
+    Return the *base name* of the string *s*, that is, everything
     following the final slash in the string. This is similar to the GNU
     `basename` command.
 
-  - `builtins.bitAnd` e1 e2  
-    Return the bitwise AND of the integers e1 and e2.
+  - `builtins.bitAnd` *e1* *e2*  
+    Return the bitwise AND of the integers *e1* and *e2*.
 
-  - `builtins.bitOr` e1 e2  
-    Return the bitwise OR of the integers e1 and e2.
+  - `builtins.bitOr` *e1* *e2*  
+    Return the bitwise OR of the integers *e1* and *e2*.
 
-  - `builtins.bitXor` e1 e2  
-    Return the bitwise XOR of the integers e1 and e2.
+  - `builtins.bitXor` *e1* *e2*  
+    Return the bitwise XOR of the integers *e1* and *e2*.
 
   - `builtins`  
     The set `builtins` contains all the built-in functions and values.
@@ -56,17 +56,17 @@ For instance, `derivation` is also available as `builtins.derivation`.
     This allows a Nix expression to fall back gracefully on older Nix
     installations that don’t have the desired built-in function.
 
-  - `builtins.compareVersions` s1 s2  
+  - `builtins.compareVersions` *s1* *s2*  
     Compare two strings representing versions and return `-1` if version
-    s1 is older than version s2, `0` if they are the same, and `1` if s1
-    is newer than s2. The version comparison algorithm is the same as
-    the one used by [`nix-env
+    *s1* is older than version *s2*, `0` if they are the same, and `1`
+    if *s1* is newer than *s2*. The version comparison algorithm is the
+    same as the one used by [`nix-env
                     -u`](#ssec-version-comparisons).
 
-  - `builtins.concatLists` lists  
+  - `builtins.concatLists` *lists*  
     Concatenate a list of lists into a single list.
 
-  - `builtins.concatStringsSep` separator list  
+  - `builtins.concatStringsSep` *separator* *list*  
     Concatenate a list of strings with a separator between each element,
     e.g. `concatStringsSep "/"
                     ["usr" "local" "bin"] == "usr/local/bin"`
@@ -76,37 +76,37 @@ For instance, `derivation` is also available as `builtins.derivation`.
     identifier for the Nix installation on which the expression is being
     evaluated, such as `"i686-linux"` or `"x86_64-darwin"`.
 
-  - `builtins.deepSeq` e1 e2  
+  - `builtins.deepSeq` *e1* *e2*  
     This is like `seq
                     e1
-                    e2`, except that e1 is evaluated *deeply*: if it’s a list or set,
+                    e2`, except that *e1* is evaluated *deeply*: if it’s a list or set,
     its elements or attributes are also evaluated recursively.
 
-  - `derivation` attrs; `builtins.derivation` attrs  
+  - `derivation` *attrs*; `builtins.derivation` *attrs*  
     `derivation` is described in [???](#ssec-derivation).
 
-  - `dirOf` s; `builtins.dirOf` s  
-    Return the directory part of the string s, that is, everything
+  - `dirOf` *s*; `builtins.dirOf` *s*  
+    Return the directory part of the string *s*, that is, everything
     before the final slash in the string. This is similar to the GNU
     `dirname` command.
 
-  - `builtins.div` e1 e2  
-    Return the quotient of the numbers e1 and e2.
+  - `builtins.div` *e1* *e2*  
+    Return the quotient of the numbers *e1* and *e2*.
 
-  - `builtins.elem` x xs  
-    Return `true` if a value equal to x occurs in the list xs, and
+  - `builtins.elem` *x* *xs*  
+    Return `true` if a value equal to *x* occurs in the list *xs*, and
     `false` otherwise.
 
-  - `builtins.elemAt` xs n  
-    Return element n from the list xs. Elements are counted starting
+  - `builtins.elemAt` *xs* *n*  
+    Return element *n* from the list *xs*. Elements are counted starting
     from 0. A fatal error occurs if the index is out of bounds.
 
-  - `builtins.fetchurl` url  
+  - `builtins.fetchurl` *url*  
     Download the specified URL and return the path of the downloaded
     file. This function is not available if [restricted evaluation
     mode](#conf-restrict-eval) is enabled.
 
-  - `fetchTarball` url; `builtins.fetchTarball` url  
+  - `fetchTarball` *url*; `builtins.fetchTarball` *url*  
     Download the specified URL, unpack it and return the path of the
     unpacked tree. The file must be a tape archive (`.tar`) compressed
     with `gzip`, `bzip2` or `xz`. The top-level path component of the
@@ -142,10 +142,10 @@ For instance, `derivation` is also available as `builtins.derivation`.
     This function is not available if [restricted evaluation
     mode](#conf-restrict-eval) is enabled.
 
-  - `builtins.fetchGit` args  
-    Fetch a path from git. args can be a URL, in which case the HEAD of
-    the repo at that URL is fetched. Otherwise, it can be an attribute
-    with the following attributes (all except `url` optional):
+  - `builtins.fetchGit` *args*  
+    Fetch a path from git. *args* can be a URL, in which case the HEAD
+    of the repo at that URL is fetched. Otherwise, it can be an
+    attribute with the following attributes (all except `url` optional):
     
       - url  
         The URL of the repo.
@@ -240,11 +240,11 @@ For instance, `derivation` is also available as `builtins.derivation`.
         > 
         > This behavior is disabled in *Pure evaluation mode*.
 
-  - `builtins.filter` f xs  
-    Return a list consisting of the elements of xs for which the
-    function f returns `true`.
+  - `builtins.filter` *f* *xs*  
+    Return a list consisting of the elements of *xs* for which the
+    function *f* returns `true`.
 
-  - `builtins.filterSource` e1 e2  
+  - `builtins.filterSource` *e1* *e2*  
     This function allows you to copy sources into the Nix store while
     filtering certain files. For instance, suppose that you want to use
     the directory `source-dir` as an input to a Nix expression, e.g.
@@ -266,9 +266,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
         ./source-dir;
     ```
     
-    Thus, the first argument e1 must be a predicate function that is
+    Thus, the first argument *e1* must be a predicate function that is
     called for each regular file, directory or symlink in the source
-    tree e2. If the function returns `true`, the file is copied to the
+    tree *e2*. If the function returns `true`, the file is copied to the
     Nix store, otherwise it is omitted. The function is called with two
     arguments. The first is the full path of the file. The second is a
     string that identifies the type of the file, which is either
@@ -276,19 +276,19 @@ For instance, `derivation` is also available as `builtins.derivation`.
     kinds of files such as device nodes or fifos — but note that those
     cannot be copied to the Nix store, so if the predicate returns
     `true` for them, the copy will fail). If you exclude a directory,
-    the entire corresponding subtree of e2 will be excluded.
+    the entire corresponding subtree of *e2* will be excluded.
 
-  - `builtins.foldl’` op nul list  
+  - `builtins.foldl’` *op* *nul* *list*  
     Reduce a list by applying a binary operator, from left to right,
     e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op
                     (op nul x0) x1) x2) ...`. The operator is applied strictly, i.e.,
     its arguments are evaluated first. For example, `foldl’ (x: y: x +
     y) 0 [1 2 3]` evaluates to 6.
 
-  - `builtins.functionArgs` f  
+  - `builtins.functionArgs` *f*  
     Return a set containing the names of the formal arguments expected
-    by the function f. The value of each attribute is a Boolean denoting
-    whether the corresponding argument has a default value. For
+    by the function *f*. The value of each attribute is a Boolean
+    denoting whether the corresponding argument has a default value. For
     instance, `functionArgs ({ x, y ? 123}: ...) = { x = false; y =
     true; }`.
     
@@ -296,7 +296,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
     the function. Plain lambdas are not included, e.g. `functionArgs (x:
     ...) = { }`.
 
-  - `builtins.fromJSON` e  
+  - `builtins.fromJSON` *e*  
     Convert a JSON string to a Nix value. For example,
     
         builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
@@ -304,21 +304,22 @@ For instance, `derivation` is also available as `builtins.derivation`.
     returns the value `{ x = [ 1 2 3 ]; y = null;
                     }`.
 
-  - `builtins.genList` generator length  
-    Generate list of size length, with each element i equal to the value
-    returned by generator `i`. For example,
+  - `builtins.genList` *generator* *length*  
+    Generate list of size *length*, with each element *i* equal to the
+    value returned by *generator* `i`. For example,
     
         builtins.genList (x: x * x) 5
     
     returns the list `[ 0 1 4 9 16 ]`.
 
-  - `builtins.getAttr` s set  
-    `getAttr` returns the attribute named s from set. Evaluation aborts
-    if the attribute doesn’t exist. This is a dynamic version of the `.`
-    operator, since s is an expression rather than an identifier.
+  - `builtins.getAttr` *s* *set*  
+    `getAttr` returns the attribute named *s* from *set*. Evaluation
+    aborts if the attribute doesn’t exist. This is a dynamic version of
+    the `.` operator, since *s* is an expression rather than an
+    identifier.
 
-  - `builtins.getEnv` s  
-    `getEnv` returns the value of the environment variable s, or an
+  - `builtins.getEnv` *s*  
+    `getEnv` returns the value of the environment variable *s*, or an
     empty string if the variable doesn’t exist. This function should be
     used with care, as it can introduce all sorts of nasty environment
     dependencies in your Nix expression.
@@ -328,29 +329,29 @@ For instance, `derivation` is also available as `builtins.derivation`.
     Packages. (That is, it does a `getEnv "HOME"` to locate the user’s
     home directory.)
 
-  - `builtins.hasAttr` s set  
-    `hasAttr` returns `true` if set has an attribute named s, and
+  - `builtins.hasAttr` *s* *set*  
+    `hasAttr` returns `true` if *set* has an attribute named *s*, and
     `false` otherwise. This is a dynamic version of the `?` operator,
-    since s is an expression rather than an identifier.
+    since *s* is an expression rather than an identifier.
 
-  - `builtins.hashString` type s  
+  - `builtins.hashString` *type* *s*  
     Return a base-16 representation of the cryptographic hash of string
-    s. The hash algorithm specified by type must be one of `"md5"`,
+    *s*. The hash algorithm specified by *type* must be one of `"md5"`,
     `"sha1"`, `"sha256"` or `"sha512"`.
 
-  - `builtins.hashFile` type p  
+  - `builtins.hashFile` *type* *p*  
     Return a base-16 representation of the cryptographic hash of the
-    file at path p. The hash algorithm specified by type must be one of
-    `"md5"`, `"sha1"`, `"sha256"` or `"sha512"`.
+    file at path *p*. The hash algorithm specified by *type* must be one
+    of `"md5"`, `"sha1"`, `"sha256"` or `"sha512"`.
 
-  - `builtins.head` list  
+  - `builtins.head` *list*  
     Return the first element of a list; abort evaluation if the argument
     isn’t a list or is an empty list. You can test whether a list is
     empty by comparing it with `[]`.
 
-  - `import` path; `builtins.import` path  
-    Load, parse and return the Nix expression in the file path. If path
-    is a directory, the file ` default.nix
+  - `import` *path*; `builtins.import` *path*  
+    Load, parse and return the Nix expression in the file *path*. If
+    *path* is a directory, the file ` default.nix
                      ` in that directory is loaded. Evaluation aborts if the file
     doesn’t exist or contains an incorrect Nix expression. `import`
     implements Nix’s module system: you can put any Nix expression (such
@@ -361,7 +362,8 @@ For instance, `derivation` is also available as `builtins.derivation`.
     > 
     > Unlike some languages, `import` is a regular function in Nix.
     > Paths using the angle bracket syntax (e.g., `
-    >     >     >     >     > import` \<foo\>) are normal path values (see [???](#ssec-values)).
+    >     >     >     >     > import` *\<foo\>*) are normal path values (see
+    > [???](#ssec-values)).
     
     A Nix expression loaded by `import` must not contain any *free
     variables* (identifiers that are not defined in the Nix expression
@@ -393,50 +395,50 @@ For instance, `derivation` is also available as `builtins.derivation`.
     (The function argument doesn’t have to be called `x` in `foo.nix`;
     any name would work.)
 
-  - `builtins.intersectAttrs` e1 e2  
-    Return a set consisting of the attributes in the set e2 that also
-    exist in the set e1.
+  - `builtins.intersectAttrs` *e1* *e2*  
+    Return a set consisting of the attributes in the set *e2* that also
+    exist in the set *e1*.
 
-  - `builtins.isAttrs` e  
-    Return `true` if e evaluates to a set, and `false` otherwise.
+  - `builtins.isAttrs` *e*  
+    Return `true` if *e* evaluates to a set, and `false` otherwise.
 
-  - `builtins.isList` e  
-    Return `true` if e evaluates to a list, and `false` otherwise.
+  - `builtins.isList` *e*  
+    Return `true` if *e* evaluates to a list, and `false` otherwise.
 
-  - `builtins.isFunction` e  
-    Return `true` if e evaluates to a function, and `false` otherwise.
+  - `builtins.isFunction` *e*  
+    Return `true` if *e* evaluates to a function, and `false` otherwise.
 
-  - `builtins.isString` e  
-    Return `true` if e evaluates to a string, and `false` otherwise.
+  - `builtins.isString` *e*  
+    Return `true` if *e* evaluates to a string, and `false` otherwise.
 
-  - `builtins.isInt` e  
-    Return `true` if e evaluates to an int, and `false` otherwise.
+  - `builtins.isInt` *e*  
+    Return `true` if *e* evaluates to an int, and `false` otherwise.
 
-  - `builtins.isFloat` e  
-    Return `true` if e evaluates to a float, and `false` otherwise.
+  - `builtins.isFloat` *e*  
+    Return `true` if *e* evaluates to a float, and `false` otherwise.
 
-  - `builtins.isBool` e  
-    Return `true` if e evaluates to a bool, and `false` otherwise.
+  - `builtins.isBool` *e*  
+    Return `true` if *e* evaluates to a bool, and `false` otherwise.
 
-  - `builtins.isPath` e  
-    Return `true` if e evaluates to a path, and `false` otherwise.
+  - `builtins.isPath` *e*  
+    Return `true` if *e* evaluates to a path, and `false` otherwise.
 
-  - `isNull` e; `builtins.isNull` e  
-    Return `true` if e evaluates to `null`, and `false` otherwise.
+  - `isNull` *e*; `builtins.isNull` *e*  
+    Return `true` if *e* evaluates to `null`, and `false` otherwise.
     
     > **Warning**
     > 
     > This function is *deprecated*; just write `e == null` instead.
 
-  - `builtins.length` e  
-    Return the length of the list e.
+  - `builtins.length` *e*  
+    Return the length of the list *e*.
 
-  - `builtins.lessThan` e1 e2  
-    Return `true` if the number e1 is less than the number e2, and
-    `false` otherwise. Evaluation aborts if either e1 or e2 does not
+  - `builtins.lessThan` *e1* *e2*  
+    Return `true` if the number *e1* is less than the number *e2*, and
+    `false` otherwise. Evaluation aborts if either *e1* or *e2* does not
     evaluate to a number.
 
-  - `builtins.listToAttrs` e  
+  - `builtins.listToAttrs` *e*  
     Construct a set from a list specifying the names and values of each
     attribute. Each element of the list should be a set consisting of a
     string-valued attribute `name` specifying the name of the attribute,
@@ -451,19 +453,20 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
         { foo = 123; bar = 456; }
 
-  - `map` f list; `builtins.map` f list  
-    Apply the function f to each element in the list list. For example,
+  - `map` *f* *list*; `builtins.map` *f* *list*  
+    Apply the function *f* to each element in the list *list*. For
+    example,
     
         map (x: "foo" + x) [ "bar" "bla" "abc" ]
     
     evaluates to `[ "foobar" "foobla" "fooabc"
                     ]`.
 
-  - `builtins.match` regex str  
+  - `builtins.match` *regex* *str*  
     Returns a list if the [extended POSIX regular
     expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
-    regex matches str precisely, otherwise returns `null`. Each item in
-    the list is a regex group.
+    *regex* matches *str* precisely, otherwise returns `null`. Each item
+    in the list is a regex group.
     
         builtins.match "ab" "abc"
     
@@ -481,21 +484,21 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
     Evaluates to `[ "foo" ]`.
 
-  - `builtins.mul` e1 e2  
-    Return the product of the numbers e1 and e2.
+  - `builtins.mul` *e1* *e2*  
+    Return the product of the numbers *e1* and *e2*.
 
-  - `builtins.parseDrvName` s  
-    Split the string s into a package name and version. The package name
-    is everything up to but not including the first dash followed by a
-    digit, and the version is everything following that dash. The result
-    is returned in a set `{ name, version }`. Thus,
+  - `builtins.parseDrvName` *s*  
+    Split the string *s* into a package name and version. The package
+    name is everything up to but not including the first dash followed
+    by a digit, and the version is everything following that dash. The
+    result is returned in a set `{ name, version }`. Thus,
     `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name = "nix";
     version = "0.12pre12876";
                     }`.
 
-  - `builtins.path` args  
+  - `builtins.path` *args*  
     An enrichment of the built-in path type, based on the attributes
-    present in args. All are optional except `path`:
+    present in *args*. All are optional except `path`:
     
       - path  
         The underlying path.
@@ -523,20 +526,20 @@ For instance, `derivation` is also available as `builtins.derivation`.
         providing a hash allows `builtins.path` to be used even when the
         `pure-eval` nix config option is on.
 
-  - `builtins.pathExists` path  
-    Return `true` if the path path exists at evaluation time, and
+  - `builtins.pathExists` *path*  
+    Return `true` if the path *path* exists at evaluation time, and
     `false` otherwise.
 
-  - `builtins.placeholder` output  
-    Return a placeholder string for the specified output that will be
+  - `builtins.placeholder` *output*  
+    Return a placeholder string for the specified *output* that will be
     substituted by the corresponding output path at build time. Typical
     outputs would be `"out"`, `"bin"` or `"dev"`.
 
-  - `builtins.readDir` path  
-    Return the contents of the directory path as a set mapping directory
-    entries to the corresponding file type. For instance, if directory
-    `A` contains a regular file `B` and another directory `C`, then
-    `builtins.readDir
+  - `builtins.readDir` *path*  
+    Return the contents of the directory *path* as a set mapping
+    directory entries to the corresponding file type. For instance, if
+    directory `A` contains a regular file `B` and another directory `C`,
+    then `builtins.readDir
                     ./A` will return the set
     
         { B = "regular"; C = "directory"; }
@@ -544,33 +547,33 @@ For instance, `derivation` is also available as `builtins.derivation`.
     The possible values for the file type are `"regular"`,
     `"directory"`, `"symlink"` and `"unknown"`.
 
-  - `builtins.readFile` path  
-    Return the contents of the file path as a string.
+  - `builtins.readFile` *path*  
+    Return the contents of the file *path* as a string.
 
-  - `removeAttrs` set list; `builtins.removeAttrs` set list  
-    Remove the attributes listed in list from set. The attributes don’t
-    have to exist in set. For instance,
+  - `removeAttrs` *set* *list*; `builtins.removeAttrs` *set* *list*  
+    Remove the attributes listed in *list* from *set*. The attributes
+    don’t have to exist in *set*. For instance,
     
         removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
     
     evaluates to `{ y = 2; }`.
 
-  - `builtins.replaceStrings` from to s  
-    Given string s, replace every occurrence of the strings in from with
-    the corresponding string in to. For example,
+  - `builtins.replaceStrings` *from* *to* *s*  
+    Given string *s*, replace every occurrence of the strings in *from*
+    with the corresponding string in *to*. For example,
     
         builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
     
     evaluates to `"fabir"`.
 
-  - `builtins.seq` e1 e2  
-    Evaluate e1, then evaluate and return e2. This ensures that a
-    computation is strict in the value of e1.
+  - `builtins.seq` *e1* *e2*  
+    Evaluate *e1*, then evaluate and return *e2*. This ensures that a
+    computation is strict in the value of *e1*.
 
-  - `builtins.sort` comparator list  
-    Return list in sorted order. It repeatedly calls the function
-    comparator with two elements. The comparator should return `true` if
-    the first element is less than the second, and `false` otherwise.
+  - `builtins.sort` *comparator* *list*  
+    Return *list* in sorted order. It repeatedly calls the function
+    *comparator* with two elements. The comparator should return `true`
+    if the first element is less than the second, and `false` otherwise.
     For example,
     
         builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
@@ -581,12 +584,12 @@ For instance, `derivation` is also available as `builtins.derivation`.
     This is a stable sort: it preserves the relative order of elements
     deemed equal by the comparator.
 
-  - `builtins.split` regex str  
+  - `builtins.split` *regex* *str*  
     Returns a list composed of non matched strings interleaved with the
     lists of the [extended POSIX regular
     expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
-    regex matches of str. Each item in the lists of matched sequences is
-    a regex group.
+    *regex* matches of *str*. Each item in the lists of matched
+    sequences is a regex group.
     
         builtins.split "(a)b" "abc"
     
@@ -604,44 +607,44 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
     Evaluates to `[ " " [ "FOO" ] " " ]`.
 
-  - `builtins.splitVersion` s  
+  - `builtins.splitVersion` *s*  
     Split a string representing a version into its components, by the
     same version splitting logic underlying the version comparison in
     [`nix-env -u`](#ssec-version-comparisons).
 
-  - `builtins.stringLength` e  
-    Return the length of the string e. If e is not a string, evaluation
-    is aborted.
+  - `builtins.stringLength` *e*  
+    Return the length of the string *e*. If *e* is not a string,
+    evaluation is aborted.
 
-  - `builtins.sub` e1 e2  
-    Return the difference between the numbers e1 and e2.
+  - `builtins.sub` *e1* *e2*  
+    Return the difference between the numbers *e1* and *e2*.
 
-  - `builtins.substring` start len s  
-    Return the substring of s from character position start (zero-based)
-    up to but not including start + len. If start is greater than the
-    length of the string, an empty string is returned, and if start +
-    len lies beyond the end of the string, only the substring up to the
-    end of the string is returned. start must be non-negative. For
-    example,
+  - `builtins.substring` *start* *len* *s*  
+    Return the substring of *s* from character position *start*
+    (zero-based) up to but not including *start + len*. If *start* is
+    greater than the length of the string, an empty string is returned,
+    and if *start + len* lies beyond the end of the string, only the
+    substring up to the end of the string is returned. *start* must be
+    non-negative. For example,
     
         builtins.substring 0 3 "nixos"
     
     evaluates to `"nix"`.
 
-  - `builtins.tail` list  
+  - `builtins.tail` *list*  
     Return the second to last elements of a list; abort evaluation if
     the argument isn’t a list or is an empty list.
 
-  - `throw` s; `builtins.throw` s  
-    Throw an error message s. This usually aborts Nix expression
+  - `throw` *s*; `builtins.throw` *s*  
+    Throw an error message *s*. This usually aborts Nix expression
     evaluation, but in `nix-env -qa` and other commands that try to
     evaluate a set of derivations to get information about those
     derivations, a derivation that throws an error is silently skipped
     (which is not the case for `abort`).
 
-  - `builtins.toFile` name s  
-    Store the string s in a file in the Nix store and return its path.
-    The file has suffix name. This file can be used as an input to
+  - `builtins.toFile` *name* *s*  
+    Store the string *s* in a file in the Nix store and return its path.
+    The file has suffix *name*. This file can be used as an input to
     derivations. One application is to write builders “inline”. For
     instance, the following Nix expression combines [???](#ex-hello-nix)
     and [???](#ex-hello-builder) into one file:
@@ -705,20 +708,20 @@ For instance, `derivation` is also available as `builtins.derivation`.
     you are using Nixpkgs, the `writeTextFile` function is able to do
     that.
 
-  - `builtins.toJSON` e  
-    Return a string containing a JSON representation of e. Strings,
+  - `builtins.toJSON` *e*  
+    Return a string containing a JSON representation of *e*. Strings,
     integers, floats, booleans, nulls and lists are mapped to their JSON
     equivalents. Sets (except derivations) are represented as objects.
     Derivations are translated to a JSON string containing the
     derivation’s output path. Paths are copied to the store and
     represented as a JSON string of the resulting store path.
 
-  - `builtins.toPath` s  
+  - `builtins.toPath` *s*  
     DEPRECATED. Use `/. + "/path"` to convert a string into an absolute
     path. For relative paths, use `./. + "/path"`.
 
-  - `toString` e; `builtins.toString` e  
-    Convert the expression e to a string. e can be:
+  - `toString` *e*; `builtins.toString` *e*  
+    Convert the expression *e* to a string. *e* can be:
     
       - A string (in which case the string is returned unmodified).
     
@@ -735,8 +738,8 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
       - `null`, which yields the empty string.
 
-  - `builtins.toXML` e  
-    Return a string containing an XML representation of e. The main
+  - `builtins.toXML` *e*  
+    Return a string containing an XML representation of *e*. The main
     application for `toXML` is to communicate information with the
     builder in a more structured format than plain environment
     variables.
@@ -822,22 +825,23 @@ For instance, `derivation` is also available as `builtins.derivation`.
     of the stylesheet is spliced into the builder using the syntax
     `xsltproc ${stylesheet}`.
 
-  - `builtins.trace` e1 e2  
-    Evaluate e1 and print its abstract syntax representation on standard
-    error. Then return e2. This function is useful for debugging.
+  - `builtins.trace` *e1* *e2*  
+    Evaluate *e1* and print its abstract syntax representation on
+    standard error. Then return *e2*. This function is useful for
+    debugging.
 
-  - `builtins.tryEval` e  
-    Try to shallowly evaluate e. Return a set containing the attributes
-    `success` (`true` if e evaluated successfully, `false` if an error
-    was thrown) and `value`, equalling e if successful and `false`
-    otherwise. Note that this doesn't evaluate e deeply, so ` let e = {
-    x = throw ""; }; in (builtins.tryEval e).success
+  - `builtins.tryEval` *e*  
+    Try to shallowly evaluate *e*. Return a set containing the
+    attributes `success` (`true` if *e* evaluated successfully, `false`
+    if an error was thrown) and `value`, equalling *e* if successful and
+    `false` otherwise. Note that this doesn't evaluate *e* deeply, so
+    ` let e = { x = throw ""; }; in (builtins.tryEval e).success
                      ` will be `true`. Using ` builtins.deepSeq
                      ` one can get the expected result: `let e = { x = throw "";
                     }; in (builtins.tryEval (builtins.deepSeq e e)).success` will be
     `false`.
 
-  - `builtins.typeOf` e  
-    Return a string representing the type of the value e, namely
+  - `builtins.typeOf` *e*  
+    Return a string representing the type of the value *e*, namely
     `"int"`, `"bool"`, `"string"`, `"path"`, `"null"`, `"set"`,
     `"list"`, `"lambda"` or `"float"`.
diff --git a/doc/manual/src/expressions/expression-syntax.md b/doc/manual/src/expressions/expression-syntax.md
index 9e99a1f60..2abe6ac6e 100644
--- a/doc/manual/src/expressions/expression-syntax.md
+++ b/doc/manual/src/expressions/expression-syntax.md
@@ -33,7 +33,7 @@ elements (referenced from the figure by number):
     
     Nix functions generally have the form `{ x, y, ...,
                     z }: e` where `x`, `y`, etc. are the names of the expected
-    arguments, and where e is the body of the function. So here, the
+    arguments, and where *e* is the body of the function. So here, the
     entire remainder of the file is the body of the function; when given
     the required arguments, the body should describe how to build an
     instance of the Hello package.
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
index 20d003348..2699d675f 100644
--- a/doc/manual/src/expressions/language-constructs.md
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -147,7 +147,7 @@ three kinds of patterns:
     It is possible to provide *default values* for attributes, in which
     case they are allowed to be missing. A default value is specified by
     writing `name ?
-            e`, where e is an arbitrary expression. For example,
+            e`, where *e* is an arbitrary expression. For example,
     
         { x, y ? "foo", z ? "bar" }: z + y + x
     
@@ -201,7 +201,7 @@ Conditionals look like this:
 
     if e1 then e2 else e3
 
-where e1 is an expression that should evaluate to a Boolean value
+where *e1* is an expression that should evaluate to a Boolean value
 (`true` or `false`).
 
 ## Assertions
@@ -211,9 +211,9 @@ between features and dependencies hold. They look like this:
 
     assert e1; e2
 
-where e1 is an expression that should evaluate to a Boolean value. If it
-evaluates to `true`, e2 is returned; otherwise expression evaluation is
-aborted and a backtrace is printed.
+where *e1* is an expression that should evaluate to a Boolean value. If
+it evaluates to `true`, *e2* is returned; otherwise expression
+evaluation is aborted and a backtrace is printed.
 
 Here is a Nix expression for the Subversion package that shows how
 assertions can be used:.
@@ -275,8 +275,8 @@ A *with-expression*,
 
     with e1; e2
 
-introduces the set e1 into the lexical scope of the expression e2. For
-instance,
+introduces the set *e1* into the lexical scope of the expression *e2*.
+For instance,
 
     let as = { x = "foo"; y = "bar"; };
     in with as; x + y
diff --git a/doc/manual/src/expressions/language-operators.md b/doc/manual/src/expressions/language-operators.md
index 4fa2eca37..b124a2417 100644
--- a/doc/manual/src/expressions/language-operators.md
+++ b/doc/manual/src/expressions/language-operators.md
@@ -4,29 +4,29 @@
 expression language, in order of precedence (from strongest to weakest
 binding).
 
-| Name                     | Syntax                        | Associativity | Description                                                                                                                                                                                                             | Precedence |
-| ------------------------ | ----------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
-| Select                   | e `.` attrpath \[ `or` def \] | none          | Select attribute denoted by the attribute path attrpath from set e. (An attribute path is a dot-separated list of attribute names.) If the attribute doesn’t exist, return def if provided, otherwise abort evaluation. | 1          |
-| Application              | e1 e2                         | left          | Call function e1 with argument e2.                                                                                                                                                                                      | 2          |
-| Arithmetic Negation      | `-` e                         | none          | Arithmetic negation.                                                                                                                                                                                                    | 3          |
-| Has Attribute            | e `?` attrpath                | none          | Test whether set e contains the attribute denoted by attrpath; return `true` or `false`.                                                                                                                                | 4          |
-| List Concatenation       | e1 `++` e2                    | right         | List concatenation.                                                                                                                                                                                                     | 5          |
-| Multiplication           | e1 `*` e2,                    | left          | Arithmetic multiplication.                                                                                                                                                                                              | 6          |
-| Division                 | e1 `/` e2                     | left          | Arithmetic division.                                                                                                                                                                                                    | 6          |
-| Addition                 | e1 `+` e2                     | left          | Arithmetic addition.                                                                                                                                                                                                    | 7          |
-| Subtraction              | e1 `-` e2                     | left          | Arithmetic subtraction.                                                                                                                                                                                                 | 7          |
-| String Concatenation     | string1 `+` string2           | left          | String concatenation.                                                                                                                                                                                                   | 7          |
-| Not                      | `!` e                         | none          | Boolean negation.                                                                                                                                                                                                       | 8          |
-| Update                   | e1 `//` e2                    | right         | Return a set consisting of the attributes in e1 and e2 (with the latter taking precedence over the former in case of equally named attributes).                                                                         | 9          |
-| Less Than                | e1 `<` e2,                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
-| Less Than or Equal To    | e1 `<=` e2                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
-| Greater Than             | e1 `>` e2                     | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
-| Greater Than or Equal To | e1 `>=` e2                    | none          | Arithmetic comparison.                                                                                                                                                                                                  | 10         |
-| Equality                 | e1 `==` e2                    | none          | Equality.                                                                                                                                                                                                               | 11         |
-| Inequality               | e1 `!=` e2                    | none          | Inequality.                                                                                                                                                                                                             | 11         |
-| Logical AND              | e1 `&&` e2                    | left          | Logical AND.                                                                                                                                                                                                            | 12         |
-| Logical OR               | e1 `\|\|` e2                  | left          | Logical OR.                                                                                                                                                                                                             | 13         |
-| Logical Implication      | e1 `->` e2                    | none          | Logical implication (equivalent to `!e1 \|\|
-        e2`).                                                                                                                                                              | 14         |
+| Name                     | Syntax                              | Associativity | Description                                                                                                                                                                                                                   | Precedence |
+| ------------------------ | ----------------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
+| Select                   | *e* `.` *attrpath* \[ `or` *def* \] | none          | Select attribute denoted by the attribute path *attrpath* from set *e*. (An attribute path is a dot-separated list of attribute names.) If the attribute doesn’t exist, return *def* if provided, otherwise abort evaluation. | 1          |
+| Application              | *e1* *e2*                           | left          | Call function *e1* with argument *e2*.                                                                                                                                                                                        | 2          |
+| Arithmetic Negation      | `-` *e*                             | none          | Arithmetic negation.                                                                                                                                                                                                          | 3          |
+| Has Attribute            | *e* `?` *attrpath*                  | none          | Test whether set *e* contains the attribute denoted by *attrpath*; return `true` or `false`.                                                                                                                                  | 4          |
+| List Concatenation       | *e1* `++` *e2*                      | right         | List concatenation.                                                                                                                                                                                                           | 5          |
+| Multiplication           | *e1* `*` *e2*,                      | left          | Arithmetic multiplication.                                                                                                                                                                                                    | 6          |
+| Division                 | *e1* `/` *e2*                       | left          | Arithmetic division.                                                                                                                                                                                                          | 6          |
+| Addition                 | *e1* `+` *e2*                       | left          | Arithmetic addition.                                                                                                                                                                                                          | 7          |
+| Subtraction              | *e1* `-` *e2*                       | left          | Arithmetic subtraction.                                                                                                                                                                                                       | 7          |
+| String Concatenation     | *string1* `+` *string2*             | left          | String concatenation.                                                                                                                                                                                                         | 7          |
+| Not                      | `!` *e*                             | none          | Boolean negation.                                                                                                                                                                                                             | 8          |
+| Update                   | *e1* `//` *e2*                      | right         | Return a set consisting of the attributes in *e1* and *e2* (with the latter taking precedence over the former in case of equally named attributes).                                                                           | 9          |
+| Less Than                | *e1* `<` *e2*,                      | none          | Arithmetic comparison.                                                                                                                                                                                                        | 10         |
+| Less Than or Equal To    | *e1* `<=` *e2*                      | none          | Arithmetic comparison.                                                                                                                                                                                                        | 10         |
+| Greater Than             | *e1* `>` *e2*                       | none          | Arithmetic comparison.                                                                                                                                                                                                        | 10         |
+| Greater Than or Equal To | *e1* `>=` *e2*                      | none          | Arithmetic comparison.                                                                                                                                                                                                        | 10         |
+| Equality                 | *e1* `==` *e2*                      | none          | Equality.                                                                                                                                                                                                                     | 11         |
+| Inequality               | *e1* `!=` *e2*                      | none          | Inequality.                                                                                                                                                                                                                   | 11         |
+| Logical AND              | *e1* `&&` *e2*                      | left          | Logical AND.                                                                                                                                                                                                                  | 12         |
+| Logical OR               | *e1* `\|\|` *e2*                    | left          | Logical OR.                                                                                                                                                                                                                   | 13         |
+| Logical Implication      | *e1* `->` *e2*                      | none          | Logical implication (equivalent to `!e1 \|\|
+        e2`).                                                                                                                                                                    | 14         |
 
 Operators
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/src/installation/building-source.md
index c498713de..35dbd5541 100644
--- a/doc/manual/src/installation/building-source.md
+++ b/doc/manual/src/installation/building-source.md
@@ -17,7 +17,7 @@ command:
 The installation path can be specified by passing the `--prefix=prefix`
 to `configure`. The default installation directory is `/usr/local`. You
 can change this to any location you like. You must have write permission
-to the prefix path.
+to the *prefix* path.
 
 Nix keeps its *store* (the place where packages are stored) in
 `/nix/store` by default. This can be changed using
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
index 04dad3339..d9c34afc6 100644
--- a/doc/manual/src/package-management/basic-package-mgmt.md
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -60,7 +60,8 @@ Nixpkgs tree using the `-f` flag:
 
     $ nix-env -qaf /path/to/nixpkgs
 
-where /path/to/nixpkgs is where you’ve unpacked or checked out Nixpkgs.
+where */path/to/nixpkgs* is where you’ve unpacked or checked out
+Nixpkgs.
 
 You can select specific packages by name:
 
diff --git a/doc/manual/src/release-notes/rl-0.10.md b/doc/manual/src/release-notes/rl-0.10.md
index 07b19ff05..1301add26 100644
--- a/doc/manual/src/release-notes/rl-0.10.md
+++ b/doc/manual/src/release-notes/rl-0.10.md
@@ -34,7 +34,7 @@
     
       - `nix-env -i
                                                         pkgname` will now install the highest available version of
-        pkgname, rather than installing all available versions (which
+        *pkgname*, rather than installing all available versions (which
         would probably give collisions) (`NIX-31`).
     
       - `nix-env (-i|-u) --dry-run` now shows exactly which missing
diff --git a/doc/manual/src/release-notes/rl-0.12.md b/doc/manual/src/release-notes/rl-0.12.md
index aaecfbb70..3a4aba07d 100644
--- a/doc/manual/src/release-notes/rl-0.12.md
+++ b/doc/manual/src/release-notes/rl-0.12.md
@@ -41,10 +41,10 @@
 
   - The garbage collector has a number of new options to allow only some
     of the garbage to be deleted. The option `--max-freed N` tells the
-    collector to stop after at least N bytes have been deleted. The
+    collector to stop after at least *N* bytes have been deleted. The
     option `--max-links
             N` tells it to stop after the link count on `/nix/store` has dropped
-    below N. This is useful for very large Nix stores on filesystems
+    below *N*. This is useful for very large Nix stores on filesystems
     with a 32000 subdirectories limit (like `ext3`). The option
     `--use-atime` causes store paths to be deleted in order of ascending
     last access time. This allows non-recently used stuff to be deleted.
diff --git a/doc/manual/src/release-notes/rl-0.13.md b/doc/manual/src/release-notes/rl-0.13.md
index 21f33e3db..13a60e01c 100644
--- a/doc/manual/src/release-notes/rl-0.13.md
+++ b/doc/manual/src/release-notes/rl-0.13.md
@@ -51,5 +51,5 @@ This is primarily a bug fix release. It has some new features:
     option is used.
 
   - The scoping rules for `inherit
-                    (e) ...` in recursive attribute sets have changed. The expression e
-    can now refer to the attributes defined in the containing set.
+                    (e) ...` in recursive attribute sets have changed. The expression
+    *e* can now refer to the attributes defined in the containing set.
diff --git a/doc/manual/src/release-notes/rl-0.16.md b/doc/manual/src/release-notes/rl-0.16.md
index 79074fcdc..23ac53786 100644
--- a/doc/manual/src/release-notes/rl-0.16.md
+++ b/doc/manual/src/release-notes/rl-0.16.md
@@ -15,7 +15,7 @@ This release has the following improvements:
     `--cores
                             N` as well as a configuration setting `build-cores =
                             N` that causes the environment variable `NIX_BUILD_CORES` to be set
-    to N when the builder is invoked. The builder can use this at its
+    to *N* when the builder is invoked. The builder can use this at its
     discretion to perform a parallel build, e.g., by calling `make -j
                             N`. In Nixpkgs, this can be enabled on a per-package basis by
     setting the derivation attribute `enableParallelBuilding` to `true`.
diff --git a/doc/manual/src/release-notes/rl-0.6.md b/doc/manual/src/release-notes/rl-0.6.md
index c816c9851..ed2d21583 100644
--- a/doc/manual/src/release-notes/rl-0.6.md
+++ b/doc/manual/src/release-notes/rl-0.6.md
@@ -49,8 +49,8 @@
     
       - New language construct: `with
                                                         E1;
-                                                        E2` brings all attributes defined in the attribute set E1 in
-        scope in E2.
+                                                        E2` brings all attributes defined in the attribute set *E1* in
+        scope in *E2*.
     
       - Added a `map` function.
     
diff --git a/doc/manual/src/release-notes/rl-1.11.md b/doc/manual/src/release-notes/rl-1.11.md
index 381887bd8..fbabdaa2f 100644
--- a/doc/manual/src/release-notes/rl-1.11.md
+++ b/doc/manual/src/release-notes/rl-1.11.md
@@ -35,7 +35,7 @@ features:
     derivations, and in `builtins.hashString`.
 
   - The new flag `--option build-repeat
-                            N` will cause every build to be executed N+1 times. If the build
+                            N` will cause every build to be executed *N*+1 times. If the build
     output differs between any round, the build is rejected, and the
     output paths are not registered as valid. This is primarily useful
     to verify build determinism. (We already had a `--check` option to
diff --git a/doc/manual/src/release-notes/rl-1.4.md b/doc/manual/src/release-notes/rl-1.4.md
index d6d2227f8..d23de71ad 100644
--- a/doc/manual/src/release-notes/rl-1.4.md
+++ b/doc/manual/src/release-notes/rl-1.4.md
@@ -10,7 +10,7 @@ There are also the following improvements:
 
   - New built-in function: `builtins.hashString`.
 
-  - Build logs are now stored in `/nix/var/log/nix/drvs/XX/`, where XX
+  - Build logs are now stored in `/nix/var/log/nix/drvs/XX/`, where *XX*
     is the first two characters of the derivation. This is useful on
     machines that keep a lot of build logs (such as Hydra servers).
 
diff --git a/doc/manual/src/release-notes/rl-1.6.1.md b/doc/manual/src/release-notes/rl-1.6.1.md
index ed974fe0b..9bb9bb1f8 100644
--- a/doc/manual/src/release-notes/rl-1.6.1.md
+++ b/doc/manual/src/release-notes/rl-1.6.1.md
@@ -6,8 +6,8 @@ This is primarily a bug fix release. Changes of interest are:
     strings, such as `"${/foo}/bar"`. This release reverts to the Nix
     1.5.3 behaviour.
 
-  - Previously, Nix optimised expressions such as `"${expr}"` to expr.
-    Thus it neither checked whether expr could be coerced to a string,
+  - Previously, Nix optimised expressions such as `"${expr}"` to *expr*.
+    Thus it neither checked whether *expr* could be coerced to a string,
     nor applied such coercions. This meant that `"${123}"` evaluatued to
     `123`, and `"${./foo}"` evaluated to `./foo` (even though `"${./foo}
     "` evaluates to `"/nix/store/hash-foo "`). Nix now checks the type
diff --git a/doc/manual/src/release-notes/rl-1.7.md b/doc/manual/src/release-notes/rl-1.7.md
index 71a327ed6..8d49ae54e 100644
--- a/doc/manual/src/release-notes/rl-1.7.md
+++ b/doc/manual/src/release-notes/rl-1.7.md
@@ -89,10 +89,10 @@ features:
     specifier. For example, `nix-store --gc --max-freed
                     1G` will free up to 1 gigabyte of disk space.
 
-  - `nix-collect-garbage` has a new flag `--delete-older-than` N`d`,
-    which deletes all user environment generations older than N days.
+  - `nix-collect-garbage` has a new flag `--delete-older-than` *N*`d`,
+    which deletes all user environment generations older than *N* days.
     Likewise, `nix-env
-                    --delete-generations` accepts a N`d` age limit.
+                    --delete-generations` accepts a *N*`d` age limit.
 
   - Nix now heuristically detects whether a build failure was due to a
     disk-full condition. In that case, the build is not flagged as

From 69333cb62c0631919ad447629bdd1035df94eb67 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:30:13 +0200
Subject: [PATCH 024/176] Sigh

---
 doc/manual/src/SUMMARY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 80a41f8d7..5f6817674 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -22,9 +22,9 @@
   - [Channels](package-management/channels.md)
   - [Sharing Packages Between Machines](package-management/sharing-packages.md)
     - [Serving a Nix store via HTTP](package-management/binary-cache-substituter.md)
-    - [Copying Closures Via SSH](package-management/copy-closure.md)
+    - [Copying Closures via SSH](package-management/copy-closure.md)
     - [Serving a Nix store via SSH](package-management/ssh-substituter.md)
-    - [Serving a Nix store via AWS S3 or S3-compatible Service](package-management/s3-substituter.md)
+    - [Serving a Nix store via S3](package-management/s3-substituter.md)
 - [Writing Nix Expressions](expressions/writing-nix-expressions.md)
   - [A Simple Nix Expression](expressions/simple-expression.md)
     - [Expression Syntax](expressions/expression-syntax.md)

From 5e3ad1dde0a03b3bd094e1d4ecc0f4fc7abdaa5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 23 Jul 2020 14:55:10 +0200
Subject: [PATCH 025/176] Add a separate manual job

---
 flake.nix | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index cebbdf9d9..f31dc4039 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,11 +144,6 @@
 
           installFlags = "sysconfdir=$(out)/etc";
 
-          postInstall = ''
-            mkdir -p $doc/nix-support
-            echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
-          '';
-
           doInstallCheck = true;
           installCheckFlags = "sysconfdir=$(out)/etc";
 
@@ -215,6 +210,25 @@
         # Perl bindings for various platforms.
         perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix.perl-bindings);
 
+        # Separate build for just the manual.
+        manual =
+          with nixpkgsFor.x86_64-linux;
+          stdenv.mkDerivation {
+            name = "nix-manual-${version}";
+            src = self;
+            buildInputs = [ mdbook ];
+            configurePhase = ":";
+            buildPhase = ":";
+            installPhase =
+              ''
+                touch Makefile.config
+                docdir=$out/share/doc/nix
+                make docdir=$docdir doc_generate=yes $docdir/manual/index.html
+                mkdir -p $out/nix-support
+                echo "doc manual $docdir/manual" >> $out/nix-support/hydra-build-products
+              '';
+          };
+
         # Binary tarball for various platforms, containing a Nix store
         # with the closure of 'nix' package, and the second half of
         # the installation script.

From a71d1cedffe17ea4dd6a48c12cf5b9323ca6114c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 11:34:01 +0200
Subject: [PATCH 026/176] printVersion(): Show system types

---
 src/libmain/shared.cc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc
index 52718c231..22929cae5 100644
--- a/src/libmain/shared.cc
+++ b/src/libmain/shared.cc
@@ -277,6 +277,8 @@ void printVersion(const string & programName)
 #if HAVE_SODIUM
         cfg.push_back("signed-caches");
 #endif
+        std::cout << "System type: " << settings.thisSystem << "\n";
+        std::cout << "Additional system types: " << concatStringsSep(", ", settings.extraPlatforms.get()) << "\n";
         std::cout << "Features: " << concatStringsSep(", ", cfg) << "\n";
         std::cout << "System configuration file: " << settings.nixConfDir + "/nix.conf" << "\n";
         std::cout << "User configuration files: " <<

From 8d0b311a1ccd0aef49c6f272aad4ecb5105b285a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 11:43:44 +0200
Subject: [PATCH 027/176] Get rid of footnotes

Markdown doesn't support them.
---
 doc/manual/command-ref/nix-instantiate.xml    |  2 +-
 doc/manual/command-ref/opt-common.xml         |  2 +-
 doc/manual/expressions/build-script.xml       | 11 ++++------
 doc/manual/expressions/derivations.xml        | 19 ++++++++---------
 doc/manual/expressions/generic-builder.xml    |  6 +++---
 .../expressions/language-constructs.xml       |  7 +++----
 doc/manual/expressions/language-values.xml    | 11 +++++-----
 doc/manual/expressions/simple-expression.xml  |  7 +++----
 doc/manual/packages/profiles.xml              | 13 ++++++------
 doc/manual/src/command-ref/nix-instantiate.md |  9 ++++----
 doc/manual/src/command-ref/opt-common.md      |  6 +++---
 doc/manual/src/expressions/build-script.md    | 10 +++------
 doc/manual/src/expressions/derivations.md     | 17 ++++++---------
 doc/manual/src/expressions/generic-builder.md | 15 ++++++-------
 .../src/expressions/language-constructs.md    |  7 ++-----
 doc/manual/src/expressions/language-values.md | 21 +++++++++----------
 .../src/expressions/simple-expression.md      | 10 +++------
 doc/manual/src/package-management/profiles.md | 16 +++++++-------
 18 files changed, 79 insertions(+), 110 deletions(-)

diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
index d67be4924..dc055fa51 100644
--- a/doc/manual/command-ref/nix-instantiate.xml
+++ b/doc/manual/command-ref/nix-instantiate.xml
@@ -106,7 +106,7 @@ input.</para>
   <varlistentry><term><option>--find-file</option></term>
 
     <listitem><para>Look up the given files in Nix’s search path (as
-    specified by the <envar linkend="env-NIX_PATH">NIX_PATH</literal>
+    specified by the <literal linkend="env-NIX_PATH">NIX_PATH</literal>
     environment variable).  If found, print the corresponding absolute
     paths on standard output.  For instance, if
     <literal>NIX_PATH</literal> is
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml
index 67950e94b..a095039b9 100644
--- a/doc/manual/command-ref/opt-common.xml
+++ b/doc/manual/command-ref/opt-common.xml
@@ -369,7 +369,7 @@
 <varlistentry xml:id="opt-I"><term><option>-I</option> <emphasis>path</emphasis></term>
 
   <listitem><para>Add a path to the Nix expression search path.  This
-  option may be given multiple times.  See the <envar
+  option may be given multiple times.  See the <literal
   linkend="env-NIX_PATH">NIX_PATH</literal> environment variable for
   information on the semantics of the Nix search path.  Paths added
   through <option>-I</option> take precedence over
diff --git a/doc/manual/expressions/build-script.xml b/doc/manual/expressions/build-script.xml
index c9af198f2..5c55954fc 100644
--- a/doc/manual/expressions/build-script.xml
+++ b/doc/manual/expressions/build-script.xml
@@ -33,13 +33,10 @@ steps:</para>
 
     <para>When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the
-    derivation).  For instance, the <literal>PATH</literal> variable is
-    empty<footnote><para>Actually, it's initialised to
-    <filename>/path-not-set</filename> to prevent Bash from setting it
-    to a default value.</para></footnote>.  This is done to prevent
-    undeclared inputs from being used in the build process.  If for
-    example the <literal>PATH</literal> contained
-    <filename>/usr/bin</filename>, then you might accidentally use
+    derivation).  This is done to prevent undeclared inputs from being
+    used in the build process. If for example the
+    <literal>PATH</literal> contained <filename>/usr/bin</filename>,
+    then you might accidentally use
     <filename>/usr/bin/gcc</filename>.</para>
 
     <para>So the first step is to set up the environment.  This is
diff --git a/doc/manual/expressions/derivations.xml b/doc/manual/expressions/derivations.xml
index a11de0088..0625bcdfe 100644
--- a/doc/manual/expressions/derivations.xml
+++ b/doc/manual/expressions/derivations.xml
@@ -13,16 +13,15 @@ of which specify the inputs of the build.</para>
 
 <itemizedlist>
 
-  <listitem xml:id="attr-system"><para>There must be an attribute named
-  <varname>system</varname> whose value must be a string specifying a
-  Nix platform identifier, such as <literal>"i686-linux"</literal> or
-  <literal>"x86_64-darwin"</literal><footnote><para>To figure out
-  your platform identifier, look at the line <quote>Checking for the
-  canonical Nix system name</quote> in the output of Nix's
-  <filename>configure</filename> script.</para></footnote> The build
-  can only be performed on a machine and operating system matching the
-  platform identifier.  (Nix can automatically forward builds for
-  other platforms by forwarding them to other machines; see <xref
+  <listitem xml:id="attr-system"><para>There must be an attribute
+  named <varname>system</varname> whose value must be a string
+  specifying a Nix system type, such as
+  <literal>"i686-linux"</literal> or
+  <literal>"x86_64-darwin"</literal>. (To figure out your system type,
+  run <literal>nix -vv --version</literal>.) The build can only be
+  performed on a machine and operating system matching the system
+  type.  (Nix can automatically forward builds for other platforms by
+  forwarding them to other machines; see <xref
   linkend='chap-distributed-builds' />.)</para></listitem>
 
   <listitem><para>There must be an attribute named
diff --git a/doc/manual/expressions/generic-builder.xml b/doc/manual/expressions/generic-builder.xml
index f6e67813d..a6f258abc 100644
--- a/doc/manual/expressions/generic-builder.xml
+++ b/doc/manual/expressions/generic-builder.xml
@@ -42,14 +42,14 @@ genericBuild ③</programlisting>
     <filename>bin</filename> subdirectory, it's added to
     <literal>PATH</literal>; if it has a <filename>include</filename>
     subdirectory, it's added to GCC's header search path; and so
-    on.<footnote><para>How does it work? <filename>setup</filename>
-    tries to source the file
+    on. (This is implemented in a modular way:
+    <filename>setup</filename> tries to source the file
     <filename><emphasis>pkg</emphasis>/nix-support/setup-hook</filename>
     of all dependencies.  These “setup hooks” can then set up whatever
     environment variables they want; for instance, the setup hook for
     Perl sets the <literal>PERL5LIB</literal> environment variable to
     contain the <filename>lib/site_perl</filename> directories of all
-    inputs.</para></footnote>
+    inputs.)
     </para>
 
   </listitem>
diff --git a/doc/manual/expressions/language-constructs.xml b/doc/manual/expressions/language-constructs.xml
index 86c25d723..e1c589f61 100644
--- a/doc/manual/expressions/language-constructs.xml
+++ b/doc/manual/expressions/language-constructs.xml
@@ -26,7 +26,7 @@ is, in a normal (non-recursive) set, attributes are not added to the
 lexical scope; in a recursive set, they are.</para>
 
 <para>Recursive sets of course introduce the danger of infinite
-recursion.  For example,
+recursion.  For example, the expression
 
 <programlisting>
 rec {
@@ -34,9 +34,8 @@ rec {
   y = x;
 }.x</programlisting>
 
-does not terminate<footnote><para>Actually, Nix detects infinite
-recursion in this case and aborts (<quote>infinite recursion
-encountered</quote>).</para></footnote>.</para>
+will crash with an <literal>infinite recursion encountered</literal>
+error message.</para>
 
 </section>
 
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
index cebafb1f5..5520a4938 100644
--- a/doc/manual/expressions/language-values.xml
+++ b/doc/manual/expressions/language-values.xml
@@ -154,11 +154,10 @@ stdenv.mkDerivation {
 
   <listitem><para><emphasis>Paths</emphasis>, e.g.,
   <filename>/bin/sh</filename> or <filename>./builder.sh</filename>.
-  A path must contain at least one slash to be recognised as such; for
-  instance, <filename>builder.sh</filename> is not a
-  path<footnote><para>It's parsed as an expression that selects the
-  attribute <varname>sh</varname> from the variable
-  <varname>builder</varname>.</para></footnote>.  If the file name is
+  A path must contain at least one slash to be recognised as such. For
+  instance, <filename>builder.sh</filename> is not a path: it's parsed
+  as an expression that selects the attribute <varname>sh</varname>
+  from the variable <varname>builder</varname>. If the file name is
   relative, i.e., if it does not begin with a slash, it is made
   absolute at parse time relative to the directory of the Nix
   expression that contained it.  For instance, if a Nix expression in
@@ -176,7 +175,7 @@ stdenv.mkDerivation {
   <para>Paths can also be specified between angle brackets, e.g.
   <literal>&lt;nixpkgs&gt;</literal>. This means that the directories
   listed in the environment variable
-  <envar linkend="env-NIX_PATH">NIX_PATH</literal> will be searched
+  <literal linkend="env-NIX_PATH">NIX_PATH</literal> will be searched
   for the given file or directory name.
   </para>
 
diff --git a/doc/manual/expressions/simple-expression.xml b/doc/manual/expressions/simple-expression.xml
index 29fd872ee..ad97220a8 100644
--- a/doc/manual/expressions/simple-expression.xml
+++ b/doc/manual/expressions/simple-expression.xml
@@ -21,10 +21,9 @@ need to do three things:
   such as dependencies, sources, and so on.</para></listitem>
 
   <listitem><para>Write a <emphasis>builder</emphasis>.  This is a
-  shell script<footnote><para>In fact, it can be written in any
-  language, but typically it's a <command>bash</command> shell
-  script.</para></footnote> that actually builds the package from
-  the inputs.</para></listitem>
+  shell script that builds the package from the inputs. (In fact, it
+  can be written in any language, but typically it's a
+  <command>bash</command> shell script.)</para></listitem>
 
   <listitem><para>Add the package to the file
   <filename>pkgs/top-level/all-packages.nix</filename>.  The Nix
diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml
index d7529d56c..3b8c5e293 100644
--- a/doc/manual/packages/profiles.xml
+++ b/doc/manual/packages/profiles.xml
@@ -18,13 +18,12 @@ of the Subversion package might be stored in a directory
 while another version might be stored in
 <filename>/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5s-subversion-1.1.2</filename>.
 The long strings prefixed to the directory names are cryptographic
-hashes<footnote><para>160-bit truncations of SHA-256 hashes encoded in
-a base-32 notation, to be precise.</para></footnote> of
-<emphasis>all</emphasis> inputs involved in building the package —
-sources, dependencies, compiler flags, and so on.  So if two packages
-differ in any way, they end up in different locations in the file
-system, so they don’t interfere with each other.  Here is what a part
-of a typical Nix store looks like:</para>
+hashes (to be precise, 160-bit truncations of SHA-256 hashes encoded
+in a base-32 notation) of <emphasis>all</emphasis> inputs involved in
+building the package — sources, dependencies, compiler flags, and so
+on.  So if two packages differ in any way, they end up in different
+locations in the file system, so they don’t interfere with each other.
+Here is what a part of a typical Nix store looks like:</para>
 
 <mediaobject>
   <imageobject>
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index 179fbf5ba..6c9f2d3e1 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -82,11 +82,10 @@ See also [???](#sec-common-options) for a list of common options.
 
   - `--find-file`  
     Look up the given files in Nix’s search path (as specified by the
-    NIX\_PATH\</literal\> environment variable). If found, print the
-    corresponding absolute paths on standard output. For instance, if
-    `NIX_PATH` is `nixpkgs=/home/alice/nixpkgs`, then `nix-instantiate
-    --find-file nixpkgs/default.nix` will print
-    `/home/alice/nixpkgs/default.nix`.
+    `NIX_PATH` environment variable). If found, print the corresponding
+    absolute paths on standard output. For instance, if `NIX_PATH` is
+    `nixpkgs=/home/alice/nixpkgs`, then `nix-instantiate --find-file
+    nixpkgs/default.nix` will print `/home/alice/nixpkgs/default.nix`.
 
   - `--strict`  
     When used with `--eval`, recursively evaluate list elements and
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
index dce95773a..b9c65c81d 100644
--- a/doc/manual/src/command-ref/opt-common.md
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -206,9 +206,9 @@ Most Nix commands accept the following command-line options:
 
   - `-I` *path*  
     Add a path to the Nix expression search path. This option may be
-    given multiple times. See the NIX\_PATH\</literal\> environment
-    variable for information on the semantics of the Nix search path.
-    Paths added through `-I` take precedence over `NIX_PATH`.
+    given multiple times. See the `NIX_PATH` environment variable for
+    information on the semantics of the Nix search path. Paths added
+    through `-I` take precedence over `NIX_PATH`.
 
   - `--option` *name* *value*  
     Set the Nix configuration option *name* to *value*. This overrides
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
index f922182c2..57222de85 100644
--- a/doc/manual/src/expressions/build-script.md
+++ b/doc/manual/src/expressions/build-script.md
@@ -19,10 +19,9 @@ steps to elucidate what a builder does. It performs the following steps:
 
 1.  When Nix runs a builder, it initially completely clears the
     environment (except for the attributes declared in the derivation).
-    For instance, the `PATH` variable is empty\[1\]. This is done to
-    prevent undeclared inputs from being used in the build process. If
-    for example the `PATH` contained `/usr/bin`, then you might
-    accidentally use `/usr/bin/gcc`.
+    This is done to prevent undeclared inputs from being used in the
+    build process. If for example the `PATH` contained `/usr/bin`, then
+    you might accidentally use `/usr/bin/gcc`.
     
     So the first step is to set up the environment. This is done by
     calling the `setup` script of the standard environment. The
@@ -67,6 +66,3 @@ If you are wondering about the absence of error checking on the result
 of various commands called in the builder: this is because the shell
 script is evaluated with Bash's `-e` option, which causes the script to
 be aborted if any command fails without an error check.
-
-1.  Actually, it's initialised to `/path-not-set` to prevent Bash from
-    setting it to a default value.
diff --git a/doc/manual/src/expressions/derivations.md b/doc/manual/src/expressions/derivations.md
index a4df20baa..4cb233e2e 100644
--- a/doc/manual/src/expressions/derivations.md
+++ b/doc/manual/src/expressions/derivations.md
@@ -5,11 +5,12 @@ describe a single derivation (a build action). It takes as input a set,
 the attributes of which specify the inputs of the build.
 
   - There must be an attribute named `system` whose value must be a
-    string specifying a Nix platform identifier, such as `"i686-linux"`
-    or `"x86_64-darwin"`\[1\] The build can only be performed on a
-    machine and operating system matching the platform identifier. (Nix
-    can automatically forward builds for other platforms by forwarding
-    them to other machines; see [???](#chap-distributed-builds).)
+    string specifying a Nix system type, such as `"i686-linux"` or
+    `"x86_64-darwin"`. (To figure out your system type, run `nix -vv
+    --version`.) The build can only be performed on a machine and
+    operating system matching the system type. (Nix can automatically
+    forward builds for other platforms by forwarding them to other
+    machines; see [???](#chap-distributed-builds).)
 
   - There must be an attribute named `name` whose value must be a
     string. This is used as a symbolic name for the package by
@@ -146,9 +147,3 @@ The builder is executed as follows:
     supported by Nix. This is because the Nix archives used in
     deployment have no concept of ownership information, and because it
     makes the build result dependent on the user performing the build.
-
-<!-- end list -->
-
-1.  To figure out your platform identifier, look at the line “Checking
-    for the canonical Nix system name” in the output of Nix's
-    `configure` script.
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
index 90bdc556b..6942abe70 100644
--- a/doc/manual/src/expressions/generic-builder.md
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -27,8 +27,12 @@ Here is what each line means:
 1.  The `buildInputs` variable tells `setup` to use the indicated
     packages as “inputs”. This means that if a package provides a `bin`
     subdirectory, it's added to `PATH`; if it has a `include`
-    subdirectory, it's added to GCC's header search path; and so
-    on.\[1\]
+    subdirectory, it's added to GCC's header search path; and so on.
+    (This is implemented in a modular way: `setup` tries to source the
+    file `pkg/nix-support/setup-hook` of all dependencies. These “setup
+    hooks” can then set up whatever environment variables they want; for
+    instance, the setup hook for Perl sets the `PERL5LIB` environment
+    variable to contain the `lib/site_perl` directories of all inputs.)
 
 2.  The function `genericBuild` is defined in the file `$stdenv/setup`.
 
@@ -55,10 +59,3 @@ shorter:
 In fact, `mkDerivation` provides a default builder that looks exactly
 like that, so it is actually possible to omit the builder for Hello
 entirely.
-
-1.  How does it work? `setup` tries to source the file
-    `pkg/nix-support/setup-hook` of all dependencies. These “setup
-    hooks” can then set up whatever environment variables they want;
-    for instance, the setup hook for Perl sets the `PERL5LIB`
-    environment variable to contain the `lib/site_perl` directories of
-    all inputs.
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
index 2699d675f..8e267a799 100644
--- a/doc/manual/src/expressions/language-constructs.md
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -17,14 +17,14 @@ would be invalid if no such variable exists. That is, in a normal
 recursive set, they are.
 
 Recursive sets of course introduce the danger of infinite recursion. For
-example,
+example, the expression
 
     rec {
       x = y;
       y = x;
     }.x
 
-does not terminate\[1\].
+will crash with an `infinite recursion encountered` error message.
 
 ## Let-expressions
 
@@ -304,6 +304,3 @@ establishes the same scope as
 Comments can be single-line, started with a `#` character, or
 inline/multi-line, enclosed within `/*
 ... */`.
-
-1.  Actually, Nix detects infinite recursion in this case and aborts
-    (“infinite recursion encountered”).
diff --git a/doc/manual/src/expressions/language-values.md b/doc/manual/src/expressions/language-values.md
index 8ffe2f0f9..eca2cab51 100644
--- a/doc/manual/src/expressions/language-values.md
+++ b/doc/manual/src/expressions/language-values.md
@@ -108,12 +108,14 @@ Nix has the following basic data types:
     floating point number will have a floating point number as a result.
 
   - *Paths*, e.g., `/bin/sh` or `./builder.sh`. A path must contain at
-    least one slash to be recognised as such; for instance, `builder.sh`
-    is not a path\[1\]. If the file name is relative, i.e., if it does
-    not begin with a slash, it is made absolute at parse time relative
-    to the directory of the Nix expression that contained it. For
-    instance, if a Nix expression in `/foo/bar/bla.nix` refers to
-    `../xyzzy/fnord.nix`, the absolute path is `/foo/xyzzy/fnord.nix`.
+    least one slash to be recognised as such. For instance, `builder.sh`
+    is not a path: it's parsed as an expression that selects the
+    attribute `sh` from the variable `builder`. If the file name is
+    relative, i.e., if it does not begin with a slash, it is made
+    absolute at parse time relative to the directory of the Nix
+    expression that contained it. For instance, if a Nix expression in
+    `/foo/bar/bla.nix` refers to `../xyzzy/fnord.nix`, the absolute path
+    is `/foo/xyzzy/fnord.nix`.
     
     If the first component of a path is a `~`, it is interpreted as if
     the rest of the path were relative to the user's home directory.
@@ -122,8 +124,8 @@ Nix has the following basic data types:
     
     Paths can also be specified between angle brackets, e.g.
     `<nixpkgs>`. This means that the directories listed in the
-    environment variable NIX\_PATH\</literal\> will be searched for the
-    given file or directory name.
+    environment variable `NIX_PATH` will be searched for the given file
+    or directory name.
 
   - *Booleans* with values `true` and `false`.
 
@@ -210,6 +212,3 @@ passed in first , e.g.,
 evaluates to `2`. This can be used to attach metadata to a function
 without the caller needing to treat it specially, or to implement a form
 of object-oriented programming, for example.
-
-1.  It's parsed as an expression that selects the attribute `sh` from
-    the variable `builder`.
diff --git a/doc/manual/src/expressions/simple-expression.md b/doc/manual/src/expressions/simple-expression.md
index 9023f97a4..857f71b9b 100644
--- a/doc/manual/src/expressions/simple-expression.md
+++ b/doc/manual/src/expressions/simple-expression.md
@@ -12,16 +12,12 @@ do three things:
     describes all the inputs involved in building the package, such as
     dependencies, sources, and so on.
 
-2.  Write a *builder*. This is a shell script\[1\] that actually builds
-    the package from the inputs.
+2.  Write a *builder*. This is a shell script that builds the package
+    from the inputs. (In fact, it can be written in any language, but
+    typically it's a `bash` shell script.)
 
 3.  Add the package to the file `pkgs/top-level/all-packages.nix`. The
     Nix expression written in the first step is a *function*; it
     requires other packages in order to build it. In this step you put
     it all together, i.e., you call the function with the right
     arguments to build the actual package.
-
-<!-- end list -->
-
-1.  In fact, it can be written in any language, but typically it's a
-    `bash` shell script.
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
index 9076033d7..1950c3121 100644
--- a/doc/manual/src/package-management/profiles.md
+++ b/doc/manual/src/package-management/profiles.md
@@ -10,12 +10,13 @@ in a directory
 `/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3/`, while
 another version might be stored in
 `/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5s-subversion-1.1.2`. The long
-strings prefixed to the directory names are cryptographic hashes\[1\] of
-*all* inputs involved in building the package — sources, dependencies,
-compiler flags, and so on. So if two packages differ in any way, they
-end up in different locations in the file system, so they don’t
-interfere with each other. Here is what a part of a typical Nix store
-looks like:
+strings prefixed to the directory names are cryptographic hashes (to be
+precise, 160-bit truncations of SHA-256 hashes encoded in a base-32
+notation) of *all* inputs involved in building the package — sources,
+dependencies, compiler flags, and so on. So if two packages differ in
+any way, they end up in different locations in the file system, so they
+don’t interfere with each other. Here is what a part of a typical Nix
+store looks like:
 
 ![](../figures/user-environments.png)
 
@@ -113,6 +114,3 @@ All `nix-env` operations work on the profile pointed to by
     $ nix-env -p /nix/var/nix/profiles/other-profile -i subversion
 
 This will *not* change the `~/.nix-profile` symlink.
-
-1.  160-bit truncations of SHA-256 hashes encoded in a base-32 notation,
-    to be precise.

From 758c9ee1bb0e9d4bea420420af93e0128fabf188 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 12:56:19 +0200
Subject: [PATCH 028/176] Clean up the manpages

---
 doc/manual/src/command-ref/conf-file.md       |  12 +-
 doc/manual/src/command-ref/nix-build.md       |  54 +---
 doc/manual/src/command-ref/nix-channel.md     |  36 +--
 .../src/command-ref/nix-collect-garbage.md    |  26 +-
 .../src/command-ref/nix-copy-closure.md       |   9 +-
 doc/manual/src/command-ref/nix-daemon.md      |  12 +-
 doc/manual/src/command-ref/nix-env.md         | 284 +++++-------------
 doc/manual/src/command-ref/nix-hash.md        |  50 +--
 doc/manual/src/command-ref/nix-instantiate.md |  76 ++---
 .../src/command-ref/nix-prefetch-url.md       |  38 +--
 doc/manual/src/command-ref/nix-shell.md       | 103 ++-----
 doc/manual/src/command-ref/nix-store.md       | 249 +++------------
 12 files changed, 248 insertions(+), 701 deletions(-)

diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
index 92abeb73e..4fa9cedfc 100644
--- a/doc/manual/src/command-ref/conf-file.md
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -1,12 +1,8 @@
-nix.conf
+Title: nix.conf
 
-5
+# Name
 
-Nix
-
-nix.conf
-
-Nix configuration file
+`nix.conf` - Nix configuration file
 
 # Description
 
@@ -20,7 +16,7 @@ By default Nix reads settings from the following places:
 
   - If `NIX_USER_CONF_FILES` is set, then each path separated by `:`
     will be loaded in reverse order.
-    
+
     Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
     and `XDG_CONFIG_HOME`. If these are unset, it will look in
     `$HOME/.config/nix.conf`.
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
index ddebc4b1b..a65f53b4b 100644
--- a/doc/manual/src/command-ref/nix-build.md
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -1,44 +1,18 @@
-nix-build
+Title: nix-build
 
-1
+# Name
 
-Nix
+`nix-build` - build a Nix expression
 
-nix-build
+# Synopsis
 
-build a Nix expression
-
-nix-build
-
-\--arg
-
-name
-
-value
-
-\--argstr
-
-name
-
-value
-
-\--attr
-
-\-A
-
-attrPath
-
-\--no-out-link
-
-\--dry-run
-
-\--out-link
-
-\-o
-
-outlink
-
-paths
+`nix-build` [*paths…*]
+  [`--arg` *name* *value*]
+  [`--argstr` *name* *value*]
+  [{`--attr` | `-A`} *attrPath*]
+  [`--no-out-link`]
+  [`--dry-run`]
+  [{`--out-link` | `-o`} *outlink*]
 
 # Description
 
@@ -63,7 +37,7 @@ expression to a low-level store derivation) and [`nix-store
 --realise`](#rsec-nix-store-realise) (to build the store derivation).
 
 > **Warning**
-> 
+>
 > The result of the build is automatically registered as a root of the
 > Nix garbage collector. This root disappears automatically when the
 > `result` symlink is deleted or renamed. So don’t rename the symlink.
@@ -94,10 +68,10 @@ The following common options are supported:
     $ nix-build '<nixpkgs>' -A firefox
     store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
     /nix/store/d18hyl92g30l...-firefox-1.5.0.7
-    
+
     $ ls -l result
     lrwxrwxrwx  ...  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
-    
+
     $ ls ./result/bin/
     firefox  firefox-config
 
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/src/command-ref/nix-channel.md
index 0c20788f0..6b4bd2459 100644
--- a/doc/manual/src/command-ref/nix-channel.md
+++ b/doc/manual/src/command-ref/nix-channel.md
@@ -1,34 +1,12 @@
-nix-channel
+Title: nix-channel
 
-1
+# Name
 
-Nix
+`nix-channel` - manage Nix channels
 
-nix-channel
+# Synopsis
 
-manage Nix channels
-
-nix-channel
-
-\--add
-
-url
-
-name
-
-\--remove
-
-name
-
-\--list
-
-\--update
-
-names
-
-\--rollback
-
-generation
+`nix-channel` {`--add` url [*name*] | `--remove` *name* | `--list` | `--update` [*names…*] | `--rollback` [*generation*] }
 
 # Description
 
@@ -82,10 +60,10 @@ You can revert channel updates using `--rollback`:
 
     $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
     "14.04.527.0e935f1"
-    
+
     $ nix-channel --rollback
     switching from generation 483 to 482
-    
+
     $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
     "14.04.526.dbadfad"
 
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md
index 77b5d42d3..7b246f3b3 100644
--- a/doc/manual/src/command-ref/nix-collect-garbage.md
+++ b/doc/manual/src/command-ref/nix-collect-garbage.md
@@ -1,28 +1,12 @@
-nix-collect-garbage
+Title: nix-collect-garbage
 
-1
+# Name
 
-Nix
+`nix-collect-garbage` - delete unreachable store paths
 
-nix-collect-garbage
+# Synopsis
 
-delete unreachable store paths
-
-nix-collect-garbage
-
-\--delete-old
-
-\-d
-
-\--delete-older-than
-
-period
-
-\--max-freed
-
-bytes
-
-\--dry-run
+`nix-collect-garbage` [`--delete-old`] [`-d`] [`--delete-older-than` *period*] [`--max-freed` *bytes*] [`--dry-run`]
 
 # Description
 
diff --git a/doc/manual/src/command-ref/nix-copy-closure.md b/doc/manual/src/command-ref/nix-copy-closure.md
index 037334c4d..4026e50de 100644
--- a/doc/manual/src/command-ref/nix-copy-closure.md
+++ b/doc/manual/src/command-ref/nix-copy-closure.md
@@ -6,7 +6,13 @@ Title: nix-copy-closure
 
 # Synopsis
 
-`nix-copy-closure` [`--to` | `--from`] [`--gzip`] [`--include-outputs`] [`--use-substitutes` | `-s`] [`-v`] _user@machine_ _paths_
+`nix-copy-closure`
+  [`--to` | `--from`]
+  [`--gzip`]
+  [`--include-outputs`]
+  [`--use-substitutes` | `-s`]
+  [`-v`]
+  _user@machine_ _paths_
 
 # Description
 
@@ -75,4 +81,3 @@ environment:
     $ nix-copy-closure --from alice@itchy.labs \
         /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
     $ nix-env -i /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
-
diff --git a/doc/manual/src/command-ref/nix-daemon.md b/doc/manual/src/command-ref/nix-daemon.md
index b0570789c..bd5d25026 100644
--- a/doc/manual/src/command-ref/nix-daemon.md
+++ b/doc/manual/src/command-ref/nix-daemon.md
@@ -1,14 +1,12 @@
-nix-daemon
+Title: nix-daemon
 
-8
+# Name
 
-Nix
+`nix-daemon` - Nix multi-user support daemon
 
-nix-daemon
+# Synopsis
 
-Nix multi-user support daemon
-
-nix-daemon
+`nix-daemon`
 
 # Description
 
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index 90a2bd351..cf688100e 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -1,50 +1,20 @@
-nix-env
+Title: nix-env
 
-1
+# Name
 
-Nix
+`nix-env` - manipulate or query Nix user environments
 
-nix-env
+# Synopsis
 
-manipulate or query Nix user environments
-
-nix-env
-
-\--arg
-
-name
-
-value
-
-\--argstr
-
-name
-
-value
-
-\--file
-
-\-f
-
-path
-
-\--profile
-
-\-p
-
-path
-
-\--system-filter
-
-system
-
-\--dry-run
-
-operation
-
-options
-
-arguments
+`nix-env`
+  [`--option` *name* *value*]
+  [`--arg` *name* *value*]
+  [`--argstr` *name* *value*]
+  [{`--file` | `-f`} *path*]
+  [{`--profile` | `-p`} *path(]
+  [`--system-filter` *system*]
+  [`--dry-run`]
+  *operation* [*options…*] [*arguments…*]
 
 # Description
 
@@ -103,7 +73,7 @@ have an effect. See also [???](#sec-common-options).
     expression*) used by the `--install`, `--upgrade`, and `--query
     --available` operations to obtain derivations. The default is
     `~/.nix-defexpr`.
-    
+
     If the argument starts with `http://` or `https://`, it is
     interpreted as the URL of a tarball that will be downloaded and
     unpacked to a temporary location. The tarball must include a single
@@ -120,7 +90,7 @@ have an effect. See also [???](#sec-common-options).
     `--switch-generation`, `--delete-generations` and `--rollback`
     operations, this flag will cause `nix-env` to print what *would* be
     done if this flag had not been specified, without actually doing it.
-    
+
     `--dry-run` also prints out which paths will be
     [substituted](#gloss-substitute) (i.e., downloaded) and which paths
     will be built from source (because no substitute is available).
@@ -135,38 +105,38 @@ have an effect. See also [???](#sec-common-options).
 # Files
 
   - `~/.nix-defexpr`  
-    The source for the default Nix expressions used by the `--install`,
-    `--upgrade`, and `--query
-                    --available` operations to obtain derivations. The `--file` option
-    may be used to override this default.
-    
+    The source for the default Nix expressions used by the
+    `--install`, `--upgrade`, and `--query --available` operations to
+    obtain derivations. The `--file` option may be used to override
+    this default.
+
     If `~/.nix-defexpr` is a file, it is loaded as a Nix expression. If
     the expression is a set, it is used as the default Nix expression.
     If the expression is a function, an empty set is passed as argument
     and the return value is used as the default Nix expression.
-    
+
     If `~/.nix-defexpr` is a directory containing a `default.nix` file,
     that file is loaded as in the above paragraph.
-    
+
     If `~/.nix-defexpr` is a directory without a `default.nix` file,
     then its contents (both files and subdirectories) are loaded as Nix
     expressions. The expressions are combined into a single set, each
     expression under an attribute with the same name as the original
     file or subdirectory.
-    
+
     For example, if `~/.nix-defexpr` contains two files, `foo.nix` and
     `bar.nix`, then the default Nix expression will essentially be
-    
+
         {
           foo = import ~/.nix-defexpr/foo.nix;
           bar = import ~/.nix-defexpr/bar.nix;
         }
-    
+
     The file `manifest.nix` is always ignored. Subdirectories without a
     `default.nix` file are traversed recursively in search of more Nix
     expressions, but the names of these intermediate directories are not
     added to the attribute paths of the default Nix expression.
-    
+
     The command `nix-channel` places symlinks to the downloaded Nix
     expressions from each subscribed channel in this directory.
 
@@ -180,21 +150,13 @@ have an effect. See also [???](#sec-common-options).
 
 ## Synopsis
 
-nix-env
-
-\--install
-
-\-i
-
-\--preserve-installed
-
-\-P
-
-\--remove-all
-
-\-r
-
-args
+`nix-env` {`--install` | `-i`} *args…*
+  [{`--prebuilt-only` | `-b`}]
+  [{`--attr` | `-A`}]
+  [`--from-expression`] [`-E`]
+  [`--from-profile` *path*]
+  [`--preserve-installed` | `-P`]
+  [`--remove-all` | `-r`]
 
 ## Description
 
@@ -208,17 +170,17 @@ a number of possible ways:
     output paths are installed. Currently installed derivations with a
     name equal to the name of a derivation being added are removed
     unless the option `--preserve-installed` is specified.
-    
+
     If there are multiple derivations matching a name in *args* that
     have the same name (e.g., `gcc-3.3.6` and `gcc-4.1.1`), then the
     derivation with the highest *priority* is used. A derivation can
     define a priority by declaring the `meta.priority` attribute. This
     attribute should be a number, with a higher value denoting a lower
     priority. The default priority is `0`.
-    
+
     If there are multiple matching derivations with the same priority,
     then the derivation with the highest version will be installed.
-    
+
     You can force the installation of multiple derivations with the same
     name by being specific about the versions. For instance, `nix-env -i
     gcc-3.3.6 gcc-4.1.1` will install both version of GCC (and will
@@ -339,21 +301,13 @@ channel:
 
 ## Synopsis
 
-nix-env
-
-\--upgrade
-
-\-u
-
-\--lt
-
-\--leq
-
-\--eq
-
-\--always
-
-args
+`nix-env` {`--upgrade` | `-u`} *args*
+  [`--lt` | `--leq` | `--eq` | `--always`]
+  [{`--prebuilt-only` | `-b`}]
+  [{`--attr` | `-A`}]
+  [`--from-expression`] [`-E`]
+  [`--from-profile` *path*]
+  [`--preserve-installed` | `-P`]
 
 ## Description
 
@@ -400,13 +354,13 @@ For the other flags, see `--install`.
 
     $ nix-env --upgrade gcc
     upgrading `gcc-3.3.1' to `gcc-3.4'
-    
+
     $ nix-env -u gcc-3.3.2 --always (switch to a specific version)
     upgrading `gcc-3.4' to `gcc-3.3.2'
-    
+
     $ nix-env --upgrade pan
     (no upgrades available, so nothing happens)
-    
+
     $ nix-env -u (try to upgrade everything)
     upgrading `hello-2.1.2' to `hello-2.1.3'
     upgrading `mozilla-1.2' to `mozilla-1.4'
@@ -451,19 +405,13 @@ This is illustrated by the following examples:
 
 ## Synopsis
 
-nix-env
-
-\--uninstall
-
-\-e
-
-drvnames
+`nix-env` {`--uninstall` | `-e`} *drvnames…*
 
 ## Description
 
 The uninstall operation creates a new user environment, based on the
 current generation of the active profile, from which the store paths
-designated by the symbolic names *names* are removed.
+designated by the symbolic names *drvnames* are removed.
 
 ## Examples
 
@@ -474,11 +422,7 @@ designated by the symbolic names *names* are removed.
 
 ## Synopsis
 
-nix-env
-
-\--set
-
-drvname
+`nix-env` `--set` *drvname*
 
 ## Description
 
@@ -496,15 +440,7 @@ contain just Firefox:
 
 ## Synopsis
 
-nix-env
-
-\--set-flag
-
-name
-
-value
-
-drvnames
+`nix-env` `--set-flag` *name* *value* *drvnames*
 
 ## Description
 
@@ -545,20 +481,20 @@ while the old remains part of the profile:
 
     $ nix-env -q
     firefox-2.0.0.9 (the current one)
-    
+
     $ nix-env --preserve-installed -i firefox-2.0.0.11
     installing `firefox-2.0.0.11'
     building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
     collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox'
       and `/nix/store/...-firefox-2.0.0.9/bin/firefox'.
     (i.e., can’t have two active at the same time)
-    
+
     $ nix-env --set-flag active false firefox
     setting flag on `firefox-2.0.0.9'
-    
+
     $ nix-env --preserve-installed -i firefox-2.0.0.11
     installing `firefox-2.0.0.11'
-    
+
     $ nix-env -q
     firefox-2.0.0.11 (the enabled one)
     firefox-2.0.0.9 (the disabled one)
@@ -572,57 +508,21 @@ To make files from `binutils` take precedence over files from `gcc`:
 
 ## Synopsis
 
-nix-env
-
-\--query
-
-\-q
-
-\--installed
-
-\--available
-
-\-a
-
-\--status
-
-\-s
-
-\--attr-path
-
-\-P
-
-\--no-name
-
-\--compare-versions
-
-\-c
-
-\--system
-
-\--drv-path
-
-\--out-path
-
-\--description
-
-\--meta
-
-\--xml
-
-\--json
-
-\--prebuilt-only
-
-\-b
-
-\--attr
-
-\-A
-
-attribute-path
-
-names
+`nix-env` {`--query` | `-q`} *names…*
+  [`--installed` | `--available` | `-a`]
+  [{`--status` | `-s`}]
+  [{`--attr-path` | `-P`}]
+  [`--no-name`]
+  [{`--compare-versions` | `-c`}]
+  [`--system`]
+  [`--drv-path`]
+  [`--out-path`]
+  [`--description`]
+  [`--meta`]
+  [`--xml`]
+  [`--json`]
+  [{`--prebuilt-only` | `-b`}]
+  [{`--attr` | `-A`} *attribute-path*]
 
 ## Description
 
@@ -696,17 +596,17 @@ derivation is shown unless `--no-name` is specified.
     `--available` is given). This is useful for quickly seeing whether
     upgrades for installed packages are available in a Nix expression. A
     column is added with the following meaning:
-    
+
       - `<` *version*  
         A newer version of the package is available or installed.
-    
+
       - `=` *version*  
         At most the same version of the package is available or
         installed.
-    
+
       - `>` *version*  
         Only older versions of the package are available or installed.
-    
+
       - `- ?`  
         No version of the package is available or installed.
 
@@ -797,13 +697,7 @@ To show all packages in the latest revision of the Nixpkgs repository:
 
 ## Synopsis
 
-nix-env
-
-\--switch-profile
-
-\-S
-
-path
+`nix-env` {`--switch-profile` | `-S`} *path*
 
 ## Description
 
@@ -818,9 +712,7 @@ the symlink `~/.nix-profile` is made to point to *path*.
 
 ## Synopsis
 
-nix-env
-
-\--list-generations
+`nix-env` `--list-generations`
 
 ## Description
 
@@ -841,11 +733,7 @@ generation, and indicates the current generation.
 
 ## Synopsis
 
-nix-env
-
-\--delete-generations
-
-generations
+`nix-env` `--delete-generations` *generations*
 
 ## Description
 
@@ -862,24 +750,18 @@ generations is important to make garbage collection effective.
 ## Examples
 
     $ nix-env --delete-generations 3 4 8
-    
+
     $ nix-env --delete-generations +5
-    
+
     $ nix-env --delete-generations 30d
-    
+
     $ nix-env -p other_profile --delete-generations old
 
 # Operation `--switch-generation`
 
 ## Synopsis
 
-nix-env
-
-\--switch-generation
-
-\-G
-
-generation
+`nix-env` {`--switch-generation` | `-G`} *generation*
 
 ## Description
 
@@ -900,9 +782,7 @@ Switching will fail if the specified generation does not exist.
 
 ## Synopsis
 
-nix-env
-
-\--rollback
+`nix-env` `--rollback`
 
 ## Description
 
@@ -915,7 +795,7 @@ generation, if it exists. It is just a convenience wrapper around
 
     $ nix-env --rollback
     switching from generation 92 to 91
-    
+
     $ nix-env --rollback
     error: no generation older than the current (91) exists
 
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/src/command-ref/nix-hash.md
index 3b8bbf740..38c9e0f67 100644
--- a/doc/manual/src/command-ref/nix-hash.md
+++ b/doc/manual/src/command-ref/nix-hash.md
@@ -1,38 +1,16 @@
-nix-hash
+Title: nix-hash
 
-1
+# Name
 
-Nix
+`nix-hash` - compute the cryptographic hash of a path
 
-nix-hash
+# Synopsis
 
-compute the cryptographic hash of a path
+`nix-hash` [`--flat`] [`--base32`] [`--truncate`] [`--type` *hashAlgo*] *path…*
 
-nix-hash
+`nix-hash` `--to-base16` *hash…*
 
-\--flat
-
-\--base32
-
-\--truncate
-
-\--type
-
-hashAlgo
-
-path
-
-nix-hash
-
-\--to-base16
-
-hash
-
-nix-hash
-
-\--to-base32
-
-hash
+`nix-hash` `--to-base32` *hash…*
 
 # Description
 
@@ -92,22 +70,22 @@ Computing hashes:
 
     $ mkdir test
     $ echo "hello" > test/world
-    
+
     $ nix-hash test/ (MD5 hash; default)
     8179d3caeff1869b5ba1744e5a245c04
-    
+
     $ nix-store --dump test/ | md5sum (for comparison)
     8179d3caeff1869b5ba1744e5a245c04  -
-    
+
     $ nix-hash --type sha1 test/
     e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
-    
+
     $ nix-hash --type sha1 --base32 test/
     nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-    
+
     $ nix-hash --type sha256 --flat test/
     error: reading file `test/': Is a directory
-    
+
     $ nix-hash --type sha256 --flat test/world
     5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
 
@@ -115,6 +93,6 @@ Converting between hexadecimal and base-32:
 
     $ nix-hash --type sha1 --to-base32 e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
     nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-    
+
     $ nix-hash --type sha1 --to-base16 nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
     e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index 6c9f2d3e1..b6bbbe80a 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -1,56 +1,22 @@
-nix-instantiate
+Title: nix-instantiate
 
-1
+# Name
 
-Nix
+`nix-instantiate` - instantiate store derivations from Nix expressions
 
-nix-instantiate
+# Synopsis
 
-instantiate store derivations from Nix expressions
+`nix-instantiate`
+  [`--parse` | `--eval` [`--strict`] [`--json`] [`--xml`] ]
+  [`--read-write-mode`]
+  [`--arg` *name* *value*]
+  [{`--attr`| `-A`} *attrPath*]
+  [`--add-root` *path*]
+  [`--indirect`]
+  [`--expr` | `-E`]
+  *files…*
 
-nix-instantiate
-
-\--parse
-
-\--eval
-
-\--strict
-
-\--json
-
-\--xml
-
-\--read-write-mode
-
-\--arg
-
-name
-
-value
-
-\--attr
-
-\-A
-
-attrPath
-
-\--add-root
-
-path
-
-\--indirect
-
-\--expr
-
-\-E
-
-files
-
-nix-instantiate
-
-\--find-file
-
-files
+`nix-instantiate` `--find-file` *files…*
 
 # Description
 
@@ -91,9 +57,9 @@ See also [???](#sec-common-options) for a list of common options.
     When used with `--eval`, recursively evaluate list elements and
     attributes. Normally, such sub-expressions are left unevaluated
     (since the Nix expression language is lazy).
-    
+
     > **Warning**
-    > 
+    >
     > This option can cause non-termination, because lazy data
     > structures can be infinitely large.
 
@@ -123,11 +89,11 @@ using `nix-store`:
 
     $ nix-instantiate test.nix (instantiate)
     /nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
-    
+
     $ nix-store -r $(nix-instantiate test.nix) (build)
     ...
     /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 (output path)
-    
+
     $ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
     dr-xr-xr-x    2 eelco    users        4096 1970-01-01 01:00 lib
     ...
@@ -145,10 +111,10 @@ Parsing and evaluating Nix expressions:
 
     $ nix-instantiate --parse -E '1 + 2'
     1 + 2
-    
+
     $ nix-instantiate --eval -E '1 + 2'
     3
-    
+
     $ nix-instantiate --eval --xml -E '1 + 2'
     <?xml version='1.0' encoding='utf-8'?>
     <expr>
@@ -179,5 +145,3 @@ attempt to show non-normal forms).
         <string value="foo" />
       </attr>
     ...
-
-# Environment variables
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/src/command-ref/nix-prefetch-url.md
index f7de27402..688496969 100644
--- a/doc/manual/src/command-ref/nix-prefetch-url.md
+++ b/doc/manual/src/command-ref/nix-prefetch-url.md
@@ -1,32 +1,16 @@
-nix-prefetch-url
+Title: nix-prefetch-url
 
-1
+# Name
 
-Nix
+`nix-prefetch-url` - copy a file from a URL into the store and print its hash
 
-nix-prefetch-url
+# Synopsis
 
-copy a file from a URL into the store and print its hash
-
-nix-prefetch-url
-
-\--version
-
-\--type
-
-hashAlgo
-
-\--print-path
-
-\--unpack
-
-\--name
-
-name
-
-url
-
-hash
+`nix-prefetch-url` *url* [*hash*]
+  [`--type` *hashAlgo*]
+  [`--print-path`]
+  [`--unpack`]
+  [`--name` *name*]
 
 # Description
 
@@ -77,11 +61,11 @@ Nix store is also printed.
 
     $ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz
     0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
-    
+
     $ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz
     0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
     /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
-    
+
     $ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz
     079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7
     /nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
index 9e2b781ab..d6dbb6e26 100644
--- a/doc/manual/src/command-ref/nix-shell.md
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -1,60 +1,21 @@
-nix-shell
+Title: nix-shell
 
-1
+# Name
 
-Nix
+`nix-shell` - start an interactive shell based on a Nix expression
 
-nix-shell
+# Synopsis
 
-start an interactive shell based on a Nix expression
-
-nix-shell
-
-\--arg
-
-name
-
-value
-
-\--argstr
-
-name
-
-value
-
-\--attr
-
-\-A
-
-attrPath
-
-\--command
-
-cmd
-
-\--run
-
-cmd
-
-\--exclude
-
-regexp
-
-\--pure
-
-\--keep
-
-name
-
-\--packages
-
-\-p
-
-packages
-
-expressions
-
-path
+`nix-shell`
+  [`--arg` *name* *value*]
+  [`--argstr` *name* *value*]
+  [{`--attr` | `-A`} *attrPath*]
+  [`--command` *cmd*]
+  [`--run` *cmd*]
+  [`--exclude` *regexp*]
+  [--pure]
+  [--keep *name*]
+  {{`--packages` | `-p`} {*packages* | *expressions*} … | [*path*]}
 
 # Description
 
@@ -96,11 +57,10 @@ All options not listed here are passed to `nix-store
     This command is executed in an interactive shell. (Use `--run` to
     use a non-interactive shell instead.) However, a call to `exit` is
     implicitly added to the command, so the shell will exit after
-    running the command. To prevent this, add `return` at the end; e.g.
-    `--command
-                    "echo Hello; return"` will print `Hello` and then drop you into the
-    interactive shell. This can be useful for doing any additional
-    initialisation.
+    running the command. To prevent this, add `return` at the end;
+    e.g.  `--command "echo Hello; return"` will print `Hello` and then
+    drop you into the interactive shell. This can be useful for doing
+    any additional initialisation.
 
   - `--run` *cmd*  
     Like `--command`, but executes the command in a non-interactive
@@ -129,8 +89,7 @@ All options not listed here are passed to `nix-store
 
   - `-i` *interpreter*  
     The chained script interpreter to be invoked by `nix-shell`. Only
-    applicable in `#!`-scripts (described
-    [below](#ssec-nix-shell-shebang)).
+    applicable in `#!`-scripts (described below).
 
   - `--keep` *name*  
     When a `--pure` shell is started, keep the listed environment
@@ -186,7 +145,7 @@ gives you a shell containing the Pan package from a specific revision of
 Nixpkgs:
 
     $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
-    
+
     [nix-shell:~]$ pan --version
     Pan 0.139
 
@@ -213,9 +172,9 @@ For example, here is a Python script that depends on Python and the
 
     #! /usr/bin/env nix-shell
     #! nix-shell -i python -p python pythonPackages.prettytable
-    
+
     import prettytable
-    
+
     # Print a simple table.
     t = prettytable.PrettyTable(["N", "N^2"])
     for n in range(1, 10): t.add_row([n, n * n])
@@ -226,12 +185,12 @@ requires Perl and the `HTML::TokeParser::Simple` and `LWP` packages:
 
     #! /usr/bin/env nix-shell
     #! nix-shell -i perl -p perl perlPackages.HTMLTokeParserSimple perlPackages.LWP
-    
+
     use HTML::TokeParser::Simple;
-    
+
     # Fetch nixos.org and print all hrefs.
     my $p = HTML::TokeParser::Simple->new(url => 'http://nixos.org/');
-    
+
     while (my $token = $p->get_tag("a")) {
         my $href = $token->get_attr("href");
         print "$href\n" if $href;
@@ -242,11 +201,11 @@ package like Terraform:
 
     #! /usr/bin/env nix-shell
     #! nix-shell -i bash -p "terraform.withPlugins (plugins: [ plugins.openstack ])"
-    
+
     terraform apply
 
 > **Note**
-> 
+>
 > You must use double quotes (`"`) when passing a simple Nix expression
 > in a nix-shell shebang.
 
@@ -257,10 +216,10 @@ branch):
     #! /usr/bin/env nix-shell
     #! nix-shell -i runghc -p "haskellPackages.ghcWithPackages (ps: [ps.HTTP ps.tagsoup])"
     #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-18.03.tar.gz
-    
+
     import Network.HTTP
     import Text.HTML.TagSoup
-    
+
     -- Fetch nixos.org and print all hrefs.
     main = do
       resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
@@ -285,7 +244,5 @@ where the file `deps.nix` in the same directory as the `#!`-script
 contains:
 
     with import <nixpkgs> {};
-    
-    runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
 
-# Environment variables
+    runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index a666de49b..a098beb1e 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -1,26 +1,15 @@
-nix-store
+Title: nix-store
 
-1
+# Name
 
-Nix
+`nix-store` - manipulate or query the Nix store
 
-nix-store
+# Synopsis
 
-manipulate or query the Nix store
-
-nix-store
-
-\--add-root
-
-path
-
-\--indirect
-
-operation
-
-options
-
-arguments
+`nix-store` *operation* [*options…*] [*arguments…*]
+  [`--option` *name* *value*]
+  [`--add-root` *path*]
+  [`--indirect`]
 
 # Description
 
@@ -44,7 +33,7 @@ options.
     which must be inside a directory that is scanned for roots by the
     garbage collector (i.e., typically in a subdirectory of
     `/nix/var/nix/gcroots/`) *unless* the `--indirect` flag is used.
-    
+
     If there are multiple results, then multiple symlinks will be
     created by sequentially numbering symlinks beyond the first one
     (e.g., `foo`, `foo-2`, `foo-3`, and so on).
@@ -55,24 +44,24 @@ options.
     commands such as `nix-build` that place a symlink to the build
     result in the current directory; such a build result should not be
     garbage-collected unless the symlink is removed.
-    
+
     The `--indirect` flag causes a uniquely named symlink to *path* to
     be stored in `/nix/var/nix/gcroots/auto/`. For instance,
-    
+
         $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
-        
+
         $ ls -l /nix/var/nix/gcroots/auto
         lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
-        
+
         $ ls -l /home/eelco/bla/result
         lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r11343n6qd4...-f-spot-0.0.10
-    
+
     Thus, when `/home/eelco/bla/result` is removed, the GC root in the
     `auto` directory becomes a dangling symlink and will be ignored by
     the collector.
-    
+
     > **Warning**
-    > 
+    >
     > Note that it is not possible to move or rename indirect GC roots,
     > since the symlink in the `auto` directory will still point to the
     > old location.
@@ -83,15 +72,7 @@ options.
 
 ## Synopsis
 
-nix-store
-
-\--realise
-
-\-r
-
-paths
-
-\--dry-run
+`nix-store` {`--realise` | `-r`} *paths…* [`--dry-run`]
 
 ## Description
 
@@ -136,7 +117,7 @@ The following flags are available:
     output path is not identical to the corresponding output from the
     previous build, the new output path is left in
     `/nix/store/name.check.`
-    
+
     See also the `build-repeat` configuration option, which repeats a
     derivation a number of times and prevents its outputs from being
     registered as “valid” in the Nix store unless they are identical.
@@ -188,11 +169,7 @@ To test whether a previously-built derivation is deterministic:
 
 ## Synopsis
 
-nix-store
-
-\--serve
-
-\--write
+`nix-store` `--serve` [`--write`]
 
 ## Description
 
@@ -220,19 +197,7 @@ used to provide build access to a given SSH public key:
 
 ## Synopsis
 
-nix-store
-
-\--gc
-
-\--print-roots
-
-\--print-live
-
-\--print-dead
-
-\--max-freed
-
-bytes
+`nix-store` `--gc` [`--print-roots` | `--print-live` | `--print-dead`] [`--max-freed` *bytes*]
 
 ## Description
 
@@ -294,13 +259,7 @@ To delete at least 100 MiBs of unreachable paths:
 
 ## Synopsis
 
-nix-store
-
-\--delete
-
-\--ignore-liveness
-
-paths
+`nix-store` `--delete` [`--ignore-liveness`] *paths…*
 
 ## Description
 
@@ -324,55 +283,13 @@ paths in the store that refer to it (i.e., depend on it).
 
 ## Synopsis
 
-nix-store
-
-\--query
-
-\-q
-
-\--outputs
-
-\--requisites
-
-\-R
-
-\--references
-
-\--referrers
-
-\--referrers-closure
-
-\--deriver
-
-\-d
-
-\--graph
-
-\--tree
-
-\--binding
-
-name
-
-\-b
-
-name
-
-\--hash
-
-\--size
-
-\--roots
-
-\--use-output
-
-\-u
-
-\--force-realise
-
-\-f
-
-paths
+`nix-store` {`--query` | `-q`}
+  {`--outputs` | `--requisites` | `-R` | `--references` |
+  `--referrers` | `--referrers-closure` | `--deriver` | `-d` |
+  `--graph` | `--tree` | `--binding` *name* | `-b` *name* | `--hash` |
+  `--size` | `--roots`}
+  [`--use-output`] [`-u`] [`--force-realise`] [`-f`]
+  *paths…*
 
 ## Description
 
@@ -403,13 +320,13 @@ symlink.
 
   - `--requisites`; `-R`  
     Prints out the [closure](#gloss-closure) of the store path *paths*.
-    
+
     This query has one option:
-    
-      - `--include-outputs`  
+
+      - `--include-outputs`
         Also include the output path of store derivations, and their
         closures.
-    
+
     This query can be used to implement various kinds of deployment. A
     *source deployment* is obtained by distributing the closure of a
     store derivation. A *binary deployment* is obtained by distributing
@@ -555,11 +472,7 @@ depends on `svn`:
 
 ## Synopsis
 
-nix-store
-
-\--add
-
-paths
+`nix-store` `--add` *paths…*
 
 ## Description
 
@@ -575,15 +488,7 @@ prints the resulting paths in the Nix store on standard output.
 
 ## Synopsis
 
-nix-store
-
-\--recursive
-
-\--add-fixed
-
-algorithm
-
-paths
+`nix-store` `--add-fixed` [`--recursive`] *algorithm* *paths…*
 
 ## Description
 
@@ -608,13 +513,7 @@ This operation has the following options:
 
 ## Synopsis
 
-nix-store
-
-\--verify
-
-\--check-contents
-
-\--repair
+`nix-store` `--verify` [`--check-contents`] [`--repair`]
 
 ## Description
 
@@ -643,11 +542,7 @@ This operation has the following options:
 
 ## Synopsis
 
-nix-store
-
-\--verify-path
-
-paths
+`nix-store` `--verify-path` *paths…*
 
 ## Description
 
@@ -666,11 +561,7 @@ To verify the integrity of the `svn` command and all its dependencies:
 
 ## Synopsis
 
-nix-store
-
-\--repair-path
-
-paths
+`nix-store` `--repair-path` *paths…*
 
 ## Description
 
@@ -679,7 +570,7 @@ by redownloading them using the available substituters. If no
 substitutes are available, then repair is not possible.
 
 > **Warning**
-> 
+>
 > During repair, there is a very small time window during which the old
 > path (if it exists) is moved out of the way and replaced with the new
 > path. If repair is interrupted in between, then the system may be left
@@ -692,7 +583,7 @@ substitutes are available, then repair is not possible.
     path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified!
       expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588',
       got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4'
-    
+
     $ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
     fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
     …
@@ -701,11 +592,7 @@ substitutes are available, then repair is not possible.
 
 ## Synopsis
 
-nix-store
-
-\--dump
-
-path
+`nix-store` `--dump` *path*
 
 ## Description
 
@@ -739,11 +626,7 @@ A Nix archive can be unpacked using `nix-store
 
 ## Synopsis
 
-nix-store
-
-\--restore
-
-path
+`nix-store` `--restore` *path*
 
 ## Description
 
@@ -754,11 +637,7 @@ not already exist. The archive is read from standard input.
 
 ## Synopsis
 
-nix-store
-
-\--export
-
-paths
+`nix-store` `--export` *paths…*
 
 ## Description
 
@@ -784,9 +663,7 @@ To import the whole closure again, run:
 
 ## Synopsis
 
-nix-store
-
-\--import
+`nix-store` `--import`
 
 ## Description
 
@@ -800,9 +677,7 @@ Nix store, the import fails.
 
 ## Synopsis
 
-nix-store
-
-\--optimise
+`nix-store` `--optimise`
 
 ## Description
 
@@ -832,13 +707,7 @@ Use `-vv` or `-vvv` to get some progress indication.
 
 ## Synopsis
 
-nix-store
-
-\--read-log
-
-\-l
-
-paths
+`nix-store` {`--read-log` | `-l`} *paths…*
 
 ## Description
 
@@ -866,11 +735,7 @@ substitute, then the log is unavailable.
 
 ## Synopsis
 
-nix-store
-
-\--dump-db
-
-paths
+`nix-store` `--dump-db` [*paths…*]
 
 ## Description
 
@@ -889,9 +754,7 @@ example.
 
 ## Synopsis
 
-nix-store
-
-\--load-db
+`nix-store` `--load-db`
 
 ## Description
 
@@ -902,11 +765,7 @@ The operation `--load-db` reads a dump of the Nix database created by
 
 ## Synopsis
 
-nix-store
-
-\--print-env
-
-drvpath
+`nix-store` `--print-env` *drvpath*
 
 ## Description
 
@@ -927,15 +786,7 @@ of the builder are placed in the variable `_args`.
 
 ## Synopsis
 
-nix-store
-
-\--generate-binary-cache-key
-
-key-name
-
-secret-key-file
-
-public-key-file
+`nix-store` `--generate-binary-cache-key` *key-name* *secret-key-file* *public-key-file*
 
 ## Description
 
@@ -952,5 +803,3 @@ mandatory parameters:
 2.  The file name where the secret key is to be stored.
 
 3.  The file name where the public key is to be stored.
-
-# Environment variables

From 7a0e6f076a34e214832ac3a8cc6472aea5fd1559 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 12:58:31 +0200
Subject: [PATCH 029/176] Move figures

---
 doc/manual/{ => src}/figures/user-environments.png | Bin
 doc/manual/{ => src}/figures/user-environments.sxd | Bin
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename doc/manual/{ => src}/figures/user-environments.png (100%)
 rename doc/manual/{ => src}/figures/user-environments.sxd (100%)

diff --git a/doc/manual/figures/user-environments.png b/doc/manual/src/figures/user-environments.png
similarity index 100%
rename from doc/manual/figures/user-environments.png
rename to doc/manual/src/figures/user-environments.png
diff --git a/doc/manual/figures/user-environments.sxd b/doc/manual/src/figures/user-environments.sxd
similarity index 100%
rename from doc/manual/figures/user-environments.sxd
rename to doc/manual/src/figures/user-environments.sxd

From 4a79b3598f077983dd5717d7822ef8cb6a9fa967 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 13:01:00 +0200
Subject: [PATCH 030/176] Fix nix-copy-closure manpage

---
 .../src/command-ref/nix-copy-closure.md       | 46 +++++++++----------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/doc/manual/src/command-ref/nix-copy-closure.md b/doc/manual/src/command-ref/nix-copy-closure.md
index 4026e50de..2a4558324 100644
--- a/doc/manual/src/command-ref/nix-copy-closure.md
+++ b/doc/manual/src/command-ref/nix-copy-closure.md
@@ -37,37 +37,37 @@ and second to send the dump of those paths.  If this bothers you, use
 
 # Options
 
-*`--to`*
-: Copy the closure of _paths_ from the local Nix store to the Nix
-  store on _machine_. This is the default.
+  - `--to`  
+    Copy the closure of _paths_ from the local Nix store to the Nix
+    store on _machine_. This is the default.
 
-*`--from`*
-: Copy the closure of _paths_ from the Nix store on _machine_ to the
-  local Nix store.
+  - `--from`  
+    Copy the closure of _paths_ from the Nix store on _machine_ to the
+    local Nix store.
 
-*`--gzip`*
-: Enable compression of the SSH connection.
+  - `--gzip`  
+    Enable compression of the SSH connection.
 
-*`--include-outputs`*
-: Also copy the outputs of store derivations included in the closure.
+  - `--include-outputs`  
+    Also copy the outputs of store derivations included in the closure.
 
-*`--use-substitutes` / `-s`*
-: Attempt to download missing paths on the target machine using Nix’s
-  substitute mechanism.  Any paths that cannot be substituted on the
-  target are still copied normally from the source.  This is useful,
-  for instance, if the connection between the source and target
-  machine is slow, but the connection between the target machine and
-  `nixos.org` (the default binary cache server) is
-  fast.
+  - `--use-substitutes` / `-s`  
+    Attempt to download missing paths on the target machine using Nix’s
+    substitute mechanism.  Any paths that cannot be substituted on the
+    target are still copied normally from the source.  This is useful,
+    for instance, if the connection between the source and target
+    machine is slow, but the connection between the target machine and
+    `nixos.org` (the default binary cache server) is
+    fast.
 
-*`-v`*
-: Show verbose output.
+  - `-v`  
+    Show verbose output.
 
 # Environment variables
 
-*`NIX_SSHOPTS`*
-: Additional options to be passed to `ssh` on the command
-  line.
+  - `NIX_SSHOPTS`  
+    Additional options to be passed to `ssh` on the command
+    line.
 
 # Examples
 

From da3d776cb91123a4d0528251b7ce909419ca0c7a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 14:31:33 +0200
Subject: [PATCH 031/176] Fix some dangling references

---
 .../src/advanced-topics/cores-vs-jobs.md      | 35 +++++----
 doc/manual/src/advanced-topics/diff-hook.md   | 20 +++---
 .../src/advanced-topics/post-build-hook.md    |  7 +-
 doc/manual/src/command-ref/conf-file.md       | 24 ++-----
 doc/manual/src/command-ref/nix-build.md       |  2 +-
 doc/manual/src/command-ref/nix-channel.md     |  1 -
 doc/manual/src/command-ref/nix-env.md         |  2 +-
 doc/manual/src/command-ref/nix-instantiate.md |  2 -
 doc/manual/src/command-ref/nix-shell.md       |  2 +-
 doc/manual/src/command-ref/nix-store.md       | 14 ++--
 .../src/expressions/arguments-variables.md    | 22 +++---
 doc/manual/src/expressions/build-script.md    |  8 +--
 doc/manual/src/expressions/builder-syntax.md  | 72 -------------------
 doc/manual/src/expressions/builtins.md        | 69 +++++++++---------
 doc/manual/src/expressions/derivations.md     |  5 +-
 .../src/expressions/expression-syntax.md      |  7 +-
 doc/manual/src/expressions/generic-builder.md | 13 ++--
 .../src/expressions/language-operators.md     |  7 +-
 doc/manual/src/glossary.md                    | 38 +++++-----
 .../package-management/basic-package-mgmt.md  | 10 +--
 .../src/package-management/copy-closure.md    |  2 +-
 .../package-management/package-management.md  |  9 +--
 doc/manual/src/package-management/profiles.md |  3 +-
 23 files changed, 139 insertions(+), 235 deletions(-)
 delete mode 100644 doc/manual/src/expressions/builder-syntax.md

diff --git a/doc/manual/src/advanced-topics/cores-vs-jobs.md b/doc/manual/src/advanced-topics/cores-vs-jobs.md
index 91e95d5b4..4a9058ca1 100644
--- a/doc/manual/src/advanced-topics/cores-vs-jobs.md
+++ b/doc/manual/src/advanced-topics/cores-vs-jobs.md
@@ -1,33 +1,32 @@
 # Tuning Cores and Jobs
 
-Nix has two relevant settings with regards to how your CPU cores will be
-utilized: [???](#conf-cores) and [???](#conf-max-jobs). This chapter
-will talk about what they are, how they interact, and their
-configuration trade-offs.
+Nix has two relevant settings with regards to how your CPU cores will
+be utilized: `cores` and `max-jobs`. This chapter will talk about what
+they are, how they interact, and their configuration trade-offs.
 
-  - [???](#conf-max-jobs)  
+  - `max-jobs`  
     Dictates how many separate derivations will be built at the same
-    time. If you set this to zero, the local machine will do no builds.
-    Nix will still substitute from binary caches, and build remotely if
-    remote builders are configured.
+    time. If you set this to zero, the local machine will do no
+    builds.  Nix will still substitute from binary caches, and build
+    remotely if remote builders are configured.
 
-  - [???](#conf-cores)  
-    Suggests how many cores each derivation should use. Similar to `make
-    -j`.
+  - `cores`  
+    Suggests how many cores each derivation should use. Similar to
+    `make -j`.
 
-The [???](#conf-cores) setting determines the value of
-`NIX_BUILD_CORES`. `NIX_BUILD_CORES` is equal to [???](#conf-cores),
-unless [???](#conf-cores) equals `0`, in which case `NIX_BUILD_CORES`
-will be the total number of cores in the system.
+The `cores` setting determines the value of
+`NIX_BUILD_CORES`. `NIX_BUILD_CORES` is equal to `cores`, unless
+`cores` equals `0`, in which case `NIX_BUILD_CORES` will be the total
+number of cores in the system.
 
 The maximum number of consumed cores is a simple multiplication,
-[???](#conf-max-jobs) \* `NIX_BUILD_CORES`.
+`max-jobs` \* `NIX_BUILD_CORES`.
 
 The balance on how to set these two independent variables depends upon
 each builder's workload and hardware. Here are a few example scenarios
 on a machine with 24 cores:
 
-| [???](#conf-max-jobs) | [???](#conf-cores) | `NIX_BUILD_CORES` | Maximum Processes | Result                                                                                                                                                                                                                                                                                 |
+| `max-jobs` | `cores` | `NIX_BUILD_CORES` | Maximum Processes | Result                                                                                                                                                                                                                                                                                 |
 | --------------------- | ------------------ | ----------------- | ----------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
 | 1                     | 24                 | 24                | 24                | One derivation will be built at a time, each one can use 24 cores. Undersold if a job can’t use 24 cores.                                                                                                                                                                              |
 | 4                     | 6                  | 6                 | 24                | Four derivations will be built at once, each given access to six cores.                                                                                                                                                                                                                |
@@ -35,8 +34,6 @@ on a machine with 24 cores:
 | 24                    | 1                  | 1                 | 24                | 24 derivations can build at the same time, each using a single core. Never oversold, but derivations which require many cores will be very slow to compile.                                                                                                                            |
 | 24                    | 0                  | 24                | 576               | 24 derivations can build at the same time, each using all the available cores of the machine. Very likely to be oversold, and very likely to suffer context switches.                                                                                                                  |
 
-Balancing 24 Build Cores
-
 It is up to the derivations' build script to respect host's requested
 cores-per-build by following the value of the `NIX_BUILD_CORES`
 environment variable.
diff --git a/doc/manual/src/advanced-topics/diff-hook.md b/doc/manual/src/advanced-topics/diff-hook.md
index 2c9896fa5..e2234147f 100644
--- a/doc/manual/src/advanced-topics/diff-hook.md
+++ b/doc/manual/src/advanced-topics/diff-hook.md
@@ -1,9 +1,8 @@
 # Verifying Build Reproducibility
 
-Specify a program with Nix's [???](#conf-diff-hook) to compare build
-results when two builds produce different results. Note: this hook is
-only executed if the results are not the same, this hook is not used for
-determining if the results are the same.
+You can use Nix's `diff-hook` setting to compare build results. Note
+that this hook is only executed if the results differ; it is not used
+for determining if the results are the same.
 
 For purposes of demonstration, we'll use the following Nix file,
 `deterministic.nix` for testing:
@@ -93,7 +92,7 @@ has copied the build results to that directory where you can examine it.
 > path will be deleted on the next garbage collection.
 > 
 > The path is guaranteed to be alive for the duration of
-> [???](#conf-diff-hook)'s execution, but may be deleted any time after.
+> the `diff-hook`'s execution, but may be deleted any time after.
 > 
 > If the comparison is performed as part of automated tooling, please
 > use the diff-hook or author your tooling to handle the case where the
@@ -112,9 +111,8 @@ Run the build without `--check`, and then try with `--check` again.
 Automatically verify every build at build time by executing the build
 multiple times.
 
-Setting [???](#conf-repeat) and [???](#conf-enforce-determinism) in your
-`nix.conf` permits the automated verification of every build Nix
-performs.
+Setting `repeat` and `enforce-determinism` in your `nix.conf` permits
+the automated verification of every build Nix performs.
 
 The following configuration will run each build three times, and will
 require the build to be deterministic:
@@ -122,9 +120,9 @@ require the build to be deterministic:
     enforce-determinism = true
     repeat = 2
 
-Setting [???](#conf-enforce-determinism) to false as in the following
-configuration will run the build multiple times, execute the build hook,
-but will allow the build to succeed even if it does not build
+Setting `enforce-determinism` to false as in the following
+configuration will run the build multiple times, execute the build
+hook, but will allow the build to succeed even if it does not build
 reproducibly:
 
     enforce-determinism = false
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/src/advanced-topics/post-build-hook.md
index 166b57da6..0d02a8ff3 100644
--- a/doc/manual/src/advanced-topics/post-build-hook.md
+++ b/doc/manual/src/advanced-topics/post-build-hook.md
@@ -17,9 +17,8 @@ the build loop.
 
 # Prerequisites
 
-This tutorial assumes you have configured an S3-compatible binary cache
-according to the instructions at
-[???](#ssec-s3-substituter-authenticated-writes), and that the `root`
+This tutorial assumes you have [configured an S3-compatible binary
+cache](../package-management/s3-substituter.md), and that the `root`
 user's default AWS profile can upload to the bucket.
 
 # Set up a Signing Key
@@ -33,7 +32,7 @@ distribute the public key for verifying the authenticity of the paths.
     example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
 
 Then, add the public key and the cache URL to your `nix.conf`'s
-[???](#conf-trusted-public-keys) and [???](#conf-substituters) like:
+`trusted-public-keys` and `substituters` options:
 
     substituters = https://cache.nixos.org/ s3://example-nix-cache
     trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
index 4fa9cedfc..bedf1ec6b 100644
--- a/doc/manual/src/command-ref/conf-file.md
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -77,8 +77,7 @@ The following settings are currently available:
                     --optimise` to get rid of duplicate files.
 
   - `builders`  
-    A list of machines on which to perform builds. See
-    [???](#chap-distributed-builds) for details.
+    A list of machines on which to perform builds.
 
   - `builders-use-substitutes`  
     If set to `true`, Nix will instruct remote build machines to use
@@ -140,8 +139,6 @@ The following settings are currently available:
     `-jN` flag to GNU Make. It can be overridden using the `--cores`
     command line switch and defaults to `1`. The value `0` means that
     the builder should use all available CPU cores in the system.
-    
-    See also [???](#chap-tuning-cores-and-jobs).
 
   - `diff-hook`  
     Absolute path to an executable capable of diffing build results. The
@@ -298,8 +295,6 @@ The following settings are currently available:
     `preferLocalBuild` derivation attribute which executes locally
     regardless). It can be overridden using the `--max-jobs` (`-j`)
     command line switch.
-    
-    See also [???](#chap-tuning-cores-and-jobs).
 
   - `max-silent-time`  
     This option defines the maximum number of seconds that a builder can
@@ -429,12 +424,10 @@ The following settings are currently available:
         
         Example:
         `/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev
-                                                                                                        /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
-                                                                                                        /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
-                                                                                                        /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
-                                                                                                        /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`.
-    
-    See [???](#chap-post-build-hook) for an example implementation.
+        /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
+        /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
+        /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
+        /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`.
 
   - `repeat`  
     How many times to repeat builds to check whether they are
@@ -459,8 +452,7 @@ The following settings are currently available:
     `allowed-uri`. The default is `false`.
 
   - `run-diff-hook`  
-    If true, enable the execution of
-    [varlistentry\_title](#conf-diff-hook).
+    If true, enable the execution of the `diff-hook` program.
     
     When using the Nix daemon, `run-diff-hook` must be set in the
     `nix.conf` configuration file, and cannot be passed at the command
@@ -595,15 +587,11 @@ The following settings are currently available:
     Nix will print a log message at the "vomit" level for every function
     entrance and function exit.
     
-    <div class="informalexample">
-    
         function-trace entered undefined position at 1565795816999559622
         function-trace exited undefined position at 1565795816999581277
         function-trace entered /nix/store/.../example.nix:226:41 at 1565795253249935150
         function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
     
-    </div>
-    
     The `undefined position` means the function call is a builtin.
     
     Use the `contrib/stack-collapse.py` script distributed with the Nix
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
index a65f53b4b..81dc26a39 100644
--- a/doc/manual/src/command-ref/nix-build.md
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -46,7 +46,7 @@ expression to a low-level store derivation) and [`nix-store
 
 All options not listed here are passed to `nix-store
 --realise`, except for `--arg` and `--attr` / `-A` which are passed to
-`nix-instantiate`. See also [???](#sec-common-options).
+`nix-instantiate`.
 
   - `--no-out-link`  
     Do not create a symlink to the output path. Note that as a result
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/src/command-ref/nix-channel.md
index 6b4bd2459..ea3a57e69 100644
--- a/doc/manual/src/command-ref/nix-channel.md
+++ b/doc/manual/src/command-ref/nix-channel.md
@@ -13,7 +13,6 @@ Title: nix-channel
 A Nix channel is a mechanism that allows you to automatically stay
 up-to-date with a set of pre-built Nix expressions. A Nix channel is
 just a URL that points to a place containing a set of Nix expressions.
-See also [???](#sec-channels).
 
 To see the list of official NixOS channels, visit
 <https://nixos.org/channels>.
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index cf688100e..ab1d10c08 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -66,7 +66,7 @@ match. Here are some examples:
 
 This section lists the options that are common to all operations. These
 options are allowed for every subcommand, though they may not always
-have an effect. See also [???](#sec-common-options).
+have an effect.
 
   - `--file` / `-f` *path*  
     Specifies the Nix expression (designated below as the *active Nix
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index b6bbbe80a..ca9ef1fc9 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -30,8 +30,6 @@ the resulting store derivations are printed on standard output.
 If *files* is the character `-`, then a Nix expression will be read from
 standard input.
 
-See also [???](#sec-common-options) for a list of common options.
-
 # Options
 
   - `--add-root` *path*; `--indirect`  
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
index d6dbb6e26..492351867 100644
--- a/doc/manual/src/command-ref/nix-shell.md
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -50,7 +50,7 @@ will cause `nix-shell` to print `Hello shell`.
 
 All options not listed here are passed to `nix-store
 --realise`, except for `--arg` and `--attr` / `-A` which are passed to
-`nix-instantiate`. See also [???](#sec-common-options).
+`nix-instantiate`.
 
   - `--command` *cmd*  
     In the environment of the derivation, run the shell command *cmd*.
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index a098beb1e..b15340fde 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -23,16 +23,15 @@ subcommand to be performed. These are documented below.
 
 This section lists the options that are common to all operations. These
 options are allowed for every subcommand, though they may not always
-have an effect. See also [???](#sec-common-options) for a list of common
-options.
+have an effect.
 
   - `--add-root` *path*  
     Causes the result of a realisation (`--realise` and
     `--force-realise`) to be registered as a root of the garbage
-    collector(see [???](#ssec-gc-roots)). The root is stored in *path*,
-    which must be inside a directory that is scanned for roots by the
-    garbage collector (i.e., typically in a subdirectory of
-    `/nix/var/nix/gcroots/`) *unless* the `--indirect` flag is used.
+    collector. The root is stored in *path*, which must be inside a
+    directory that is scanned for roots by the garbage collector
+    (i.e., typically in a subdirectory of `/nix/var/nix/gcroots/`)
+    *unless* the `--indirect` flag is used.
 
     If there are multiple results, then multiple symlinks will be
     created by sequentially numbering symlinks beyond the first one
@@ -209,8 +208,7 @@ The following suboperations may be specified:
 
   - `--print-roots`  
     This operation prints on standard output the set of roots used by
-    the garbage collector. What constitutes a root is described in
-    [???](#ssec-gc-roots).
+    the garbage collector.
 
   - `--print-live`  
     This operation prints on standard output the set of “live” store
diff --git a/doc/manual/src/expressions/arguments-variables.md b/doc/manual/src/expressions/arguments-variables.md
index 436ae559d..2956f98f1 100644
--- a/doc/manual/src/expressions/arguments-variables.md
+++ b/doc/manual/src/expressions/arguments-variables.md
@@ -1,11 +1,12 @@
 # Arguments and Variables
 
-The Nix expression in [???](#ex-hello-nix) is a function; it is missing
-some arguments that have to be filled in somewhere. In the Nix Packages
-collection this is done in the file `pkgs/top-level/all-packages.nix`,
-where all Nix expressions for packages are imported and called with the
-appropriate arguments. Here are some fragments of `all-packages.nix`,
-with annotations of what they mean:
+The [Nix expression for GNU Hello](expression-syntax.md) is a
+function; it is missing some arguments that have to be filled in
+somewhere. In the Nix Packages collection this is done in the file
+`pkgs/top-level/all-packages.nix`, where all Nix expressions for
+packages are imported and called with the appropriate arguments. Here
+are some fragments of `all-packages.nix`, with annotations of what
+they mean:
 
     ...
     
@@ -35,9 +36,10 @@ with annotations of what they mean:
 
 2.  Here we *import* the Nix expression for GNU Hello. The import
     operation just loads and returns the specified Nix expression. In
-    fact, we could just have put the contents of [???](#ex-hello-nix) in
-    `all-packages.nix` at this point. That would be completely
-    equivalent, but it would make the file rather bulky.
+    fact, we could just have put the contents of the Nix expression
+    for GNU Hello in `all-packages.nix` at this point. That would be
+    completely equivalent, but it would make `all-packages.nix` rather
+    bulky.
     
     Note that we refer to `../applications/misc/hello/ex-1`, not
     `../applications/misc/hello/ex-1/default.nix`. When you try to
@@ -54,7 +56,7 @@ with annotations of what they mean:
     The result of this function call is an actual derivation that can be
     built by Nix (since when we fill in the arguments of the function,
     what we get is its body, which is the call to `stdenv.mkDerivation`
-    in [???](#ex-hello-nix)).
+    in the [Nix expression for GNU Hello](expression-syntax.md)).
     
     > **Note**
     > 
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
index 57222de85..e0dda56f8 100644
--- a/doc/manual/src/expressions/build-script.md
+++ b/doc/manual/src/expressions/build-script.md
@@ -25,10 +25,10 @@ steps to elucidate what a builder does. It performs the following steps:
     
     So the first step is to set up the environment. This is done by
     calling the `setup` script of the standard environment. The
-    environment variable `stdenv` points to the location of the standard
-    environment being used. (It wasn't specified explicitly as an
-    attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
-    automatically.)
+    environment variable `stdenv` points to the location of the
+    standard environment being used. (It wasn't specified explicitly
+    as an attribute in Hello's Nix expression, but `mkDerivation` adds
+    it automatically.)
 
 2.  Since Hello needs Perl, we have to make sure that Perl is in the
     `PATH`. The `perl` environment variable points to the location of
diff --git a/doc/manual/src/expressions/builder-syntax.md b/doc/manual/src/expressions/builder-syntax.md
deleted file mode 100644
index 916159d40..000000000
--- a/doc/manual/src/expressions/builder-syntax.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Builder Syntax
-
-    source $stdenv/setup 
-    
-    PATH=$perl/bin:$PATH 
-    
-    tar xvfz $src 
-    cd hello-*
-    ./configure --prefix=$out 
-    make 
-    make install
-
-[example\_title](#ex-hello-builder) shows the builder referenced from
-Hello's Nix expression (stored in
-`pkgs/applications/misc/hello/ex-1/builder.sh`). The builder can
-actually be made a lot shorter by using the *generic builder* functions
-provided by `stdenv`, but here we write out the build steps to elucidate
-what a builder does. It performs the following steps:
-
-  - When Nix runs a builder, it initially completely clears the
-    environment (except for the attributes declared in the derivation).
-    For instance, the `PATH` variable is empty\[1\]. This is done to
-    prevent undeclared inputs from being used in the build process. If
-    for example the `PATH` contained `/usr/bin`, then you might
-    accidentally use `/usr/bin/gcc`.
-    
-    So the first step is to set up the environment. This is done by
-    calling the `setup` script of the standard environment. The
-    environment variable `stdenv` points to the location of the standard
-    environment being used. (It wasn't specified explicitly as an
-    attribute in [???](#ex-hello-nix), but `mkDerivation` adds it
-    automatically.)
-
-  - Since Hello needs Perl, we have to make sure that Perl is in the
-    `PATH`. The `perl` environment variable points to the location of
-    the Perl package (since it was passed in as an attribute to the
-    derivation), so `$perl/bin` is the directory containing the Perl
-    interpreter.
-
-  - Now we have to unpack the sources. The `src` attribute was bound to
-    the result of fetching the Hello source tarball from the network, so
-    the `src` environment variable points to the location in the Nix
-    store to which the tarball was downloaded. After unpacking, we `cd`
-    to the resulting source directory.
-    
-    The whole build is performed in a temporary directory created in
-    `/tmp`, by the way. This directory is removed after the builder
-    finishes, so there is no need to clean up the sources afterwards.
-    Also, the temporary directory is always newly created, so you don't
-    have to worry about files from previous builds interfering with the
-    current build.
-
-  - GNU Hello is a typical Autoconf-based package, so we first have to
-    run its `configure` script. In Nix every package is stored in a
-    separate location in the Nix store, for instance
-    `/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1`. Nix
-    computes this path by cryptographically hashing all attributes of
-    the derivation. The path is passed to the builder through the `out`
-    environment variable. So here we give `configure` the parameter
-    `--prefix=$out` to cause Hello to be installed in the expected
-    location.
-
-  - Finally we build Hello (`make`) and install it into the location
-    specified by `out` (`make install`).
-
-If you are wondering about the absence of error checking on the result
-of various commands called in the builder: this is because the shell
-script is evaluated with Bash's `-e` option, which causes the script to
-be aborted if any command fails without an error check.
-
-1.  Actually, it's initialised to `/path-not-set` to prevent Bash from
-    setting it to a default value.
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index 8f19c692a..3c9bb4533 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -83,7 +83,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
     its elements or attributes are also evaluated recursively.
 
   - `derivation` *attrs*; `builtins.derivation` *attrs*  
-    `derivation` is described in [???](#ssec-derivation).
+    `derivation` is described in [its own section](derivations.md).
 
   - `dirOf` *s*; `builtins.dirOf` *s*  
     Return the directory part of the string *s*, that is, everything
@@ -233,8 +233,8 @@ For instance, `derivation` is also available as `builtins.derivation`.
         
         > **Note**
         > 
-        > Nix will refetch the branch in accordance to
-        > [???](#conf-tarball-ttl).
+        > Nix will refetch the branch in accordance with
+        > the option `tarball-ttl`.
         
         > **Note**
         > 
@@ -351,19 +351,18 @@ For instance, `derivation` is also available as `builtins.derivation`.
 
   - `import` *path*; `builtins.import` *path*  
     Load, parse and return the Nix expression in the file *path*. If
-    *path* is a directory, the file ` default.nix
-                     ` in that directory is loaded. Evaluation aborts if the file
-    doesn’t exist or contains an incorrect Nix expression. `import`
-    implements Nix’s module system: you can put any Nix expression (such
-    as a set or a function) in a separate file, and use it from Nix
-    expressions in other files.
+    *path* is a directory, the file ` default.nix ` in that directory
+    is loaded. Evaluation aborts if the file doesn’t exist or contains
+    an incorrect Nix expression. `import` implements Nix’s module
+    system: you can put any Nix expression (such as a set or a
+    function) in a separate file, and use it from Nix expressions in
+    other files.
     
     > **Note**
     > 
     > Unlike some languages, `import` is a regular function in Nix.
-    > Paths using the angle bracket syntax (e.g., `
-    >     >     >     >     > import` *\<foo\>*) are normal path values (see
-    > [???](#ssec-values)).
+    > Paths using the angle bracket syntax (e.g., `import` *\<foo\>*)
+    > are [normal path values](language-values.md).
     
     A Nix expression loaded by `import` must not contain any *free
     variables* (identifiers that are not defined in the Nix expression
@@ -643,11 +642,12 @@ For instance, `derivation` is also available as `builtins.derivation`.
     (which is not the case for `abort`).
 
   - `builtins.toFile` *name* *s*  
-    Store the string *s* in a file in the Nix store and return its path.
-    The file has suffix *name*. This file can be used as an input to
-    derivations. One application is to write builders “inline”. For
-    instance, the following Nix expression combines [???](#ex-hello-nix)
-    and [???](#ex-hello-builder) into one file:
+    Store the string *s* in a file in the Nix store and return its
+    path.  The file has suffix *name*. This file can be used as an
+    input to derivations. One application is to write builders
+    “inline”. For instance, the following Nix expression combines the
+    [Nix expression for GNU Hello](expression-syntax.md) and its
+    [build script](build-script.md) into one file:
     
         { stdenv, fetchurl, perl }:
         
@@ -688,8 +688,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
       ";
     ```
     
-    Note that `${configFile}` is an antiquotation (see
-    [???](#ssec-values)), so the result of the expression `configFile`
+    Note that `${configFile}` is an
+    [antiquotation](language-values.md), so the result of the
+    expression `configFile`
     (i.e., a path like `/nix/store/m7p7jfny445k...-foo.conf`) will be
     spliced into the resulting string.
     
@@ -786,17 +787,17 @@ For instance, `derivation` is also available as `builtins.derivation`.
     container contains a number of servlets (`*.war` files) each
     exported under a specific URI prefix. So the servlet configuration
     is a list of sets containing the `path` and `war` of the servlet
-    ([???](#ex-toxml-co-servlets)). This kind of information is
-    difficult to communicate with the normal method of passing
-    information through an environment variable, which just concatenates
-    everything together into a string (which might just work in this
-    case, but wouldn’t work if fields are optional or contain lists
-    themselves). Instead the Nix expression is converted to an XML
-    representation with `toXML`, which is unambiguous and can easily be
-    processed with the appropriate tools. For instance, in the example
-    an XSLT stylesheet (at point ②) is applied to it (at point ①) to
-    generate the XML configuration file for the Jetty server. The XML
-    representation produced at point ③ by `toXML` is as follows:
+    (①). This kind of information is difficult to communicate with the
+    normal method of passing information through an environment
+    variable, which just concatenates everything together into a
+    string (which might just work in this case, but wouldn’t work if
+    fields are optional or contain lists themselves). Instead the Nix
+    expression is converted to an XML representation with `toXML`,
+    which is unambiguous and can easily be processed with the
+    appropriate tools. For instance, in the example an XSLT stylesheet
+    (at point ②) is applied to it (at point ①) to generate the XML
+    configuration file for the Jetty server. The XML representation
+    produced at point ③ by `toXML` is as follows:
     
         <?xml version='1.0' encoding='utf-8'?>
         <expr>
@@ -820,10 +821,10 @@ For instance, `derivation` is also available as `builtins.derivation`.
           </list>
         </expr>
     
-    Note that [???](#ex-toxml) uses the `toFile` built-in to write the
-    builder and the stylesheet “inline” in the Nix expression. The path
-    of the stylesheet is spliced into the builder using the syntax
-    `xsltproc ${stylesheet}`.
+    Note that we used the `toFile` built-in to write the builder and
+    the stylesheet “inline” in the Nix expression. The path of the
+    stylesheet is spliced into the builder using the syntax `xsltproc
+    ${stylesheet}`.
 
   - `builtins.trace` *e1* *e2*  
     Evaluate *e1* and print its abstract syntax representation on
diff --git a/doc/manual/src/expressions/derivations.md b/doc/manual/src/expressions/derivations.md
index 4cb233e2e..0e5656b5b 100644
--- a/doc/manual/src/expressions/derivations.md
+++ b/doc/manual/src/expressions/derivations.md
@@ -9,8 +9,9 @@ the attributes of which specify the inputs of the build.
     `"x86_64-darwin"`. (To figure out your system type, run `nix -vv
     --version`.) The build can only be performed on a machine and
     operating system matching the system type. (Nix can automatically
-    forward builds for other platforms by forwarding them to other
-    machines; see [???](#chap-distributed-builds).)
+    [forward builds for other
+    platforms](../advanced-topics/distributed-builds.md) by forwarding
+    them to other machines.)
 
   - There must be an attribute named `name` whose value must be a
     string. This is used as a symbolic name for the package by
diff --git a/doc/manual/src/expressions/expression-syntax.md b/doc/manual/src/expressions/expression-syntax.md
index 2abe6ac6e..e3432b577 100644
--- a/doc/manual/src/expressions/expression-syntax.md
+++ b/doc/manual/src/expressions/expression-syntax.md
@@ -61,9 +61,10 @@ elements (referenced from the figure by number):
     sometimes be omitted, in which case `mkDerivation` will fill in a
     default builder (which does a `configure; make; make install`, in
     essence). Hello is sufficiently simple that the default builder
-    would suffice, but in this case, we will show an actual builder for
-    educational purposes. The value `./builder.sh` refers to the shell
-    script shown in [???](#ex-hello-builder), discussed below.
+    would suffice, but in this case, we will show an actual builder
+    for educational purposes. The value `./builder.sh` refers to the
+    shell script shown in the [next section](build-script.md),
+    discussed below.
 
 5.  The builder has to know what the sources of the package are. Here,
     the attribute `src` is bound to the result of a call to the
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
index 6942abe70..43275dbf7 100644
--- a/doc/manual/src/expressions/generic-builder.md
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -1,7 +1,7 @@
 # Generic Builder Syntax
 
-Recall from [???](#ex-hello-builder) that the builder looked something
-like this:
+Recall that the [build script for GNU Hello](build-script.md) looked
+something like this:
 
     PATH=$perl/bin:$PATH
     tar xvfz $src
@@ -37,11 +37,10 @@ Here is what each line means:
 2.  The function `genericBuild` is defined in the file `$stdenv/setup`.
 
 3.  The final step calls the shell function `genericBuild`, which
-    performs the steps that were done explicitly in
-    [???](#ex-hello-builder). The generic builder is smart enough to
-    figure out whether to unpack the sources using `gzip`, `bzip2`, etc.
-    It can be customised in many ways; see the Nixpkgs manual for
-    details.
+    performs the steps that were done explicitly in the previous build
+    script. The generic builder is smart enough to figure out whether
+    to unpack the sources using `gzip`, `bzip2`, etc.  It can be
+    customised in many ways; see the Nixpkgs manual for details.
 
 Discerning readers will note that the `buildInputs` could just as well
 have been set in the Nix expression, like this:
diff --git a/doc/manual/src/expressions/language-operators.md b/doc/manual/src/expressions/language-operators.md
index b124a2417..1d787ffe3 100644
--- a/doc/manual/src/expressions/language-operators.md
+++ b/doc/manual/src/expressions/language-operators.md
@@ -1,8 +1,7 @@
 # Operators
 
-[table\_title](#table-operators) lists the operators in the Nix
-expression language, in order of precedence (from strongest to weakest
-binding).
+The table below lists the operators in the Nix expression language, in
+order of precedence (from strongest to weakest binding).
 
 | Name                     | Syntax                              | Associativity | Description                                                                                                                                                                                                                   | Precedence |
 | ------------------------ | ----------------------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ---------- |
@@ -28,5 +27,3 @@ binding).
 | Logical OR               | *e1* `\|\|` *e2*                    | left          | Logical OR.                                                                                                                                                                                                                   | 13         |
 | Logical Implication      | *e1* `->` *e2*                      | none          | Logical implication (equivalent to `!e1 \|\|
         e2`).                                                                                                                                                                    | 14         |
-
-Operators
diff --git a/doc/manual/src/glossary.md b/doc/manual/src/glossary.md
index c8bdf4fd2..56af9cd85 100644
--- a/doc/manual/src/glossary.md
+++ b/doc/manual/src/glossary.md
@@ -3,7 +3,7 @@
   - derivation  
     A description of a build action. The result of a derivation is a
     store object. Derivations are typically specified in Nix expressions
-    using the [`derivation` primitive](#ssec-derivation). These are
+    using the [`derivation` primitive](expressions/derivations.md). These are
     translated into low-level *store derivations* (implicitly by
     `nix-env` and `nix-build`, or explicitly by `nix-instantiate`).
 
@@ -53,20 +53,19 @@
     paths.
 
   - reachable  
-    A store path `Q` is reachable from another store path `P` if `Q` is
-    in the [closure](#gloss-closure) of the
-    [references](#gloss-reference) relation.
+    A store path `Q` is reachable from another store path `P` if `Q`
+    is in the *closure* of the *references* relation.
 
   - closure  
     The closure of a store path is the set of store paths that are
     directly or indirectly “reachable” from that store path; that is,
-    it’s the closure of the path under the
-    [references](#gloss-reference) relation. For a package, the closure
-    of its derivation is equivalent to the build-time dependencies,
-    while the closure of its output path is equivalent to its runtime
-    dependencies. For correct deployment it is necessary to deploy whole
-    closures, since otherwise at runtime files could be missing. The
-    command `nix-store -qR` prints out closures of store paths.
+    it’s the closure of the path under the *references* relation. For
+    a package, the closure of its derivation is equivalent to the
+    build-time dependencies, while the closure of its output path is
+    equivalent to its runtime dependencies. For correct deployment it
+    is necessary to deploy whole closures, since otherwise at runtime
+    files could be missing. The command `nix-store -qR` prints out
+    closures of store paths.
     
     As an example, if the store object at path `P` contains a reference
     to path `Q`, then `Q` is in the closure of `P`. Further, if `Q`
@@ -76,7 +75,7 @@
     A store path produced by a derivation.
 
   - deriver  
-    The deriver of an [output path](#gloss-output-path) is the store
+    The deriver of an *output path* is the store
     derivation that built it.
 
   - validity  
@@ -87,16 +86,15 @@
   - user environment  
     An automatically generated store object that consists of a set of
     symlinks to “active” applications, i.e., other store paths. These
-    are generated automatically by [`nix-env`](#sec-nix-env). See
-    [???](#sec-profiles).
+    are generated automatically by
+    [`nix-env`](command-ref/nix-env.md). See *profiles*.
 
   - profile  
-    A symlink to the current [user environment](#gloss-user-env) of a
-    user, e.g., `/nix/var/nix/profiles/default`.
+    A symlink to the current *user environment* of a user, e.g.,
+    `/nix/var/nix/profiles/default`.
 
   - NAR  
     A *N*ix *AR*chive. This is a serialisation of a path in the Nix
-    store. It can contain regular files, directories and symbolic links.
-    NARs are generated and unpacked using `nix-store --dump` and
-    `nix-store
-            --restore`.
+    store. It can contain regular files, directories and symbolic
+    links.  NARs are generated and unpacked using `nix-store --dump`
+    and `nix-store --restore`.
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
index d9c34afc6..8edaca6b0 100644
--- a/doc/manual/src/package-management/basic-package-mgmt.md
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -24,11 +24,11 @@ or completely new ones.)
 
 You can manually download the latest version of Nixpkgs from
 <http://nixos.org/nixpkgs/download.html>. However, it’s much more
-convenient to use the Nixpkgs *channel*, since it makes it easy to stay
-up to date with new versions of Nixpkgs. (Channels are described in more
-detail in [???](#sec-channels).) Nixpkgs is automatically added to your
-list of “subscribed” channels when you install Nix. If this is not the
-case for some reason, you can add it as follows:
+convenient to use the Nixpkgs [*channel*](channels.md), since it makes
+it easy to stay up to date with new versions of Nixpkgs. Nixpkgs is
+automatically added to your list of “subscribed” channels when you
+install Nix. If this is not the case for some reason, you can add it
+as follows:
 
     $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
     $ nix-channel --update
diff --git a/doc/manual/src/package-management/copy-closure.md b/doc/manual/src/package-management/copy-closure.md
index d78b77e36..d3fac4d76 100644
--- a/doc/manual/src/package-management/copy-closure.md
+++ b/doc/manual/src/package-management/copy-closure.md
@@ -8,7 +8,7 @@ dependencies:
 
     $ nix-copy-closure --to alice@itchy.example.org $(type -p firefox)
 
-See [???](#sec-nix-copy-closure) for details.
+See the [manpage for `nix-copy-closure`](../command-ref/nix-copy-closure.md) for details.
 
 With `nix-store
 --export` and `nix-store --import` you can write the closure of a store
diff --git a/doc/manual/src/package-management/package-management.md b/doc/manual/src/package-management/package-management.md
index a2d078c16..bd26a09ab 100644
--- a/doc/manual/src/package-management/package-management.md
+++ b/doc/manual/src/package-management/package-management.md
@@ -1,4 +1,5 @@
-This chapter discusses how to do package management with Nix, i.e., how
-to obtain, install, upgrade, and erase packages. This is the “user’s”
-perspective of the Nix system — people who want to *create* packages
-should consult [???](#chap-writing-nix-expressions).
+This chapter discusses how to do package management with Nix, i.e.,
+how to obtain, install, upgrade, and erase packages. This is the
+“user’s” perspective of the Nix system — people who want to *create*
+packages should consult the [chapter on writing Nix
+expressions](../expressions/writing-nix-expressions.md).
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
index 1950c3121..f3786072d 100644
--- a/doc/manual/src/package-management/profiles.md
+++ b/doc/manual/src/package-management/profiles.md
@@ -104,8 +104,7 @@ These commands switch to the `my-profile` and default profile,
 respectively. If the profile doesn’t exist, it will be created
 automatically. You should be careful about storing a profile in another
 location than the `profiles` directory, since otherwise it might not be
-used as a root of the garbage collector (see
-[???](#sec-garbage-collection)).
+used as a root of the [garbage collector](garbage-collection.md).
 
 All `nix-env` operations work on the profile pointed to by
 `~/.nix-profile`, but you can override this using the `--profile` option

From 05a282295f3d454c811f9bdd9b755f6a5c07c190 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 15:46:16 +0200
Subject: [PATCH 032/176] Fix internal links

---
 .../src/advanced-topics/distributed-builds.md |  3 +-
 .../src/advanced-topics/post-build-hook.md    |  3 +-
 doc/manual/src/command-ref/conf-file.md       | 99 ++++++++-----------
 doc/manual/src/command-ref/env-common.md      |  7 +-
 doc/manual/src/command-ref/nix-build.md       |  5 +-
 .../src/command-ref/nix-collect-garbage.md    | 20 ++--
 doc/manual/src/command-ref/nix-env.md         | 37 +++----
 doc/manual/src/command-ref/nix-hash.md        | 14 +--
 doc/manual/src/command-ref/nix-instantiate.md | 10 +-
 doc/manual/src/command-ref/nix-store.md       | 50 +++++-----
 doc/manual/src/command-ref/opt-common.md      | 84 ++++++++--------
 .../src/expressions/advanced-attributes.md    | 30 +++---
 doc/manual/src/expressions/builtins.md        | 39 ++++----
 .../expressions/simple-building-testing.md    | 10 +-
 .../src/installation/installing-binary.md     |  4 +-
 doc/manual/src/installation/multi-user.md     |  8 +-
 .../package-management/basic-package-mgmt.md  |  7 +-
 doc/manual/src/package-management/channels.md |  4 +-
 .../src/package-management/s3-substituter.md  | 10 +-
 doc/manual/src/release-notes/rl-2.0.md        | 41 ++++----
 doc/manual/src/release-notes/rl-2.1.md        | 22 ++---
 21 files changed, 245 insertions(+), 262 deletions(-)

diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md
index 4f24febb0..76a5380bf 100644
--- a/doc/manual/src/advanced-topics/distributed-builds.md
+++ b/doc/manual/src/advanced-topics/distributed-builds.md
@@ -134,8 +134,7 @@ causes the list of machines in `/etc/nix/machines` to be included. (This
 is the default.)
 
 If you want the builders to use caches, you likely want to set the
-option [`builders-use-substitutes`](#conf-builders-use-substitutes) in
-your local `nix.conf`.
+option `builders-use-substitutes` in your local `nix.conf`.
 
 To build only on remote builders and disable building on the local
 machine, you can use the option `--max-jobs 0`.
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/src/advanced-topics/post-build-hook.md
index 0d02a8ff3..7b3ae58fb 100644
--- a/doc/manual/src/advanced-topics/post-build-hook.md
+++ b/doc/manual/src/advanced-topics/post-build-hook.md
@@ -108,5 +108,4 @@ We now have a Nix installation configured to automatically sign and
 upload every local build to a remote binary cache.
 
 Before deploying this to production, be sure to consider the
-implementation caveats in [Implementation
-Caveats](#chap-post-build-hook-caveats).
+[implementation caveats](#implementation-caveats).
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
index bedf1ec6b..306ad23f5 100644
--- a/doc/manual/src/command-ref/conf-file.md
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -141,10 +141,10 @@ The following settings are currently available:
     the builder should use all available CPU cores in the system.
 
   - `diff-hook`  
-    Absolute path to an executable capable of diffing build results. The
-    hook executes if [varlistentry\_title](#conf-run-diff-hook) is true,
-    and the output of a build is known to not be the same. This program
-    is not executed to determine if two results are the same.
+    Absolute path to an executable capable of diffing build
+    results. The hook is executed if `run-diff-hook` is true, and the
+    output of a build is known to not be the same. This program is not
+    executed to determine if two results are the same.
     
     The diff hook is executed by the same user and group who ran the
     build. However, the diff hook does not have write access to the
@@ -169,7 +169,7 @@ The following settings are currently available:
     configuration file, and cannot be passed at the command line.
 
   - `enforce-determinism`  
-    See [varlistentry\_title](#conf-repeat).
+    See `repeat`.
 
   - `extra-sandbox-paths`  
     A list of additional paths appended to `sandbox-paths`. Useful if
@@ -343,7 +343,7 @@ The following settings are currently available:
         password my-password
     
     For the exact syntax, see [the `curl`
-    documentation.](https://ec.haxx.se/usingcurl-netrc.html)
+    documentation](https://ec.haxx.se/usingcurl-netrc.html).
     
     > **Note**
     > 
@@ -434,9 +434,9 @@ The following settings are currently available:
     deterministic. The default value is 0. If the value is non-zero,
     every build is repeated the specified number of times. If the
     contents of any of the runs differs from the previous ones and
-    [varlistentry\_title](#conf-enforce-determinism) is true, the build
-    is rejected and the resulting store paths are not registered as
-    “valid” in Nix’s database.
+    `enforce-determinism` is true, the build is rejected and the
+    resulting store paths are not registered as “valid” in Nix’s
+    database.
 
   - `require-sigs`  
     If set to `true` (the default), any non-content-addressed path added
@@ -461,20 +461,21 @@ The following settings are currently available:
   - `sandbox`  
     If set to `true`, builds will be performed in a *sandboxed
     environment*, i.e., they’re isolated from the normal file system
-    hierarchy and will only see their dependencies in the Nix store, the
-    temporary build directory, private versions of `/proc`, `/dev`,
-    `/dev/shm` and `/dev/pts` (on Linux), and the paths configured with
-    the [`sandbox-paths` option](#conf-sandbox-paths). This is useful to
+    hierarchy and will only see their dependencies in the Nix store,
+    the temporary build directory, private versions of `/proc`,
+    `/dev`, `/dev/shm` and `/dev/pts` (on Linux), and the paths
+    configured with the `sandbox-paths` option. This is useful to
     prevent undeclared dependencies on files in directories such as
-    `/usr/bin`. In addition, on Linux, builds run in private PID, mount,
-    network, IPC and UTS namespaces to isolate them from other processes
-    in the system (except that fixed-output derivations do not run in
-    private network namespace to ensure they can access the network).
+    `/usr/bin`. In addition, on Linux, builds run in private PID,
+    mount, network, IPC and UTS namespaces to isolate them from other
+    processes in the system (except that fixed-output derivations do
+    not run in private network namespace to ensure they can access the
+    network).
     
     Currently, sandboxing only work on Linux and macOS. The use of a
     sandbox requires that Nix is run as root (so you should use the
-    [“build users” feature](#conf-build-users-group) to perform the
-    actual builds under different users than root).
+    “build users” feature to perform the actual builds under different
+    users than root).
     
     If this option is set to `relaxed`, then fixed-output derivations
     and derivations that have the `__noChroot` attribute set to `true`
@@ -631,81 +632,61 @@ The following settings are currently available:
 ## Deprecated Settings
 
   - `binary-caches`  
-    *Deprecated:* `binary-caches` is now an alias to
-    [varlistentry\_title](#conf-substituters).
+    *Deprecated:* `binary-caches` is now an alias to `substituters`.
 
   - `binary-cache-public-keys`  
-    *Deprecated:* `binary-cache-public-keys` is now an alias to
-    [varlistentry\_title](#conf-trusted-public-keys).
+    *Deprecated:* `binary-cache-public-keys` is now an alias `trusted-public-keys`.
 
   - `build-compress-log`  
-    *Deprecated:* `build-compress-log` is now an alias to
-    [varlistentry\_title](#conf-compress-build-log).
+    *Deprecated:* `build-compress-log` is now an alias to `compress-build-log`.
 
   - `build-cores`  
-    *Deprecated:* `build-cores` is now an alias to
-    [varlistentry\_title](#conf-cores).
+    *Deprecated:* `build-cores` is now an alias to `cores`.
 
   - `build-extra-chroot-dirs`  
-    *Deprecated:* `build-extra-chroot-dirs` is now an alias to
-    [varlistentry\_title](#conf-extra-sandbox-paths).
+    *Deprecated:* `build-extra-chroot-dirs` is now an alias to `extra-sandbox-paths`.
 
   - `build-extra-sandbox-paths`  
-    *Deprecated:* `build-extra-sandbox-paths` is now an alias to
-    [varlistentry\_title](#conf-extra-sandbox-paths).
+    *Deprecated:* `build-extra-sandbox-paths` is now an alias to `extra-sandbox-paths`.
 
   - `build-fallback`  
-    *Deprecated:* `build-fallback` is now an alias to
-    [varlistentry\_title](#conf-fallback).
+    *Deprecated:* `build-fallback` is now an alias to `fallback`.
 
   - `build-max-jobs`  
-    *Deprecated:* `build-max-jobs` is now an alias to
-    [varlistentry\_title](#conf-max-jobs).
+    *Deprecated:* `build-max-jobs` is now an alias to `max-jobs`.
 
   - `build-max-log-size`  
-    *Deprecated:* `build-max-log-size` is now an alias to
-    [varlistentry\_title](#conf-max-build-log-size).
+    *Deprecated:* `build-max-log-size` is now an alias to `max-build-log-size`.
 
   - `build-max-silent-time`  
-    *Deprecated:* `build-max-silent-time` is now an alias to
-    [varlistentry\_title](#conf-max-silent-time).
+    *Deprecated:* `build-max-silent-time` is now an alias to `max-silent-time`.
 
   - `build-repeat`  
-    *Deprecated:* `build-repeat` is now an alias to
-    [varlistentry\_title](#conf-repeat).
+    *Deprecated:* `build-repeat` is now an alias to `repeat`.
 
   - `build-timeout`  
-    *Deprecated:* `build-timeout` is now an alias to
-    [varlistentry\_title](#conf-timeout).
+    *Deprecated:* `build-timeout` is now an alias to `timeout`.
 
   - `build-use-chroot`  
-    *Deprecated:* `build-use-chroot` is now an alias to
-    [varlistentry\_title](#conf-sandbox).
+    *Deprecated:* `build-use-chroot` is now an alias to `sandbox`.
 
   - `build-use-sandbox`  
-    *Deprecated:* `build-use-sandbox` is now an alias to
-    [varlistentry\_title](#conf-sandbox).
+    *Deprecated:* `build-use-sandbox` is now an alias to `sandbox`.
 
   - `build-use-substitutes`  
-    *Deprecated:* `build-use-substitutes` is now an alias to
-    [varlistentry\_title](#conf-substitute).
+    *Deprecated:* `build-use-substitutes` is now an alias to `substitute`.
 
   - `gc-keep-derivations`  
-    *Deprecated:* `gc-keep-derivations` is now an alias to
-    [varlistentry\_title](#conf-keep-derivations).
+    *Deprecated:* `gc-keep-derivations` is now an alias to `keep-derivations`.
 
   - `gc-keep-outputs`  
-    *Deprecated:* `gc-keep-outputs` is now an alias to
-    [varlistentry\_title](#conf-keep-outputs).
+    *Deprecated:* `gc-keep-outputs` is now an alias to `keep-outputs`.
 
   - `env-keep-derivations`  
-    *Deprecated:* `env-keep-derivations` is now an alias to
-    [varlistentry\_title](#conf-keep-env-derivations).
+    *Deprecated:* `env-keep-derivations` is now an alias to `keep-env-derivations`.
 
   - `extra-binary-caches`  
-    *Deprecated:* `extra-binary-caches` is now an alias to
-    [varlistentry\_title](#conf-extra-substituters).
+    *Deprecated:* `extra-binary-caches` is now an alias to `extra-substituters`.
 
   - `trusted-binary-caches`  
-    *Deprecated:* `trusted-binary-caches` is now an alias to
-    [varlistentry\_title](#conf-trusted-substituters).
+    *Deprecated:* `trusted-binary-caches` is now an alias to `trusted-substituters`.
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/src/command-ref/env-common.md
index 14e08e0f1..e5fd45a7f 100644
--- a/doc/manual/src/command-ref/env-common.md
+++ b/doc/manual/src/command-ref/env-common.md
@@ -92,9 +92,10 @@ Most Nix commands interpret the following environment variables:
   - `NIX_REMOTE`  
     This variable should be set to `daemon` if you want to use the Nix
     daemon to execute Nix operations. This is necessary in [multi-user
-    Nix installations](#ssec-multi-user). If the Nix daemon's Unix
-    socket is at some non-standard path, this variable should be set to
-    `unix://path/to/socket`. Otherwise, it should be left unset.
+    Nix installations](../installation/multi-user.md). If the Nix
+    daemon's Unix socket is at some non-standard path, this variable
+    should be set to `unix://path/to/socket`. Otherwise, it should be
+    left unset.
 
   - `NIX_SHOW_STATS`  
     If set to `1`, Nix will print some evaluation statistics, such as
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
index 81dc26a39..026495c8d 100644
--- a/doc/manual/src/command-ref/nix-build.md
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -32,9 +32,10 @@ to a temporary location. The tarball must include a single top-level
 directory containing at least a file named `default.nix`.
 
 `nix-build` is essentially a wrapper around
-[`nix-instantiate`](#sec-nix-instantiate) (to translate a high-level Nix
+[`nix-instantiate`](nix-instantiate.md) (to translate a high-level Nix
 expression to a low-level store derivation) and [`nix-store
---realise`](#rsec-nix-store-realise) (to build the store derivation).
+--realise`](nix-store.md#operation---realise) (to build the store
+derivation).
 
 > **Warning**
 >
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md
index 7b246f3b3..37587c7e1 100644
--- a/doc/manual/src/command-ref/nix-collect-garbage.md
+++ b/doc/manual/src/command-ref/nix-collect-garbage.md
@@ -11,16 +11,16 @@ Title: nix-collect-garbage
 # Description
 
 The command `nix-collect-garbage` is mostly an alias of [`nix-store
---gc`](#rsec-nix-store-gc), that is, it deletes all unreachable paths in
-the Nix store to clean up your system. However, it provides two
-additional options: `-d` (`--delete-old`), which deletes all old
-generations of all profiles in `/nix/var/nix/profiles` by invoking
-`nix-env --delete-generations old` on all profiles (of course, this
-makes rollbacks to previous configurations impossible); and
-`--delete-older-than` *period*, where period is a value such as `30d`,
-which deletes all generations older than the specified number of days in
-all profiles in `/nix/var/nix/profiles` (except for the generations that
-were active at that point in time).
+--gc`](nix-store.md#operation---gc), that is, it deletes all
+unreachable paths in the Nix store to clean up your system. However,
+it provides two additional options: `-d` (`--delete-old`), which
+deletes all old generations of all profiles in `/nix/var/nix/profiles`
+by invoking `nix-env --delete-generations old` on all profiles (of
+course, this makes rollbacks to previous configurations impossible);
+and `--delete-older-than` *period*, where period is a value such as
+`30d`, which deletes all generations older than the specified number
+of days in all profiles in `/nix/var/nix/profiles` (except for the
+generations that were active at that point in time).
 
 # Example
 
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index ab1d10c08..c5fcce316 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -92,7 +92,7 @@ have an effect.
     done if this flag had not been specified, without actually doing it.
 
     `--dry-run` also prints out which paths will be
-    [substituted](#gloss-substitute) (i.e., downloaded) and which paths
+    [substituted](../glossary.md) (i.e., downloaded) and which paths
     will be built from source (because no substitute is available).
 
   - `--system-filter` *system*  
@@ -186,11 +186,11 @@ a number of possible ways:
     gcc-3.3.6 gcc-4.1.1` will install both version of GCC (and will
     probably cause a user environment conflict\!).
 
-  - If [`--attr`](#opt-attr) (`-A`) is specified, the arguments are
-    *attribute paths* that select attributes from the top-level Nix
+  - If `--attr` (`-A`) is specified, the arguments are *attribute
+    paths* that select attributes from the top-level Nix
     expression. This is faster than using derivation names and
-    unambiguous. To find out the attribute paths of available packages,
-    use `nix-env -qaP`.
+    unambiguous. To find out the attribute paths of available
+    packages, use `nix-env -qaP`.
 
   - If `--from-profile` *path* is given, *args* is a set of names
     denoting installed store paths in the profile *path*. This is an
@@ -198,18 +198,19 @@ a number of possible ways:
     another.
 
   - If `--from-expression` is given, *args* are Nix
-    [functions](#ss-functions) that are called with the active Nix
-    expression as their single argument. The derivations returned by
-    those function calls are installed. This allows derivations to be
-    specified in an unambiguous way, which is necessary if there are
-    multiple derivations with the same name.
+    [functions](../expressions/language-constructs.md#functions)
+    that are called with the active Nix expression as their single
+    argument. The derivations returned by those function calls are
+    installed. This allows derivations to be specified in an
+    unambiguous way, which is necessary if there are multiple
+    derivations with the same name.
 
   - If *args* are store derivations, then these are
-    [realised](#rsec-nix-store-realise), and the resulting output paths
+    [realised](nix-store.md#operation---realise), and the resulting output paths
     are installed.
 
   - If *args* are store paths that are not store derivations, then these
-    are [realised](#rsec-nix-store-realise) and installed.
+    are [realised](nix-store.md#operation---realise) and installed.
 
   - By default all outputs are installed for each derivation. That can
     be reduced by setting `meta.outputsToInstall`.
@@ -319,9 +320,9 @@ left untouched; this is not an error. It is also not an error if an
 element of *args* matches no installed derivations.
 
 For a description of how *args* is mapped to a set of store paths, see
-[`--install`](#rsec-nix-env-install). If *args* describes multiple store
-paths with the same symbolic name, only the one with the highest version
-is installed.
+[`--install`](#operation---install). If *args* describes multiple
+store paths with the same symbolic name, only the one with the highest
+version is installed.
 
 ## Flags
 
@@ -584,9 +585,9 @@ derivation is shown unless `--no-name` is specified.
 
   - `--attr-path`; `-P`  
     Print the *attribute path* of the derivation, which can be used to
-    unambiguously select it using the [`--attr` option](#opt-attr)
-    available in commands that install derivations like `nix-env
-    --install`. This option only works together with `--available`
+    unambiguously select it using the `--attr` option available in
+    commands that install derivations like `nix-env --install`. This
+    option only works together with `--available`
 
   - `--no-name`  
     Suppress printing of the `name` attribute of each derivation.
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/src/command-ref/nix-hash.md
index 38c9e0f67..edb331e1c 100644
--- a/doc/manual/src/command-ref/nix-hash.md
+++ b/doc/manual/src/command-ref/nix-hash.md
@@ -21,13 +21,13 @@ is printed in hexadecimal. To generate the same hash as
 `nix-prefetch-url` you have to specify multiple arguments, see below for
 an example.
 
-The hash is computed over a *serialisation* of each path: a dump of the
-file system tree rooted at the path. This allows directories and
-symlinks to be hashed as well as regular files. The dump is in the *NAR
-format* produced by [`nix-store` `--dump`](#refsec-nix-store-dump).
-Thus, `nix-hash
-path` yields the same cryptographic hash as `nix-store --dump
-path | md5sum`.
+The hash is computed over a *serialisation* of each path: a dump of
+the file system tree rooted at the path. This allows directories and
+symlinks to be hashed as well as regular files. The dump is in the
+*NAR format* produced by [`nix-store
+--dump`](nix-store.md#operation---dump).  Thus, `nix-hash path`
+yields the same cryptographic hash as `nix-store --dump path |
+md5sum`.
 
 # Options
 
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index ca9ef1fc9..2d6525e77 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -21,11 +21,11 @@ Title: nix-instantiate
 # Description
 
 The command `nix-instantiate` generates [store
-derivations](#gloss-derivation) from (high-level) Nix expressions. It
+derivations](../glossary.md) from (high-level) Nix expressions. It
 evaluates the Nix expressions in each of *files* (which defaults to
 *./default.nix*). Each top-level expression should evaluate to a
-derivation, a list of derivations, or a set of derivations. The paths of
-the resulting store derivations are printed on standard output.
+derivation, a list of derivations, or a set of derivations. The paths
+of the resulting store derivations are printed on standard output.
 
 If *files* is the character `-`, then a Nix expression will be read from
 standard input.
@@ -33,7 +33,7 @@ standard input.
 # Options
 
   - `--add-root` *path*; `--indirect`  
-    See the [corresponding options](#opt-add-root) in `nix-store`.
+    See the [corresponding options](nix-store.md) in `nix-store`.
 
   - `--parse`  
     Just parse the input files, and print their abstract syntax trees on
@@ -69,7 +69,7 @@ standard input.
     When used with `--eval`, print the resulting value as an XML
     representation of the abstract syntax tree rather than as an ATerm.
     The schema is the same as that used by the [`toXML`
-    built-in](#builtin-toXML).
+    built-in](../expressions/builtins.md).
 
   - `--read-write-mode`  
     When used with `--eval`, perform evaluation in read/write mode so
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index b15340fde..1842f8858 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -79,13 +79,14 @@ The operation `--realise` essentially “builds” the specified store
 paths. Realisation is a somewhat overloaded term:
 
   - If the store path is a *derivation*, realisation ensures that the
-    output paths of the derivation are [valid](#gloss-validity) (i.e.,
-    the output path and its closure exist in the file system). This can
-    be done in several ways. First, it is possible that the outputs are
-    already valid, in which case we are done immediately. Otherwise,
-    there may be [substitutes](#gloss-substitute) that produce the
-    outputs (e.g., by downloading them). Finally, the outputs can be
-    produced by performing the build action described by the derivation.
+    output paths of the derivation are [valid](../glossary.md) (i.e.,
+    the output path and its closure exist in the file system). This
+    can be done in several ways. First, it is possible that the
+    outputs are already valid, in which case we are done
+    immediately. Otherwise, there may be [substitutes](../glossary.md)
+    that produce the outputs (e.g., by downloading them). Finally, the
+    outputs can be produced by performing the build action described
+    by the derivation.
 
   - If the store path is not a derivation, realisation ensures that the
     specified path is valid (i.e., it and its closure exist in the file
@@ -129,11 +130,12 @@ Special exit codes:
 
   - `101`  
     Build timeout, the build was aborted because it did not complete
-    within the specified [`timeout`](#conf-timeout).
+    within the specified `timeout`.
 
   - `102`  
     Hash mismatch, the build output was rejected because it does not
-    match the specified [`outputHash`](#fixed-output-drvs).
+    match the [`outputHash` attribute of the
+    derivation](../expressions/advanced-attributes.md).
 
   - `104`  
     Not deterministic, the build succeeded in check mode but the
@@ -153,12 +155,12 @@ or.
 ## Examples
 
 This operation is typically used to build store derivations produced by
-[`nix-instantiate`](#sec-nix-instantiate):
+[`nix-instantiate`](nix-instantiate.md):
 
     $ nix-store -r $(nix-instantiate ./test.nix)
     /nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1
 
-This is essentially what [`nix-build`](#sec-nix-build) does.
+This is essentially what [`nix-build`](nix-build.md) does.
 
 To test whether a previously-built derivation is deterministic:
 
@@ -232,8 +234,7 @@ control what gets deleted and in what order:
     or TiB units.
 
 The behaviour of the collector is also influenced by the
-[`keep-outputs`](#conf-keep-outputs) and
-[`keep-derivations`](#conf-keep-derivations) variables in the Nix
+`keep-outputs` and `keep-derivations` variables in the Nix
 configuration file.
 
 By default, the collector prints the total number of freed bytes when it
@@ -307,17 +308,17 @@ symlink.
 
   - `--force-realise`; `-f`  
     Realise each argument to the query first (see [`nix-store
-                    --realise`](#rsec-nix-store-realise)).
+    --realise`](#operation---realise)).
 
 ## Queries
 
   - `--outputs`  
-    Prints out the [output paths](#gloss-output-path) of the store
+    Prints out the [output paths](../glossary.md) of the store
     derivations *paths*. These are the paths that will be produced when
     the derivation is built.
 
   - `--requisites`; `-R`  
-    Prints out the [closure](#gloss-closure) of the store path *paths*.
+    Prints out the [closure](../glossary.md) of the store path *paths*.
 
     This query has one option:
 
@@ -334,7 +335,7 @@ symlink.
     derivation and specifying the option `--include-outputs`.
 
   - `--references`  
-    Prints the set of [references](#gloss-reference) of the store paths
+    Prints the set of [references](../glossary.md) of the store paths
     *paths*, that is, their immediate dependencies. (For *all*
     dependencies, use `--requisites`.)
 
@@ -352,7 +353,7 @@ symlink.
     in the Nix store that are dependent on *paths*.
 
   - `--deriver`; `-d`  
-    Prints the [deriver](#gloss-deriver) of the store paths *paths*. If
+    Prints the [deriver](../glossary.md) of the store paths *paths*. If
     the path has no deriver (e.g., if it is a source file), or if the
     deriver is not known (e.g., in the case of a binary-only
     deployment), the string `unknown-deriver` is printed.
@@ -605,13 +606,12 @@ anyway. Likewise, all permissions are left out except for the execute
 bit, because all files in the Nix store have 444 or 555 permission.
 
 Also, a NAR archive is *canonical*, meaning that “equal” paths always
-produce the same NAR archive. For instance, directory entries are always
-sorted so that the actual on-disk order doesn’t influence the result.
-This means that the cryptographic hash of a NAR dump of a path is usable
-as a fingerprint of the contents of the path. Indeed, the hashes of
-store paths stored in Nix’s database (see [`nix-store -q
---hash`](#refsec-nix-store-query)) are SHA-256 hashes of the NAR dump of
-each store path.
+produce the same NAR archive. For instance, directory entries are
+always sorted so that the actual on-disk order doesn’t influence the
+result.  This means that the cryptographic hash of a NAR dump of a
+path is usable as a fingerprint of the contents of the path. Indeed,
+the hashes of store paths stored in Nix’s database (see `nix-store -q
+--hash`) are SHA-256 hashes of the NAR dump of each store path.
 
 NAR archives support filenames of unlimited length and 64-bit file
 sizes. They can contain regular files, directories, and symbolic links,
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
index b9c65c81d..ee8419fd2 100644
--- a/doc/manual/src/command-ref/opt-common.md
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -71,35 +71,34 @@ Most Nix commands accept the following command-line options:
   - `--max-jobs` / `-j` *number*  
     Sets the maximum number of build jobs that Nix will perform in
     parallel to the specified number. Specify `auto` to use the number
-    of CPUs in the system. The default is specified by the
-    [`max-jobs`](#conf-max-jobs) configuration setting, which itself
-    defaults to `1`. A higher value is useful on SMP systems or to
-    exploit I/O latency.
+    of CPUs in the system. The default is specified by the `max-jobs`
+    configuration setting, which itself defaults to `1`. A higher
+    value is useful on SMP systems or to exploit I/O latency.
     
     Setting it to `0` disallows building on the local machine, which is
     useful when you want builds to happen only on remote builders.
 
   - `--cores`  
-    Sets the value of the `NIX_BUILD_CORES` environment variable in the
-    invocation of builders. Builders can use this variable at their
-    discretion to control the maximum amount of parallelism. For
+    Sets the value of the `NIX_BUILD_CORES` environment variable in
+    the invocation of builders. Builders can use this variable at
+    their discretion to control the maximum amount of parallelism. For
     instance, in Nixpkgs, if the derivation attribute
     `enableParallelBuilding` is set to `true`, the builder passes the
-    `-jN` flag to GNU Make. It defaults to the value of the
-    [`cores`](#conf-cores) configuration setting, if set, or `1`
-    otherwise. The value `0` means that the builder should use all
-    available CPU cores in the system.
+    `-jN` flag to GNU Make. It defaults to the value of the `cores`
+    configuration setting, if set, or `1` otherwise. The value `0`
+    means that the builder should use all available CPU cores in the
+    system.
 
   - `--max-silent-time`  
     Sets the maximum number of seconds that a builder can go without
-    producing any data on standard output or standard error. The default
-    is specified by the [`max-silent-time`](#conf-max-silent-time)
-    configuration setting. `0` means no time-out.
+    producing any data on standard output or standard error. The
+    default is specified by the `max-silent-time` configuration
+    setting. `0` means no time-out.
 
   - `--timeout`  
     Sets the maximum number of seconds that a builder can run. The
-    default is specified by the [`timeout`](#conf-timeout) configuration
-    setting. `0` means no timeout.
+    default is specified by the `timeout` configuration setting. `0`
+    means no timeout.
 
   - `--keep-going` / `-k`  
     Keep going in case of failed builds, to the greatest extent
@@ -145,16 +144,17 @@ Most Nix commands accept the following command-line options:
     operations will fail.
 
   - `--arg` *name* *value*  
-    This option is accepted by `nix-env`, `nix-instantiate`, `nix-shell`
-    and `nix-build`. When evaluating Nix expressions, the expression
-    evaluator will automatically try to call functions that it
-    encounters. It can automatically call functions for which every
-    argument has a [default value](#ss-functions) (e.g., `{ argName ?
-            defaultValue }:
-            ...`). With `--arg`, you can also call functions that have arguments
-    without a default value (or override a default value). That is, if
-    the evaluator encounters a function with an argument named *name*,
-    it will call it with value *value*.
+    This option is accepted by `nix-env`, `nix-instantiate`,
+    `nix-shell` and `nix-build`. When evaluating Nix expressions, the
+    expression evaluator will automatically try to call functions that
+    it encounters. It can automatically call functions for which every
+    argument has a [default
+    value](../expressions/language-constructs.md#functions) (e.g.,
+    `{ argName ?  defaultValue }: ...`). With `--arg`, you can also
+    call functions that have arguments without a default value (or
+    override a default value). That is, if the evaluator encounters a
+    function with an argument named *name*, it will call it with value
+    *value*.
     
     For instance, the top-level `default.nix` in Nixpkgs is actually a
     function:
@@ -165,28 +165,28 @@ Most Nix commands accept the following command-line options:
         }: ...
     
     So if you call this Nix expression (e.g., when you do `nix-env -i
-    pkgname`), the function will be called automatically using the value
-    [`builtins.currentSystem`](#builtin-currentSystem) for the `system`
-    argument. You can override this using `--arg`, e.g., `nix-env -i
-            pkgname --arg system
-            \"i686-freebsd\"`. (Note that since the argument is a Nix string
-    literal, you have to escape the quotes.)
+    pkgname`), the function will be called automatically using the
+    value [`builtins.currentSystem`](../expressions/builtins.md) for
+    the `system` argument. You can override this using `--arg`, e.g.,
+    `nix-env -i pkgname --arg system \"i686-freebsd\"`. (Note that
+    since the argument is a Nix string literal, you have to escape the
+    quotes.)
 
   - `--argstr` *name* *value*  
-    This option is like `--arg`, only the value is not a Nix expression
-    but a string. So instead of `--arg system \"i686-linux\"` (the outer
-    quotes are to keep the shell happy) you can say `--argstr system
-            i686-linux`.
+    This option is like `--arg`, only the value is not a Nix
+    expression but a string. So instead of `--arg system
+    \"i686-linux\"` (the outer quotes are to keep the shell happy) you
+    can say `--argstr system i686-linux`.
 
   - `--attr` / `-A` *attrPath*  
     Select an attribute from the top-level Nix expression being
     evaluated. (`nix-env`, `nix-instantiate`, `nix-build` and
-    `nix-shell` only.) The *attribute path* *attrPath* is a sequence of
-    attribute names separated by dots. For instance, given a top-level
-    Nix expression *e*, the attribute path `xorg.xorgserver` would cause
-    the expression `e.xorg.xorgserver` to be used. See [`nix-env
-            --install`](#refsec-nix-env-install-examples) for some concrete
-    examples.
+    `nix-shell` only.) The *attribute path* *attrPath* is a sequence
+    of attribute names separated by dots. For instance, given a
+    top-level Nix expression *e*, the attribute path `xorg.xorgserver`
+    would cause the expression `e.xorg.xorgserver` to be used. See
+    [`nix-env --install`](nix-env.md#operation---install) for some
+    concrete examples.
     
     In addition to attribute names, you can also specify array indices.
     For instance, the attribute path `foo.3.bar` selects the `bar`
diff --git a/doc/manual/src/expressions/advanced-attributes.md b/doc/manual/src/expressions/advanced-attributes.md
index 3582fa268..bfee28acf 100644
--- a/doc/manual/src/expressions/advanced-attributes.md
+++ b/doc/manual/src/expressions/advanced-attributes.md
@@ -89,10 +89,10 @@ Derivations can declare some infrequently used optional attributes.
     to make it use the proxy server configuration specified by the user
     in the environment variables `http_proxy` and friends.
     
-    This attribute is only allowed in [fixed-output
-    derivations](#fixed-output-drvs), where impurities such as these are
-    okay since (the hash of) the output is known in advance. It is
-    ignored for all other derivations.
+    This attribute is only allowed in *fixed-output derivations* (see
+    below), where impurities such as these are okay since (the hash
+    of) the output is known in advance. It is ignored for all other
+    derivations.
     
     > **Warning**
     > 
@@ -183,13 +183,14 @@ Derivations can declare some infrequently used optional attributes.
       - `"recursive"`  
         The hash is computed over the NAR archive dump of the output
         (i.e., the result of [`nix-store
-                                                                        --dump`](#refsec-nix-store-dump)). In this case, the output can
-        be anything, including a directory tree.
+        --dump`](../command-ref/nix-store.md#operation---dump)). In
+        this case, the output can be anything, including a directory
+        tree.
     
-    The `outputHash` attribute, finally, must be a string containing the
-    hash in either hexadecimal or base-32 notation. (See the [`nix-hash`
-    command](#sec-nix-hash) for information about converting to and from
-    base-32 notation.)
+    The `outputHash` attribute, finally, must be a string containing
+    the hash in either hexadecimal or base-32 notation. (See the
+    [`nix-hash` command](../command-ref/nix-hash.md) for information
+    about converting to and from base-32 notation.)
 
   - `passAsFile`  
     A list of names of attributes that should be passed via files rather
@@ -213,10 +214,11 @@ Derivations can declare some infrequently used optional attributes.
 
   - `preferLocalBuild`  
     If this attribute is set to `true` and [distributed building is
-    enabled](#chap-distributed-builds), then, if possible, the derivaton
-    will be built locally instead of forwarded to a remote machine. This
-    is appropriate for trivial builders where the cost of doing a
-    download or remote build would exceed the cost of building locally.
+    enabled](../advanced-topics/distributed-builds.md), then, if
+    possible, the derivaton will be built locally instead of forwarded
+    to a remote machine. This is appropriate for trivial builders
+    where the cost of doing a download or remote build would exceed
+    the cost of building locally.
 
   - `allowSubstitutes`  
     If this attribute is set to `false`, then Nix will always build this
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index 3c9bb4533..22f133c33 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -57,19 +57,19 @@ For instance, `derivation` is also available as `builtins.derivation`.
     installations that don’t have the desired built-in function.
 
   - `builtins.compareVersions` *s1* *s2*  
-    Compare two strings representing versions and return `-1` if version
-    *s1* is older than version *s2*, `0` if they are the same, and `1`
-    if *s1* is newer than *s2*. The version comparison algorithm is the
-    same as the one used by [`nix-env
-                    -u`](#ssec-version-comparisons).
+    Compare two strings representing versions and return `-1` if
+    version *s1* is older than version *s2*, `0` if they are the same,
+    and `1` if *s1* is newer than *s2*. The version comparison
+    algorithm is the same as the one used by [`nix-env
+    -u`](../command-ref/nix-env.md#operation---upgrade).
 
   - `builtins.concatLists` *lists*  
     Concatenate a list of lists into a single list.
 
   - `builtins.concatStringsSep` *separator* *list*  
-    Concatenate a list of strings with a separator between each element,
-    e.g. `concatStringsSep "/"
-                    ["usr" "local" "bin"] == "usr/local/bin"`
+    Concatenate a list of strings with a separator between each
+    element, e.g. `concatStringsSep "/" ["usr" "local" "bin"] ==
+    "usr/local/bin"`
 
   - `builtins.currentSystem`  
     The built-in value `currentSystem` evaluates to the Nix platform
@@ -77,10 +77,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
     evaluated, such as `"i686-linux"` or `"x86_64-darwin"`.
 
   - `builtins.deepSeq` *e1* *e2*  
-    This is like `seq
-                    e1
-                    e2`, except that *e1* is evaluated *deeply*: if it’s a list or set,
-    its elements or attributes are also evaluated recursively.
+    This is like `seq e1 e2`, except that *e1* is evaluated *deeply*:
+    if it’s a list or set, its elements or attributes are also
+    evaluated recursively.
 
   - `derivation` *attrs*; `builtins.derivation` *attrs*  
     `derivation` is described in [its own section](derivations.md).
@@ -104,7 +103,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
   - `builtins.fetchurl` *url*  
     Download the specified URL and return the path of the downloaded
     file. This function is not available if [restricted evaluation
-    mode](#conf-restrict-eval) is enabled.
+    mode](../command-ref/conf-file.md) is enabled.
 
   - `fetchTarball` *url*; `builtins.fetchTarball` *url*  
     Download the specified URL, unpack it and return the path of the
@@ -140,7 +139,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
         stdenv.mkDerivation { … }
     
     This function is not available if [restricted evaluation
-    mode](#conf-restrict-eval) is enabled.
+    mode](../command-ref/conf-file.md) is enabled.
 
   - `builtins.fetchGit` *args*  
     Fetch a path from git. *args* can be a URL, in which case the HEAD
@@ -491,9 +490,8 @@ For instance, `derivation` is also available as `builtins.derivation`.
     name is everything up to but not including the first dash followed
     by a digit, and the version is everything following that dash. The
     result is returned in a set `{ name, version }`. Thus,
-    `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name = "nix";
-    version = "0.12pre12876";
-                    }`.
+    `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name =
+    "nix"; version = "0.12pre12876"; }`.
 
   - `builtins.path` *args*  
     An enrichment of the built-in path type, based on the attributes
@@ -508,9 +506,8 @@ For instance, `derivation` is also available as `builtins.derivation`.
         like `@`.
     
       - filter  
-        A function of the type expected by
-        [builtins.filterSource](#builtin-filterSource), with the same
-        semantics.
+        A function of the type expected by `builtins.filterSource`,
+        with the same semantics.
     
       - recursive  
         When `false`, when `path` is added to the store it is with a
@@ -609,7 +606,7 @@ For instance, `derivation` is also available as `builtins.derivation`.
   - `builtins.splitVersion` *s*  
     Split a string representing a version into its components, by the
     same version splitting logic underlying the version comparison in
-    [`nix-env -u`](#ssec-version-comparisons).
+    [`nix-env -u`](../command-ref/nix-env.md#operation---upgrade).
 
   - `builtins.stringLength` *e*  
     Return the length of the string *e*. If *e* is not a string,
diff --git a/doc/manual/src/expressions/simple-building-testing.md b/doc/manual/src/expressions/simple-building-testing.md
index c3e8d7f82..ca422acea 100644
--- a/doc/manual/src/expressions/simple-building-testing.md
+++ b/doc/manual/src/expressions/simple-building-testing.md
@@ -19,11 +19,11 @@ yet. The best way to test the package is by using the command
     $ ./result/bin/hello
     Hello, world!
 
-The [`-A`](#opt-attr) option selects the `hello` attribute. This is
-faster than using the symbolic package name specified by the `name`
-attribute (which also happens to be `hello`) and is unambiguous (there
-can be multiple packages with the symbolic name `hello`, but there can
-be only one attribute in a set named `hello`).
+The `-A` option selects the `hello` attribute. This is faster than
+using the symbolic package name specified by the `name` attribute
+(which also happens to be `hello`) and is unambiguous (there can be
+multiple packages with the symbolic name `hello`, but there can be
+only one attribute in a set named `hello`).
 
 `nix-build` registers the `./result` symlink as a garbage collection
 root, so unless and until you delete the `./result` symlink, the output
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md
index 6983452d3..a1dd993c4 100644
--- a/doc/manual/src/installation/installing-binary.md
+++ b/doc/manual/src/installation/installing-binary.md
@@ -8,7 +8,7 @@ easiest way to install Nix is to run the following command:
 ```
 
 If you're using macOS 10.15 (Catalina) or newer, consult [the macOS
-installation instructions](#sect-macos-installation) before installing.
+installation instructions](#macos-installation) before installing.
 
 As of Nix 2.1.0, the Nix installer will always default to creating a
 single-user installation, however opting in to the multi-user
@@ -64,7 +64,7 @@ will invoke `sudo` as needed.
 > 
 > If you need Nix to use a different group ID or user ID set, you will
 > have to download the tarball manually and [edit the install
-> script](#sect-nix-install-binary-tarball).
+> script](#installing-from-a-binary-tarball).
 
 The installer will modify `/etc/bashrc`, and `/etc/zshrc` if they exist.
 The installer will first back up these files with a `.backup-before-nix`
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/src/installation/multi-user.md
index 4a861691d..de159b603 100644
--- a/doc/manual/src/installation/multi-user.md
+++ b/doc/manual/src/installation/multi-user.md
@@ -39,16 +39,16 @@ expect to do many builds at the same time.
 
 ## Running the daemon
 
-The [Nix daemon](#sec-nix-daemon) should be started as follows (as
-`root`):
+The [Nix daemon](../command-ref/nix-daemon.md) should be started as
+follows (as `root`):
 
     $ nix-daemon
 
 You’ll want to put that line somewhere in your system’s boot scripts.
 
 To let unprivileged users use the daemon, they should set the
-[`NIX_REMOTE` environment variable](#envar-remote) to `daemon`. So you
-should put a line like
+[`NIX_REMOTE` environment variable](../command-ref/env-common.md) to
+`daemon`. So you should put a line like
 
     export NIX_REMOTE=daemon
 
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
index 8edaca6b0..17b5cc9c2 100644
--- a/doc/manual/src/package-management/basic-package-mgmt.md
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -1,8 +1,9 @@
 # Basic Package Management
 
-The main command for package management is [`nix-env`](#sec-nix-env).
-You can use it to install, upgrade, and erase packages, and to query
-what packages are installed or are available for installation.
+The main command for package management is
+[`nix-env`](../command-ref/nix-env.md).  You can use it to install,
+upgrade, and erase packages, and to query what packages are installed
+or are available for installation.
 
 In Nix, different users can have different “views” on the set of
 installed applications. That is, there might be lots of applications
diff --git a/doc/manual/src/package-management/channels.md b/doc/manual/src/package-management/channels.md
index 8a3e92d70..c239998d9 100644
--- a/doc/manual/src/package-management/channels.md
+++ b/doc/manual/src/package-management/channels.md
@@ -7,8 +7,8 @@ better way: *Nix channels*.
 
 A Nix channel is just a URL that points to a place that contains a set
 of Nix expressions and a manifest. Using the command
-[`nix-channel`](#sec-nix-channel) you can automatically stay up to date
-with whatever is available at that URL.
+[`nix-channel`](../command-ref/nix-channel.md) you can automatically
+stay up to date with whatever is available at that URL.
 
 To see the list of official NixOS channels, visit
 <https://nixos.org/channels>.
diff --git a/doc/manual/src/package-management/s3-substituter.md b/doc/manual/src/package-management/s3-substituter.md
index d96114e3c..2824c1a9b 100644
--- a/doc/manual/src/package-management/s3-substituter.md
+++ b/doc/manual/src/package-management/s3-substituter.md
@@ -1,9 +1,9 @@
 # Serving a Nix store via S3
 
 Nix has built-in support for storing and fetching store paths from
-Amazon S3 and S3-compatible services. This uses the same *binary* cache
-mechanism that Nix usually uses to fetch prebuilt binaries from
-[cache.nixos.org](cache.nixos.org).
+Amazon S3 and S3-compatible services. This uses the same *binary*
+cache mechanism that Nix usually uses to fetch prebuilt binaries from
+[cache.nixos.org](https://cache.nixos.org/).
 
 The following options can be specified as URL parameters to the S3 URL:
 
@@ -85,8 +85,8 @@ caches.
 
 Your bucket will need a bucket policy allowing the desired users to
 perform the `s3:GetObject` and `s3:GetBucketLocation` action on all
-objects in the bucket. The anonymous policy in [Anonymous Reads to your
-S3-compatible binary cache](#ssec-s3-substituter-anonymous-reads) can be
+objects in the bucket. The [anonymous policy given
+above](#anonymous-reads-to-your-s3-compatible-binary-cache) can be
 updated to have a restricted `Principal` to support this.
 
 ## Authenticated Writes to your S3-compatible binary cache
diff --git a/doc/manual/src/release-notes/rl-2.0.md b/doc/manual/src/release-notes/rl-2.0.md
index 170275f89..9f6d4aa83 100644
--- a/doc/manual/src/release-notes/rl-2.0.md
+++ b/doc/manual/src/release-notes/rl-2.0.md
@@ -148,11 +148,11 @@ This release has the following new features:
         `nix-store
                                                                         --verify-path`.
     
-      - `nix log` shows the build log of a package or path. If the build
-        log is not available locally, it will try to obtain it from the
-        configured substituters (such as
-        [cache.nixos.org](cache.nixos.org), which now provides build
-        logs).
+      - `nix log` shows the build log of a package or path. If the
+        build log is not available locally, it will try to obtain it
+        from the configured substituters (such as
+        [cache.nixos.org](https://cache.nixos.org/), which now
+        provides build logs).
     
       - `nix edit` opens the source code of a package in your editor.
     
@@ -213,16 +213,17 @@ This release has the following new features:
         current values.
 
   - The store abstraction that Nix has had for a long time to support
-    store access via the Nix daemon has been extended significantly. In
-    particular, substituters (which used to be external programs such as
-    `download-from-binary-cache`) are now subclasses of the abstract
-    `Store` class. This allows many Nix commands to operate on such
-    store types. For example, `nix path-info` shows information about
-    paths in your local Nix store, while `nix path-info --store
-                    https://cache.nixos.org/` shows information about paths in the
-    specified binary cache. Similarly, `nix-copy-closure`, `nix-push`
-    and substitution are all instances of the general notion of copying
-    paths between different kinds of Nix stores.
+    store access via the Nix daemon has been extended
+    significantly. In particular, substituters (which used to be
+    external programs such as `download-from-binary-cache`) are now
+    subclasses of the abstract `Store` class. This allows many Nix
+    commands to operate on such store types. For example, `nix
+    path-info` shows information about paths in your local Nix store,
+    while `nix path-info --store https://cache.nixos.org/` shows
+    information about paths in the specified binary cache. Similarly,
+    `nix-copy-closure`, `nix-push` and substitution are all instances
+    of the general notion of copying paths between different kinds of
+    Nix stores.
     
     Stores are specified using an URI-like syntax, e.g.
     <https://cache.nixos.org/> or <ssh://machine>. The following store
@@ -241,7 +242,7 @@ This release has the following new features:
         `/home/alice/nix/store`) to differ from its “logical” location
         (typically `/nix/store`). This allows non-root users to use Nix
         while still getting the benefits from prebuilt binaries from
-        [cache.nixos.org](cache.nixos.org).
+        [cache.nixos.org](https://cache.nixos.org/).
     
       - `BinaryCacheStore` is the abstract superclass of all binary
         cache stores. It supports writing build logs and NAR content
@@ -356,11 +357,11 @@ This release has the following new features:
   - `NIX_PATH` is now lazy, so URIs in the path are only downloaded if
     they are needed for evaluation.
 
-  - You can now use <channel:> as a short-hand for
+  - You can now use `channel:` as a short-hand for
     <https://nixos.org/channels//nixexprs.tar.xz>. For example,
     `nix-build channel:nixos-15.09 -A hello` will build the GNU Hello
-    package from the `nixos-15.09` channel. In the future, this may use
-    Git to fetch updates more efficiently.
+    package from the `nixos-15.09` channel. In the future, this may
+    use Git to fetch updates more efficiently.
 
   - When `--no-build-output` is given, the last 10 lines of the build
     log will be shown if a build fails.
@@ -382,7 +383,7 @@ This release has the following new features:
         in all places where Nix allows URIs.
     
       - Brotli compression is now supported. In particular,
-        [cache.nixos.org](cache.nixos.org) build logs are now compressed
+        [cache.nixos.org](https://cache.nixos.org/) build logs are now compressed
         using Brotli.
 
   - `nix-env`
diff --git a/doc/manual/src/release-notes/rl-2.1.md b/doc/manual/src/release-notes/rl-2.1.md
index 08986ef9d..b88834c83 100644
--- a/doc/manual/src/release-notes/rl-2.1.md
+++ b/doc/manual/src/release-notes/rl-2.1.md
@@ -4,18 +4,18 @@ This is primarily a bug fix release. It also reduces memory consumption
 in certain situations. In addition, it has the following new features:
 
   - The Nix installer will no longer default to the Multi-User
-    installation for macOS. You can still [instruct the installer to run
-    in multi-user mode](#sect-multi-user-installation).
+    installation for macOS. You can still instruct the installer to
+    run in multi-user mode.
 
-  - The Nix installer now supports performing a Multi-User installation
-    for Linux computers which are running systemd. You can [select a
-    Multi-User installation](#sect-multi-user-installation) by passing
-    the `--daemon` flag to the installer: `sh <(curl
-                    https://nixos.org/nix/install) --daemon`.
-    
-    The multi-user installer cannot handle systems with SELinux. If your
-    system has SELinux enabled, you can [force the installer to run in
-    single-user mode](#sect-single-user-installation).
+  - The Nix installer now supports performing a Multi-User
+    installation for Linux computers which are running systemd. You
+    can select a Multi-User installation by passing the `--daemon`
+    flag to the installer: `sh <(curl https://nixos.org/nix/install)
+    --daemon`.
+
+    The multi-user installer cannot handle systems with SELinux. If
+    your system has SELinux enabled, you can force the installer to
+    run in single-user mode.
 
   - New builtin functions: `builtins.bitAnd`, `builtins.bitOr`,
     `builtins.bitXor`, `builtins.fromTOML`, `builtins.concatMap`,

From 1308c8404e19aacc6458b3813d445857620a60a8 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 24 Jul 2020 15:48:40 +0200
Subject: [PATCH 033/176] Remove DocBook manual

---
 .gitignore                                    |    5 -
 .../advanced-topics/advanced-topics.xml       |   14 -
 doc/manual/advanced-topics/cores-vs-jobs.xml  |  121 --
 doc/manual/advanced-topics/diff-hook.xml      |  202 --
 .../advanced-topics/distributed-builds.xml    |  190 --
 .../advanced-topics/post-build-hook.xml       |  158 --
 doc/manual/command-ref/command-ref.xml        |   20 -
 doc/manual/command-ref/conf-file.xml          | 1244 ------------
 doc/manual/command-ref/env-common.xml         |  209 ---
 doc/manual/command-ref/files.xml              |   14 -
 doc/manual/command-ref/main-commands.xml      |   17 -
 doc/manual/command-ref/nix-build.xml          |  190 --
 doc/manual/command-ref/nix-channel.xml        |  181 --
 .../command-ref/nix-collect-garbage.xml       |   63 -
 doc/manual/command-ref/nix-copy-closure.xml   |  169 --
 doc/manual/command-ref/nix-daemon.xml         |   35 -
 doc/manual/command-ref/nix-env.xml            | 1503 ---------------
 doc/manual/command-ref/nix-hash.xml           |  176 --
 doc/manual/command-ref/nix-instantiate.xml    |  266 ---
 doc/manual/command-ref/nix-prefetch-url.xml   |  131 --
 doc/manual/command-ref/nix-shell.xml          |  411 ----
 doc/manual/command-ref/nix-store.xml          | 1516 ---------------
 doc/manual/command-ref/opt-common-syn.xml     |   68 -
 doc/manual/command-ref/opt-common.xml         |  405 ----
 doc/manual/command-ref/opt-inst-syn.xml       |   22 -
 doc/manual/command-ref/utilities.xml          |   20 -
 .../expressions/advanced-attributes.xml       |  351 ----
 .../expressions/arguments-variables.xml       |  114 --
 doc/manual/expressions/build-script.xml       |  114 --
 doc/manual/expressions/builtins.xml           | 1663 -----------------
 doc/manual/expressions/derivations.xml        |  210 ---
 .../expressions/expression-language.xml       |   30 -
 doc/manual/expressions/expression-syntax.xml  |  146 --
 doc/manual/expressions/generic-builder.xml    |   98 -
 .../expressions/language-constructs.xml       |  408 ----
 doc/manual/expressions/language-operators.xml |  222 ---
 doc/manual/expressions/language-values.xml    |  312 ----
 .../expressions/simple-building-testing.xml   |   76 -
 doc/manual/expressions/simple-expression.xml  |   46 -
 .../expressions/writing-nix-expressions.xml   |   26 -
 doc/manual/glossary/glossary.xml              |  199 --
 doc/manual/hacking.xml                        |   74 -
 doc/manual/installation/building-source.xml   |   49 -
 doc/manual/installation/env-variables.xml     |   89 -
 doc/manual/installation/installation.xml      |   34 -
 doc/manual/installation/installing-binary.xml |  469 -----
 doc/manual/installation/installing-source.xml |   16 -
 doc/manual/installation/multi-user.xml        |  107 --
 doc/manual/installation/nix-security.xml      |   27 -
 doc/manual/installation/obtaining-source.xml  |   30 -
 .../installation/prerequisites-source.xml     |  101 -
 doc/manual/installation/single-user.xml       |   21 -
 .../installation/supported-platforms.xml      |   36 -
 doc/manual/installation/upgrading.xml         |   27 -
 doc/manual/introduction/about-nix.xml         |  268 ---
 doc/manual/introduction/introduction.xml      |   12 -
 doc/manual/introduction/quick-start.xml       |  124 --
 doc/manual/local.mk                           |    9 -
 doc/manual/manual.xml                         |   52 -
 doc/manual/nix-lang-ref.xml                   |  182 --
 doc/manual/packages/basic-package-mgmt.xml    |  194 --
 .../packages/binary-cache-substituter.xml     |   70 -
 doc/manual/packages/channels.xml              |   60 -
 doc/manual/packages/copy-closure.xml          |   50 -
 doc/manual/packages/garbage-collection.xml    |   86 -
 .../packages/garbage-collector-roots.xml      |   29 -
 doc/manual/packages/package-management.xml    |   23 -
 doc/manual/packages/profiles.xml              |  154 --
 doc/manual/packages/s3-substituter.xml        |  191 --
 doc/manual/packages/sharing-packages.xml      |   20 -
 doc/manual/packages/ssh-substituter.xml       |   73 -
 doc/manual/release-notes/release-notes.xml    |   51 -
 doc/manual/release-notes/rl-0.10.1.xml        |   13 -
 doc/manual/release-notes/rl-0.10.xml          |  323 ----
 doc/manual/release-notes/rl-0.11.xml          |  261 ---
 doc/manual/release-notes/rl-0.12.xml          |  175 --
 doc/manual/release-notes/rl-0.13.xml          |  106 --
 doc/manual/release-notes/rl-0.14.xml          |   46 -
 doc/manual/release-notes/rl-0.15.xml          |   14 -
 doc/manual/release-notes/rl-0.16.xml          |   55 -
 doc/manual/release-notes/rl-0.5.xml           |   11 -
 doc/manual/release-notes/rl-0.6.xml           |  122 --
 doc/manual/release-notes/rl-0.7.xml           |   35 -
 doc/manual/release-notes/rl-0.8.1.xml         |   21 -
 doc/manual/release-notes/rl-0.8.xml           |  246 ---
 doc/manual/release-notes/rl-0.9.1.xml         |   13 -
 doc/manual/release-notes/rl-0.9.2.xml         |   28 -
 doc/manual/release-notes/rl-0.9.xml           |   98 -
 doc/manual/release-notes/rl-1.0.xml           |  119 --
 doc/manual/release-notes/rl-1.1.xml           |  100 -
 doc/manual/release-notes/rl-1.10.xml          |   64 -
 doc/manual/release-notes/rl-1.11.10.xml       |   31 -
 doc/manual/release-notes/rl-1.11.xml          |  141 --
 doc/manual/release-notes/rl-1.2.xml           |  157 --
 doc/manual/release-notes/rl-1.3.xml           |   19 -
 doc/manual/release-notes/rl-1.4.xml           |   39 -
 doc/manual/release-notes/rl-1.5.1.xml         |   12 -
 doc/manual/release-notes/rl-1.5.2.xml         |   12 -
 doc/manual/release-notes/rl-1.5.xml           |   12 -
 doc/manual/release-notes/rl-1.6.1.xml         |   69 -
 doc/manual/release-notes/rl-1.6.xml           |  127 --
 doc/manual/release-notes/rl-1.7.xml           |  263 ---
 doc/manual/release-notes/rl-1.8.xml           |  123 --
 doc/manual/release-notes/rl-1.9.xml           |  216 ---
 doc/manual/release-notes/rl-2.0.xml           | 1012 ----------
 doc/manual/release-notes/rl-2.1.xml           |  133 --
 doc/manual/release-notes/rl-2.2.xml           |  143 --
 doc/manual/release-notes/rl-2.3.xml           |   91 -
 doc/manual/schemas.xml                        |    4 -
 109 files changed, 18547 deletions(-)
 delete mode 100644 doc/manual/advanced-topics/advanced-topics.xml
 delete mode 100644 doc/manual/advanced-topics/cores-vs-jobs.xml
 delete mode 100644 doc/manual/advanced-topics/diff-hook.xml
 delete mode 100644 doc/manual/advanced-topics/distributed-builds.xml
 delete mode 100644 doc/manual/advanced-topics/post-build-hook.xml
 delete mode 100644 doc/manual/command-ref/command-ref.xml
 delete mode 100644 doc/manual/command-ref/conf-file.xml
 delete mode 100644 doc/manual/command-ref/env-common.xml
 delete mode 100644 doc/manual/command-ref/files.xml
 delete mode 100644 doc/manual/command-ref/main-commands.xml
 delete mode 100644 doc/manual/command-ref/nix-build.xml
 delete mode 100644 doc/manual/command-ref/nix-channel.xml
 delete mode 100644 doc/manual/command-ref/nix-collect-garbage.xml
 delete mode 100644 doc/manual/command-ref/nix-copy-closure.xml
 delete mode 100644 doc/manual/command-ref/nix-daemon.xml
 delete mode 100644 doc/manual/command-ref/nix-env.xml
 delete mode 100644 doc/manual/command-ref/nix-hash.xml
 delete mode 100644 doc/manual/command-ref/nix-instantiate.xml
 delete mode 100644 doc/manual/command-ref/nix-prefetch-url.xml
 delete mode 100644 doc/manual/command-ref/nix-shell.xml
 delete mode 100644 doc/manual/command-ref/nix-store.xml
 delete mode 100644 doc/manual/command-ref/opt-common-syn.xml
 delete mode 100644 doc/manual/command-ref/opt-common.xml
 delete mode 100644 doc/manual/command-ref/opt-inst-syn.xml
 delete mode 100644 doc/manual/command-ref/utilities.xml
 delete mode 100644 doc/manual/expressions/advanced-attributes.xml
 delete mode 100644 doc/manual/expressions/arguments-variables.xml
 delete mode 100644 doc/manual/expressions/build-script.xml
 delete mode 100644 doc/manual/expressions/builtins.xml
 delete mode 100644 doc/manual/expressions/derivations.xml
 delete mode 100644 doc/manual/expressions/expression-language.xml
 delete mode 100644 doc/manual/expressions/expression-syntax.xml
 delete mode 100644 doc/manual/expressions/generic-builder.xml
 delete mode 100644 doc/manual/expressions/language-constructs.xml
 delete mode 100644 doc/manual/expressions/language-operators.xml
 delete mode 100644 doc/manual/expressions/language-values.xml
 delete mode 100644 doc/manual/expressions/simple-building-testing.xml
 delete mode 100644 doc/manual/expressions/simple-expression.xml
 delete mode 100644 doc/manual/expressions/writing-nix-expressions.xml
 delete mode 100644 doc/manual/glossary/glossary.xml
 delete mode 100644 doc/manual/hacking.xml
 delete mode 100644 doc/manual/installation/building-source.xml
 delete mode 100644 doc/manual/installation/env-variables.xml
 delete mode 100644 doc/manual/installation/installation.xml
 delete mode 100644 doc/manual/installation/installing-binary.xml
 delete mode 100644 doc/manual/installation/installing-source.xml
 delete mode 100644 doc/manual/installation/multi-user.xml
 delete mode 100644 doc/manual/installation/nix-security.xml
 delete mode 100644 doc/manual/installation/obtaining-source.xml
 delete mode 100644 doc/manual/installation/prerequisites-source.xml
 delete mode 100644 doc/manual/installation/single-user.xml
 delete mode 100644 doc/manual/installation/supported-platforms.xml
 delete mode 100644 doc/manual/installation/upgrading.xml
 delete mode 100644 doc/manual/introduction/about-nix.xml
 delete mode 100644 doc/manual/introduction/introduction.xml
 delete mode 100644 doc/manual/introduction/quick-start.xml
 delete mode 100644 doc/manual/manual.xml
 delete mode 100644 doc/manual/nix-lang-ref.xml
 delete mode 100644 doc/manual/packages/basic-package-mgmt.xml
 delete mode 100644 doc/manual/packages/binary-cache-substituter.xml
 delete mode 100644 doc/manual/packages/channels.xml
 delete mode 100644 doc/manual/packages/copy-closure.xml
 delete mode 100644 doc/manual/packages/garbage-collection.xml
 delete mode 100644 doc/manual/packages/garbage-collector-roots.xml
 delete mode 100644 doc/manual/packages/package-management.xml
 delete mode 100644 doc/manual/packages/profiles.xml
 delete mode 100644 doc/manual/packages/s3-substituter.xml
 delete mode 100644 doc/manual/packages/sharing-packages.xml
 delete mode 100644 doc/manual/packages/ssh-substituter.xml
 delete mode 100644 doc/manual/release-notes/release-notes.xml
 delete mode 100644 doc/manual/release-notes/rl-0.10.1.xml
 delete mode 100644 doc/manual/release-notes/rl-0.10.xml
 delete mode 100644 doc/manual/release-notes/rl-0.11.xml
 delete mode 100644 doc/manual/release-notes/rl-0.12.xml
 delete mode 100644 doc/manual/release-notes/rl-0.13.xml
 delete mode 100644 doc/manual/release-notes/rl-0.14.xml
 delete mode 100644 doc/manual/release-notes/rl-0.15.xml
 delete mode 100644 doc/manual/release-notes/rl-0.16.xml
 delete mode 100644 doc/manual/release-notes/rl-0.5.xml
 delete mode 100644 doc/manual/release-notes/rl-0.6.xml
 delete mode 100644 doc/manual/release-notes/rl-0.7.xml
 delete mode 100644 doc/manual/release-notes/rl-0.8.1.xml
 delete mode 100644 doc/manual/release-notes/rl-0.8.xml
 delete mode 100644 doc/manual/release-notes/rl-0.9.1.xml
 delete mode 100644 doc/manual/release-notes/rl-0.9.2.xml
 delete mode 100644 doc/manual/release-notes/rl-0.9.xml
 delete mode 100644 doc/manual/release-notes/rl-1.0.xml
 delete mode 100644 doc/manual/release-notes/rl-1.1.xml
 delete mode 100644 doc/manual/release-notes/rl-1.10.xml
 delete mode 100644 doc/manual/release-notes/rl-1.11.10.xml
 delete mode 100644 doc/manual/release-notes/rl-1.11.xml
 delete mode 100644 doc/manual/release-notes/rl-1.2.xml
 delete mode 100644 doc/manual/release-notes/rl-1.3.xml
 delete mode 100644 doc/manual/release-notes/rl-1.4.xml
 delete mode 100644 doc/manual/release-notes/rl-1.5.1.xml
 delete mode 100644 doc/manual/release-notes/rl-1.5.2.xml
 delete mode 100644 doc/manual/release-notes/rl-1.5.xml
 delete mode 100644 doc/manual/release-notes/rl-1.6.1.xml
 delete mode 100644 doc/manual/release-notes/rl-1.6.xml
 delete mode 100644 doc/manual/release-notes/rl-1.7.xml
 delete mode 100644 doc/manual/release-notes/rl-1.8.xml
 delete mode 100644 doc/manual/release-notes/rl-1.9.xml
 delete mode 100644 doc/manual/release-notes/rl-2.0.xml
 delete mode 100644 doc/manual/release-notes/rl-2.1.xml
 delete mode 100644 doc/manual/release-notes/rl-2.2.xml
 delete mode 100644 doc/manual/release-notes/rl-2.3.xml
 delete mode 100644 doc/manual/schemas.xml

diff --git a/.gitignore b/.gitignore
index 983026570..d456d7da3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,14 +22,9 @@ perl/Makefile.config
 /corepkgs/nar/unnar.sh
 
 # /doc/manual/
-/doc/manual/manual.html
-/doc/manual/manual.xmli
-/doc/manual/manual.pdf
-/doc/manual/manual.is-valid
 /doc/manual/*.1
 /doc/manual/*.5
 /doc/manual/*.8
-/doc/manual/version.txt
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/doc/manual/advanced-topics/advanced-topics.xml b/doc/manual/advanced-topics/advanced-topics.xml
deleted file mode 100644
index 871b7eb1d..000000000
--- a/doc/manual/advanced-topics/advanced-topics.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xml:id="part-advanced-topics"
-      version="5.0">
-
-<title>Advanced Topics</title>
-
-<xi:include href="distributed-builds.xml" />
-<xi:include href="cores-vs-jobs.xml" />
-<xi:include href="diff-hook.xml" />
-<xi:include href="post-build-hook.xml" />
-
-</part>
diff --git a/doc/manual/advanced-topics/cores-vs-jobs.xml b/doc/manual/advanced-topics/cores-vs-jobs.xml
deleted file mode 100644
index a75dea37f..000000000
--- a/doc/manual/advanced-topics/cores-vs-jobs.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="chap-tuning-cores-and-jobs">
-
-<title>Tuning Cores and Jobs</title>
-
-<para>Nix has two relevant settings with regards to how your CPU cores
-will be utilized: <xref linkend="conf-cores" /> and
-<xref linkend="conf-max-jobs" />. This chapter will talk about what
-they are, how they interact, and their configuration trade-offs.</para>
-
-<variablelist>
-  <varlistentry>
-    <term><xref linkend="conf-max-jobs" /></term>
-    <listitem><para>
-      Dictates how many separate derivations will be built at the same
-      time. If you set this to zero, the local machine will do no
-      builds. Nix will still substitute from binary caches, and build
-      remotely if remote builders are configured.
-    </para></listitem>
-  </varlistentry>
-  <varlistentry>
-    <term><xref linkend="conf-cores" /></term>
-    <listitem><para>
-      Suggests how many cores each derivation should use. Similar to
-      <command>make -j</command>.
-    </para></listitem>
-  </varlistentry>
-</variablelist>
-
-<para>The <xref linkend="conf-cores" /> setting determines the value of
-<literal>NIX_BUILD_CORES</literal>. <literal>NIX_BUILD_CORES</literal> is equal
-to <xref linkend="conf-cores" />, unless <xref linkend="conf-cores" />
-equals <literal>0</literal>, in which case <literal>NIX_BUILD_CORES</literal>
-will be the total number of cores in the system.</para>
-
-<para>The maximum number of consumed cores is a simple multiplication,
-<xref linkend="conf-max-jobs" /> * <literal>NIX_BUILD_CORES</literal>.</para>
-
-<para>The balance on how to set these two independent variables depends
-upon each builder's workload and hardware. Here are a few example
-scenarios on a machine with 24 cores:</para>
-
-<table>
-  <caption>Balancing 24 Build Cores</caption>
-  <thead>
-    <tr>
-      <th><xref linkend="conf-max-jobs" /></th>
-      <th><xref linkend="conf-cores" /></th>
-      <th><literal>NIX_BUILD_CORES</literal></th>
-      <th>Maximum Processes</th>
-      <th>Result</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td>1</td>
-      <td>24</td>
-      <td>24</td>
-      <td>24</td>
-      <td>
-        One derivation will be built at a time, each one can use 24
-        cores. Undersold if a job can’t use 24 cores.
-      </td>
-    </tr>
-
-    <tr>
-      <td>4</td>
-      <td>6</td>
-      <td>6</td>
-      <td>24</td>
-      <td>
-        Four derivations will be built at once, each given access to
-        six cores.
-      </td>
-    </tr>
-    <tr>
-      <td>12</td>
-      <td>6</td>
-      <td>6</td>
-      <td>72</td>
-      <td>
-        12 derivations will be built at once, each given access to six
-        cores. This configuration is over-sold. If all 12 derivations
-        being built simultaneously try to use all six cores, the
-        machine's performance will be degraded due to extensive context
-        switching between the 12 builds.
-      </td>
-    </tr>
-    <tr>
-      <td>24</td>
-      <td>1</td>
-      <td>1</td>
-      <td>24</td>
-      <td>
-        24 derivations can build at the same time, each using a single
-        core. Never oversold, but derivations which require many cores
-        will be very slow to compile.
-      </td>
-    </tr>
-    <tr>
-      <td>24</td>
-      <td>0</td>
-      <td>24</td>
-      <td>576</td>
-      <td>
-        24 derivations can build at the same time, each using all the
-        available cores of the machine. Very likely to be oversold,
-        and very likely to suffer context switches.
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-<para>It is up to the derivations' build script to respect
-host's requested cores-per-build by following the value of the
-<literal>NIX_BUILD_CORES</literal> environment variable.</para>
-
-</chapter>
diff --git a/doc/manual/advanced-topics/diff-hook.xml b/doc/manual/advanced-topics/diff-hook.xml
deleted file mode 100644
index 85cfdfc02..000000000
--- a/doc/manual/advanced-topics/diff-hook.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xml:id="chap-diff-hook"
-      version="5.0"
-      >
-
-<title>Verifying Build Reproducibility</title>
-
-<para>Specify a program with Nix's <xref linkend="conf-diff-hook" /> to
-compare build results when two builds produce different results. Note:
-this hook is only executed if the results are not the same, this hook
-is not used for determining if the results are the same.</para>
-
-<para>For purposes of demonstration, we'll use the following Nix file,
-<filename>deterministic.nix</filename> for testing:</para>
-
-<programlisting>
-let
-  inherit (import &lt;nixpkgs&gt; {}) runCommand;
-in {
-  stable = runCommand "stable" {} ''
-    touch $out
-  '';
-
-  unstable = runCommand "unstable" {} ''
-    echo $RANDOM > $out
-  '';
-}
-</programlisting>
-
-<para>Additionally, <filename>nix.conf</filename> contains:
-
-<programlisting>
-diff-hook = /etc/nix/my-diff-hook
-run-diff-hook = true
-</programlisting>
-
-where <filename>/etc/nix/my-diff-hook</filename> is an executable
-file containing:
-
-<programlisting>
-#!/bin/sh
-exec &gt;&amp;2
-echo "For derivation $3:"
-/run/current-system/sw/bin/diff -r "$1" "$2"
-</programlisting>
-
-</para>
-
-<para>The diff hook is executed by the same user and group who ran the
-build. However, the diff hook does not have write access to the store
-path just built.</para>
-
-<section>
-  <title>
-    Spot-Checking Build Determinism
-  </title>
-
-  <para>
-    Verify a path which already exists in the Nix store by passing
-    <option>--check</option> to the build command.
-  </para>
-
-  <para>If the build passes and is deterministic, Nix will exit with a
-  status code of 0:</para>
-
-  <screen>
-$ nix-build ./deterministic.nix -A stable
-this derivation will be built:
-  /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv
-building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
-/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
-
-$ nix-build ./deterministic.nix -A stable --check
-checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
-/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
-</screen>
-
-  <para>If the build is not deterministic, Nix will exit with a status
-  code of 1:</para>
-
-  <screen>
-$ nix-build ./deterministic.nix -A unstable
-this derivation will be built:
-  /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv
-building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable
-
-$ nix-build ./deterministic.nix -A unstable --check
-checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
-</screen>
-
-<para>In the Nix daemon's log, we will now see:
-<screen>
-For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
-1c1
-&lt; 8108
----
-&gt; 30204
-</screen>
-</para>
-
-  <para>Using <option>--check</option> with <option>--keep-failed</option>
-  will cause Nix to keep the second build's output in a special,
-  <literal>.check</literal> path:</para>
-
-  <screen>
-$ nix-build ./deterministic.nix -A unstable --check --keep-failed
-checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-note: keeping build directory '/tmp/nix-build-unstable.drv-0'
-error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check'
-</screen>
-
-  <para>In particular, notice the
-  <literal>/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check</literal>
-  output. Nix has copied the build results to that directory where you
-  can examine it.</para>
-
-  <note xml:id="check-dirs-are-unregistered">
-    <title><literal>.check</literal> paths are not registered store paths</title>
-
-    <para>Check paths are not protected against garbage collection,
-    and this path will be deleted on the next garbage collection.</para>
-
-    <para>The path is guaranteed to be alive for the duration of
-    <xref linkend="conf-diff-hook" />'s execution, but may be deleted
-    any time after.</para>
-
-    <para>If the comparison is performed as part of automated tooling,
-    please use the diff-hook or author your tooling to handle the case
-    where the build was not deterministic and also a check path does
-    not exist.</para>
-  </note>
-
-  <para>
-    <option>--check</option> is only usable if the derivation has
-    been built on the system already. If the derivation has not been
-    built Nix will fail with the error:
-    <screen>
-error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' are not valid, so checking is not possible
-</screen>
-
-    Run the build without <option>--check</option>, and then try with
-    <option>--check</option> again.
-  </para>
-</section>
-
-<section>
-  <title>
-    Automatic and Optionally Enforced Determinism Verification
-  </title>
-
-  <para>
-    Automatically verify every build at build time by executing the
-    build multiple times.
-  </para>
-
-  <para>
-    Setting <xref linkend="conf-repeat" /> and
-    <xref linkend="conf-enforce-determinism" /> in your
-    <filename>nix.conf</filename> permits the automated verification
-    of every build Nix performs.
-  </para>
-
-  <para>
-    The following configuration will run each build three times, and
-    will require the build to be deterministic:
-
-    <programlisting>
-enforce-determinism = true
-repeat = 2
-</programlisting>
-  </para>
-
-  <para>
-    Setting <xref linkend="conf-enforce-determinism" /> to false as in
-    the following configuration will run the build multiple times,
-    execute the build hook, but will allow the build to succeed even
-    if it does not build reproducibly:
-
-    <programlisting>
-enforce-determinism = false
-repeat = 1
-</programlisting>
-  </para>
-
-  <para>
-    An example output of this configuration:
-    <screen>
-$ nix-build ./test.nix -A unstable
-this derivation will be built:
-  /nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv
-building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 1/2)...
-building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 2/2)...
-output '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable' of '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' differs from '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable.check' from previous round
-/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable
-</screen>
-  </para>
-</section>
-</chapter>
diff --git a/doc/manual/advanced-topics/distributed-builds.xml b/doc/manual/advanced-topics/distributed-builds.xml
deleted file mode 100644
index ec9e98e77..000000000
--- a/doc/manual/advanced-topics/distributed-builds.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='chap-distributed-builds'>
-
-<title>Remote Builds</title>
-
-<para>Nix supports remote builds, where a local Nix installation can
-forward Nix builds to other machines.  This allows multiple builds to
-be performed in parallel and allows Nix to perform multi-platform
-builds in a semi-transparent way.  For instance, if you perform a
-build for a <literal>x86_64-darwin</literal> on an
-<literal>i686-linux</literal> machine, Nix can automatically forward
-the build to a <literal>x86_64-darwin</literal> machine, if
-available.</para>
-
-<para>To forward a build to a remote machine, it’s required that the
-remote machine is accessible via SSH and that it has Nix
-installed. You can test whether connecting to the remote Nix instance
-works, e.g.
-
-<screen>
-$ nix ping-store --store ssh://mac
-</screen>
-
-will try to connect to the machine named <literal>mac</literal>. It is
-possible to specify an SSH identity file as part of the remote store
-URI, e.g.
-
-<screen>
-$ nix ping-store --store ssh://mac?ssh-key=/home/alice/my-key
-</screen>
-
-Since builds should be non-interactive, the key should not have a
-passphrase. Alternatively, you can load identities ahead of time into
-<command>ssh-agent</command> or <command>gpg-agent</command>.</para>
-
-<para>If you get the error
-
-<screen>
-bash: nix-store: command not found
-error: cannot connect to 'mac'
-</screen>
-
-then you need to ensure that the <literal>PATH</literal> of
-non-interactive login shells contains Nix.</para>
-
-<warning><para>If you are building via the Nix daemon, it is the Nix
-daemon user account (that is, <literal>root</literal>) that should
-have SSH access to the remote machine. If you can’t or don’t want to
-configure <literal>root</literal> to be able to access to remote
-machine, you can use a private Nix store instead by passing
-e.g. <literal>--store ~/my-nix</literal>.</para></warning>
-
-<para>The list of remote machines can be specified on the command line
-or in the Nix configuration file. The former is convenient for
-testing. For example, the following command allows you to build a
-derivation for <literal>x86_64-darwin</literal> on a Linux machine:
-
-<screen>
-$ uname
-Linux
-
-$ nix build \
-  '(with import &lt;nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
-  --builders 'ssh://mac x86_64-darwin'
-[1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
-
-$ cat ./result
-Darwin
-</screen>
-
-It is possible to specify multiple builders separated by a semicolon
-or a newline, e.g.
-
-<screen>
-  --builders 'ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd'
-</screen>
-</para>
-
-<para>Each machine specification consists of the following elements,
-separated by spaces. Only the first element is required.
-To leave a field at its default, set it to <literal>-</literal>.
-
-<orderedlist>
-
-  <listitem><para>The URI of the remote store in the format
-  <literal>ssh://[<emphasis>username</emphasis>@]<emphasis>hostname</emphasis></literal>,
-  e.g. <literal>ssh://nix@mac</literal> or
-  <literal>ssh://mac</literal>. For backward compatibility,
-  <literal>ssh://</literal> may be omitted. The hostname may be an
-  alias defined in your
-  <filename>~/.ssh/config</filename>.</para></listitem>
-
-  <listitem><para>A comma-separated list of Nix platform type
-  identifiers, such as <literal>x86_64-darwin</literal>.  It is
-  possible for a machine to support multiple platform types, e.g.,
-  <literal>i686-linux,x86_64-linux</literal>. If omitted, this
-  defaults to the local platform type.</para></listitem>
-
-  <listitem><para>The SSH identity file to be used to log in to the
-  remote machine. If omitted, SSH will use its regular
-  identities.</para></listitem>
-
-  <listitem><para>The maximum number of builds that Nix will execute
-  in parallel on the machine.  Typically this should be equal to the
-  number of CPU cores.  For instance, the machine
-  <literal>itchy</literal> in the example will execute up to 8 builds
-  in parallel.</para></listitem>
-
-  <listitem><para>The “speed factor”, indicating the relative speed of
-  the machine.  If there are multiple machines of the right type, Nix
-  will prefer the fastest, taking load into account.</para></listitem>
-
-  <listitem><para>A comma-separated list of <emphasis>supported
-  features</emphasis>.  If a derivation has the
-  <varname>requiredSystemFeatures</varname> attribute, then Nix will
-  only perform the derivation on a machine that has the specified
-  features.  For instance, the attribute
-
-<programlisting>
-requiredSystemFeatures = [ "kvm" ];
-</programlisting>
-
-  will cause the build to be performed on a machine that has the
-  <literal>kvm</literal> feature.</para></listitem>
-
-  <listitem><para>A comma-separated list of <emphasis>mandatory
-  features</emphasis>.  A machine will only be used to build a
-  derivation if all of the machine’s mandatory features appear in the
-  derivation’s <varname>requiredSystemFeatures</varname>
-  attribute..</para></listitem>
-
-</orderedlist>
-
-For example, the machine specification
-
-<programlisting>
-nix@scratchy.labs.cs.uu.nl  i686-linux      /home/nix/.ssh/id_scratchy_auto        8 1 kvm
-nix@itchy.labs.cs.uu.nl     i686-linux      /home/nix/.ssh/id_scratchy_auto        8 2
-nix@poochie.labs.cs.uu.nl   i686-linux      /home/nix/.ssh/id_scratchy_auto        1 2 kvm benchmark
-</programlisting>
-
-specifies several machines that can perform
-<literal>i686-linux</literal> builds. However,
-<literal>poochie</literal> will only do builds that have the attribute
-
-<programlisting>
-requiredSystemFeatures = [ "benchmark" ];
-</programlisting>
-
-or
-
-<programlisting>
-requiredSystemFeatures = [ "benchmark" "kvm" ];
-</programlisting>
-
-<literal>itchy</literal> cannot do builds that require
-<literal>kvm</literal>, but <literal>scratchy</literal> does support
-such builds. For regular builds, <literal>itchy</literal> will be
-preferred over <literal>scratchy</literal> because it has a higher
-speed factor.</para>
-
-<para>Remote builders can also be configured in
-<filename>nix.conf</filename>, e.g.
-
-<programlisting>
-builders = ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd
-</programlisting>
-
-Finally, remote builders can be configured in a separate configuration
-file included in <option>builders</option> via the syntax
-<literal>@<emphasis>file</emphasis></literal>. For example,
-
-<programlisting>
-builders = @/etc/nix/machines
-</programlisting>
-
-causes the list of machines in <filename>/etc/nix/machines</filename>
-to be included. (This is the default.)</para>
-
-<para>If you want the builders to use caches, you likely want to set
-the option <link linkend='conf-builders-use-substitutes'><literal>builders-use-substitutes</literal></link>
-in your local <filename>nix.conf</filename>.</para>
-
-<para>To build only on remote builders and disable building on the local machine,
-you can use the option <option>--max-jobs 0</option>.</para>
-
-</chapter>
diff --git a/doc/manual/advanced-topics/post-build-hook.xml b/doc/manual/advanced-topics/post-build-hook.xml
deleted file mode 100644
index 1480ab86a..000000000
--- a/doc/manual/advanced-topics/post-build-hook.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      xml:id="chap-post-build-hook"
-      version="5.0"
-      >
-
-<title>Using the <option linkend="conf-post-build-hook">post-build-hook</option></title>
-
-<section xml:id="chap-post-build-hook-caveats">
-  <title>Implementation Caveats</title>
-  <para>Here we use the post-build hook to upload to a binary cache.
-  This is a simple and working example, but it is not suitable for all
-  use cases.</para>
-
-  <para>The post build hook program runs after each executed build,
-  and blocks the build loop. The build loop exits if the hook program
-  fails.</para>
-
-  <para>Concretely, this implementation will make Nix slow or unusable
-  when the internet is slow or unreliable.</para>
-
-  <para>A more advanced implementation might pass the store paths to a
-  user-supplied daemon or queue for processing the store paths outside
-  of the build loop.</para>
-</section>
-
-<section>
-  <title>Prerequisites</title>
-
-  <para>
-    This tutorial assumes you have configured an S3-compatible binary cache
-    according to the instructions at
-    <xref linkend="ssec-s3-substituter-authenticated-writes" />, and
-    that the <literal>root</literal> user's default AWS profile can
-    upload to the bucket.
-  </para>
-</section>
-
-<section>
-  <title>Set up a Signing Key</title>
-  <para>Use <command>nix-store --generate-binary-cache-key</command> to
-  create our public and private signing keys. We will sign paths
-  with the private key, and distribute the public key for verifying
-  the authenticity of the paths.</para>
-
-  <screen>
-# nix-store --generate-binary-cache-key example-nix-cache-1 /etc/nix/key.private /etc/nix/key.public
-# cat /etc/nix/key.public
-example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
-</screen>
-
-<para>Then, add the public key and the cache URL to your
-<filename>nix.conf</filename>'s <xref linkend="conf-trusted-public-keys" />
-and <xref linkend="conf-substituters" /> like:</para>
-
-<programlisting>
-substituters = https://cache.nixos.org/ s3://example-nix-cache
-trusted-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY= example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
-</programlisting>
-
-<para>We will restart the Nix daemon in a later step.</para>
-</section>
-
-<section>
-  <title>Implementing the build hook</title>
-  <para>Write the following script to
-  <filename>/etc/nix/upload-to-cache.sh</filename>:
-  </para>
-
-  <programlisting>
-#!/bin/sh
-
-set -eu
-set -f # disable globbing
-export IFS=' '
-
-echo "Signing paths" $OUT_PATHS
-nix sign-paths --key-file /etc/nix/key.private $OUT_PATHS
-echo "Uploading paths" $OUT_PATHS
-exec nix copy --to 's3://example-nix-cache' $OUT_PATHS
-</programlisting>
-
-  <note>
-    <title>Should <literal>$OUT_PATHS</literal> be quoted?</title>
-    <para>
-      The <literal>$OUT_PATHS</literal> variable is a space-separated
-      list of Nix store paths. In this case, we expect and want the
-      shell to perform word splitting to make each output path its
-      own argument to <command>nix sign-paths</command>. Nix guarantees
-      the paths will not contain any spaces, however a store path
-      might contain glob characters. The <command>set -f</command>
-      disables globbing in the shell.
-    </para>
-  </note>
-  <para>
-    Then make sure the hook program is executable by the <literal>root</literal> user:
-    <screen>
-# chmod +x /etc/nix/upload-to-cache.sh
-</screen></para>
-</section>
-
-<section>
-  <title>Updating Nix Configuration</title>
-
-  <para>Edit <filename>/etc/nix/nix.conf</filename> to run our hook,
-  by adding the following configuration snippet at the end:</para>
-
-  <programlisting>
-post-build-hook = /etc/nix/upload-to-cache.sh
-</programlisting>
-
-<para>Then, restart the <command>nix-daemon</command>.</para>
-</section>
-
-<section>
-  <title>Testing</title>
-
-  <para>Build any derivation, for example:</para>
-
-  <screen>
-$ nix-build -E '(import &lt;nixpkgs&gt; {}).writeText "example" (builtins.toString builtins.currentTime)'
-this derivation will be built:
-  /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv
-building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv'...
-running post-build-hook '/home/grahamc/projects/github.com/NixOS/nix/post-hook.sh'...
-post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-/nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-</screen>
-
-  <para>Then delete the path from the store, and try substituting it from the binary cache:</para>
-  <screen>
-$ rm ./result
-$ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-</screen>
-
-<para>Now, copy the path back from the cache:</para>
-<screen>
-$ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example from 's3://example-nix-cache'...
-warning: you did not specify '--add-root'; the result might be removed by the garbage collector
-/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example
-</screen>
-</section>
-<section>
-  <title>Conclusion</title>
-  <para>
-    We now have a Nix installation configured to automatically sign and
-    upload every local build to a remote binary cache.
-  </para>
-
-  <para>
-    Before deploying this to production, be sure to consider the
-    implementation caveats in <xref linkend="chap-post-build-hook-caveats" />.
-  </para>
-</section>
-</chapter>
diff --git a/doc/manual/command-ref/command-ref.xml b/doc/manual/command-ref/command-ref.xml
deleted file mode 100644
index cfad9b7d7..000000000
--- a/doc/manual/command-ref/command-ref.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='part-command-ref'>
-
-<title>Command Reference</title>
-
-<partintro>
-<para>This section lists commands and options that you can use when you
-work with Nix.</para>
-</partintro>
-
-<xi:include href="opt-common.xml" />
-<xi:include href="env-common.xml" />
-<xi:include href="main-commands.xml" />
-<xi:include href="utilities.xml" />
-<xi:include href="files.xml" />
-
-</part>
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml
deleted file mode 100644
index 62cc117b6..000000000
--- a/doc/manual/command-ref/conf-file.xml
+++ /dev/null
@@ -1,1244 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<refentry xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-conf-file"
-          version="5">
-
-<refmeta>
-  <refentrytitle>nix.conf</refentrytitle>
-  <manvolnum>5</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix.conf</refname>
-  <refpurpose>Nix configuration file</refpurpose>
-</refnamediv>
-
-<refsection><title>Description</title>
-
-<para>By default Nix reads settings from the following places:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>
-      The system-wide configuration file
-      <filename><emphasis>sysconfdir</emphasis>/nix/nix.conf</filename>
-      (i.e. <filename>/etc/nix/nix.conf</filename> on most systems),
-      or <filename>$NIX_CONF_DIR/nix.conf</filename> if
-      <literal>NIX_CONF_DIR</literal> is set. Values loaded in this
-      file are not forwarded to the Nix daemon. The client assumes
-      that the daemon has already loaded them.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      If <literal>NIX_USER_CONF_FILES</literal> is set, then each path separated by
-      <literal>:</literal> will be loaded in reverse order.
-    </para>
-
-    <para>
-      Otherwise it will look for <filename>nix/nix.conf</filename>
-      files in <literal>XDG_CONFIG_DIRS</literal> and
-      <literal>XDG_CONFIG_HOME</literal>.  If these are unset, it will
-      look in <filename>$HOME/.config/nix.conf</filename>.
-    </para>
-  </listitem>
-
-</itemizedlist>
-
-<para>The configuration files consist of
-<literal><emphasis>name</emphasis> =
-<emphasis>value</emphasis></literal> pairs, one per line. Other
-files can be included with a line like <literal>include
-<emphasis>path</emphasis></literal>, where
-<emphasis>path</emphasis> is interpreted relative to the current
-conf file and a missing file is an error unless
-<literal>!include</literal> is used instead.
-Comments start with a <literal>#</literal> character.  Here is an
-example configuration file:</para>
-
-<programlisting>
-keep-outputs = true       # Nice for developers
-keep-derivations = true   # Idem
-</programlisting>
-
-<para>You can override settings on the command line using the
-<option>--option</option> flag, e.g. <literal>--option keep-outputs
-false</literal>.</para>
-
-<para>The following settings are currently available:
-
-<variablelist>
-
-
-  <varlistentry xml:id="conf-allowed-uris"><term><literal>allowed-uris</literal></term>
-
-    <listitem>
-
-      <para>A list of URI prefixes to which access is allowed in
-      restricted evaluation mode. For example, when set to
-      <literal>https://github.com/NixOS</literal>, builtin functions
-      such as <function>fetchGit</function> are allowed to access
-      <literal>https://github.com/NixOS/patchelf.git</literal>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-allow-import-from-derivation"><term><literal>allow-import-from-derivation</literal></term>
-
-    <listitem><para>By default, Nix allows you to <function>import</function> from a derivation,
-    allowing building at evaluation time. With this option set to false, Nix will throw an error
-    when evaluating an expression that uses this feature, allowing users to ensure their evaluation
-    will not require any builds to take place.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-allow-new-privileges"><term><literal>allow-new-privileges</literal></term>
-
-    <listitem><para>(Linux-specific.) By default, builders on Linux
-    cannot acquire new privileges by calling setuid/setgid programs or
-    programs that have file capabilities. For example, programs such
-    as <command>sudo</command> or <command>ping</command> will
-    fail. (Note that in sandbox builds, no such programs are available
-    unless you bind-mount them into the sandbox via the
-    <option>sandbox-paths</option> option.) You can allow the
-    use of such programs by enabling this option. This is impure and
-    usually undesirable, but may be useful in certain scenarios
-    (e.g. to spin up containers or set up userspace network interfaces
-    in tests).</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-allowed-users"><term><literal>allowed-users</literal></term>
-
-    <listitem>
-
-      <para>A list of names of users (separated by whitespace) that
-      are allowed to connect to the Nix daemon. As with the
-      <option>trusted-users</option> option, you can specify groups by
-      prefixing them with <literal>@</literal>. Also, you can allow
-      all users by specifying <literal>*</literal>. The default is
-      <literal>*</literal>.</para>
-
-      <para>Note that trusted users are always allowed to connect.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-auto-optimise-store"><term><literal>auto-optimise-store</literal></term>
-
-    <listitem><para>If set to <literal>true</literal>, Nix
-    automatically detects files in the store that have identical
-    contents, and replaces them with hard links to a single copy.
-    This saves disk space.  If set to <literal>false</literal> (the
-    default), you can still run <command>nix-store
-    --optimise</command> to get rid of duplicate
-    files.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-builders">
-    <term><literal>builders</literal></term>
-    <listitem>
-      <para>A list of machines on which to perform builds. <phrase
-      condition="manual">See <xref linkend="chap-distributed-builds"
-      /> for details.</phrase></para>
-    </listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-builders-use-substitutes"><term><literal>builders-use-substitutes</literal></term>
-
-    <listitem><para>If set to <literal>true</literal>, Nix will instruct
-    remote build machines to use their own binary substitutes if available. In
-    practical terms, this means that remote hosts will fetch as many build
-    dependencies as possible from their own substitutes (e.g, from
-    <literal>cache.nixos.org</literal>), instead of waiting for this host to
-    upload them all. This can drastically reduce build times if the network
-    connection between this computer and the remote build host is slow. Defaults
-    to <literal>false</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-users-group"><term><literal>build-users-group</literal></term>
-
-    <listitem><para>This options specifies the Unix group containing
-    the Nix build user accounts.  In multi-user Nix installations,
-    builds should not be performed by the Nix account since that would
-    allow users to arbitrarily modify the Nix store and database by
-    supplying specially crafted builders; and they cannot be performed
-    by the calling user since that would allow him/her to influence
-    the build result.</para>
-
-    <para>Therefore, if this option is non-empty and specifies a valid
-    group, builds will be performed under the user accounts that are a
-    member of the group specified here (as listed in
-    <filename>/etc/group</filename>).  Those user accounts should not
-    be used for any other purpose!</para>
-
-    <para>Nix will never run two builds under the same user account at
-    the same time.  This is to prevent an obvious security hole: a
-    malicious user writing a Nix expression that modifies the build
-    result of a legitimate Nix expression being built by another user.
-    Therefore it is good to have as many Nix build user accounts as
-    you can spare.  (Remember: uids are cheap.)</para>
-
-    <para>The build users should have permission to create files in
-    the Nix store, but not delete them.  Therefore,
-    <filename>/nix/store</filename> should be owned by the Nix
-    account, its group should be the group specified here, and its
-    mode should be <literal>1775</literal>.</para>
-
-    <para>If the build users group is empty, builds will be performed
-    under the uid of the Nix process (that is, the uid of the caller
-    if <literal>NIX_REMOTE</literal> is empty, the uid under which the Nix
-    daemon runs if <literal>NIX_REMOTE</literal> is
-    <literal>daemon</literal>).  Obviously, this should not be used in
-    multi-user settings with untrusted users.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-compress-build-log"><term><literal>compress-build-log</literal></term>
-
-    <listitem><para>If set to <literal>true</literal> (the default),
-    build logs written to <filename>/nix/var/log/nix/drvs</filename>
-    will be compressed on the fly using bzip2.  Otherwise, they will
-    not be compressed.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-connect-timeout"><term><literal>connect-timeout</literal></term>
-
-    <listitem>
-
-      <para>The timeout (in seconds) for establishing connections in
-      the binary cache substituter.  It corresponds to
-      <command>curl</command>’s <option>--connect-timeout</option>
-      option.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-cores"><term><literal>cores</literal></term>
-
-    <listitem><para>Sets the value of the
-    <literal>NIX_BUILD_CORES</literal> environment variable in the
-    invocation of builders.  Builders can use this variable at their
-    discretion to control the maximum amount of parallelism.  For
-    instance, in Nixpkgs, if the derivation attribute
-    <varname>enableParallelBuilding</varname> is set to
-    <literal>true</literal>, the builder passes the
-    <option>-j<emphasis>N</emphasis></option> flag to GNU Make.
-    It can be overridden using the <option
-    linkend='opt-cores'>--cores</option> command line switch and
-    defaults to <literal>1</literal>.  The value <literal>0</literal>
-    means that the builder should use all available CPU cores in the
-    system.</para>
-
-    <para>See also <xref linkend="chap-tuning-cores-and-jobs" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-diff-hook"><term><literal>diff-hook</literal></term>
-  <listitem>
-    <para>
-      Absolute path to an executable capable of diffing build results.
-      The hook executes if <xref linkend="conf-run-diff-hook" /> is
-      true, and the output of a build is known to not be the same.
-      This program is not executed to determine if two results are the
-      same.
-    </para>
-
-    <para>
-      The diff hook is executed by the same user and group who ran the
-      build. However, the diff hook does not have write access to the
-      store path just built.
-    </para>
-
-    <para>The diff hook program receives three parameters:</para>
-
-    <orderedlist>
-      <listitem>
-        <para>
-          A path to the previous build's results
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          A path to the current build's results
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The path to the build's derivation
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The path to the build's scratch directory. This directory
-          will exist only if the build was run with
-          <option>--keep-failed</option>.
-        </para>
-      </listitem>
-    </orderedlist>
-
-    <para>
-      The stderr and stdout output from the diff hook will not be
-      displayed to the user. Instead, it will print to the nix-daemon's
-      log.
-    </para>
-
-    <para>When using the Nix daemon, <literal>diff-hook</literal> must
-    be set in the <filename>nix.conf</filename> configuration file, and
-    cannot be passed at the command line.
-    </para>
-  </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-enforce-determinism">
-    <term><literal>enforce-determinism</literal></term>
-
-    <listitem><para>See <xref linkend="conf-repeat" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-extra-sandbox-paths">
-    <term><literal>extra-sandbox-paths</literal></term>
-
-    <listitem><para>A list of additional paths appended to
-    <option>sandbox-paths</option>. Useful if you want to extend
-    its default value.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-extra-platforms"><term><literal>extra-platforms</literal></term>
-
-    <listitem><para>Platforms other than the native one which
-    this machine is capable of building for. This can be useful for
-    supporting additional architectures on compatible machines:
-    i686-linux can be built on x86_64-linux machines (and the default
-    for this setting reflects this); armv7 is backwards-compatible with
-    armv6 and armv5tel; some aarch64 machines can also natively run
-    32-bit ARM code; and qemu-user may be used to support non-native
-    platforms (though this may be slow and buggy). Most values for this
-    are not enabled by default because build systems will often
-    misdetect the target platform and generate incompatible code, so you
-    may wish to cross-check the results of using this option against
-    proper natively-built versions of your
-    derivations.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-extra-substituters"><term><literal>extra-substituters</literal></term>
-
-    <listitem><para>Additional binary caches appended to those
-    specified in <option>substituters</option>.  When used by
-    unprivileged users, untrusted substituters (i.e. those not listed
-    in <option>trusted-substituters</option>) are silently
-    ignored.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-fallback"><term><literal>fallback</literal></term>
-
-    <listitem><para>If set to <literal>true</literal>, Nix will fall
-    back to building from source if a binary substitute fails.  This
-    is equivalent to the <option>--fallback</option> flag.  The
-    default is <literal>false</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-fsync-metadata"><term><literal>fsync-metadata</literal></term>
-
-    <listitem><para>If set to <literal>true</literal>, changes to the
-    Nix store metadata (in <filename>/nix/var/nix/db</filename>) are
-    synchronously flushed to disk.  This improves robustness in case
-    of system crashes, but reduces performance.  The default is
-    <literal>true</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-hashed-mirrors"><term><literal>hashed-mirrors</literal></term>
-
-    <listitem><para>A list of web servers used by
-    <function>builtins.fetchurl</function> to obtain files by
-    hash. The default is
-    <literal>http://tarballs.nixos.org/</literal>. Given a hash type
-    <emphasis>ht</emphasis> and a base-16 hash
-    <emphasis>h</emphasis>, Nix will try to download the file
-    from
-    <literal>hashed-mirror/<emphasis>ht</emphasis>/<emphasis>h</emphasis></literal>.
-    This allows files to be downloaded even if they have disappeared
-    from their original URI. For example, given the default mirror
-    <literal>http://tarballs.nixos.org/</literal>, when building the derivation
-
-<programlisting>
-builtins.fetchurl {
-  url = "https://example.org/foo-1.2.3.tar.xz";
-  sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
-}
-</programlisting>
-
-    Nix will attempt to download this file from
-    <literal>http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae</literal>
-    first. If it is not available there, if will try the original URI.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-http-connections"><term><literal>http-connections</literal></term>
-
-    <listitem><para>The maximum number of parallel TCP connections
-    used to fetch files from binary caches and by other downloads. It
-    defaults to 25. 0 means no limit.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-keep-build-log"><term><literal>keep-build-log</literal></term>
-
-    <listitem><para>If set to <literal>true</literal> (the default),
-    Nix will write the build log of a derivation (i.e. the standard
-    output and error of its builder) to the directory
-    <filename>/nix/var/log/nix/drvs</filename>.  The build log can be
-    retrieved using the command <command>nix-store -l
-    <emphasis>path</emphasis></command>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-keep-derivations"><term><literal>keep-derivations</literal></term>
-
-    <listitem><para>If <literal>true</literal> (default), the garbage
-    collector will keep the derivations from which non-garbage store
-    paths were built.  If <literal>false</literal>, they will be
-    deleted unless explicitly registered as a root (or reachable from
-    other roots).</para>
-
-    <para>Keeping derivation around is useful for querying and
-    traceability (e.g., it allows you to ask with what dependencies or
-    options a store path was built), so by default this option is on.
-    Turn it off to save a bit of disk space (or a lot if
-    <literal>keep-outputs</literal> is also turned on).</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-keep-env-derivations"><term><literal>keep-env-derivations</literal></term>
-
-    <listitem><para>If <literal>false</literal> (default), derivations
-    are not stored in Nix user environments.  That is, the derivations of
-    any build-time-only dependencies may be garbage-collected.</para>
-
-    <para>If <literal>true</literal>, when you add a Nix derivation to
-    a user environment, the path of the derivation is stored in the
-    user environment.  Thus, the derivation will not be
-    garbage-collected until the user environment generation is deleted
-    (<command>nix-env --delete-generations</command>).  To prevent
-    build-time-only dependencies from being collected, you should also
-    turn on <literal>keep-outputs</literal>.</para>
-
-    <para>The difference between this option and
-    <literal>keep-derivations</literal> is that this one is
-    “sticky”: it applies to any user environment created while this
-    option was enabled, while <literal>keep-derivations</literal>
-    only applies at the moment the garbage collector is
-    run.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-keep-outputs"><term><literal>keep-outputs</literal></term>
-
-    <listitem><para>If <literal>true</literal>, the garbage collector
-    will keep the outputs of non-garbage derivations.  If
-    <literal>false</literal> (default), outputs will be deleted unless
-    they are GC roots themselves (or reachable from other roots).</para>
-
-    <para>In general, outputs must be registered as roots separately.
-    However, even if the output of a derivation is registered as a
-    root, the collector will still delete store paths that are used
-    only at build time (e.g., the C compiler, or source tarballs
-    downloaded from the network).  To prevent it from doing so, set
-    this option to <literal>true</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-max-build-log-size"><term><literal>max-build-log-size</literal></term>
-
-    <listitem>
-
-      <para>This option defines the maximum number of bytes that a
-      builder can write to its stdout/stderr.  If the builder exceeds
-      this limit, it’s killed.  A value of <literal>0</literal> (the
-      default) means that there is no limit.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-max-free"><term><literal>max-free</literal></term>
-
-    <listitem><para>When a garbage collection is triggered by the
-    <literal>min-free</literal> option, it stops as soon as
-    <literal>max-free</literal> bytes are available. The default is
-    infinity (i.e. delete all garbage).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-max-jobs"><term><literal>max-jobs</literal></term>
-
-    <listitem><para>This option defines the maximum number of jobs
-    that Nix will try to build in parallel.  The default is
-    <literal>1</literal>. The special value <literal>auto</literal>
-    causes Nix to use the number of CPUs in your system.  <literal>0</literal>
-    is useful when using remote builders to prevent any local builds (except for
-    <literal>preferLocalBuild</literal> derivation attribute which executes locally
-    regardless).  It can be
-    overridden using the <option
-    linkend='opt-max-jobs'>--max-jobs</option> (<option>-j</option>)
-    command line switch.</para>
-
-    <para>See also <xref linkend="chap-tuning-cores-and-jobs" />.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-max-silent-time"><term><literal>max-silent-time</literal></term>
-
-    <listitem>
-
-      <para>This option defines the maximum number of seconds that a
-      builder can go without producing any data on standard output or
-      standard error.  This is useful (for instance in an automated
-      build system) to catch builds that are stuck in an infinite
-      loop, or to catch remote builds that are hanging due to network
-      problems.  It can be overridden using the <option
-      linkend="opt-max-silent-time">--max-silent-time</option> command
-      line switch.</para>
-
-      <para>The value <literal>0</literal> means that there is no
-      timeout.  This is also the default.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-min-free"><term><literal>min-free</literal></term>
-
-    <listitem>
-      <para>When free disk space in <filename>/nix/store</filename>
-      drops below <literal>min-free</literal> during a build, Nix
-      performs a garbage-collection until <literal>max-free</literal>
-      bytes are available or there is no more garbage.  A value of
-      <literal>0</literal> (the default) disables this feature.</para>
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-narinfo-cache-negative-ttl"><term><literal>narinfo-cache-negative-ttl</literal></term>
-
-    <listitem>
-
-      <para>The TTL in seconds for negative lookups. If a store path is
-      queried from a substituter but was not found, there will be a
-      negative lookup cached in the local disk cache database for the
-      specified duration.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-narinfo-cache-positive-ttl"><term><literal>narinfo-cache-positive-ttl</literal></term>
-
-    <listitem>
-
-      <para>The TTL in seconds for positive lookups. If a store path is
-      queried from a substituter, the result of the query will be cached
-      in the local disk cache database including some of the NAR
-      metadata. The default TTL is a month, setting a shorter TTL for
-      positive lookups can be useful for binary caches that have
-      frequent garbage collection, in which case having a more frequent
-      cache invalidation would prevent trying to pull the path again and
-      failing with a hash mismatch if the build isn't reproducible.
-      </para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-netrc-file"><term><literal>netrc-file</literal></term>
-
-    <listitem><para>If set to an absolute path to a <filename>netrc</filename>
-    file, Nix will use the HTTP authentication credentials in this file when
-    trying to download from a remote host through HTTP or HTTPS. Defaults to
-    <filename>$NIX_CONF_DIR/netrc</filename>.</para>
-
-    <para>The <filename>netrc</filename> file consists of a list of
-    accounts in the following format:
-
-<screen>
-machine <emphasis>my-machine</emphasis>
-login <emphasis>my-username</emphasis>
-password <emphasis>my-password</emphasis>
-</screen>
-
-    For the exact syntax, see <link
-    xlink:href="https://ec.haxx.se/usingcurl-netrc.html">the
-    <literal>curl</literal> documentation.</link></para>
-
-    <note><para>This must be an absolute path, and <literal>~</literal>
-    is not resolved. For example, <filename>~/.netrc</filename> won't
-    resolve to your home directory's <filename>.netrc</filename>.</para></note>
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-plugin-files">
-    <term><literal>plugin-files</literal></term>
-    <listitem>
-      <para>
-        A list of plugin files to be loaded by Nix. Each of these
-        files will be dlopened by Nix, allowing them to affect
-        execution through static initialization. In particular, these
-        plugins may construct static instances of RegisterPrimOp to
-        add new primops or constants to the expression language,
-        RegisterStoreImplementation to add new store implementations,
-        RegisterCommand to add new subcommands to the
-        <literal>nix</literal> command, and RegisterSetting to add new
-        nix config settings. See the constructors for those types for
-        more details.
-      </para>
-      <para>
-        Since these files are loaded into the same address space as
-        Nix itself, they must be DSOs compatible with the instance of
-        Nix running at the time (i.e. compiled against the same
-        headers, not linked to any incompatible libraries). They
-        should not be linked to any Nix libs directly, as those will
-        be available already at load time.
-      </para>
-      <para>
-        If an entry in the list is a directory, all files in the
-        directory are loaded as plugins (non-recursively).
-      </para>
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-pre-build-hook"><term><literal>pre-build-hook</literal></term>
-
-    <listitem>
-
-
-      <para>If set, the path to a program that can set extra
-      derivation-specific settings for this system. This is used for settings
-      that can't be captured by the derivation model itself and are too variable
-      between different versions of the same system to be hard-coded into nix.
-      </para>
-
-      <para>The hook is passed the derivation path and, if sandboxes are enabled,
-      the sandbox directory. It can then modify the sandbox and send a series of
-      commands to modify various settings to stdout. The currently recognized
-      commands are:</para>
-
-      <variablelist>
-        <varlistentry xml:id="extra-sandbox-paths">
-          <term><literal>extra-sandbox-paths</literal></term>
-
-          <listitem>
-
-            <para>Pass a list of files and directories to be included in the
-            sandbox for this build. One entry per line, terminated by an empty
-            line. Entries have the same format as
-            <literal>sandbox-paths</literal>.</para>
-
-          </listitem>
-
-        </varlistentry>
-      </variablelist>
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-post-build-hook">
-    <term><literal>post-build-hook</literal></term>
-    <listitem>
-      <para>Optional. The path to a program to execute after each build.</para>
-
-      <para>This option is only settable in the global
-      <filename>nix.conf</filename>, or on the command line by trusted
-      users.</para>
-
-      <para>When using the nix-daemon, the daemon executes the hook as
-      <literal>root</literal>. If the nix-daemon is not involved, the
-      hook runs as the user executing the nix-build.</para>
-
-      <itemizedlist>
-        <listitem><para>The hook executes after an evaluation-time build.</para></listitem>
-        <listitem><para>The hook does not execute on substituted paths.</para></listitem>
-        <listitem><para>The hook's output always goes to the user's terminal.</para></listitem>
-        <listitem><para>If the hook fails, the build succeeds but no further builds execute.</para></listitem>
-        <listitem><para>The hook executes synchronously, and blocks other builds from progressing while it runs.</para></listitem>
-      </itemizedlist>
-
-      <para>The program executes with no arguments. The program's environment
-      contains the following environment variables:</para>
-
-      <variablelist>
-        <varlistentry>
-          <term><literal>DRV_PATH</literal></term>
-          <listitem>
-            <para>The derivation for the built paths.</para>
-            <para>Example:
-            <literal>/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3f-bash-4.4-p23.drv</literal>
-            </para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry>
-          <term><literal>OUT_PATHS</literal></term>
-          <listitem>
-            <para>Output paths of the built derivation, separated by a space character.</para>
-            <para>Example:
-            <literal>/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev
-            /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
-            /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
-            /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
-            /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23</literal>.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-      <para>See <xref linkend="chap-post-build-hook" /> for an example
-      implementation.</para>
-
-    </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-repeat"><term><literal>repeat</literal></term>
-
-    <listitem><para>How many times to repeat builds to check whether
-    they are deterministic. The default value is 0. If the value is
-    non-zero, every build is repeated the specified number of
-    times. If the contents of any of the runs differs from the
-    previous ones and <xref linkend="conf-enforce-determinism" /> is
-    true, the build is rejected and the resulting store paths are not
-    registered as “valid” in Nix’s database.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-require-sigs"><term><literal>require-sigs</literal></term>
-
-    <listitem><para>If set to <literal>true</literal> (the default),
-    any non-content-addressed path added or copied to the Nix store
-    (e.g. when substituting from a binary cache) must have a valid
-    signature, that is, be signed using one of the keys listed in
-    <option>trusted-public-keys</option> or
-    <option>secret-key-files</option>. Set to <literal>false</literal>
-    to disable signature checking.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-restrict-eval"><term><literal>restrict-eval</literal></term>
-
-    <listitem>
-
-      <para>If set to <literal>true</literal>, the Nix evaluator will
-      not allow access to any files outside of the Nix search path (as
-      set via the <literal>NIX_PATH</literal> environment variable or the
-      <option>-I</option> option), or to URIs outside of
-      <option>allowed-uri</option>. The default is
-      <literal>false</literal>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-run-diff-hook"><term><literal>run-diff-hook</literal></term>
-  <listitem>
-    <para>
-      If true, enable the execution of <xref linkend="conf-diff-hook" />.
-    </para>
-
-    <para>
-      When using the Nix daemon, <literal>run-diff-hook</literal> must
-      be set in the <filename>nix.conf</filename> configuration file,
-      and cannot be passed at the command line.
-    </para>
-  </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-sandbox"><term><literal>sandbox</literal></term>
-
-    <listitem><para>If set to <literal>true</literal>, builds will be
-    performed in a <emphasis>sandboxed environment</emphasis>, i.e.,
-    they’re isolated from the normal file system hierarchy and will
-    only see their dependencies in the Nix store, the temporary build
-    directory, private versions of <filename>/proc</filename>,
-    <filename>/dev</filename>, <filename>/dev/shm</filename> and
-    <filename>/dev/pts</filename> (on Linux), and the paths configured with the
-    <link linkend='conf-sandbox-paths'><literal>sandbox-paths</literal>
-    option</link>. This is useful to prevent undeclared dependencies
-    on files in directories such as <filename>/usr/bin</filename>. In
-    addition, on Linux, builds run in private PID, mount, network, IPC
-    and UTS namespaces to isolate them from other processes in the
-    system (except that fixed-output derivations do not run in private
-    network namespace to ensure they can access the network).</para>
-
-    <para>Currently, sandboxing only work on Linux and macOS. The use
-    of a sandbox requires that Nix is run as root (so you should use
-    the <link linkend='conf-build-users-group'>“build users”
-    feature</link> to perform the actual builds under different users
-    than root).</para>
-
-    <para>If this option is set to <literal>relaxed</literal>, then
-    fixed-output derivations and derivations that have the
-    <varname>__noChroot</varname> attribute set to
-    <literal>true</literal> do not run in sandboxes.</para>
-
-    <para>The default is <literal>true</literal> on Linux and
-    <literal>false</literal> on all other platforms.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-sandbox-dev-shm-size"><term><literal>sandbox-dev-shm-size</literal></term>
-
-    <listitem><para>This option determines the maximum size of the
-    <literal>tmpfs</literal> filesystem mounted on
-    <filename>/dev/shm</filename> in Linux sandboxes. For the format,
-    see the description of the <option>size</option> option of
-    <literal>tmpfs</literal> in
-    <citerefentry><refentrytitle>mount</refentrytitle><manvolnum>8</manvolnum></citerefentry>. The
-    default is <literal>50%</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-sandbox-paths">
-    <term><literal>sandbox-paths</literal></term>
-
-    <listitem><para>A list of paths bind-mounted into Nix sandbox
-    environments. You can use the syntax
-    <literal><emphasis>target</emphasis>=<emphasis>source</emphasis></literal>
-    to mount a path in a different location in the sandbox; for
-    instance, <literal>/bin=/nix-bin</literal> will mount the path
-    <literal>/nix-bin</literal> as <literal>/bin</literal> inside the
-    sandbox. If <emphasis>source</emphasis> is followed by
-    <literal>?</literal>, then it is not an error if
-    <emphasis>source</emphasis> does not exist; for example,
-    <literal>/dev/nvidiactl?</literal> specifies that
-    <filename>/dev/nvidiactl</filename> will only be mounted in the
-    sandbox if it exists in the host filesystem.</para>
-
-    <para>Depending on how Nix was built, the default value for this option
-    may be empty or provide <filename>/bin/sh</filename> as a
-    bind-mount of <command>bash</command>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-secret-key-files"><term><literal>secret-key-files</literal></term>
-
-    <listitem><para>A whitespace-separated list of files containing
-    secret (private) keys. These are used to sign locally-built
-    paths. They can be generated using <command>nix-store
-    --generate-binary-cache-key</command>. The corresponding public
-    key can be distributed to other users, who can add it to
-    <option>trusted-public-keys</option> in their
-    <filename>nix.conf</filename>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-show-trace"><term><literal>show-trace</literal></term>
-
-    <listitem><para>Causes Nix to print out a stack trace in case of Nix
-    expression evaluation errors.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-substitute"><term><literal>substitute</literal></term>
-
-    <listitem><para>If set to <literal>true</literal> (default), Nix
-    will use binary substitutes if available.  This option can be
-    disabled to force building from source.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-stalled-download-timeout"><term><literal>stalled-download-timeout</literal></term>
-    <listitem>
-      <para>The timeout (in seconds) for receiving data from servers
-      during download. Nix cancels idle downloads after this timeout's
-      duration.</para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-substituters"><term><literal>substituters</literal></term>
-
-    <listitem><para>A list of URLs of substituters, separated by
-    whitespace.  The default is
-    <literal>https://cache.nixos.org</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-system"><term><literal>system</literal></term>
-
-    <listitem><para>This option specifies the canonical Nix system
-    name of the current installation, such as
-    <literal>i686-linux</literal> or
-    <literal>x86_64-darwin</literal>.  Nix can only build derivations
-    whose <literal>system</literal> attribute equals the value
-    specified here.  In general, it never makes sense to modify this
-    value from its default, since you can use it to ‘lie’ about the
-    platform you are building on (e.g., perform a Mac OS build on a
-    Linux machine; the result would obviously be wrong).  It only
-    makes sense if the Nix binaries can run on multiple platforms,
-    e.g., ‘universal binaries’ that run on <literal>x86_64-linux</literal> and
-    <literal>i686-linux</literal>.</para>
-
-    <para>It defaults to the canonical Nix system name detected by
-    <filename>configure</filename> at build time.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="conf-system-features"><term><literal>system-features</literal></term>
-
-    <listitem><para>A set of system “features” supported by this
-    machine, e.g. <literal>kvm</literal>. Derivations can express a
-    dependency on such features through the derivation attribute
-    <varname>requiredSystemFeatures</varname>. For example, the
-    attribute
-
-<programlisting>
-requiredSystemFeatures = [ "kvm" ];
-</programlisting>
-
-    ensures that the derivation can only be built on a machine with
-    the <literal>kvm</literal> feature.</para>
-
-    <para>This setting by default includes <literal>kvm</literal> if
-    <filename>/dev/kvm</filename> is accessible, and the
-    pseudo-features <literal>nixos-test</literal>,
-    <literal>benchmark</literal> and <literal>big-parallel</literal>
-    that are used in Nixpkgs to route builds to specific
-    machines.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-tarball-ttl"><term><literal>tarball-ttl</literal></term>
-
-    <listitem>
-      <para>Default: <literal>3600</literal> seconds.</para>
-
-      <para>The number of seconds a downloaded tarball is considered
-      fresh. If the cached tarball is stale, Nix will check whether
-      it is still up to date using the ETag header. Nix will download
-      a new version if the ETag header is unsupported, or the
-      cached ETag doesn't match.
-      </para>
-
-      <para>Setting the TTL to <literal>0</literal> forces Nix to always
-      check if the tarball is up to date.</para>
-
-      <para>Nix caches tarballs in
-      <filename>$XDG_CACHE_HOME/nix/tarballs</filename>.</para>
-
-      <para>Files fetched via <literal>NIX_PATH</literal>,
-      <function>fetchGit</function>, <function>fetchMercurial</function>,
-      <function>fetchTarball</function>, and <function>fetchurl</function>
-      respect this TTL.
-      </para>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-timeout"><term><literal>timeout</literal></term>
-
-    <listitem>
-
-      <para>This option defines the maximum number of seconds that a
-      builder can run.  This is useful (for instance in an automated
-      build system) to catch builds that are stuck in an infinite loop
-      but keep writing to their standard output or standard error.  It
-      can be overridden using the <option
-      linkend="opt-timeout">--timeout</option> command line
-      switch.</para>
-
-      <para>The value <literal>0</literal> means that there is no
-      timeout.  This is also the default.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-trace-function-calls"><term><literal>trace-function-calls</literal></term>
-
-    <listitem>
-
-      <para>Default: <literal>false</literal>.</para>
-
-      <para>If set to <literal>true</literal>, the Nix evaluator will
-      trace every function call. Nix will print a log message at the
-      "vomit" level for every function entrance and function exit.</para>
-
-      <informalexample><screen>
-function-trace entered undefined position at 1565795816999559622
-function-trace exited undefined position at 1565795816999581277
-function-trace entered /nix/store/.../example.nix:226:41 at 1565795253249935150
-function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
-</screen></informalexample>
-
-      <para>The <literal>undefined position</literal> means the function
-      call is a builtin.</para>
-
-      <para>Use the <literal>contrib/stack-collapse.py</literal> script
-      distributed with the Nix source code to convert the trace logs
-      in to a format suitable for <command>flamegraph.pl</command>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-trusted-public-keys"><term><literal>trusted-public-keys</literal></term>
-
-    <listitem><para>A whitespace-separated list of public keys. When
-    paths are copied from another Nix store (such as a binary cache),
-    they must be signed with one of these keys. For example:
-    <literal>cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-    hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-trusted-substituters"><term><literal>trusted-substituters</literal></term>
-
-    <listitem><para>A list of URLs of substituters, separated by
-    whitespace.  These are not used by default, but can be enabled by
-    users of the Nix daemon by specifying <literal>--option
-    substituters <emphasis>urls</emphasis></literal> on the
-    command line.  Unprivileged users are only allowed to pass a
-    subset of the URLs listed in <literal>substituters</literal> and
-    <literal>trusted-substituters</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="conf-trusted-users"><term><literal>trusted-users</literal></term>
-
-    <listitem>
-
-      <para>A list of names of users (separated by whitespace) that
-      have additional rights when connecting to the Nix daemon, such
-      as the ability to specify additional binary caches, or to import
-      unsigned NARs. You can also specify groups by prefixing them
-      with <literal>@</literal>; for instance,
-      <literal>@wheel</literal> means all users in the
-      <literal>wheel</literal> group. The default is
-      <literal>root</literal>.</para>
-
-      <warning><para>Adding a user to <option>trusted-users</option>
-      is essentially equivalent to giving that user root access to the
-      system. For example, the user can set
-      <option>sandbox-paths</option> and thereby obtain read access to
-      directories that are otherwise inacessible to
-      them.</para></warning>
-
-    </listitem>
-
-  </varlistentry>
-
-</variablelist>
-</para>
-
-<refsection>
-  <title>Deprecated Settings</title>
-
-<para>
-
-<variablelist>
-
-  <varlistentry xml:id="conf-binary-caches">
-    <term><literal>binary-caches</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>binary-caches</literal> is now an alias to
-    <xref linkend="conf-substituters" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-binary-cache-public-keys">
-    <term><literal>binary-cache-public-keys</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>binary-cache-public-keys</literal> is now an alias to
-    <xref linkend="conf-trusted-public-keys" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-compress-log">
-    <term><literal>build-compress-log</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-compress-log</literal> is now an alias to
-    <xref linkend="conf-compress-build-log" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-cores">
-    <term><literal>build-cores</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-cores</literal> is now an alias to
-    <xref linkend="conf-cores" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-extra-chroot-dirs">
-    <term><literal>build-extra-chroot-dirs</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-extra-chroot-dirs</literal> is now an alias to
-    <xref linkend="conf-extra-sandbox-paths" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-extra-sandbox-paths">
-    <term><literal>build-extra-sandbox-paths</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-extra-sandbox-paths</literal> is now an alias to
-    <xref linkend="conf-extra-sandbox-paths" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-fallback">
-    <term><literal>build-fallback</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-fallback</literal> is now an alias to
-    <xref linkend="conf-fallback" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-max-jobs">
-    <term><literal>build-max-jobs</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-max-jobs</literal> is now an alias to
-    <xref linkend="conf-max-jobs" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-max-log-size">
-    <term><literal>build-max-log-size</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-max-log-size</literal> is now an alias to
-    <xref linkend="conf-max-build-log-size" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-max-silent-time">
-    <term><literal>build-max-silent-time</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-max-silent-time</literal> is now an alias to
-    <xref linkend="conf-max-silent-time" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-repeat">
-    <term><literal>build-repeat</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-repeat</literal> is now an alias to
-    <xref linkend="conf-repeat" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-timeout">
-    <term><literal>build-timeout</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-timeout</literal> is now an alias to
-    <xref linkend="conf-timeout" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-use-chroot">
-    <term><literal>build-use-chroot</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-use-chroot</literal> is now an alias to
-    <xref linkend="conf-sandbox" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-use-sandbox">
-    <term><literal>build-use-sandbox</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-use-sandbox</literal> is now an alias to
-    <xref linkend="conf-sandbox" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-build-use-substitutes">
-    <term><literal>build-use-substitutes</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>build-use-substitutes</literal> is now an alias to
-    <xref linkend="conf-substitute" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-gc-keep-derivations">
-    <term><literal>gc-keep-derivations</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>gc-keep-derivations</literal> is now an alias to
-    <xref linkend="conf-keep-derivations" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-gc-keep-outputs">
-    <term><literal>gc-keep-outputs</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>gc-keep-outputs</literal> is now an alias to
-    <xref linkend="conf-keep-outputs" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-env-keep-derivations">
-    <term><literal>env-keep-derivations</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>env-keep-derivations</literal> is now an alias to
-    <xref linkend="conf-keep-env-derivations" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-extra-binary-caches">
-    <term><literal>extra-binary-caches</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>extra-binary-caches</literal> is now an alias to
-    <xref linkend="conf-extra-substituters" />.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id="conf-trusted-binary-caches">
-    <term><literal>trusted-binary-caches</literal></term>
-
-    <listitem><para><emphasis>Deprecated:</emphasis>
-    <literal>trusted-binary-caches</literal> is now an alias to
-    <xref linkend="conf-trusted-substituters" />.</para></listitem>
-  </varlistentry>
-</variablelist>
-</para>
-</refsection>
-
-</refsection>
-
-</refentry>
diff --git a/doc/manual/command-ref/env-common.xml b/doc/manual/command-ref/env-common.xml
deleted file mode 100644
index ac40fccf7..000000000
--- a/doc/manual/command-ref/env-common.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-common-env">
-
-<title>Common Environment Variables</title>
-
-
-<para>Most Nix commands interpret the following environment variables:</para>
-
-<variablelist xml:id="env-common">
-
-<varlistentry><term><literal>IN_NIX_SHELL</literal></term>
-
-  <listitem><para>Indicator that tells if the current environment was set up by
-  <command>nix-shell</command>.  Since Nix 2.0 the values are
-  <literal>"pure"</literal> and <literal>"impure"</literal></para></listitem>
-
-</varlistentry>
-
-<varlistentry xml:id="env-NIX_PATH"><term><literal>NIX_PATH</literal></term>
-
-  <listitem>
-
-    <para>A colon-separated list of directories used to look up Nix
-    expressions enclosed in angle brackets (i.e.,
-    <literal>&lt;<emphasis>path</emphasis>></literal>).  For
-    instance, the value
-
-    <screen>
-/home/eelco/Dev:/etc/nixos</screen>
-
-    will cause Nix to look for paths relative to
-    <filename>/home/eelco/Dev</filename> and
-    <filename>/etc/nixos</filename>, in this order.  It is also
-    possible to match paths against a prefix.  For example, the value
-
-    <screen>
-nixpkgs=/home/eelco/Dev/nixpkgs-branch:/etc/nixos</screen>
-
-    will cause Nix to search for
-    <literal>&lt;nixpkgs/<emphasis>path</emphasis>></literal> in
-    <filename>/home/eelco/Dev/nixpkgs-branch/<emphasis>path</emphasis></filename>
-    and
-    <filename>/etc/nixos/nixpkgs/<emphasis>path</emphasis></filename>.</para>
-
-    <para>If a path in the Nix search path starts with
-    <literal>http://</literal> or <literal>https://</literal>, it is
-    interpreted as the URL of a tarball that will be downloaded and
-    unpacked to a temporary location. The tarball must consist of a
-    single top-level directory. For example, setting
-    <literal>NIX_PATH</literal> to
-
-    <screen>
-nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-15.09.tar.gz</screen>
-
-    tells Nix to download the latest revision in the Nixpkgs/NixOS
-    15.09 channel.</para>
-
-    <para>A following shorthand can be used to refer to the official channels:
-
-    <screen>nixpkgs=channel:nixos-15.09</screen>
-    </para>
-
-    <para>The search path can be extended using the <option
-    linkend="opt-I">-I</option> option, which takes precedence over
-    <literal>NIX_PATH</literal>.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_IGNORE_SYMLINK_STORE</literal></term>
-
-  <listitem>
-
-  <para>Normally, the Nix store directory (typically
-  <filename>/nix/store</filename>) is not allowed to contain any
-  symlink components.  This is to prevent “impure” builds.  Builders
-  sometimes “canonicalise” paths by resolving all symlink components.
-  Thus, builds on different machines (with
-  <filename>/nix/store</filename> resolving to different locations)
-  could yield different results.  This is generally not a problem,
-  except when builds are deployed to machines where
-  <filename>/nix/store</filename> resolves differently.  If you are
-  sure that you’re not going to do that, you can set
-  <literal>NIX_IGNORE_SYMLINK_STORE</literal> to <literal>1</literal>.</para>
-
-  <para>Note that if you’re symlinking the Nix store so that you can
-  put it on another file system than the root file system, on Linux
-  you’re better off using <literal>bind</literal> mount points, e.g.,
-
-  <screen>
-$ mkdir /nix
-$ mount -o bind /mnt/otherdisk/nix /nix</screen>
-
-  Consult the <citerefentry><refentrytitle>mount</refentrytitle>
-  <manvolnum>8</manvolnum></citerefentry> manual page for details.</para>
-
-  </listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_STORE_DIR</literal></term>
-
-  <listitem><para>Overrides the location of the Nix store (default
-  <filename><emphasis>prefix</emphasis>/store</filename>).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_DATA_DIR</literal></term>
-
-  <listitem><para>Overrides the location of the Nix static data
-  directory (default
-  <filename><emphasis>prefix</emphasis>/share</filename>).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_LOG_DIR</literal></term>
-
-  <listitem><para>Overrides the location of the Nix log directory
-  (default <filename><emphasis>prefix</emphasis>/var/log/nix</filename>).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_STATE_DIR</literal></term>
-
-  <listitem><para>Overrides the location of the Nix state directory
-  (default <filename><emphasis>prefix</emphasis>/var/nix</filename>).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_CONF_DIR</literal></term>
-
-  <listitem><para>Overrides the location of the system Nix configuration
-  directory (default
-  <filename><emphasis>prefix</emphasis>/etc/nix</filename>).</para></listitem>
-
-</varlistentry>
-
-<varlistentry><term><literal>NIX_USER_CONF_FILES</literal></term>
-
-  <listitem><para>Overrides the location of the user Nix configuration files
-  to load from (defaults to the XDG spec locations). The variable is treated
-  as a list separated by the <literal>:</literal> token.</para></listitem>
-
-</varlistentry>
-
-<varlistentry><term><literal>TMPDIR</literal></term>
-
-  <listitem><para>Use the specified directory to store temporary
-  files.  In particular, this includes temporary build directories;
-  these can take up substantial amounts of disk space.  The default is
-  <filename>/tmp</filename>.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="envar-remote"><term><literal>NIX_REMOTE</literal></term>
-
-  <listitem><para>This variable should be set to
-  <literal>daemon</literal> if you want to use the Nix daemon to
-  execute Nix operations. This is necessary in <link
-  linkend="ssec-multi-user">multi-user Nix installations</link>.
-  If the Nix daemon's Unix socket is at some non-standard path,
-  this variable should be set to <literal>unix://path/to/socket</literal>.
-  Otherwise, it should be left unset.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_SHOW_STATS</literal></term>
-
-  <listitem><para>If set to <literal>1</literal>, Nix will print some
-  evaluation statistics, such as the number of values
-  allocated.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>NIX_COUNT_CALLS</literal></term>
-
-  <listitem><para>If set to <literal>1</literal>, Nix will print how
-  often functions were called during Nix expression evaluation.  This
-  is useful for profiling your Nix expressions.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><literal>GC_INITIAL_HEAP_SIZE</literal></term>
-
-  <listitem><para>If Nix has been configured to use the Boehm garbage
-  collector, this variable sets the initial size of the heap in bytes.
-  It defaults to 384 MiB.  Setting it to a low value reduces memory
-  consumption, but will increase runtime due to the overhead of
-  garbage collection.</para></listitem>
-
-</varlistentry>
-
-
-</variablelist>
-
-
-</chapter>
diff --git a/doc/manual/command-ref/files.xml b/doc/manual/command-ref/files.xml
deleted file mode 100644
index 7bbc96e89..000000000
--- a/doc/manual/command-ref/files.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='ch-files'>
-
-<title>Files</title>
-
-<para>This section lists configuration files that you can use when you
-work with Nix.</para>
-
-<xi:include href="conf-file.xml" />
-
-</chapter>
\ No newline at end of file
diff --git a/doc/manual/command-ref/main-commands.xml b/doc/manual/command-ref/main-commands.xml
deleted file mode 100644
index 0f4169243..000000000
--- a/doc/manual/command-ref/main-commands.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='ch-main-commands'>
-
-<title>Main Commands</title>
-
-<para>This section lists commands and options that you can use when you
-work with Nix.</para>
-
-<xi:include href="nix-env.xml" />
-<xi:include href="nix-build.xml" />
-<xi:include href="nix-shell.xml" />
-<xi:include href="nix-store.xml" />
-
-</chapter>
\ No newline at end of file
diff --git a/doc/manual/command-ref/nix-build.xml b/doc/manual/command-ref/nix-build.xml
deleted file mode 100644
index ec9145143..000000000
--- a/doc/manual/command-ref/nix-build.xml
+++ /dev/null
@@ -1,190 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-build">
-
-<refmeta>
-  <refentrytitle>nix-build</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-build</refname>
-  <refpurpose>build a Nix expression</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-build</command>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--attr</option></arg>
-        <arg choice='plain'><option>-A</option></arg>
-      </group>
-      <emphasis>attrPath</emphasis>
-    </arg>
-    <arg><option>--no-out-link</option></arg>
-    <arg><option>--dry-run</option></arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--out-link</option></arg>
-        <arg choice='plain'><option>-o</option></arg>
-      </group>
-      <emphasis>outlink</emphasis>
-    </arg>
-    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>The <command>nix-build</command> command builds the derivations
-described by the Nix expressions in <emphasis>paths</emphasis>.
-If the build succeeds, it places a symlink to the result in the
-current directory.  The symlink is called <filename>result</filename>.
-If there are multiple Nix expressions, or the Nix expressions evaluate
-to multiple derivations, multiple sequentially numbered symlinks are
-created (<filename>result</filename>, <filename>result-2</filename>,
-and so on).</para>
-
-<para>If no <emphasis>paths</emphasis> are specified, then
-<command>nix-build</command> will use <filename>default.nix</filename>
-in the current directory, if it exists.</para>
-
-<para>If an element of <emphasis>paths</emphasis> starts with
-<literal>http://</literal> or <literal>https://</literal>, it is
-interpreted as the URL of a tarball that will be downloaded and
-unpacked to a temporary location. The tarball must include a single
-top-level directory containing at least a file named
-<filename>default.nix</filename>.</para>
-
-<para><command>nix-build</command> is essentially a wrapper around
-<link
-linkend="sec-nix-instantiate"><command>nix-instantiate</command></link>
-(to translate a high-level Nix expression to a low-level store
-derivation) and <link
-linkend="rsec-nix-store-realise"><command>nix-store
---realise</command></link> (to build the store derivation).</para>
-
-<warning><para>The result of the build is automatically registered as
-a root of the Nix garbage collector.  This root disappears
-automatically when the <filename>result</filename> symlink is deleted
-or renamed.  So don’t rename the symlink.</para></warning>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>All options not listed here are passed to <command>nix-store
---realise</command>, except for <option>--arg</option> and
-<option>--attr</option> / <option>-A</option> which are passed to
-<command>nix-instantiate</command>.  <phrase condition="manual">See
-also <xref linkend="sec-common-options" />.</phrase></para>
-
-<variablelist>
-
-  <varlistentry><term><option>--no-out-link</option></term>
-
-    <listitem><para>Do not create a symlink to the output path.  Note
-    that as a result the output does not become a root of the garbage
-    collector, and so might be deleted by <command>nix-store
-    --gc</command>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--dry-run</option></term>
-   <listitem><para>Show what store paths would be built or downloaded.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id='opt-out-link'><term><option>--out-link</option> /
-  <option>-o</option> <emphasis>outlink</emphasis></term>
-
-    <listitem><para>Change the name of the symlink to the output path
-    created from <filename>result</filename> to
-    <emphasis>outlink</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<para>The following common options are supported:</para>
-
-<variablelist condition="manpage">
-  <xi:include href="opt-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='opt-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-build '&lt;nixpkgs>' -A firefox
-store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
-/nix/store/d18hyl92g30l...-firefox-1.5.0.7
-
-$ ls -l result
-lrwxrwxrwx  <emphasis>...</emphasis>  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
-
-$ ls ./result/bin/
-firefox  firefox-config</screen>
-
-<para>If a derivation has multiple outputs,
-<command>nix-build</command> will build the default (first) output.
-You can also build all outputs:
-<screen>
-$ nix-build '&lt;nixpkgs>' -A openssl.all
-</screen>
-This will create a symlink for each output named
-<filename>result-<emphasis>outputname</emphasis></filename>.
-The suffix is omitted if the output name is <literal>out</literal>.
-So if <literal>openssl</literal> has outputs <literal>out</literal>,
-<literal>bin</literal> and <literal>man</literal>,
-<command>nix-build</command> will create symlinks
-<literal>result</literal>, <literal>result-bin</literal> and
-<literal>result-man</literal>.  It’s also possible to build a specific
-output:
-<screen>
-$ nix-build '&lt;nixpkgs>' -A openssl.man
-</screen>
-This will create a symlink <literal>result-man</literal>.</para>
-
-<para>Build a Nix expression given on the command line:
-
-<screen>
-$ nix-build -E 'with import &lt;nixpkgs> { }; runCommand "foo" { } "echo bar > $out"'
-$ cat ./result
-bar
-</screen>
-
-</para>
-
-<para>Build the GNU Hello package from the latest revision of the
-master branch of Nixpkgs:
-
-<screen>
-$ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
-</screen>
-
-</para>
-
-</refsection>
-
-
-<refsection condition="manpage"><title>Environment variables</title>
-
-<variablelist>
-  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-channel.xml b/doc/manual/command-ref/nix-channel.xml
deleted file mode 100644
index 2abeca0a0..000000000
--- a/doc/manual/command-ref/nix-channel.xml
+++ /dev/null
@@ -1,181 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-channel">
-
-<refmeta>
-  <refentrytitle>nix-channel</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-channel</refname>
-  <refpurpose>manage Nix channels</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-channel</command>
-    <group choice='req'>
-      <arg choice='plain'><option>--add</option> <emphasis>url</emphasis> <arg choice='opt'><emphasis>name</emphasis></arg></arg>
-      <arg choice='plain'><option>--remove</option> <emphasis>name</emphasis></arg>
-      <arg choice='plain'><option>--list</option></arg>
-      <arg choice='plain'><option>--update</option> <arg rep='repeat'><emphasis>names</emphasis></arg></arg>
-      <arg choice='plain'><option>--rollback</option> <arg choice='opt'><emphasis>generation</emphasis></arg></arg>
-    </group>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>A Nix channel is a mechanism that allows you to automatically
-stay up-to-date with a set of pre-built Nix expressions.  A Nix
-channel is just a URL that points to a place containing a set of Nix
-expressions.  <phrase condition="manual">See also <xref
-linkend="sec-channels" />.</phrase></para>
-      
-<para>To see the list of official NixOS channels, visit <link
-xlink:href="https://nixos.org/channels" />.</para>
-
-<para>This command has the following operations:
-
-<variablelist>
-
-  <varlistentry><term><option>--add</option> <emphasis>url</emphasis> [<emphasis>name</emphasis>]</term>
-
-    <listitem><para>Adds a channel named
-    <emphasis>name</emphasis> with URL
-    <emphasis>url</emphasis> to the list of subscribed channels.
-    If <emphasis>name</emphasis> is omitted, it defaults to the
-    last component of <emphasis>url</emphasis>, with the
-    suffixes <literal>-stable</literal> or
-    <literal>-unstable</literal> removed.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--remove</option> <emphasis>name</emphasis></term>
-
-    <listitem><para>Removes the channel named
-    <emphasis>name</emphasis> from the list of subscribed
-    channels.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--list</option></term>
-
-    <listitem><para>Prints the names and URLs of all subscribed
-    channels on standard output.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--update</option> [<emphasis>names</emphasis>…]</term>
-
-    <listitem><para>Downloads the Nix expressions of all subscribed
-    channels (or only those included in
-    <emphasis>names</emphasis> if specified) and makes them the
-    default for <command>nix-env</command> operations (by symlinking
-    them from the directory
-    <filename>~/.nix-defexpr</filename>).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--rollback</option> [<emphasis>generation</emphasis>]</term>
-
-    <listitem><para>Reverts the previous call to <command>nix-channel
-    --update</command>. Optionally, you can specify a specific channel
-    generation number to restore.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-<para>Note that <option>--add</option> does not automatically perform
-an update.</para>
-
-<para>The list of subscribed channels is stored in
-<filename>~/.nix-channels</filename>.</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<para>To subscribe to the Nixpkgs channel and install the GNU Hello package:</para>
-
-<screen>
-$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-$ nix-channel --update
-$ nix-env -iA nixpkgs.hello</screen>
-
-<para>You can revert channel updates using <option>--rollback</option>:</para>
-
-<screen>
-$ nix-instantiate --eval -E '(import &lt;nixpkgs> {}).lib.version'
-"14.04.527.0e935f1"
-
-$ nix-channel --rollback
-switching from generation 483 to 482
-
-$ nix-instantiate --eval -E '(import &lt;nixpkgs> {}).lib.version'
-"14.04.526.dbadfad"
-</screen>
-
-</refsection>
-
-<refsection><title>Files</title>
-
-<variablelist>
-
-  <varlistentry><term><filename>/nix/var/nix/profiles/per-user/<emphasis>username</emphasis>/channels</filename></term>
-
-    <listitem><para><command>nix-channel</command> uses a
-    <command>nix-env</command> profile to keep track of previous
-    versions of the subscribed channels. Every time you run
-    <command>nix-channel --update</command>, a new channel generation
-    (that is, a symlink to the channel Nix expressions in the Nix store)
-    is created. This enables <command>nix-channel --rollback</command>
-    to revert to previous versions.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><filename>~/.nix-defexpr/channels</filename></term>
-
-    <listitem><para>This is a symlink to
-    <filename>/nix/var/nix/profiles/per-user/<emphasis>username</emphasis>/channels</filename>. It
-    ensures that <command>nix-env</command> can find your channels. In
-    a multi-user installation, you may also have
-    <filename>~/.nix-defexpr/channels_root</filename>, which links to
-    the channels of the root user.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-<refsection><title>Channel format</title>
-
-<para>A channel URL should point to a directory containing the
-following files:</para>
-
-<variablelist>
-
-  <varlistentry><term><filename>nixexprs.tar.xz</filename></term>
-
-    <listitem><para>A tarball containing Nix expressions and files
-    referenced by them (such as build scripts and patches). At the
-    top level, the tarball should contain a single directory. That
-    directory must contain a file <filename>default.nix</filename>
-    that serves as the channel’s “entry point”.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-collect-garbage.xml b/doc/manual/command-ref/nix-collect-garbage.xml
deleted file mode 100644
index cbcb5add5..000000000
--- a/doc/manual/command-ref/nix-collect-garbage.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-collect-garbage">
-  
-<refmeta>
-  <refentrytitle>nix-collect-garbage</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-collect-garbage</refname>
-  <refpurpose>delete unreachable store paths</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-collect-garbage</command>
-    <arg><option>--delete-old</option></arg>
-    <arg><option>-d</option></arg>
-    <arg><option>--delete-older-than</option> <emphasis>period</emphasis></arg>
-    <arg><option>--max-freed</option> <emphasis>bytes</emphasis></arg>
-    <arg><option>--dry-run</option></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-collect-garbage</command> is mostly an
-alias of <link linkend="rsec-nix-store-gc"><command>nix-store
---gc</command></link>, that is, it deletes all unreachable paths in
-the Nix store to clean up your system.  However, it provides two
-additional options: <option>-d</option> (<option>--delete-old</option>),
-which deletes all old generations of all profiles in
-<filename>/nix/var/nix/profiles</filename> by invoking
-<literal>nix-env --delete-generations old</literal> on all profiles
-(of course, this makes rollbacks to previous configurations
-impossible); and
-<option>--delete-older-than</option> <emphasis>period</emphasis>,
-where period is a value such as <literal>30d</literal>, which deletes
-all generations older than the specified number of days in all profiles
-in <filename>/nix/var/nix/profiles</filename> (except for the generations
-that were active at that point in time).
-</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<para>To delete from the Nix store everything that is not used by the
-current generations of each profile, do
-
-<screen>
-$ nix-collect-garbage -d</screen>
-
-</para>
-
-</refsection>
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-copy-closure.xml b/doc/manual/command-ref/nix-copy-closure.xml
deleted file mode 100644
index 6fc8c312b..000000000
--- a/doc/manual/command-ref/nix-copy-closure.xml
+++ /dev/null
@@ -1,169 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-copy-closure">
-
-<refmeta>
-  <refentrytitle>nix-copy-closure</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-copy-closure</refname>
-  <refpurpose>copy a closure to or from a remote machine via SSH</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-copy-closure</command>
-    <group>
-      <arg choice='plain'><option>--to</option></arg>
-      <arg choice='plain'><option>--from</option></arg>
-    </group>
-    <arg><option>--gzip</option></arg>
-    <!--
-    <arg><option>- -show-progress</option></arg>
-    -->
-    <arg><option>--include-outputs</option></arg>
-    <group>
-      <arg choice='plain'><option>--use-substitutes</option></arg>
-      <arg choice='plain'><option>-s</option></arg>
-    </group>
-    <arg><option>-v</option></arg>
-    <arg choice='plain'>
-      <emphasis>user@</emphasis><emphasis>machine</emphasis>
-    </arg>
-    <arg choice='plain'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para><command>nix-copy-closure</command> gives you an easy and
-efficient way to exchange software between machines.  Given one or
-more Nix store <emphasis>paths</emphasis> on the local
-machine, <command>nix-copy-closure</command> computes the closure of
-those paths (i.e. all their dependencies in the Nix store), and copies
-all paths in the closure to the remote machine via the
-<command>ssh</command> (Secure Shell) command.  With the
-<option>--from</option>, the direction is reversed:
-the closure of <emphasis>paths</emphasis> on a remote machine is
-copied to the Nix store on the local machine.</para>
-
-<para>This command is efficient because it only sends the store paths
-that are missing on the target machine.</para>
-
-<para>Since <command>nix-copy-closure</command> calls
-<command>ssh</command>, you may be asked to type in the appropriate
-password or passphrase.  In fact, you may be asked
-<emphasis>twice</emphasis> because <command>nix-copy-closure</command>
-currently connects twice to the remote machine, first to get the set
-of paths missing on the target machine, and second to send the dump of
-those paths.  If this bothers you, use
-<command>ssh-agent</command>.</para>
-
-
-<refsection><title>Options</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--to</option></term>
-
-    <listitem><para>Copy the closure of
-    <emphasis>paths</emphasis> from the local Nix store to the
-    Nix store on <emphasis>machine</emphasis>.  This is the
-    default.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--from</option></term>
-
-    <listitem><para>Copy the closure of
-    <emphasis>paths</emphasis> from the Nix store on
-    <emphasis>machine</emphasis> to the local Nix
-    store.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--gzip</option></term>
-
-    <listitem><para>Enable compression of the SSH
-    connection.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--include-outputs</option></term>
-
-    <listitem><para>Also copy the outputs of store derivations
-    included in the closure.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--use-substitutes</option> / <option>-s</option></term>
-
-    <listitem><para>Attempt to download missing paths on the target
-    machine using Nix’s substitute mechanism.  Any paths that cannot
-    be substituted on the target are still copied normally from the
-    source.  This is useful, for instance, if the connection between
-    the source and target machine is slow, but the connection between
-    the target machine and <literal>nixos.org</literal> (the default
-    binary cache server) is fast.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>-v</option></term>
-
-    <listitem><para>Show verbose output.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Environment variables</title>
-
-<variablelist>
-
-  <varlistentry><term><literal>NIX_SSHOPTS</literal></term>
-
-    <listitem><para>Additional options to be passed to
-    <command>ssh</command> on the command line.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Copy Firefox with all its dependencies to a remote machine:
-
-<screen>
-$ nix-copy-closure --to alice@itchy.labs $(type -tP firefox)</screen>
-
-</para>
-
-<para>Copy Subversion from a remote machine and then install it into a
-user environment:
-
-<screen>
-$ nix-copy-closure --from alice@itchy.labs \
-    /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
-$ nix-env -i /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
-</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-daemon.xml b/doc/manual/command-ref/nix-daemon.xml
deleted file mode 100644
index a2161f033..000000000
--- a/doc/manual/command-ref/nix-daemon.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-daemon">
-
-<refmeta>
-  <refentrytitle>nix-daemon</refentrytitle>
-  <manvolnum>8</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-daemon</refname>
-  <refpurpose>Nix multi-user support daemon</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-daemon</command>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>The Nix daemon is necessary in multi-user Nix installations.  It
-performs build actions and other operations on the Nix store on behalf
-of unprivileged users.</para>
-
-
-</refsection>
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml
deleted file mode 100644
index 6a97c7e37..000000000
--- a/doc/manual/command-ref/nix-env.xml
+++ /dev/null
@@ -1,1503 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-env">
-
-<refmeta>
-  <refentrytitle>nix-env</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-env</refname>
-  <refpurpose>manipulate or query Nix user environments</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-env</command>
-    <xi:include href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--file</option></arg>
-        <arg choice='plain'><option>-f</option></arg>
-      </group>
-      <emphasis>path</emphasis>
-    </arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--profile</option></arg>
-        <arg choice='plain'><option>-p</option></arg>
-      </group>
-      <emphasis>path</emphasis>
-    </arg>
-    <arg>
-      <arg choice='plain'><option>--system-filter</option></arg>
-      <emphasis>system</emphasis>
-    </arg>
-    <arg><option>--dry-run</option></arg>
-    <arg choice='plain'><emphasis>operation</emphasis></arg>
-    <arg rep='repeat'><emphasis>options</emphasis></arg>
-    <arg rep='repeat'><emphasis>arguments</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-env</command> is used to manipulate Nix
-user environments.  User environments are sets of software packages
-available to a user at some point in time.  In other words, they are a
-synthesised view of the programs available in the Nix store.  There
-may be many user environments: different users can have different
-environments, and individual users can switch between different
-environments.</para>
-
-<para><command>nix-env</command> takes exactly one
-<emphasis>operation</emphasis> flag which indicates the subcommand to
-be performed.  These are documented below.</para>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Selectors</title>
-
-<para>Several commands, such as <command>nix-env -q</command> and
-<command>nix-env -i</command>, take a list of arguments that specify
-the packages on which to operate. These are extended regular
-expressions that must match the entire name of the package. (For
-details on regular expressions, see
-<citerefentry><refentrytitle>regex</refentrytitle><manvolnum>7</manvolnum></citerefentry>.)
-The match is case-sensitive. The regular expression can optionally be
-followed by a dash and a version number; if omitted, any version of
-the package will match.  Here are some examples:
-
-<variablelist>
-
-  <varlistentry>
-    <term><literal>firefox</literal></term>
-    <listitem><para>Matches the package name
-    <literal>firefox</literal> and any version.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>firefox-32.0</literal></term>
-    <listitem><para>Matches the package name
-    <literal>firefox</literal> and version
-    <literal>32.0</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>gtk\\+</literal></term>
-    <listitem><para>Matches the package name
-    <literal>gtk+</literal>. The <literal>+</literal> character must
-    be escaped using a backslash to prevent it from being interpreted
-    as a quantifier, and the backslash must be escaped in turn with
-    another backslash to ensure that the shell passes it
-    on.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>.\*</literal></term>
-    <listitem><para>Matches any package name. This is the default for
-    most commands.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>'.*zip.*'</literal></term>
-    <listitem><para>Matches any package name containing the string
-    <literal>zip</literal>. Note the dots: <literal>'*zip*'</literal>
-    does not work, because in a regular expression, the character
-    <literal>*</literal> is interpreted as a
-    quantifier.</para></listitem>
-  </varlistentry>
-
-  <varlistentry>
-    <term><literal>'.*(firefox|chromium).*'</literal></term>
-    <listitem><para>Matches any package name containing the strings
-    <literal>firefox</literal> or
-    <literal>chromium</literal>.</para></listitem>
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Common options</title>
-
-<para>This section lists the options that are common to all
-operations.  These options are allowed for every subcommand, though
-they may not always have an effect.  <phrase condition="manual">See
-also <xref linkend="sec-common-options" />.</phrase></para>
-
-<variablelist>
-
-  <varlistentry><term><option>--file</option> / <option>-f</option> <emphasis>path</emphasis></term>
-
-    <listitem><para>Specifies the Nix expression (designated below as
-    the <emphasis>active Nix expression</emphasis>) used by the
-    <option>--install</option>, <option>--upgrade</option>, and
-    <option>--query --available</option> operations to obtain
-    derivations.  The default is
-    <filename>~/.nix-defexpr</filename>.</para>
-
-    <para>If the argument starts with <literal>http://</literal> or
-    <literal>https://</literal>, it is interpreted as the URL of a
-    tarball that will be downloaded and unpacked to a temporary
-    location. The tarball must include a single top-level directory
-    containing at least a file named <filename>default.nix</filename>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--profile</option> / <option>-p</option> <emphasis>path</emphasis></term>
-
-    <listitem><para>Specifies the profile to be used by those
-    operations that operate on a profile (designated below as the
-    <emphasis>active profile</emphasis>).  A profile is a sequence of
-    user environments called <emphasis>generations</emphasis>, one of
-    which is the <emphasis>current
-    generation</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--dry-run</option></term>
-
-    <listitem><para>For the <option>--install</option>,
-    <option>--upgrade</option>, <option>--uninstall</option>,
-    <option>--switch-generation</option>,
-    <option>--delete-generations</option> and
-    <option>--rollback</option> operations, this flag will cause
-    <command>nix-env</command> to print what
-    <emphasis>would</emphasis> be done if this flag had not been
-    specified, without actually doing it.</para>
-
-    <para><option>--dry-run</option> also prints out which paths will
-    be <link linkend="gloss-substitute">substituted</link> (i.e.,
-    downloaded) and which paths will be built from source (because no
-    substitute is available).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--system-filter</option> <emphasis>system</emphasis></term>
-
-    <listitem><para>By default, operations such as <option>--query
-    --available</option> show derivations matching any platform.  This
-    option allows you to use derivations for the specified platform
-    <emphasis>system</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<variablelist condition="manpage">
-  <xi:include href="opt-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='opt-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Files</title>
-
-<variablelist>
-
-  <varlistentry><term><filename>~/.nix-defexpr</filename></term>
-
-    <listitem><para>The source for the default Nix
-    expressions used by the <option>--install</option>,
-    <option>--upgrade</option>, and <option>--query
-    --available</option> operations to obtain derivations. The
-    <option>--file</option> option may be used to override this
-    default.</para>
-
-    <para>If <filename>~/.nix-defexpr</filename> is a file,
-    it is loaded as a Nix expression. If the expression
-    is a set, it is used as the default Nix expression.
-    If the expression is a function, an empty set is passed
-    as argument and the return value is used as
-    the default Nix expression.</para>
-
-    <para>If <filename>~/.nix-defexpr</filename> is a directory
-    containing a <filename>default.nix</filename> file, that file
-    is loaded as in the above paragraph.</para>
-
-    <para>If <filename>~/.nix-defexpr</filename> is a directory without
-    a <filename>default.nix</filename> file, then its contents
-    (both files and subdirectories) are loaded as Nix expressions.
-    The expressions are combined into a single set, each expression
-    under an attribute with the same name as the original file
-    or subdirectory.
-    </para>
-
-    <para>For example, if <filename>~/.nix-defexpr</filename> contains
-    two files, <filename>foo.nix</filename> and <filename>bar.nix</filename>,
-    then the default Nix expression will essentially be
-
-<programlisting>
-{
-  foo = import ~/.nix-defexpr/foo.nix;
-  bar = import ~/.nix-defexpr/bar.nix;
-}</programlisting>
-
-    </para>
-
-    <para>The file <filename>manifest.nix</filename> is always ignored.
-    Subdirectories without a <filename>default.nix</filename> file
-    are traversed recursively in search of more Nix expressions,
-    but the names of these intermediate directories are not
-    added to the attribute paths of the default Nix expression.</para>
-
-    <para>The command <command>nix-channel</command> places symlinks
-    to the downloaded Nix expressions from each subscribed channel in
-    this directory.</para>
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><filename>~/.nix-profile</filename></term>
-
-    <listitem><para>A symbolic link to the user's current profile.  By
-    default, this symlink points to
-    <filename><emphasis>prefix</emphasis>/var/nix/profiles/default</filename>.
-    The <literal>PATH</literal> environment variable should include
-    <filename>~/.nix-profile/bin</filename> for the user environment
-    to be visible to the user.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id="rsec-nix-env-install"><title>Operation <option>--install</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--install</option></arg>
-    <arg choice='plain'><option>-i</option></arg>
-  </group>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-inst-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-  <group choice='opt'>
-    <arg choice='plain'><option>--preserve-installed</option></arg>
-    <arg choice='plain'><option>-P</option></arg>
-  </group>
-  <group choice='opt'>
-    <arg choice='plain'><option>--remove-all</option></arg>
-    <arg choice='plain'><option>-r</option></arg>
-  </group>
-  <arg choice='plain' rep='repeat'><emphasis>args</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>The install operation creates a new user environment, based on
-the current generation of the active profile, to which a set of store
-paths described by <emphasis>args</emphasis> is added.  The
-arguments <emphasis>args</emphasis> map to store paths in a
-number of possible ways:
-
-<itemizedlist>
-
-  <listitem><para>By default, <emphasis>args</emphasis> is a set
-  of derivation names denoting derivations in the active Nix
-  expression.  These are realised, and the resulting output paths are
-  installed.  Currently installed derivations with a name equal to the
-  name of a derivation being added are removed unless the option
-  <option>--preserve-installed</option> is
-  specified.</para>
-
-  <para>If there are multiple derivations matching a name in
-  <emphasis>args</emphasis> that have the same name (e.g.,
-  <literal>gcc-3.3.6</literal> and <literal>gcc-4.1.1</literal>), then
-  the derivation with the highest <emphasis>priority</emphasis> is
-  used.  A derivation can define a priority by declaring the
-  <varname>meta.priority</varname> attribute.  This attribute should
-  be a number, with a higher value denoting a lower priority.  The
-  default priority is <literal>0</literal>.</para>
-
-  <para>If there are multiple matching derivations with the same
-  priority, then the derivation with the highest version will be
-  installed.</para>
-
-  <para>You can force the installation of multiple derivations with
-  the same name by being specific about the versions.  For instance,
-  <literal>nix-env -i gcc-3.3.6 gcc-4.1.1</literal> will install both
-  version of GCC (and will probably cause a user environment
-  conflict!).</para></listitem>
-
-  <listitem><para>If <link
-  linkend='opt-attr'><option>--attr</option></link>
-  (<option>-A</option>) is specified, the arguments are
-  <emphasis>attribute paths</emphasis> that select attributes from the
-  top-level Nix expression.  This is faster than using derivation
-  names and unambiguous.  To find out the attribute paths of available
-  packages, use <literal>nix-env -qaP</literal>.</para></listitem>
-
-  <listitem><para>If <option>--from-profile</option>
-  <emphasis>path</emphasis> is given,
-  <emphasis>args</emphasis> is a set of names denoting installed
-  store paths in the profile <emphasis>path</emphasis>.  This is
-  an easy way to copy user environment elements from one profile to
-  another.</para></listitem>
-
-  <listitem><para>If <option>--from-expression</option> is given,
-  <emphasis>args</emphasis> are Nix <link
-  linkend="ss-functions">functions</link> that are called with the
-  active Nix expression as their single argument.  The derivations
-  returned by those function calls are installed.  This allows
-  derivations to be specified in an unambiguous way, which is necessary
-  if there are multiple derivations with the same
-  name.</para></listitem>
-
-  <listitem><para>If <emphasis>args</emphasis> are store
-  derivations, then these are <link
-  linkend="rsec-nix-store-realise">realised</link>, and the resulting
-  output paths are installed.</para></listitem>
-
-  <listitem><para>If <emphasis>args</emphasis> are store paths
-  that are not store derivations, then these are <link
-  linkend="rsec-nix-store-realise">realised</link> and
-  installed.</para></listitem>
-
-  <listitem><para>By default all outputs are installed for each derivation.
-  That can be reduced by setting <literal>meta.outputsToInstall</literal>.
-  </para></listitem> <!-- TODO: link nixpkgs docs on the ability to override those. -->
-
-</itemizedlist>
-
-</para>
-
-</refsection>
-
-
-<refsection><title>Flags</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--prebuilt-only</option> / <option>-b</option></term>
-
-    <listitem><para>Use only derivations for which a substitute is
-    registered, i.e., there is a pre-built binary available that can
-    be downloaded in lieu of building the derivation.  Thus, no
-    packages will be built from source.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--preserve-installed</option></term>
-    <term><option>-P</option></term>
-
-    <listitem><para>Do not remove derivations with a name matching one
-    of the derivations being installed.  Usually, trying to have two
-    versions of the same package installed in the same generation of a
-    profile will lead to an error in building the generation, due to
-    file name clashes between the two versions.  However, this is not
-    the case for all packages.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--remove-all</option></term>
-    <term><option>-r</option></term>
-
-    <listitem><para>Remove all previously installed packages first.
-    This is equivalent to running <literal>nix-env -e '.*'</literal>
-    first, except that everything happens in a single
-    transaction.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection xml:id='refsec-nix-env-install-examples'><title>Examples</title>
-
-<para>To install a specific version of <command>gcc</command> from the
-active Nix expression:
-
-<screen>
-$ nix-env --install gcc-3.3.2
-installing `gcc-3.3.2'
-uninstalling `gcc-3.1'</screen>
-
-Note the previously installed version is removed, since
-<option>--preserve-installed</option> was not specified.</para>
-
-<para>To install an arbitrary version:
-
-<screen>
-$ nix-env --install gcc
-installing `gcc-3.3.2'</screen>
-
-</para>
-
-<para>To install using a specific attribute:
-
-<screen>
-$ nix-env -i -A gcc40mips
-$ nix-env -i -A xorg.xorgserver</screen>
-
-</para>
-
-<para>To install all derivations in the Nix expression <filename>foo.nix</filename>:
-
-<screen>
-$ nix-env -f ~/foo.nix -i '.*'</screen>
-
-</para>
-
-<para>To copy the store path with symbolic name <literal>gcc</literal>
-from another profile:
-
-<screen>
-$ nix-env -i --from-profile /nix/var/nix/profiles/foo gcc</screen>
-
-</para>
-
-<para>To install a specific store derivation (typically created by
-<command>nix-instantiate</command>):
-
-<screen>
-$ nix-env -i /nix/store/fibjb1bfbpm5mrsxc4mh2d8n37sxh91i-gcc-3.4.3.drv</screen>
-
-</para>
-
-<para>To install a specific output path:
-
-<screen>
-$ nix-env -i /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vk-gcc-3.4.3</screen>
-
-</para>
-
-<para>To install from a Nix expression specified on the command-line:
-
-<screen>
-$ nix-env -f ./foo.nix -i -E \
-    'f: (f {system = "i686-linux";}).subversionWithJava'</screen>
-
-I.e., this evaluates to <literal>(f: (f {system =
-"i686-linux";}).subversionWithJava) (import ./foo.nix)</literal>, thus
-selecting the <literal>subversionWithJava</literal> attribute from the
-set returned by calling the function defined in
-<filename>./foo.nix</filename>.</para>
-
-<para>A dry-run tells you which paths will be downloaded or built from
-source:
-
-<screen>
-$ nix-env -f '&lt;nixpkgs>' -iA hello --dry-run
-(dry run; not doing anything)
-installing ‘hello-2.10’
-this path will be fetched (0.04 MiB download, 0.19 MiB unpacked):
-  /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10
-  <emphasis>...</emphasis></screen>
-
-</para>
-
-<para>To install Firefox from the latest revision in the Nixpkgs/NixOS
-14.12 channel:
-
-<screen>
-$ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA firefox
-</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id="rsec-nix-env-upgrade"><title>Operation <option>--upgrade</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--upgrade</option></arg>
-    <arg choice='plain'><option>-u</option></arg>
-  </group>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-inst-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-  <group choice='opt'>
-    <arg choice='plain'><option>--lt</option></arg>
-    <arg choice='plain'><option>--leq</option></arg>
-    <arg choice='plain'><option>--eq</option></arg>
-    <arg choice='plain'><option>--always</option></arg>
-  </group>
-  <arg choice='plain' rep='repeat'><emphasis>args</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The upgrade operation creates a new user environment, based on
-the current generation of the active profile, in which all store paths
-are replaced for which there are newer versions in the set of paths
-described by <emphasis>args</emphasis>.  Paths for which there
-are no newer versions are left untouched; this is not an error.  It is
-also not an error if an element of <emphasis>args</emphasis>
-matches no installed derivations.</para>
-
-<para>For a description of how <emphasis>args</emphasis> is
-mapped to a set of store paths, see <link
-linkend="rsec-nix-env-install"><option>--install</option></link>.  If
-<emphasis>args</emphasis> describes multiple store paths with
-the same symbolic name, only the one with the highest version is
-installed.</para>
-
-</refsection>
-
-<refsection><title>Flags</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--lt</option></term>
-
-    <listitem><para>Only upgrade a derivation to newer versions.  This
-    is the default.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--leq</option></term>
-
-    <listitem><para>In addition to upgrading to newer versions, also
-    “upgrade” to derivations that have the same version.  Version are
-    not a unique identification of a derivation, so there may be many
-    derivations that have the same version.  This flag may be useful
-    to force “synchronisation” between the installed and available
-    derivations.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--eq</option></term>
-
-    <listitem><para><emphasis>Only</emphasis> “upgrade” to derivations
-    that have the same version.  This may not seem very useful, but it
-    actually is, e.g., when there is a new release of Nixpkgs and you
-    want to replace installed applications with the same versions
-    built against newer dependencies (to reduce the number of
-    dependencies floating around on your system).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--always</option></term>
-
-    <listitem><para>In addition to upgrading to newer versions, also
-    “upgrade” to derivations that have the same or a lower version.
-    I.e., derivations may actually be downgraded depending on what is
-    available in the active Nix expression.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<para>For the other flags, see <option
-linkend="rsec-nix-env-install">--install</option>.</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env --upgrade gcc
-upgrading `gcc-3.3.1' to `gcc-3.4'
-
-$ nix-env -u gcc-3.3.2 --always <lineannotation>(switch to a specific version)</lineannotation>
-upgrading `gcc-3.4' to `gcc-3.3.2'
-
-$ nix-env --upgrade pan
-<lineannotation>(no upgrades available, so nothing happens)</lineannotation>
-
-$ nix-env -u <lineannotation>(try to upgrade everything)</lineannotation>
-upgrading `hello-2.1.2' to `hello-2.1.3'
-upgrading `mozilla-1.2' to `mozilla-1.4'</screen>
-
-</refsection>
-
-<refsection xml:id="ssec-version-comparisons"><title>Versions</title>
-
-<para>The upgrade operation determines whether a derivation
-<varname>y</varname> is an upgrade of a derivation
-<varname>x</varname> by looking at their respective
-<literal>name</literal> attributes.  The names (e.g.,
-<literal>gcc-3.3.1</literal> are split into two parts: the package
-name (<literal>gcc</literal>), and the version
-(<literal>3.3.1</literal>).  The version part starts after the first
-dash not followed by a letter.  <varname>x</varname> is considered an
-upgrade of <varname>y</varname> if their package names match, and the
-version of <varname>y</varname> is higher that that of
-<varname>x</varname>.</para>
-
-<para>The versions are compared by splitting them into contiguous
-components of numbers and letters.  E.g., <literal>3.3.1pre5</literal>
-is split into <literal>[3, 3, 1, "pre", 5]</literal>.  These lists are
-then compared lexicographically (from left to right).  Corresponding
-components <varname>a</varname> and <varname>b</varname> are compared
-as follows.  If they are both numbers, integer comparison is used.  If
-<varname>a</varname> is an empty string and <varname>b</varname> is a
-number, <varname>a</varname> is considered less than
-<varname>b</varname>.  The special string component
-<literal>pre</literal> (for <emphasis>pre-release</emphasis>) is
-considered to be less than other components.  String components are
-considered less than number components.  Otherwise, they are compared
-lexicographically (i.e., using case-sensitive string comparison).</para>
-
-<para>This is illustrated by the following examples:
-
-<screen>
-1.0 &lt; 2.3
-2.1 &lt; 2.3
-2.3 = 2.3
-2.5 > 2.3
-3.1 > 2.3
-2.3.1 > 2.3
-2.3.1 > 2.3a
-2.3pre1 &lt; 2.3
-2.3pre3 &lt; 2.3pre12
-2.3a &lt; 2.3c
-2.3pre1 &lt; 2.3c
-2.3pre1 &lt; 2.3q</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--uninstall</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--uninstall</option></arg>
-    <arg choice='plain'><option>-e</option></arg>
-  </group>
-  <arg choice='plain' rep='repeat'><emphasis>drvnames</emphasis></arg>
-</cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The uninstall operation creates a new user environment, based on
-the current generation of the active profile, from which the store
-paths designated by the symbolic names
-<emphasis>names</emphasis> are removed.</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env --uninstall gcc
-$ nix-env -e '.*' <lineannotation>(remove everything)</lineannotation></screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id="rsec-nix-env-set"><title>Operation <option>--set</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <arg choice='plain'><option>--set</option></arg>
-  <arg choice='plain'><emphasis>drvname</emphasis></arg>
-</cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The <option>--set</option> operation modifies the current generation of a
-profile so that it contains exactly the specified derivation, and nothing else.
-</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<para>
-The following updates a profile such that its current generation will contain
-just Firefox:
-
-<screen>
-$ nix-env -p /nix/var/nix/profiles/browser --set firefox</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id="rsec-nix-env-set-flag"><title>Operation <option>--set-flag</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <arg choice='plain'><option>--set-flag</option></arg>
-  <arg choice='plain'><emphasis>name</emphasis></arg>
-  <arg choice='plain'><emphasis>value</emphasis></arg>
-  <arg choice='plain' rep='repeat'><emphasis>drvnames</emphasis></arg>
-</cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The <option>--set-flag</option> operation allows meta attributes
-of installed packages to be modified.  There are several attributes
-that can be usefully modified, because they affect the behaviour of
-<command>nix-env</command> or the user environment build
-script:
-
-<itemizedlist>
-
-  <listitem><para><varname>priority</varname> can be changed to
-  resolve filename clashes.  The user environment build script uses
-  the <varname>meta.priority</varname> attribute of derivations to
-  resolve filename collisions between packages.  Lower priority values
-  denote a higher priority.  For instance, the GCC wrapper package and
-  the Binutils package in Nixpkgs both have a file
-  <filename>bin/ld</filename>, so previously if you tried to install
-  both you would get a collision.  Now, on the other hand, the GCC
-  wrapper declares a higher priority than Binutils, so the former’s
-  <filename>bin/ld</filename> is symlinked in the user
-  environment.</para></listitem>
-
-  <listitem><para><varname>keep</varname> can be set to
-  <literal>true</literal> to prevent the package from being upgraded
-  or replaced.  This is useful if you want to hang on to an older
-  version of a package.</para></listitem>
-
-  <listitem><para><varname>active</varname> can be set to
-  <literal>false</literal> to “disable” the package.  That is, no
-  symlinks will be generated to the files of the package, but it
-  remains part of the profile (so it won’t be garbage-collected).  It
-  can be set back to <literal>true</literal> to re-enable the
-  package.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<para>To prevent the currently installed Firefox from being upgraded:
-
-<screen>
-$ nix-env --set-flag keep true firefox</screen>
-
-After this, <command>nix-env -u</command> will ignore Firefox.</para>
-
-<para>To disable the currently installed Firefox, then install a new
-Firefox while the old remains part of the profile:
-
-<screen>
-$ nix-env -q
-firefox-2.0.0.9 <lineannotation>(the current one)</lineannotation>
-
-$ nix-env --preserve-installed -i firefox-2.0.0.11
-installing `firefox-2.0.0.11'
-building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
-collision between `/nix/store/<emphasis>...</emphasis>-firefox-2.0.0.11/bin/firefox'
-  and `/nix/store/<emphasis>...</emphasis>-firefox-2.0.0.9/bin/firefox'.
-<lineannotation>(i.e., can’t have two active at the same time)</lineannotation>
-
-$ nix-env --set-flag active false firefox
-setting flag on `firefox-2.0.0.9'
-
-$ nix-env --preserve-installed -i firefox-2.0.0.11
-installing `firefox-2.0.0.11'
-
-$ nix-env -q
-firefox-2.0.0.11 <lineannotation>(the enabled one)</lineannotation>
-firefox-2.0.0.9 <lineannotation>(the disabled one)</lineannotation></screen>
-
-</para>
-
-<para>To make files from <literal>binutils</literal> take precedence
-over files from <literal>gcc</literal>:
-
-<screen>
-$ nix-env --set-flag priority 5 binutils
-$ nix-env --set-flag priority 10 gcc</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--query</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--query</option></arg>
-    <arg choice='plain'><option>-q</option></arg>
-  </group>
-  <group choice='opt'>
-    <arg choice='plain'><option>--installed</option></arg>
-    <arg choice='plain'><option>--available</option></arg>
-    <arg choice='plain'><option>-a</option></arg>
-  </group>
-
-  <sbr />
-
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--status</option></arg>
-      <arg choice='plain'><option>-s</option></arg>
-    </group>
-  </arg>
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--attr-path</option></arg>
-      <arg choice='plain'><option>-P</option></arg>
-    </group>
-  </arg>
-  <arg><option>--no-name</option></arg>
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--compare-versions</option></arg>
-      <arg choice='plain'><option>-c</option></arg>
-    </group>
-  </arg>
-  <arg><option>--system</option></arg>
-  <arg><option>--drv-path</option></arg>
-  <arg><option>--out-path</option></arg>
-  <arg><option>--description</option></arg>
-  <arg><option>--meta</option></arg>
-
-  <sbr />
-
-  <arg><option>--xml</option></arg>
-  <arg><option>--json</option></arg>
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--prebuilt-only</option></arg>
-      <arg choice='plain'><option>-b</option></arg>
-    </group>
-  </arg>
-
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--attr</option></arg>
-      <arg choice='plain'><option>-A</option></arg>
-    </group>
-    <emphasis>attribute-path</emphasis>
-  </arg>
-
-  <sbr />
-
-  <arg choice='plain' rep='repeat'><emphasis>names</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>The query operation displays information about either the store
-paths that are installed in the current generation of the active
-profile (<option>--installed</option>), or the derivations that are
-available for installation in the active Nix expression
-(<option>--available</option>).  It only prints information about
-derivations whose symbolic name matches one of
-<emphasis>names</emphasis>.</para>
-
-<para>The derivations are sorted by their <literal>name</literal>
-attributes.</para>
-
-</refsection>
-
-
-<refsection><title>Source selection</title>
-
-<para>The following flags specify the set of things on which the query
-operates.</para>
-
-<variablelist>
-
-  <varlistentry><term><option>--installed</option></term>
-
-    <listitem><para>The query operates on the store paths that are
-    installed in the current generation of the active profile.  This
-    is the default.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--available</option></term>
-    <term><option>-a</option></term>
-
-    <listitem><para>The query operates on the derivations that are
-    available in the active Nix expression.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Queries</title>
-
-<para>The following flags specify what information to display about
-the selected derivations.  Multiple flags may be specified, in which
-case the information is shown in the order given here.  Note that the
-name of the derivation is shown unless <option>--no-name</option> is
-specified.</para>
-
-<!-- TODO: fix the terminology here; i.e., derivations, store paths,
-user environment elements, etc. -->
-
-<variablelist>
-
-  <varlistentry><term><option>--xml</option></term>
-
-    <listitem><para>Print the result in an XML representation suitable
-    for automatic processing by other tools.  The root element is
-    called <literal>items</literal>, which contains a
-    <literal>item</literal> element for each available or installed
-    derivation.  The fields discussed below are all stored in
-    attributes of the <literal>item</literal>
-    elements.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--json</option></term>
-
-    <listitem><para>Print the result in a JSON representation suitable
-    for automatic processing by other tools.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--prebuilt-only</option> / <option>-b</option></term>
-
-    <listitem><para>Show only derivations for which a substitute is
-    registered, i.e., there is a pre-built binary available that can
-    be downloaded in lieu of building the derivation.  Thus, this
-    shows all packages that probably can be installed
-    quickly.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--status</option></term>
-    <term><option>-s</option></term>
-
-    <listitem><para>Print the <emphasis>status</emphasis> of the
-    derivation.  The status consists of three characters.  The first
-    is <literal>I</literal> or <literal>-</literal>, indicating
-    whether the derivation is currently installed in the current
-    generation of the active profile.  This is by definition the case
-    for <option>--installed</option>, but not for
-    <option>--available</option>.  The second is <literal>P</literal>
-    or <literal>-</literal>, indicating whether the derivation is
-    present on the system.  This indicates whether installation of an
-    available derivation will require the derivation to be built.  The
-    third is <literal>S</literal> or <literal>-</literal>, indicating
-    whether a substitute is available for the
-    derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--attr-path</option></term>
-    <term><option>-P</option></term>
-
-    <listitem><para>Print the <emphasis>attribute path</emphasis> of
-    the derivation, which can be used to unambiguously select it using
-    the <link linkend="opt-attr"><option>--attr</option> option</link>
-    available in commands that install derivations like
-    <literal>nix-env --install</literal>. This option only works
-    together with <option>--available</option></para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--no-name</option></term>
-
-    <listitem><para>Suppress printing of the <literal>name</literal>
-    attribute of each derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--compare-versions</option> /
-  <option>-c</option></term>
-
-    <listitem><para>Compare installed versions to available versions,
-    or vice versa (if <option>--available</option> is given).  This is
-    useful for quickly seeing whether upgrades for installed
-    packages are available in a Nix expression.  A column is added
-    with the following meaning:
-
-    <variablelist>
-
-      <varlistentry><term><literal>&lt;</literal> <emphasis>version</emphasis></term>
-
-        <listitem><para>A newer version of the package is available
-        or installed.</para></listitem>
-
-      </varlistentry>
-
-      <varlistentry><term><literal>=</literal> <emphasis>version</emphasis></term>
-
-        <listitem><para>At most the same version of the package is
-        available or installed.</para></listitem>
-
-      </varlistentry>
-
-      <varlistentry><term><literal>></literal> <emphasis>version</emphasis></term>
-
-        <listitem><para>Only older versions of the package are
-        available or installed.</para></listitem>
-
-      </varlistentry>
-
-      <varlistentry><term><literal>- ?</literal></term>
-
-        <listitem><para>No version of the package is available or
-        installed.</para></listitem>
-
-      </varlistentry>
-
-    </variablelist>
-
-    </para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--system</option></term>
-
-    <listitem><para>Print the <literal>system</literal> attribute of
-    the derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--drv-path</option></term>
-
-    <listitem><para>Print the path of the store
-    derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--out-path</option></term>
-
-    <listitem><para>Print the output path of the
-    derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--description</option></term>
-
-    <listitem><para>Print a short (one-line) description of the
-    derivation, if available.  The description is taken from the
-    <literal>meta.description</literal> attribute of the
-    derivation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--meta</option></term>
-
-    <listitem><para>Print all of the meta-attributes of the
-    derivation.  This option is only available with
-    <option>--xml</option> or <option>--json</option>.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>To show installed packages:
-
-<screen>
-$ nix-env -q
-bison-1.875c
-docbook-xml-4.2
-firefox-1.0.4
-MPlayer-1.0pre7
-ORBit2-2.8.3
-<emphasis>…</emphasis>
-</screen>
-
-</para>
-
-<para>To show available packages:
-
-<screen>
-$ nix-env -qa
-firefox-1.0.7
-GConf-2.4.0.1
-MPlayer-1.0pre7
-ORBit2-2.8.3
-<emphasis>…</emphasis>
-</screen>
-
-</para>
-
-<para>To show the status of available packages:
-
-<screen>
-$ nix-env -qas
--P- firefox-1.0.7   <lineannotation>(not installed but present)</lineannotation>
---S GConf-2.4.0.1   <lineannotation>(not present, but there is a substitute for fast installation)</lineannotation>
---S MPlayer-1.0pre3 <lineannotation>(i.e., this is not the installed MPlayer, even though the version is the same!)</lineannotation>
-IP- ORBit2-2.8.3    <lineannotation>(installed and by definition present)</lineannotation>
-<emphasis>…</emphasis>
-</screen>
-
-</para>
-
-<para>To show available packages in the Nix expression <filename>foo.nix</filename>:
-
-<screen>
-$ nix-env -f ./foo.nix -qa
-foo-1.2.3
-</screen>
-
-</para>
-
-<para>To compare installed versions to what’s available:
-
-<screen>
-$ nix-env -qc
-<emphasis>...</emphasis>
-acrobat-reader-7.0 - ?      <lineannotation>(package is not available at all)</lineannotation>
-autoconf-2.59      = 2.59   <lineannotation>(same version)</lineannotation>
-firefox-1.0.4      &lt; 1.0.7  <lineannotation>(a more recent version is available)</lineannotation>
-<emphasis>...</emphasis>
-</screen>
-
-</para>
-
-<para>To show all packages with “<literal>zip</literal>” in the name:
-
-<screen>
-$ nix-env -qa '.*zip.*'
-bzip2-1.0.6
-gzip-1.6
-zip-3.0
-<emphasis>…</emphasis>
-</screen>
-
-</para>
-
-<para>To show all packages with “<literal>firefox</literal>” or
-“<literal>chromium</literal>” in the name:
-
-<screen>
-$ nix-env -qa '.*(firefox|chromium).*'
-chromium-37.0.2062.94
-chromium-beta-38.0.2125.24
-firefox-32.0.3
-firefox-with-plugins-13.0.1
-<emphasis>…</emphasis>
-</screen>
-
-</para>
-
-<para>To show all packages in the latest revision of the Nixpkgs
-repository:
-
-<screen>
-$ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
-</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--switch-profile</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--switch-profile</option></arg>
-    <arg choice='plain'><option>-S</option></arg>
-  </group>
-  <arg choice='req'><emphasis>path</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>This operation makes <emphasis>path</emphasis> the current
-profile for the user.  That is, the symlink
-<filename>~/.nix-profile</filename> is made to point to
-<emphasis>path</emphasis>.</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env -S ~/my-profile</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--list-generations</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <arg choice='plain'><option>--list-generations</option></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>This operation print a list of all the currently existing
-generations for the active profile.  These may be switched to using
-the <option>--switch-generation</option> operation.  It also prints
-the creation date of the generation, and indicates the current
-generation.</para>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env --list-generations
-  95   2004-02-06 11:48:24
-  96   2004-02-06 11:49:01
-  97   2004-02-06 16:22:45
-  98   2004-02-06 16:24:33   (current)</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--delete-generations</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <arg choice='plain'><option>--delete-generations</option></arg>
-  <arg choice='plain' rep='repeat'><emphasis>generations</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>This operation deletes the specified generations of the current
-profile.  The generations can be a list of generation numbers, the
-special value <literal>old</literal> to delete all non-current
-generations,  a value such as <literal>30d</literal> to delete all
-generations older than the specified number of days (except for the
-generation that was active at that point in time), or a value such as
-<literal>+5</literal> to keep the last <literal>5</literal> generations
-ignoring any newer than current, e.g., if <literal>30</literal> is the current
-generation <literal>+5</literal> will delete generation <literal>25</literal>
-and all older generations.
-Periodically deleting old generations is important to make garbage collection
-effective.</para>
-
-</refsection>
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env --delete-generations 3 4 8
-
-$ nix-env --delete-generations +5
-
-$ nix-env --delete-generations 30d
-
-$ nix-env -p other_profile --delete-generations old</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--switch-generation</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--switch-generation</option></arg>
-    <arg choice='plain'><option>-G</option></arg>
-  </group>
-  <arg choice='req'><emphasis>generation</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>This operation makes generation number
-<emphasis>generation</emphasis> the current generation of the
-active profile.  That is, if the
-<filename><emphasis>profile</emphasis></filename> is the path to
-the active profile, then the symlink
-<filename><emphasis>profile</emphasis></filename> is made to
-point to
-<filename><emphasis>profile</emphasis>-<emphasis>generation</emphasis>-link</filename>,
-which is in turn a symlink to the actual user environment in the Nix
-store.</para>
-
-<para>Switching will fail if the specified generation does not exist.</para>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env -G 42
-switching from generation 50 to 42</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--rollback</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-env</command>
-  <arg choice='plain'><option>--rollback</option></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>This operation switches to the “previous” generation of the
-active profile, that is, the highest numbered generation lower than
-the current generation, if it exists.  It is just a convenience
-wrapper around <option>--list-generations</option> and
-<option>--switch-generation</option>.</para>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-env --rollback
-switching from generation 92 to 91
-
-$ nix-env --rollback
-error: no generation older than the current (91) exists</screen>
-
-</refsection>
-
-</refsection>
-
-
-<refsection condition="manpage"><title>Environment variables</title>
-
-<variablelist>
-
-  <varlistentry><term><literal>NIX_PROFILE</literal></term>
-
-    <listitem><para>Location of the Nix profile.  Defaults to the
-    target of the symlink <filename>~/.nix-profile</filename>, if it
-    exists, or <filename>/nix/var/nix/profiles/default</filename>
-    otherwise.</para></listitem>
-
-  </varlistentry>
-
-  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-hash.xml b/doc/manual/command-ref/nix-hash.xml
deleted file mode 100644
index 2f80dc568..000000000
--- a/doc/manual/command-ref/nix-hash.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-hash">
-  
-<refmeta>
-  <refentrytitle>nix-hash</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-hash</refname>
-  <refpurpose>compute the cryptographic hash of a path</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-hash</command>
-    <arg><option>--flat</option></arg>
-    <arg><option>--base32</option></arg>
-    <arg><option>--truncate</option></arg>
-    <arg><option>--type</option> <emphasis>hashAlgo</emphasis></arg>
-    <arg choice='plain' rep='repeat'><emphasis>path</emphasis></arg>
-  </cmdsynopsis>
-  <cmdsynopsis>
-    <command>nix-hash</command>
-    <arg choice='plain'><option>--to-base16</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>hash</emphasis></arg>
-  </cmdsynopsis>
-  <cmdsynopsis>
-    <command>nix-hash</command>
-    <arg choice='plain'><option>--to-base32</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>hash</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-hash</command> computes the
-cryptographic hash of the contents of each
-<emphasis>path</emphasis> and prints it on standard output.  By
-default, it computes an MD5 hash, but other hash algorithms are
-available as well.  The hash is printed in hexadecimal.  To generate
-the same hash as <command>nix-prefetch-url</command> you have to
-specify multiple arguments, see below for an example.</para>
-
-<para>The hash is computed over a <emphasis>serialisation</emphasis>
-of each path: a dump of the file system tree rooted at the path.  This
-allows directories and symlinks to be hashed as well as regular files.
-The dump is in the <emphasis>NAR format</emphasis> produced by <link
-linkend="refsec-nix-store-dump"><command>nix-store</command>
-<option>--dump</option></link>.  Thus, <literal>nix-hash
-<emphasis>path</emphasis></literal> yields the same
-cryptographic hash as <literal>nix-store --dump
-<emphasis>path</emphasis> | md5sum</literal>.</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<variablelist>
-  
-  <varlistentry><term><option>--flat</option></term>
-
-    <listitem><para>Print the cryptographic hash of the contents of
-    each regular file <emphasis>path</emphasis>.  That is, do
-    not compute the hash over the dump of
-    <emphasis>path</emphasis>.  The result is identical to that
-    produced by the GNU commands <command>md5sum</command> and
-    <command>sha1sum</command>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--base32</option></term>
-
-    <listitem><para>Print the hash in a base-32 representation rather
-    than hexadecimal.  This base-32 representation is more compact and
-    can be used in Nix expressions (such as in calls to
-    <function>fetchurl</function>).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--truncate</option></term>
-
-    <listitem><para>Truncate hashes longer than 160 bits (such as
-    SHA-256) to 160 bits.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--type</option> <emphasis>hashAlgo</emphasis></term>
-
-    <listitem><para>Use the specified cryptographic hash algorithm,
-    which can be one of <literal>md5</literal>,
-    <literal>sha1</literal>, and
-    <literal>sha256</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--to-base16</option></term>
-
-    <listitem><para>Don’t hash anything, but convert the base-32 hash
-    representation <emphasis>hash</emphasis> to
-    hexadecimal.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--to-base32</option></term>
-
-    <listitem><para>Don’t hash anything, but convert the hexadecimal
-    hash representation <emphasis>hash</emphasis> to
-    base-32.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Computing the same hash as <command>nix-prefetch-url</command>:
-<screen>
-$ nix-prefetch-url file://&lt;(echo test)
-1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
-$ nix-hash --type sha256 --flat --base32 &lt;(echo test)
-1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
-</screen>
-</para>
-
-<para>Computing hashes:
-
-<screen>
-$ mkdir test
-$ echo "hello" > test/world
-
-$ nix-hash test/ <lineannotation>(MD5 hash; default)</lineannotation>
-8179d3caeff1869b5ba1744e5a245c04
-
-$ nix-store --dump test/ | md5sum <lineannotation>(for comparison)</lineannotation>
-8179d3caeff1869b5ba1744e5a245c04  -
-
-$ nix-hash --type sha1 test/
-e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
-
-$ nix-hash --type sha1 --base32 test/
-nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-
-$ nix-hash --type sha256 --flat test/
-error: reading file `test/': Is a directory
-
-$ nix-hash --type sha256 --flat test/world
-5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03</screen>
-
-</para>
-
-<para>Converting between hexadecimal and base-32:
-
-<screen>
-$ nix-hash --type sha1 --to-base32 e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
-nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-
-$ nix-hash --type sha1 --to-base16 nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6</screen>
-
-</para>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-instantiate.xml b/doc/manual/command-ref/nix-instantiate.xml
deleted file mode 100644
index dc055fa51..000000000
--- a/doc/manual/command-ref/nix-instantiate.xml
+++ /dev/null
@@ -1,266 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-instantiate">
-
-<refmeta>
-  <refentrytitle>nix-instantiate</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-instantiate</refname>
-  <refpurpose>instantiate store derivations from Nix expressions</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-instantiate</command>
-    <group>
-      <arg choice='plain'><option>--parse</option></arg>
-      <arg choice='plain'>
-        <option>--eval</option>
-        <arg><option>--strict</option></arg>
-        <arg><option>--json</option></arg>
-        <arg><option>--xml</option></arg>
-      </arg>
-    </group>
-    <arg><option>--read-write-mode</option></arg>
-    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--attr</option></arg>
-        <arg choice='plain'><option>-A</option></arg>
-      </group>
-      <emphasis>attrPath</emphasis>
-    </arg>
-    <arg><option>--add-root</option> <emphasis>path</emphasis></arg>
-    <arg><option>--indirect</option></arg>
-    <group>
-      <arg choice='plain'><option>--expr</option></arg>
-      <arg choice='plain'><option>-E</option></arg>
-    </group>
-    <arg choice='plain' rep='repeat'><emphasis>files</emphasis></arg>
-  </cmdsynopsis>
-  <cmdsynopsis>
-    <command>nix-instantiate</command>
-    <arg choice='plain'><option>--find-file</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>files</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-instantiate</command> generates <link
-linkend="gloss-derivation">store derivations</link> from (high-level)
-Nix expressions.  It evaluates the Nix expressions in each of
-<emphasis>files</emphasis> (which defaults to
-<emphasis>./default.nix</emphasis>).  Each top-level expression
-should evaluate to a derivation, a list of derivations, or a set of
-derivations.  The paths of the resulting store derivations are printed
-on standard output.</para>
-
-<para>If <emphasis>files</emphasis> is the character
-<literal>-</literal>, then a Nix expression will be read from standard
-input.</para>
-
-<para condition="manual">See also <xref linkend="sec-common-options"
-/> for a list of common options.</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<variablelist>
-
-  <varlistentry>
-    <term><option>--add-root</option> <emphasis>path</emphasis></term>
-    <term><option>--indirect</option></term>
-
-    <listitem><para>See the <link linkend="opt-add-root">corresponding
-    options</link> in <command>nix-store</command>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--parse</option></term>
-
-    <listitem><para>Just parse the input files, and print their
-    abstract syntax trees on standard output in ATerm
-    format.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--eval</option></term>
-
-    <listitem><para>Just parse and evaluate the input files, and print
-    the resulting values on standard output.  No instantiation of
-    store derivations takes place.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--find-file</option></term>
-
-    <listitem><para>Look up the given files in Nix’s search path (as
-    specified by the <literal linkend="env-NIX_PATH">NIX_PATH</literal>
-    environment variable).  If found, print the corresponding absolute
-    paths on standard output.  For instance, if
-    <literal>NIX_PATH</literal> is
-    <literal>nixpkgs=/home/alice/nixpkgs</literal>, then
-    <literal>nix-instantiate --find-file nixpkgs/default.nix</literal>
-    will print
-    <literal>/home/alice/nixpkgs/default.nix</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--strict</option></term>
-
-    <listitem><para>When used with <option>--eval</option>,
-    recursively evaluate list elements and attributes.  Normally, such
-    sub-expressions are left unevaluated (since the Nix expression
-    language is lazy).</para>
-
-    <warning><para>This option can cause non-termination, because lazy
-    data structures can be infinitely large.</para></warning>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--json</option></term>
-
-    <listitem><para>When used with <option>--eval</option>, print the resulting
-    value as an JSON representation of the abstract syntax tree rather
-    than as an ATerm.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--xml</option></term>
-
-    <listitem><para>When used with <option>--eval</option>, print the resulting
-    value as an XML representation of the abstract syntax tree rather than as
-    an ATerm. The schema is the same as that used by the <link
-    linkend="builtin-toXML"><function>toXML</function> built-in</link>.
-    </para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--read-write-mode</option></term>
-
-    <listitem><para>When used with <option>--eval</option>, perform
-    evaluation in read/write mode so nix language features that
-    require it will still work (at the cost of needing to do
-    instantiation of every evaluated derivation). If this option is
-    not enabled, there may be uninstantiated store paths in the final
-    output.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<variablelist condition="manpage">
-  <xi:include href="opt-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='opt-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Instantiating store derivations from a Nix expression, and
-building them using <command>nix-store</command>:
-
-<screen>
-$ nix-instantiate test.nix <lineannotation>(instantiate)</lineannotation>
-/nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
-
-$ nix-store -r $(nix-instantiate test.nix) <lineannotation>(build)</lineannotation>
-<emphasis>...</emphasis>
-/nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 <lineannotation>(output path)</lineannotation>
-
-$ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
-dr-xr-xr-x    2 eelco    users        4096 1970-01-01 01:00 lib
-...</screen>
-
-</para>
-
-<para>You can also give a Nix expression on the command line:
-
-<screen>
-$ nix-instantiate -E 'with import &lt;nixpkgs> { }; hello'
-/nix/store/j8s4zyv75a724q38cb0r87rlczaiag4y-hello-2.8.drv
-</screen>
-
-This is equivalent to:
-
-<screen>
-$ nix-instantiate '&lt;nixpkgs>' -A hello
-</screen>
-
-</para>
-
-<para>Parsing and evaluating Nix expressions:
-
-<screen>
-$ nix-instantiate --parse -E '1 + 2'
-1 + 2
-
-$ nix-instantiate --eval -E '1 + 2'
-3
-
-$ nix-instantiate --eval --xml -E '1 + 2'
-<![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <int value="3" />
-</expr>]]></screen>
-
-</para>
-
-<para>The difference between non-strict and strict evaluation:
-
-<screen>
-$ nix-instantiate --eval --xml -E 'rec { x = "foo"; y = x; }'
-<emphasis>...</emphasis><![CDATA[
-  <attr name="x">
-    <string value="foo" />
-  </attr>
-  <attr name="y">
-    <unevaluated />
-  </attr>]]>
-<emphasis>...</emphasis></screen>
-
-Note that <varname>y</varname> is left unevaluated (the XML
-representation doesn’t attempt to show non-normal forms).
-
-<screen>
-$ nix-instantiate --eval --xml --strict -E 'rec { x = "foo"; y = x; }'
-<emphasis>...</emphasis><![CDATA[
-  <attr name="x">
-    <string value="foo" />
-  </attr>
-  <attr name="y">
-    <string value="foo" />
-  </attr>]]>
-<emphasis>...</emphasis></screen>
-
-</para>
-
-</refsection>
-
-
-<refsection condition="manpage"><title>Environment variables</title>
-
-<variablelist>
-  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-prefetch-url.xml b/doc/manual/command-ref/nix-prefetch-url.xml
deleted file mode 100644
index db2a6960a..000000000
--- a/doc/manual/command-ref/nix-prefetch-url.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-prefetch-url">
-
-<refmeta>
-  <refentrytitle>nix-prefetch-url</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-prefetch-url</refname>
-  <refpurpose>copy a file from a URL into the store and print its hash</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-prefetch-url</command>
-    <arg><option>--version</option></arg>
-    <arg><option>--type</option> <emphasis>hashAlgo</emphasis></arg>
-    <arg><option>--print-path</option></arg>
-    <arg><option>--unpack</option></arg>
-    <arg><option>--name</option> <emphasis>name</emphasis></arg>
-    <arg choice='plain'><emphasis>url</emphasis></arg>
-    <arg><emphasis>hash</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-prefetch-url</command> downloads the
-file referenced by the URL <emphasis>url</emphasis>, prints its
-cryptographic hash, and copies it into the Nix store.  The file name
-in the store is
-<filename><emphasis>hash</emphasis>-<emphasis>baseName</emphasis></filename>,
-where <emphasis>baseName</emphasis> is everything following the
-final slash in <emphasis>url</emphasis>.</para>
-
-<para>This command is just a convenience for Nix expression writers.
-Often a Nix expression fetches some source distribution from the
-network using the <literal>fetchurl</literal> expression contained in
-Nixpkgs.  However, <literal>fetchurl</literal> requires a
-cryptographic hash.  If you don't know the hash, you would have to
-download the file first, and then <literal>fetchurl</literal> would
-download it again when you build your Nix expression.  Since
-<literal>fetchurl</literal> uses the same name for the downloaded file
-as <command>nix-prefetch-url</command>, the redundant download can be
-avoided.</para>
-
-<para>If <emphasis>hash</emphasis> is specified, then a download
-is not performed if the Nix store already contains a file with the
-same hash and base name.  Otherwise, the file is downloaded, and an
-error is signaled if the actual hash of the file does not match the
-specified hash.</para>
-
-<para>This command prints the hash on standard output.  Additionally,
-if the option <option>--print-path</option> is used, the path of the
-downloaded file in the Nix store is also printed.</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--type</option> <emphasis>hashAlgo</emphasis></term>
-
-    <listitem><para>Use the specified cryptographic hash algorithm,
-    which can be one of <literal>md5</literal>,
-    <literal>sha1</literal>, and
-    <literal>sha256</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--print-path</option></term>
-
-    <listitem><para>Print the store path of the downloaded file on
-    standard output.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--unpack</option></term>
-
-    <listitem><para>Unpack the archive (which must be a tarball or zip
-    file) and add the result to the Nix store. The resulting hash can
-    be used with functions such as Nixpkgs’s
-    <varname>fetchzip</varname> or
-    <varname>fetchFromGitHub</varname>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--name</option> <emphasis>name</emphasis></term>
-
-    <listitem><para>Override the name of the file in the Nix store. By
-    default, this is
-    <literal><emphasis>hash</emphasis>-<emphasis>basename</emphasis></literal>,
-    where <emphasis>basename</emphasis> is the last component of
-    <emphasis>url</emphasis>. Overriding the name is necessary
-    when <emphasis>basename</emphasis> contains characters that
-    are not allowed in Nix store paths.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<screen>
-$ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz
-0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
-
-$ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz
-0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
-/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
-
-$ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz
-079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7
-/nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz
-</screen>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-shell.xml b/doc/manual/command-ref/nix-shell.xml
deleted file mode 100644
index 1d55b5622..000000000
--- a/doc/manual/command-ref/nix-shell.xml
+++ /dev/null
@@ -1,411 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-shell">
-
-<refmeta>
-  <refentrytitle>nix-shell</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-shell</refname>
-  <refpurpose>start an interactive shell based on a Nix expression</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-shell</command>
-    <arg><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></arg>
-    <arg>
-      <group choice='req'>
-        <arg choice='plain'><option>--attr</option></arg>
-        <arg choice='plain'><option>-A</option></arg>
-      </group>
-      <emphasis>attrPath</emphasis>
-    </arg>
-    <arg><option>--command</option> <emphasis>cmd</emphasis></arg>
-    <arg><option>--run</option> <emphasis>cmd</emphasis></arg>
-    <arg><option>--exclude</option> <emphasis>regexp</emphasis></arg>
-    <arg><option>--pure</option></arg>
-    <arg><option>--keep</option> <emphasis>name</emphasis></arg>
-    <group choice='req'>
-      <arg choice='plain'>
-        <group choice='req'>
-          <arg choice='plain'><option>--packages</option></arg>
-          <arg choice='plain'><option>-p</option></arg>
-        </group>
-        <arg choice='plain' rep='repeat'>
-          <group choice='req'>
-            <arg choice="plain"><emphasis>packages</emphasis></arg>
-            <arg choice="plain"><emphasis>expressions</emphasis></arg>
-          </group>
-        </arg>
-      </arg>
-      <arg><emphasis>path</emphasis></arg>
-    </group>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-shell</command> will build the
-dependencies of the specified derivation, but not the derivation
-itself.  It will then start an interactive shell in which all
-environment variables defined by the derivation
-<emphasis>path</emphasis> have been set to their corresponding
-values, and the script <literal>$stdenv/setup</literal> has been
-sourced.  This is useful for reproducing the environment of a
-derivation for development.</para>
-
-<para>If <emphasis>path</emphasis> is not given,
-<command>nix-shell</command> defaults to
-<filename>shell.nix</filename> if it exists, and
-<filename>default.nix</filename> otherwise.</para>
-
-<para>If <emphasis>path</emphasis> starts with
-<literal>http://</literal> or <literal>https://</literal>, it is
-interpreted as the URL of a tarball that will be downloaded and
-unpacked to a temporary location. The tarball must include a single
-top-level directory containing at least a file named
-<filename>default.nix</filename>.</para>
-
-<para>If the derivation defines the variable
-<varname>shellHook</varname>, it will be evaluated after
-<literal>$stdenv/setup</literal> has been sourced.  Since this hook is
-not executed by regular Nix builds, it allows you to perform
-initialisation specific to <command>nix-shell</command>.  For example,
-the derivation attribute
-
-<programlisting>
-shellHook =
-  ''
-    echo "Hello shell"
-  '';
-</programlisting>
-
-will cause <command>nix-shell</command> to print <literal>Hello shell</literal>.</para>
-
-</refsection>
-
-
-<refsection><title>Options</title>
-
-<para>All options not listed here are passed to <command>nix-store
---realise</command>, except for <option>--arg</option> and
-<option>--attr</option> / <option>-A</option> which are passed to
-<command>nix-instantiate</command>.  <phrase condition="manual">See
-also <xref linkend="sec-common-options" />.</phrase></para>
-
-<variablelist>
-
-  <varlistentry><term><option>--command</option> <emphasis>cmd</emphasis></term>
-
-    <listitem><para>In the environment of the derivation, run the
-    shell command <emphasis>cmd</emphasis>. This command is
-    executed in an interactive shell. (Use <option>--run</option> to
-    use a non-interactive shell instead.) However, a call to
-    <literal>exit</literal> is implicitly added to the command, so the
-    shell will exit after running the command. To prevent this, add
-    <literal>return</literal> at the end; e.g. <literal>--command
-    "echo Hello; return"</literal> will print <literal>Hello</literal>
-    and then drop you into the interactive shell. This can be useful
-    for doing any additional initialisation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--run</option> <emphasis>cmd</emphasis></term>
-
-    <listitem><para>Like <option>--command</option>, but executes the
-    command in a non-interactive shell. This means (among other
-    things) that if you hit Ctrl-C while the command is running, the
-    shell exits.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--exclude</option> <emphasis>regexp</emphasis></term>
-
-    <listitem><para>Do not build any dependencies whose store path
-    matches the regular expression <emphasis>regexp</emphasis>.
-    This option may be specified multiple times.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--pure</option></term>
-
-    <listitem><para>If this flag is specified, the environment is
-    almost entirely cleared before the interactive shell is started,
-    so you get an environment that more closely corresponds to the
-    “real” Nix build.  A few variables, in particular
-    <literal>HOME</literal>, <literal>USER</literal> and
-    <literal>DISPLAY</literal>, are retained.  Note that
-    <filename>~/.bashrc</filename> and (depending on your Bash
-    installation) <filename>/etc/bashrc</filename> are still sourced,
-    so any variables set there will affect the interactive
-    shell.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--packages</option> / <option>-p</option> <emphasis>packages</emphasis>…</term>
-
-    <listitem><para>Set up an environment in which the specified
-    packages are present.  The command line arguments are interpreted
-    as attribute names inside the Nix Packages collection.  Thus,
-    <literal>nix-shell -p libjpeg openjdk</literal> will start a shell
-    in which the packages denoted by the attribute names
-    <varname>libjpeg</varname> and <varname>openjdk</varname> are
-    present.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>-i</option> <emphasis>interpreter</emphasis></term>
-
-    <listitem><para>The chained script interpreter to be invoked by
-    <command>nix-shell</command>. Only applicable in
-    <literal>#!</literal>-scripts (described <link
-    linkend="ssec-nix-shell-shebang">below</link>).</para>
-
-    </listitem></varlistentry>
-
-  <varlistentry><term><option>--keep</option> <emphasis>name</emphasis></term>
-
-    <listitem><para>When a <option>--pure</option> shell is started,
-    keep the listed environment variables.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<para>The following common options are supported:</para>
-
-<variablelist condition="manpage">
-  <xi:include href="opt-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='opt-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Environment variables</title>
-
-<variablelist>
-
-  <varlistentry><term><literal>NIX_BUILD_SHELL</literal></term>
-
-    <listitem><para>Shell used to start the interactive environment.
-    Defaults to the <command>bash</command> found in <literal>PATH</literal>.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>To build the dependencies of the package Pan, and start an
-interactive shell in which to build it:
-
-<screen>
-$ nix-shell '&lt;nixpkgs>' -A pan
-[nix-shell]$ unpackPhase
-[nix-shell]$ cd pan-*
-[nix-shell]$ configurePhase
-[nix-shell]$ buildPhase
-[nix-shell]$ ./pan/gui/pan
-</screen>
-
-To clear the environment first, and do some additional automatic
-initialisation of the interactive shell:
-
-<screen>
-$ nix-shell '&lt;nixpkgs>' -A pan --pure \
-    --command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
-</screen>
-
-Nix expressions can also be given on the command line using the
-<command>-E</command> and <command>-p</command> flags.
-For instance, the following starts a shell containing the packages
-<literal>sqlite</literal> and <literal>libX11</literal>:
-
-<screen>
-$ nix-shell -E 'with import &lt;nixpkgs> { }; runCommand "dummy" { buildInputs = [ sqlite xorg.libX11 ]; } ""'
-</screen>
-
-A shorter way to do the same is:
-
-<screen>
-$ nix-shell -p sqlite xorg.libX11
-[nix-shell]$ echo $NIX_LDFLAGS
-… -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
-</screen>
-
-Note that <command>-p</command> accepts multiple full nix expressions that
-are valid in the <literal>buildInputs = [ ... ]</literal> shown above,
-not only package names. So the following is also legal:
-
-<screen>
-$ nix-shell -p sqlite 'git.override { withManual = false; }'
-</screen>
-
-The <command>-p</command> flag looks up Nixpkgs in the Nix search
-path. You can override it by passing <option>-I</option> or setting
-<literal>NIX_PATH</literal>. For example, the following gives you a shell
-containing the Pan package from a specific revision of Nixpkgs:
-
-<screen>
-$ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
-
-[nix-shell:~]$ pan --version
-Pan 0.139
-</screen>
-
-</para>
-
-</refsection>
-
-
-<refsection xml:id="ssec-nix-shell-shebang"><title>Use as a <literal>#!</literal>-interpreter</title>
-
-<para>You can use <command>nix-shell</command> as a script interpreter
-to allow scripts written in arbitrary languages to obtain their own
-dependencies via Nix. This is done by starting the script with the
-following lines:
-
-<programlisting>
-#! /usr/bin/env nix-shell
-#! nix-shell -i <emphasis>real-interpreter</emphasis> -p <emphasis>packages</emphasis>
-</programlisting>
-
-where <emphasis>real-interpreter</emphasis> is the “real” script
-interpreter that will be invoked by <command>nix-shell</command> after
-it has obtained the dependencies and initialised the environment, and
-<emphasis>packages</emphasis> are the attribute names of the
-dependencies in Nixpkgs.</para>
-
-<para>The lines starting with <literal>#! nix-shell</literal> specify
-<command>nix-shell</command> options (see above). Note that you cannot
-write <literal>#! /usr/bin/env nix-shell -i ...</literal> because
-many operating systems only allow one argument in
-<literal>#!</literal> lines.</para>
-
-<para>For example, here is a Python script that depends on Python and
-the <literal>prettytable</literal> package:
-
-<programlisting>
-#! /usr/bin/env nix-shell
-#! nix-shell -i python -p python pythonPackages.prettytable
-
-import prettytable
-
-# Print a simple table.
-t = prettytable.PrettyTable(["N", "N^2"])
-for n in range(1, 10): t.add_row([n, n * n])
-print t
-</programlisting>
-
-</para>
-
-<para>Similarly, the following is a Perl script that specifies that it
-requires Perl and the <literal>HTML::TokeParser::Simple</literal> and
-<literal>LWP</literal> packages:
-
-<programlisting>
-#! /usr/bin/env nix-shell
-#! nix-shell -i perl -p perl perlPackages.HTMLTokeParserSimple perlPackages.LWP
-
-use HTML::TokeParser::Simple;
-
-# Fetch nixos.org and print all hrefs.
-my $p = HTML::TokeParser::Simple->new(url => 'http://nixos.org/');
-
-while (my $token = $p->get_tag("a")) {
-    my $href = $token->get_attr("href");
-    print "$href\n" if $href;
-}
-</programlisting>
-
-</para>
-
-<para>Sometimes you need to pass a simple Nix expression to customize
-a package like Terraform:
-
-<programlisting><![CDATA[
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p "terraform.withPlugins (plugins: [ plugins.openstack ])"
-
-terraform apply
-]]></programlisting>
-
-<note><para>You must use double quotes (<literal>"</literal>) when
-passing a simple Nix expression in a nix-shell shebang.</para></note>
-</para>
-
-<para>Finally, using the merging of multiple nix-shell shebangs the
-following Haskell script uses a specific branch of Nixpkgs/NixOS (the
-18.03 stable branch):
-
-<programlisting><![CDATA[
-#! /usr/bin/env nix-shell
-#! nix-shell -i runghc -p "haskellPackages.ghcWithPackages (ps: [ps.HTTP ps.tagsoup])"
-#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-18.03.tar.gz
-
-import Network.HTTP
-import Text.HTML.TagSoup
-
--- Fetch nixos.org and print all hrefs.
-main = do
-  resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
-  body <- getResponseBody resp
-  let tags = filter (isTagOpenName "a") $ parseTags body
-  let tags' = map (fromAttrib "href") tags
-  mapM_ putStrLn $ filter (/= "") tags'
-]]></programlisting>
-
-If you want to be even more precise, you can specify a specific
-revision of Nixpkgs:
-
-<programlisting>
-#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/0672315759b3e15e2121365f067c1c8c56bb4722.tar.gz
-</programlisting>
-
-</para>
-
-<para>The examples above all used <option>-p</option> to get
-dependencies from Nixpkgs. You can also use a Nix expression to build
-your own dependencies. For example, the Python example could have been
-written as:
-
-<programlisting>
-#! /usr/bin/env nix-shell
-#! nix-shell deps.nix -i python
-</programlisting>
-
-where the file <filename>deps.nix</filename> in the same directory
-as the <literal>#!</literal>-script contains:
-
-<programlisting>
-with import &lt;nixpkgs> {};
-
-runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
-</programlisting>
-
-</para>
-
-</refsection>
-
-
-<refsection condition="manpage"><title>Environment variables</title>
-
-<variablelist>
-  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/nix-store.xml b/doc/manual/command-ref/nix-store.xml
deleted file mode 100644
index 352e716ae..000000000
--- a/doc/manual/command-ref/nix-store.xml
+++ /dev/null
@@ -1,1516 +0,0 @@
-<refentry xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-nix-store">
-
-<refmeta>
-  <refentrytitle>nix-store</refentrytitle>
-  <manvolnum>1</manvolnum>
-  <refmiscinfo class="source">Nix</refmiscinfo>
-  <refmiscinfo class="version"><xi:include href="../version.txt" parse="text"/></refmiscinfo>
-</refmeta>
-
-<refnamediv>
-  <refname>nix-store</refname>
-  <refpurpose>manipulate or query the Nix store</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="opt-common-syn.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(/db:nop/*)" />
-    <arg><option>--add-root</option> <emphasis>path</emphasis></arg>
-    <arg><option>--indirect</option></arg>
-    <arg choice='plain'><emphasis>operation</emphasis></arg>
-    <arg rep='repeat'><emphasis>options</emphasis></arg>
-    <arg rep='repeat'><emphasis>arguments</emphasis></arg>
-  </cmdsynopsis>
-</refsynopsisdiv>
-
-
-<refsection><title>Description</title>
-
-<para>The command <command>nix-store</command> performs primitive
-operations on the Nix store.  You generally do not need to run this
-command manually.</para>
-
-<para><command>nix-store</command> takes exactly one
-<emphasis>operation</emphasis> flag which indicates the subcommand to
-be performed.  These are documented below.</para>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Common options</title>
-
-<para>This section lists the options that are common to all
-operations.  These options are allowed for every subcommand, though
-they may not always have an effect.  <phrase condition="manual">See
-also <xref linkend="sec-common-options" /> for a list of common
-options.</phrase></para>
-
-<variablelist>
-
-  <varlistentry xml:id="opt-add-root"><term><option>--add-root</option> <emphasis>path</emphasis></term>
-
-    <listitem><para>Causes the result of a realisation
-    (<option>--realise</option> and <option>--force-realise</option>)
-    to be registered as a root of the garbage collector<phrase
-    condition="manual"> (see <xref linkend="ssec-gc-roots"
-    />)</phrase>.  The root is stored in
-    <emphasis>path</emphasis>, which must be inside a directory
-    that is scanned for roots by the garbage collector (i.e.,
-    typically in a subdirectory of
-    <filename>/nix/var/nix/gcroots/</filename>)
-    <emphasis>unless</emphasis> the <option>--indirect</option> flag
-    is used.</para>
-
-    <para>If there are multiple results, then multiple symlinks will
-    be created by sequentially numbering symlinks beyond the first one
-    (e.g., <filename>foo</filename>, <filename>foo-2</filename>,
-    <filename>foo-3</filename>, and so on).</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--indirect</option></term>
-
-    <listitem>
-
-    <para>In conjunction with <option>--add-root</option>, this option
-    allows roots to be stored <emphasis>outside</emphasis> of the GC
-    roots directory.  This is useful for commands such as
-    <command>nix-build</command> that place a symlink to the build
-    result in the current directory; such a build result should not be
-    garbage-collected unless the symlink is removed.</para>
-
-    <para>The <option>--indirect</option> flag causes a uniquely named
-    symlink to <emphasis>path</emphasis> to be stored in
-    <filename>/nix/var/nix/gcroots/auto/</filename>.  For instance,
-
-    <screen>
-$ nix-store --add-root /home/eelco/bla/result --indirect -r <emphasis>...</emphasis>
-
-$ ls -l /nix/var/nix/gcroots/auto
-lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
-
-$ ls -l /home/eelco/bla/result
-lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r11343n6qd4...-f-spot-0.0.10</screen>
-
-    Thus, when <filename>/home/eelco/bla/result</filename> is removed,
-    the GC root in the <filename>auto</filename> directory becomes a
-    dangling symlink and will be ignored by the collector.</para>
-
-    <warning><para>Note that it is not possible to move or rename
-    indirect GC roots, since the symlink in the
-    <filename>auto</filename> directory will still point to the old
-    location.</para></warning>
-
-    </listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<variablelist condition="manpage">
-  <xi:include href="opt-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='opt-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id='rsec-nix-store-realise'><title>Operation <option>--realise</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--realise</option></arg>
-    <arg choice='plain'><option>-r</option></arg>
-  </group>
-  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  <arg><option>--dry-run</option></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--realise</option> essentially “builds”
-the specified store paths.  Realisation is a somewhat overloaded term:
-
-<itemizedlist>
-
-  <listitem><para>If the store path is a
-  <emphasis>derivation</emphasis>, realisation ensures that the output
-  paths of the derivation are <link
-  linkend="gloss-validity">valid</link> (i.e., the output path and its
-  closure exist in the file system).  This can be done in several
-  ways.  First, it is possible that the outputs are already valid, in
-  which case we are done immediately.  Otherwise, there may be <link
-  linkend="gloss-substitute">substitutes</link> that produce the
-  outputs (e.g., by downloading them).  Finally, the outputs can be
-  produced by performing the build action described by the
-  derivation.</para></listitem>
-
-  <listitem><para>If the store path is not a derivation, realisation
-  ensures that the specified path is valid (i.e., it and its closure
-  exist in the file system).  If the path is already valid, we are
-  done immediately.  Otherwise, the path and any missing paths in its
-  closure may be produced through substitutes.  If there are no
-  (successful) subsitutes, realisation fails.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>The output path of each derivation is printed on standard
-output.  (For non-derivations argument, the argument itself is
-printed.)</para>
-
-<para>The following flags are available:</para>
-
-<variablelist>
-
-  <varlistentry><term><option>--dry-run</option></term>
-
-    <listitem><para>Print on standard error a description of what
-    packages would be built or downloaded, without actually performing
-    the operation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--ignore-unknown</option></term>
-
-    <listitem><para>If a non-derivation path does not have a
-    substitute, then silently ignore it.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--check</option></term>
-
-    <listitem><para>This option allows you to check whether a
-    derivation is deterministic. It rebuilds the specified derivation
-    and checks whether the result is bitwise-identical with the
-    existing outputs, printing an error if that’s not the case. The
-    outputs of the specified derivation must already exist. When used
-    with <option>-K</option>, if an output path is not identical to
-    the corresponding output from the previous build, the new output
-    path is left in
-    <filename>/nix/store/<emphasis>name</emphasis>.check.</filename></para>
-
-    <para>See also the <option>build-repeat</option> configuration
-    option, which repeats a derivation a number of times and prevents
-    its outputs from being registered as “valid” in the Nix store
-    unless they are identical.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<para>Special exit codes:</para>
-
-<variablelist>
-
-  <varlistentry><term><literal>100</literal></term>
-    <listitem><para>Generic build failure, the builder process
-    returned with a non-zero exit code.</para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>101</literal></term>
-    <listitem><para>Build timeout, the build was aborted because it
-    did not complete within the specified <link
-    linkend='conf-timeout'><literal>timeout</literal></link>.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>102</literal></term>
-    <listitem><para>Hash mismatch, the build output was rejected
-    because it does not match the specified <link
-    linkend="fixed-output-drvs"><varname>outputHash</varname></link>.
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>104</literal></term>
-    <listitem><para>Not deterministic, the build succeeded in check
-    mode but the resulting output is not binary reproducable.</para>
-    </listitem>
-  </varlistentry>
-
-</variablelist>
-
-<para>With the <option>--keep-going</option> flag it's possible for
-multiple failures to occur, in this case the 1xx status codes are or combined
-using binary or. <screen>
-1100100
-   ^^^^
-   |||`- timeout
-   ||`-- output hash mismatch
-   |`--- build failure
-   `---- not deterministic
-</screen></para>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>This operation is typically used to build store derivations
-produced by <link
-linkend="sec-nix-instantiate"><command>nix-instantiate</command></link>:
-
-<screen>
-$ nix-store -r $(nix-instantiate ./test.nix)
-/nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1</screen>
-
-This is essentially what <link
-linkend="sec-nix-build"><command>nix-build</command></link> does.</para>
-
-<para>To test whether a previously-built derivation is deterministic:
-
-<screen>
-$ nix-build '&lt;nixpkgs>' -A hello --check -K
-</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id='rsec-nix-store-serve'><title>Operation <option>--serve</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg choice='plain'><option>--serve</option></arg>
-  <arg><option>--write</option></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--serve</option> provides access to
-the Nix store over stdin and stdout, and is intended to be used
-as a means of providing Nix store access to a restricted ssh user.
-</para>
-
-<para>The following flags are available:</para>
-
-<variablelist>
-
-  <varlistentry><term><option>--write</option></term>
-
-    <listitem><para>Allow the connected client to request the realization
-    of derivations. In effect, this can be used to make the host act
-    as a remote builder.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>To turn a host into a build server, the
-<filename>authorized_keys</filename> file can be used to provide build
-access to a given SSH public key:
-
-<screen>
-$ cat &lt;&lt;EOF >>/root/.ssh/authorized_keys
-command="nice -n20 nix-store --serve --write" ssh-rsa AAAAB3NzaC1yc2EAAAA...
-EOF
-</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id='rsec-nix-store-gc'><title>Operation <option>--gc</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg choice='plain'><option>--gc</option></arg>
-  <group>
-    <arg choice='plain'><option>--print-roots</option></arg>
-    <arg choice='plain'><option>--print-live</option></arg>
-    <arg choice='plain'><option>--print-dead</option></arg>
-  </group>
-  <arg><option>--max-freed</option> <emphasis>bytes</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>Without additional flags, the operation <option>--gc</option>
-performs a garbage collection on the Nix store.  That is, all paths in
-the Nix store not reachable via file system references from a set of
-“roots”, are deleted.</para>
-
-<para>The following suboperations may be specified:</para>
-
-<variablelist>
-
-  <varlistentry><term><option>--print-roots</option></term>
-
-    <listitem><para>This operation prints on standard output the set
-    of roots used by the garbage collector.  What constitutes a root
-    is described in <xref linkend="ssec-gc-roots"
-    />.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--print-live</option></term>
-
-    <listitem><para>This operation prints on standard output the set
-    of “live” store paths, which are all the store paths reachable
-    from the roots.  Live paths should never be deleted, since that
-    would break consistency — it would become possible that
-    applications are installed that reference things that are no
-    longer present in the store.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--print-dead</option></term>
-
-    <listitem><para>This operation prints out on standard output the
-    set of “dead” store paths, which is just the opposite of the set
-    of live paths: any path in the store that is not live (with
-    respect to the roots) is dead.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-<para>By default, all unreachable paths are deleted.  The following
-options control what gets deleted and in what order:
-
-<variablelist>
-
-  <varlistentry><term><option>--max-freed</option> <emphasis>bytes</emphasis></term>
-
-    <listitem><para>Keep deleting paths until at least
-    <emphasis>bytes</emphasis> bytes have been deleted, then
-    stop.  The argument <emphasis>bytes</emphasis> can be
-    followed by the multiplicative suffix <literal>K</literal>,
-    <literal>M</literal>, <literal>G</literal> or
-    <literal>T</literal>, denoting KiB, MiB, GiB or TiB
-    units.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-<para>The behaviour of the collector is also influenced by the <link
-linkend="conf-keep-outputs"><literal>keep-outputs</literal></link>
-and <link
-linkend="conf-keep-derivations"><literal>keep-derivations</literal></link>
-variables in the Nix configuration file.</para>
-
-<para>By default, the collector prints the total number of freed bytes
-when it finishes (or when it is interrupted). With
-<option>--print-dead</option>, it prints the number of bytes that would
-be freed.</para>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>To delete all unreachable paths, just do:
-
-<screen>
-$ nix-store --gc
-deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv'
-<emphasis>...</emphasis>
-8825586 bytes freed (8.42 MiB)</screen>
-
-</para>
-
-<para>To delete at least 100 MiBs of unreachable paths:
-
-<screen>
-$ nix-store --gc --max-freed $((100 * 1024 * 1024))</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--delete</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg choice='plain'><option>--delete</option></arg>
-  <arg><option>--ignore-liveness</option></arg>
-  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--delete</option> deletes the store paths
-<emphasis>paths</emphasis> from the Nix store, but only if it is
-safe to do so; that is, when the path is not reachable from a root of
-the garbage collector.  This means that you can only delete paths that
-would also be deleted by <literal>nix-store --gc</literal>.  Thus,
-<literal>--delete</literal> is a more targeted version of
-<literal>--gc</literal>.</para>
-
-<para>With the option <option>--ignore-liveness</option>, reachability
-from the roots is ignored.  However, the path still won’t be deleted
-if there are other paths in the store that refer to it (i.e., depend
-on it).</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --delete /nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4
-0 bytes freed (0.00 MiB)
-error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4' since it is still alive</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id='refsec-nix-store-query'><title>Operation <option>--query</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <group choice='req'>
-    <arg choice='plain'><option>--query</option></arg>
-    <arg choice='plain'><option>-q</option></arg>
-  </group>
-  <group choice='req'>
-    <arg choice='plain'><option>--outputs</option></arg>
-    <arg choice='plain'><option>--requisites</option></arg>
-    <arg choice='plain'><option>-R</option></arg>
-    <arg choice='plain'><option>--references</option></arg>
-    <arg choice='plain'><option>--referrers</option></arg>
-    <arg choice='plain'><option>--referrers-closure</option></arg>
-    <arg choice='plain'><option>--deriver</option></arg>
-    <arg choice='plain'><option>-d</option></arg>
-    <arg choice='plain'><option>--graph</option></arg>
-    <arg choice='plain'><option>--tree</option></arg>
-    <arg choice='plain'><option>--binding</option> <emphasis>name</emphasis></arg>
-    <arg choice='plain'><option>-b</option> <emphasis>name</emphasis></arg>
-    <arg choice='plain'><option>--hash</option></arg>
-    <arg choice='plain'><option>--size</option></arg>
-    <arg choice='plain'><option>--roots</option></arg>
-  </group>
-  <arg><option>--use-output</option></arg>
-  <arg><option>-u</option></arg>
-  <arg><option>--force-realise</option></arg>
-  <arg><option>-f</option></arg>
-  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--query</option> displays various bits of
-information about the store paths .  The queries are described below.  At
-most one query can be specified.  The default query is
-<option>--outputs</option>.</para>
-
-<para>The paths <emphasis>paths</emphasis> may also be symlinks
-from outside of the Nix store, to the Nix store.  In that case, the
-query is applied to the target of the symlink.</para>
-
-
-</refsection>
-
-
-<refsection><title>Common query options</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--use-output</option></term>
-    <term><option>-u</option></term>
-
-    <listitem><para>For each argument to the query that is a store
-    derivation, apply the query to the output path of the derivation
-    instead.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--force-realise</option></term>
-    <term><option>-f</option></term>
-
-    <listitem><para>Realise each argument to the query first (see
-    <link linkend="rsec-nix-store-realise"><command>nix-store
-    --realise</command></link>).</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection xml:id='nixref-queries'><title>Queries</title>
-
-<variablelist>
-
-  <varlistentry><term><option>--outputs</option></term>
-
-    <listitem><para>Prints out the <link
-    linkend="gloss-output-path">output paths</link> of the store
-    derivations <emphasis>paths</emphasis>.  These are the paths
-    that will be produced when the derivation is
-    built.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--requisites</option></term>
-    <term><option>-R</option></term>
-
-    <listitem><para>Prints out the <link
-    linkend="gloss-closure">closure</link> of the store path
-    <emphasis>paths</emphasis>.</para>
-
-    <para>This query has one option:</para>
-
-    <variablelist>
-
-      <varlistentry><term><option>--include-outputs</option></term>
-
-        <listitem><para>Also include the output path of store
-        derivations, and their closures.</para></listitem>
-
-      </varlistentry>
-
-    </variablelist>
-
-    <para>This query can be used to implement various kinds of
-    deployment.  A <emphasis>source deployment</emphasis> is obtained
-    by distributing the closure of a store derivation.  A
-    <emphasis>binary deployment</emphasis> is obtained by distributing
-    the closure of an output path.  A <emphasis>cache
-    deployment</emphasis> (combined source/binary deployment,
-    including binaries of build-time-only dependencies) is obtained by
-    distributing the closure of a store derivation and specifying the
-    option <option>--include-outputs</option>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--references</option></term>
-
-    <listitem><para>Prints the set of <link
-    linkend="gloss-reference">references</link> of the store paths
-    <emphasis>paths</emphasis>, that is, their immediate
-    dependencies.  (For <emphasis>all</emphasis> dependencies, use
-    <option>--requisites</option>.)</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--referrers</option></term>
-
-    <listitem><para>Prints the set of <emphasis>referrers</emphasis> of
-    the store paths <emphasis>paths</emphasis>, that is, the
-    store paths currently existing in the Nix store that refer to one
-    of <emphasis>paths</emphasis>.  Note that contrary to the
-    references, the set of referrers is not constant; it can change as
-    store paths are added or removed.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--referrers-closure</option></term>
-
-    <listitem><para>Prints the closure of the set of store paths
-    <emphasis>paths</emphasis> under the referrers relation; that
-    is, all store paths that directly or indirectly refer to one of
-    <emphasis>paths</emphasis>.  These are all the path currently
-    in the Nix store that are dependent on
-    <emphasis>paths</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--deriver</option></term>
-    <term><option>-d</option></term>
-
-    <listitem><para>Prints the <link
-    linkend="gloss-deriver">deriver</link> of the store paths
-    <emphasis>paths</emphasis>.  If the path has no deriver
-    (e.g., if it is a source file), or if the deriver is not known
-    (e.g., in the case of a binary-only deployment), the string
-    <literal>unknown-deriver</literal> is printed.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--graph</option></term>
-
-    <listitem><para>Prints the references graph of the store paths
-    <emphasis>paths</emphasis> in the format of the
-    <command>dot</command> tool of AT&amp;T's <link
-    xlink:href="http://www.graphviz.org/">Graphviz package</link>.
-    This can be used to visualise dependency graphs.  To obtain a
-    build-time dependency graph, apply this to a store derivation.  To
-    obtain a runtime dependency graph, apply it to an output
-    path.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--tree</option></term>
-
-    <listitem><para>Prints the references graph of the store paths
-    <emphasis>paths</emphasis> as a nested ASCII tree.
-    References are ordered by descending closure size; this tends to
-    flatten the tree, making it more readable.  The query only
-    recurses into a store path when it is first encountered; this
-    prevents a blowup of the tree representation of the
-    graph.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--graphml</option></term>
-
-    <listitem><para>Prints the references graph of the store paths
-    <emphasis>paths</emphasis> in the <link
-    xlink:href="http://graphml.graphdrawing.org/">GraphML</link> file format.
-    This can be used to visualise dependency graphs. To obtain a
-    build-time dependency graph, apply this to a store derivation. To
-    obtain a runtime dependency graph, apply it to an output
-    path.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--binding</option> <emphasis>name</emphasis></term>
-    <term><option>-b</option> <emphasis>name</emphasis></term>
-
-    <listitem><para>Prints the value of the attribute
-    <emphasis>name</emphasis> (i.e., environment variable) of
-    the store derivations <emphasis>paths</emphasis>.  It is an
-    error for a derivation to not have the specified
-    attribute.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--hash</option></term>
-
-    <listitem><para>Prints the SHA-256 hash of the contents of the
-    store paths <emphasis>paths</emphasis> (that is, the hash of
-    the output of <command>nix-store --dump</command> on the given
-    paths).  Since the hash is stored in the Nix database, this is a
-    fast operation.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--size</option></term>
-
-    <listitem><para>Prints the size in bytes of the contents of the
-    store paths <emphasis>paths</emphasis> — to be precise, the
-    size of the output of <command>nix-store --dump</command> on the
-    given paths.  Note that the actual disk space required by the
-    store paths may be higher, especially on filesystems with large
-    cluster sizes.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--roots</option></term>
-
-    <listitem><para>Prints the garbage collector roots that point,
-    directly or indirectly, at the store paths
-    <emphasis>paths</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</refsection>
-
-
-<refsection><title>Examples</title>
-
-<para>Print the closure (runtime dependencies) of the
-<command>svn</command> program in the current user environment:
-
-<screen>
-$ nix-store -qR $(which svn)
-/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
-/nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
-<emphasis>...</emphasis></screen>
-
-</para>
-
-<para>Print the build-time dependencies of <command>svn</command>:
-
-<screen>
-$ nix-store -qR $(nix-store -qd $(which svn))
-/nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv
-/nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh
-/nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv
-<emphasis>... lots of other paths ...</emphasis></screen>
-
-The difference with the previous example is that we ask the closure of
-the derivation (<option>-qd</option>), not the closure of the output
-path that contains <command>svn</command>.</para>
-
-<para>Show the build-time dependencies as a tree:
-
-<screen>
-$ nix-store -q --tree $(nix-store -qd $(which svn))
-/nix/store/7i5082kfb6yjbqdbiwdhhza0am2xvh6c-subversion-1.1.4.drv
-+---/nix/store/d8afh10z72n8l1cr5w42366abiblgn54-builder.sh
-+---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv
-|   +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash
-|   +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh
-<emphasis>...</emphasis></screen>
-
-</para>
-
-<para>Show all paths that depend on the same OpenSSL library as
-<command>svn</command>:
-
-<screen>
-$ nix-store -q --referrers $(nix-store -q --binding openssl $(nix-store -qd $(which svn)))
-/nix/store/23ny9l9wixx21632y2wi4p585qhva1q8-sylpheed-1.0.0
-/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
-/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3
-/nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fx-lynx-2.8.5</screen>
-
-</para>
-
-<para>Show all paths that directly or indirectly depend on the Glibc
-(C library) used by <command>svn</command>:
-
-<screen>
-$ nix-store -q --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}')
-/nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2
-/nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4
-<emphasis>...</emphasis></screen>
-
-Note that <command>ldd</command> is a command that prints out the
-dynamic libraries used by an ELF executable.</para>
-
-<para>Make a picture of the runtime dependency graph of the current
-user environment:
-
-<screen>
-$ nix-store -q --graph ~/.nix-profile | dot -Tps > graph.ps
-$ gv graph.ps</screen>
-
-</para>
-
-<para>Show every garbage collector root that points to a store path
-that depends on <command>svn</command>:
-
-<screen>
-$ nix-store -q --roots $(which svn)
-/nix/var/nix/profiles/default-81-link
-/nix/var/nix/profiles/default-82-link
-/nix/var/nix/profiles/per-user/eelco/profile-97-link
-</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<!--
-<refsection xml:id="rsec-nix-store-reg-val"><title>Operation <option>-XXX-register-validity</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg choice='plain'><option>-XXX-register-validity</option></arg>
-</cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>TODO</para>
-
-</refsection>
-
-</refsection>
--->
-
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--add</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg choice='plain'><option>--add</option></arg>
-  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--add</option> adds the specified paths to
-the Nix store.  It prints the resulting paths in the Nix store on
-standard output.</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --add ./foo.c
-/nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zf-foo.c</screen>
-
-</refsection>
-
-</refsection>
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--add-fixed</option></title>
-
-<refsection><title>Synopsis</title>
-
-<cmdsynopsis>
-  <command>nix-store</command>
-  <arg><option>--recursive</option></arg>
-  <arg choice='plain'><option>--add-fixed</option></arg>
-  <arg choice='plain'><emphasis>algorithm</emphasis></arg>
-  <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-</cmdsynopsis>
-
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--add-fixed</option> adds the specified paths to
-the Nix store.  Unlike <option>--add</option> paths are registered using the
-specified hashing algorithm, resulting in the same output path as a fixed-output
-derivation.  This can be used for sources that are not available from a public
-url or broke since the download expression was written.
-</para>
-
-<para>This operation has the following options:
-
-<variablelist>
-
-  <varlistentry><term><option>--recursive</option></term>
-
-    <listitem><para>
-      Use recursive instead of flat hashing mode, used when adding directories
-      to the store.
-    </para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --add-fixed sha256 ./hello-2.10.tar.gz
-/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz</screen>
-
-</refsection>
-
-</refsection>
-
-
-
-<!--######################################################################-->
-
-<refsection xml:id='refsec-nix-store-verify'><title>Operation <option>--verify</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--verify</option></arg>
-    <arg><option>--check-contents</option></arg>
-    <arg><option>--repair</option></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--verify</option> verifies the internal
-consistency of the Nix database, and the consistency between the Nix
-database and the Nix store.  Any inconsistencies encountered are
-automatically repaired.  Inconsistencies are generally the result of
-the Nix store or database being modified by non-Nix tools, or of bugs
-in Nix itself.</para>
-
-<para>This operation has the following options:
-
-<variablelist>
-
-  <varlistentry><term><option>--check-contents</option></term>
-
-    <listitem><para>Checks that the contents of every valid store path
-    has not been altered by computing a SHA-256 hash of the contents
-    and comparing it with the hash stored in the Nix database at build
-    time.  Paths that have been modified are printed out.  For large
-    stores, <option>--check-contents</option> is obviously quite
-    slow.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><option>--repair</option></term>
-
-    <listitem><para>If any valid path is missing from the store, or
-    (if <option>--check-contents</option> is given) the contents of a
-    valid path has been modified, then try to repair the path by
-    redownloading it.  See <command>nix-store --repair-path</command>
-    for details.</para></listitem>
-
-  </varlistentry>
-
-</variablelist>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--verify-path</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--verify-path</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--verify-path</option> compares the
-contents of the given store paths to their cryptographic hashes stored
-in Nix’s database.  For every changed path, it prints a warning
-message.  The exit status is 0 if no path has changed, and 1
-otherwise.</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<para>To verify the integrity of the <command>svn</command> command and all its dependencies:
-
-<screen>
-$ nix-store --verify-path $(nix-store -qR $(which svn))
-</screen>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--repair-path</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--repair-path</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--repair-path</option> attempts to
-“repair” the specified paths by redownloading them using the available
-substituters.  If no substitutes are available, then repair is not
-possible.</para>
-
-<warning><para>During repair, there is a very small time window during
-which the old path (if it exists) is moved out of the way and replaced
-with the new path.  If repair is interrupted in between, then the
-system may be left in a broken state (e.g., if the path contains a
-critical system component like the GNU C Library).</para></warning>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
-path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified!
-  expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588',
-  got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4'
-
-$ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
-fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
-…
-</screen>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection xml:id='refsec-nix-store-dump'><title>Operation <option>--dump</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--dump</option></arg>
-    <arg choice='plain'><emphasis>path</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--dump</option> produces a NAR (Nix
-ARchive) file containing the contents of the file system tree rooted
-at <emphasis>path</emphasis>.  The archive is written to
-standard output.</para>
-
-<para>A NAR archive is like a TAR or Zip archive, but it contains only
-the information that Nix considers important.  For instance,
-timestamps are elided because all files in the Nix store have their
-timestamp set to 0 anyway.  Likewise, all permissions are left out
-except for the execute bit, because all files in the Nix store have
-444 or 555 permission.</para>
-
-<para>Also, a NAR archive is <emphasis>canonical</emphasis>, meaning
-that “equal” paths always produce the same NAR archive.  For instance,
-directory entries are always sorted so that the actual on-disk order
-doesn’t influence the result.  This means that the cryptographic hash
-of a NAR dump of a path is usable as a fingerprint of the contents of
-the path.  Indeed, the hashes of store paths stored in Nix’s database
-(see <link linkend="refsec-nix-store-query"><literal>nix-store -q
---hash</literal></link>) are SHA-256 hashes of the NAR dump of each
-store path.</para>
-
-<para>NAR archives support filenames of unlimited length and 64-bit
-file sizes.  They can contain regular files, directories, and symbolic
-links, but not other types of files (such as device nodes).</para>
-
-<para>A Nix archive can be unpacked using <literal>nix-store
---restore</literal>.</para>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--restore</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--restore</option></arg>
-    <arg choice='plain'><emphasis>path</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--restore</option> unpacks a NAR archive
-to <emphasis>path</emphasis>, which must not already exist.  The
-archive is read from standard input.</para>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection xml:id='refsec-nix-store-export'><title>Operation <option>--export</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--export</option></arg>
-    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--export</option> writes a serialisation
-of the specified store paths to standard output in a format that can
-be imported into another Nix store with <command
-linkend="refsec-nix-store-import">nix-store --import</command>.  This
-is like <command linkend="refsec-nix-store-dump">nix-store
---dump</command>, except that the NAR archive produced by that command
-doesn’t contain the necessary meta-information to allow it to be
-imported into another Nix store (namely, the set of references of the
-path).</para>
-
-<para>This command does not produce a <emphasis>closure</emphasis> of
-the specified paths, so if a store path references other store paths
-that are missing in the target Nix store, the import will fail.  To
-copy a whole closure, do something like:
-
-<screen>
-$ nix-store --export $(nix-store -qR <emphasis>paths</emphasis>) > out</screen>
-
-To import the whole closure again, run:
-
-<screen>
-$ nix-store --import &lt; out</screen>
-
-</para>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection xml:id='refsec-nix-store-import'><title>Operation <option>--import</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--import</option></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--import</option> reads a serialisation of
-a set of store paths produced by <command
-linkend="refsec-nix-store-export">nix-store --export</command> from
-standard input and adds those store paths to the Nix store.  Paths
-that already exist in the Nix store are ignored.  If a path refers to
-another path that doesn’t exist in the Nix store, the import
-fails.</para>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--optimise</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--optimise</option></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--optimise</option> reduces Nix store disk
-space usage by finding identical files in the store and hard-linking
-them to each other.  It typically reduces the size of the store by
-something like 25-35%.  Only regular files and symlinks are
-hard-linked in this manner.  Files are considered identical when they
-have the same NAR archive serialisation: that is, regular files must
-have the same contents and permission (executable or non-executable),
-and symlinks must have the same contents.</para>
-
-<para>After completion, or when the command is interrupted, a report
-on the achieved savings is printed on standard error.</para>
-
-<para>Use <option>-vv</option> or <option>-vvv</option> to get some
-progress indication.</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --optimise
-hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
-<emphasis>...</emphasis>
-541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
-there are 114486 files with equal contents out of 215894 files in total
-</screen>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--read-log</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <group choice='req'>
-      <arg choice='plain'><option>--read-log</option></arg>
-      <arg choice='plain'><option>-l</option></arg>
-    </group>
-    <arg choice='plain' rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--read-log</option> prints the build log
-of the specified store paths on standard output.  The build log is
-whatever the builder of a derivation wrote to standard output and
-standard error.  If a store path is not a derivation, the deriver of
-the store path is used.</para>
-
-<para>Build logs are kept in
-<filename>/nix/var/log/nix/drvs</filename>.  However, there is no
-guarantee that a build log is available for any particular store path.
-For instance, if the path was downloaded as a pre-built binary through
-a substitute, then the log is unavailable.</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store -l $(which ktorrent)
-building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66ph1-ktorrent-2.2.1
-unpacking sources
-unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz
-ktorrent-2.2.1/
-ktorrent-2.2.1/NEWS
-<emphasis>...</emphasis>
-</screen>
-
-</refsection>
-
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--dump-db</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--dump-db</option></arg>
-    <arg rep='repeat'><emphasis>paths</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--dump-db</option> writes a dump of the
-Nix database to standard output.  It can be loaded into an empty Nix
-store using <option>--load-db</option>.  This is useful for making
-backups and when migrating to different database schemas.</para>
-
-<para>By default, <option>--dump-db</option> will dump the entire Nix
-database.  When one or more store paths is passed, only the subset of
-the Nix database for those store paths is dumped.  As with
-<option>--export</option>, the user is responsible for passing all the
-store paths for a closure.  See <option>--export</option> for an
-example.</para>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--load-db</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--load-db</option></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--load-db</option> reads a dump of the Nix
-database created by <option>--dump-db</option> from standard input and
-loads it into the Nix database.</para>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection><title>Operation <option>--print-env</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'><option>--print-env</option></arg>
-    <arg choice='plain'><emphasis>drvpath</emphasis></arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>The operation <option>--print-env</option> prints out the
-environment of a derivation in a format that can be evaluated by a
-shell.  The command line arguments of the builder are placed in the
-variable <literal>_args</literal>.</para>
-
-</refsection>
-
-<refsection><title>Example</title>
-
-<screen>
-$ nix-store --print-env $(nix-instantiate '&lt;nixpkgs>' -A firefox)
-<emphasis>…</emphasis>
-export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2'
-export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
-export system; system='x86_64-linux'
-export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh'
-</screen>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection xml:id='rsec-nix-store-generate-binary-cache-key'><title>Operation <option>--generate-binary-cache-key</option></title>
-
-<refsection>
-  <title>Synopsis</title>
-  <cmdsynopsis>
-    <command>nix-store</command>
-    <arg choice='plain'>
-      <option>--generate-binary-cache-key</option>
-      <option>key-name</option>
-      <option>secret-key-file</option>
-      <option>public-key-file</option>
-    </arg>
-  </cmdsynopsis>
-</refsection>
-
-<refsection><title>Description</title>
-
-<para>This command generates an <link
-xlink:href="http://ed25519.cr.yp.to/">Ed25519 key pair</link> that can
-be used to create a signed binary cache. It takes three mandatory
-parameters:
-
-<orderedlist>
-
-  <listitem><para>A key name, such as
-  <literal>cache.example.org-1</literal>, that is used to look up keys
-  on the client when it verifies signatures. It can be anything, but
-  it’s suggested to use the host name of your cache
-  (e.g. <literal>cache.example.org</literal>) with a suffix denoting
-  the number of the key (to be incremented every time you need to
-  revoke a key).</para></listitem>
-
-  <listitem><para>The file name where the secret key is to be
-  stored.</para></listitem>
-
-  <listitem><para>The file name where the public key is to be
-  stored.</para></listitem>
-
-</orderedlist>
-
-</para>
-
-</refsection>
-
-</refsection>
-
-
-<!--######################################################################-->
-
-<refsection condition="manpage"><title>Environment variables</title>
-
-<variablelist>
-  <xi:include href="env-common.xml#xmlns(db=http://docbook.org/ns/docbook)xpointer(//db:variablelist[@xml:id='env-common']/*)" />
-</variablelist>
-
-</refsection>
-
-
-</refentry>
diff --git a/doc/manual/command-ref/opt-common-syn.xml b/doc/manual/command-ref/opt-common-syn.xml
deleted file mode 100644
index 6b7b5c833..000000000
--- a/doc/manual/command-ref/opt-common-syn.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<nop xmlns="http://docbook.org/ns/docbook">
-
-<arg><option>--help</option></arg>
-<arg><option>--version</option></arg>
-<arg rep='repeat'>
-  <group choice='req'>
-    <arg choice='plain'><option>--verbose</option></arg>
-    <arg choice='plain'><option>-v</option></arg>
-  </group>
-</arg>
-<arg>
-  <arg choice='plain'><option>--quiet</option></arg>
-</arg>
-<arg>
-  <option>--log-format</option>
-  <emphasis>format</emphasis>
-</arg>
-<arg>
-  <group choice='plain'>
-    <arg choice='plain'><option>--no-build-output</option></arg>
-    <arg choice='plain'><option>-Q</option></arg>
-  </group>
-</arg>
-<arg>
-  <group choice='req'>
-    <arg choice='plain'><option>--max-jobs</option></arg>
-    <arg choice='plain'><option>-j</option></arg>
-  </group>
-  <emphasis>number</emphasis>
-</arg>
-<arg>
-  <option>--cores</option>
-  <emphasis>number</emphasis>
-</arg>
-<arg>
-  <option>--max-silent-time</option>
-  <emphasis>number</emphasis>
-</arg>
-<arg>
-  <option>--timeout</option>
-  <emphasis>number</emphasis>
-</arg>
-<arg>
-  <group choice='plain'>
-    <arg choice='plain'><option>--keep-going</option></arg>
-    <arg choice='plain'><option>-k</option></arg>
-  </group>
-</arg>
-<arg>
-  <group choice='plain'>
-    <arg choice='plain'><option>--keep-failed</option></arg>
-    <arg choice='plain'><option>-K</option></arg>
-  </group>
-</arg>
-<arg><option>--fallback</option></arg>
-<arg><option>--readonly-mode</option></arg>
-<arg>
-  <option>-I</option>
-  <emphasis>path</emphasis>
-</arg>
-<arg>
-  <option>--option</option>
-  <emphasis>name</emphasis>
-  <emphasis>value</emphasis>
-</arg>
-<sbr />
-
-</nop>
diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml
deleted file mode 100644
index a095039b9..000000000
--- a/doc/manual/command-ref/opt-common.xml
+++ /dev/null
@@ -1,405 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook" xml:id="sec-common-options">
-
-<title>Common Options</title>
-
-
-<para>Most Nix commands accept the following command-line options:</para>
-
-<variablelist xml:id="opt-common">
-
-<varlistentry><term><option>--help</option></term>
-
-  <listitem><para>Prints out a summary of the command syntax and
-  exits.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--version</option></term>
-
-  <listitem><para>Prints out the Nix version number on standard output
-  and exits.</para></listitem>
-</varlistentry>
-
-
-<varlistentry><term><option>--verbose</option> / <option>-v</option></term>
-
-  <listitem>
-
-  <para>Increases the level of verbosity of diagnostic messages
-  printed on standard error.  For each Nix operation, the information
-  printed on standard output is well-defined; any diagnostic
-  information is printed on standard error, never on standard
-  output.</para>
-
-  <para>This option may be specified repeatedly.  Currently, the
-  following verbosity levels exist:</para>
-
-  <variablelist>
-
-    <varlistentry><term>0</term>
-    <listitem><para>“Errors only”: only print messages
-    explaining why the Nix invocation failed.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>1</term>
-    <listitem><para>“Informational”: print
-    <emphasis>useful</emphasis> messages about what Nix is doing.
-    This is the default.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>2</term>
-    <listitem><para>“Talkative”: print more informational
-    messages.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>3</term>
-    <listitem><para>“Chatty”: print even more
-    informational messages.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>4</term>
-    <listitem><para>“Debug”: print debug
-    information.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>5</term>
-    <listitem><para>“Vomit”: print vast amounts of debug
-    information.</para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  </listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--quiet</option></term>
-
-  <listitem>
-
-  <para>Decreases the level of verbosity of diagnostic messages
-  printed on standard error.  This is the inverse option to
-  <option>-v</option> / <option>--verbose</option>.
-  </para>
-
-  <para>This option may be specified repeatedly.  See the previous
-  verbosity levels list.</para>
-
-  </listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-log-format"><term><option>--log-format</option> <emphasis>format</emphasis></term>
-
-  <listitem>
-
-  <para>This option can be used to change the output of the log format, with
-  <emphasis>format</emphasis> being one of:</para>
-
-  <variablelist>
-
-    <varlistentry><term>raw</term>
-    <listitem><para>This is the raw format, as outputted by nix-build.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>internal-json</term>
-    <listitem><para>Outputs the logs in a structured manner. NOTE: the json schema is not guarantees to be stable between releases.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>bar</term>
-    <listitem><para>Only display a progress bar during the builds.</para></listitem>
-    </varlistentry>
-
-    <varlistentry><term>bar-with-logs</term>
-    <listitem><para>Display the raw logs, with the progress bar at the bottom.</para></listitem>
-    </varlistentry>
-
-  </variablelist>
-
-  </listitem>
-
-</varlistentry>
-
-<varlistentry><term><option>--no-build-output</option> / <option>-Q</option></term>
-
-  <listitem><para>By default, output written by builders to standard
-  output and standard error is echoed to the Nix command's standard
-  error.  This option suppresses this behaviour.  Note that the
-  builder's standard output and error are always written to a log file
-  in
-  <filename><emphasis>prefix</emphasis>/nix/var/log/nix</filename>.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-max-jobs"><term><option>--max-jobs</option> / <option>-j</option>
-<emphasis>number</emphasis></term>
-
-  <listitem>
-
-  <para>Sets the maximum number of build jobs that Nix will
-  perform in parallel to the specified number.  Specify
-  <literal>auto</literal> to use the number of CPUs in the system.
-  The default is specified by the <link
-  linkend='conf-max-jobs'><literal>max-jobs</literal></link>
-  configuration setting, which itself defaults to
-  <literal>1</literal>.  A higher value is useful on SMP systems or to
-  exploit I/O latency.</para>
-
-  <para> Setting it to <literal>0</literal> disallows building on the local
-  machine, which is useful when you want builds to happen only on remote
-  builders.</para>
-
-  </listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-cores"><term><option>--cores</option></term>
-
-  <listitem><para>Sets the value of the <literal>NIX_BUILD_CORES</literal>
-  environment variable in the invocation of builders.  Builders can
-  use this variable at their discretion to control the maximum amount
-  of parallelism.  For instance, in Nixpkgs, if the derivation
-  attribute <varname>enableParallelBuilding</varname> is set to
-  <literal>true</literal>, the builder passes the
-  <option>-j<emphasis>N</emphasis></option> flag to GNU Make.
-  It defaults to the value of the <link
-  linkend='conf-cores'><literal>cores</literal></link>
-  configuration setting, if set, or <literal>1</literal> otherwise.
-  The value <literal>0</literal> means that the builder should use all
-  available CPU cores in the system.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-max-silent-time"><term><option>--max-silent-time</option></term>
-
-  <listitem><para>Sets the maximum number of seconds that a builder
-  can go without producing any data on standard output or standard
-  error.  The default is specified by the <link
-  linkend='conf-max-silent-time'><literal>max-silent-time</literal></link>
-  configuration setting.  <literal>0</literal> means no
-  time-out.</para></listitem>
-
-</varlistentry>
-
-<varlistentry xml:id="opt-timeout"><term><option>--timeout</option></term>
-
-  <listitem><para>Sets the maximum number of seconds that a builder
-  can run.  The default is specified by the <link
-  linkend='conf-timeout'><literal>timeout</literal></link>
-  configuration setting.  <literal>0</literal> means no
-  timeout.</para></listitem>
-
-</varlistentry>
-
-<varlistentry><term><option>--keep-going</option> / <option>-k</option></term>
-
-  <listitem><para>Keep going in case of failed builds, to the
-  greatest extent possible.  That is, if building an input of some
-  derivation fails, Nix will still build the other inputs, but not the
-  derivation itself.  Without this option, Nix stops if any build
-  fails (except for builds of substitutes), possibly killing builds in
-  progress (in case of parallel or distributed builds).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--keep-failed</option> / <option>-K</option></term>
-
-  <listitem><para>Specifies that in case of a build failure, the
-  temporary directory (usually in <filename>/tmp</filename>) in which
-  the build takes place should not be deleted.  The path of the build
-  directory is printed as an informational message.
-    </para>
-  </listitem>
-</varlistentry>
-
-
-<varlistentry><term><option>--fallback</option></term>
-
-  <listitem>
-
-  <para>Whenever Nix attempts to build a derivation for which
-  substitutes are known for each output path, but realising the output
-  paths through the substitutes fails, fall back on building the
-  derivation.</para>
-
-  <para>The most common scenario in which this is useful is when we
-  have registered substitutes in order to perform binary distribution
-  from, say, a network repository.  If the repository is down, the
-  realisation of the derivation will fail.  When this option is
-  specified, Nix will build the derivation instead.  Thus,
-  installation from binaries falls back on installation from source.
-  This option is not the default since it is generally not desirable
-  for a transient failure in obtaining the substitutes to lead to a
-  full build from source (with the related consumption of
-  resources).</para>
-
-  </listitem>
-
-</varlistentry>
-
-<varlistentry><term><option>--no-build-hook</option></term>
-
-  <listitem>
-
-  <para>Disables the build hook mechanism.  This allows to ignore remote
-  builders if they are setup on the machine.</para>
-
-  <para>It's useful in cases where the bandwidth between the client and the
-  remote builder is too low.  In that case it can take more time to upload the
-  sources to the remote builder and fetch back the result than to do the
-  computation locally.</para>
-
-  </listitem>
-
-</varlistentry>
-
-
-
-<varlistentry><term><option>--readonly-mode</option></term>
-
-  <listitem><para>When this option is used, no attempt is made to open
-  the Nix database.  Most Nix operations do need database access, so
-  those operations will fail.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--arg</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
-
-  <listitem><para>This option is accepted by
-  <command>nix-env</command>, <command>nix-instantiate</command>,
-  <command>nix-shell</command> and <command>nix-build</command>.
-  When evaluating Nix expressions, the expression evaluator will
-  automatically try to call functions that
-  it encounters.  It can automatically call functions for which every
-  argument has a <link linkend='ss-functions'>default value</link>
-  (e.g., <literal>{ <emphasis>argName</emphasis> ?
-  <emphasis>defaultValue</emphasis> }:
-  <emphasis>...</emphasis></literal>).  With
-  <option>--arg</option>, you can also call functions that have
-  arguments without a default value (or override a default value).
-  That is, if the evaluator encounters a function with an argument
-  named <emphasis>name</emphasis>, it will call it with value
-  <emphasis>value</emphasis>.</para>
-
-  <para>For instance, the top-level <literal>default.nix</literal> in
-  Nixpkgs is actually a function:
-
-<programlisting>
-{ # The system (e.g., `i686-linux') for which to build the packages.
-  system ? builtins.currentSystem
-  <emphasis>...</emphasis>
-}: <emphasis>...</emphasis></programlisting>
-
-  So if you call this Nix expression (e.g., when you do
-  <literal>nix-env -i <emphasis>pkgname</emphasis></literal>),
-  the function will be called automatically using the value <link
-  linkend='builtin-currentSystem'><literal>builtins.currentSystem</literal></link>
-  for the <literal>system</literal> argument.  You can override this
-  using <option>--arg</option>, e.g., <literal>nix-env -i
-  <emphasis>pkgname</emphasis> --arg system
-  \"i686-freebsd\"</literal>.  (Note that since the argument is a Nix
-  string literal, you have to escape the quotes.)</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--argstr</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
-
-  <listitem><para>This option is like <option>--arg</option>, only the
-  value is not a Nix expression but a string.  So instead of
-  <literal>--arg system \"i686-linux\"</literal> (the outer quotes are
-  to keep the shell happy) you can say <literal>--argstr system
-  i686-linux</literal>.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-attr"><term><option>--attr</option> / <option>-A</option>
-<emphasis>attrPath</emphasis></term>
-
-  <listitem><para>Select an attribute from the top-level Nix
-  expression being evaluated.  (<command>nix-env</command>,
-  <command>nix-instantiate</command>, <command>nix-build</command> and
-  <command>nix-shell</command> only.)  The <emphasis>attribute
-  path</emphasis> <emphasis>attrPath</emphasis> is a sequence of
-  attribute names separated by dots.  For instance, given a top-level
-  Nix expression <emphasis>e</emphasis>, the attribute path
-  <literal>xorg.xorgserver</literal> would cause the expression
-  <literal><emphasis>e</emphasis>.xorg.xorgserver</literal> to
-  be used.  See <link
-  linkend='refsec-nix-env-install-examples'><command>nix-env
-  --install</command></link> for some concrete examples.</para>
-
-  <para>In addition to attribute names, you can also specify array
-  indices.  For instance, the attribute path
-  <literal>foo.3.bar</literal> selects the <literal>bar</literal>
-  attribute of the fourth element of the array in the
-  <literal>foo</literal> attribute of the top-level
-  expression.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--expr</option> / <option>-E</option></term>
-
-  <listitem><para>Interpret the command line arguments as a list of
-  Nix expressions to be parsed and evaluated, rather than as a list
-  of file names of Nix expressions.
-  (<command>nix-instantiate</command>, <command>nix-build</command>
-  and <command>nix-shell</command> only.)</para>
-
-  <para>For <command>nix-shell</command>, this option is commonly used
-  to give you a shell in which you can build the packages returned
-  by the expression. If you want to get a shell which contain the
-  <emphasis>built</emphasis> packages ready for use, give your
-  expression to the <command>nix-shell -p</command> convenience flag
-  instead.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry xml:id="opt-I"><term><option>-I</option> <emphasis>path</emphasis></term>
-
-  <listitem><para>Add a path to the Nix expression search path.  This
-  option may be given multiple times.  See the <literal
-  linkend="env-NIX_PATH">NIX_PATH</literal> environment variable for
-  information on the semantics of the Nix search path.  Paths added
-  through <option>-I</option> take precedence over
-  <literal>NIX_PATH</literal>.</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--option</option> <emphasis>name</emphasis> <emphasis>value</emphasis></term>
-
-  <listitem><para>Set the Nix configuration option
-  <emphasis>name</emphasis> to <emphasis>value</emphasis>.
-  This overrides settings in the Nix configuration file (see
-  <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>).</para></listitem>
-
-</varlistentry>
-
-
-<varlistentry><term><option>--repair</option></term>
-
-  <listitem><para>Fix corrupted or missing store paths by
-  redownloading or rebuilding them.  Note that this is slow because it
-  requires computing a cryptographic hash of the contents of every
-  path in the closure of the build.  Also note the warning under
-  <command>nix-store --repair-path</command>.</para></listitem>
-
-</varlistentry>
-
-
-</variablelist>
-
-
-</chapter>
diff --git a/doc/manual/command-ref/opt-inst-syn.xml b/doc/manual/command-ref/opt-inst-syn.xml
deleted file mode 100644
index e324a5e6d..000000000
--- a/doc/manual/command-ref/opt-inst-syn.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<nop xmlns="http://docbook.org/ns/docbook">
-  
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--prebuilt-only</option></arg>
-      <arg choice='plain'><option>-b</option></arg>
-    </group>
-  </arg>
-  
-  <arg>
-    <group choice='req'>
-      <arg choice='plain'><option>--attr</option></arg>
-      <arg choice='plain'><option>-A</option></arg>
-    </group>
-  </arg>
-
-  <arg><option>--from-expression</option></arg>
-  <arg><option>-E</option></arg>
-    
-  <arg><option>--from-profile</option> <emphasis>path</emphasis></arg>
-
-</nop>
diff --git a/doc/manual/command-ref/utilities.xml b/doc/manual/command-ref/utilities.xml
deleted file mode 100644
index 893f5b5b5..000000000
--- a/doc/manual/command-ref/utilities.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='ch-utilities'>
-
-<title>Utilities</title>
-
-<para>This section lists utilities that you can use when you
-work with Nix.</para>
-
-<xi:include href="nix-channel.xml" />
-<xi:include href="nix-collect-garbage.xml" />
-<xi:include href="nix-copy-closure.xml" />
-<xi:include href="nix-daemon.xml" />
-<xi:include href="nix-hash.xml" />
-<xi:include href="nix-instantiate.xml" />
-<xi:include href="nix-prefetch-url.xml" />
-
-</chapter>
diff --git a/doc/manual/expressions/advanced-attributes.xml b/doc/manual/expressions/advanced-attributes.xml
deleted file mode 100644
index 794d020d9..000000000
--- a/doc/manual/expressions/advanced-attributes.xml
+++ /dev/null
@@ -1,351 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-advanced-attributes">
-
-<title>Advanced Attributes</title>
-
-<para>Derivations can declare some infrequently used optional
-attributes.</para>
-
-<variablelist>
-
-  <varlistentry xml:id="adv-attr-allowedReferences"><term><varname>allowedReferences</varname></term>
-
-    <listitem><para>The optional attribute
-    <varname>allowedReferences</varname> specifies a list of legal
-    references (dependencies) of the output of the builder.  For
-    example,
-
-<programlisting>
-allowedReferences = [];
-</programlisting>
-
-    enforces that the output of a derivation cannot have any runtime
-    dependencies on its inputs.  To allow an output to have a runtime
-    dependency on itself, use <literal>"out"</literal> as a list item.
-    This is used in NixOS to check that generated files such as
-    initial ramdisks for booting Linux don’t have accidental
-    dependencies on other paths in the Nix store.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-allowedRequisites"><term><varname>allowedRequisites</varname></term>
-
-    <listitem><para>This attribute is similar to
-    <varname>allowedReferences</varname>, but it specifies the legal
-    requisites of the whole closure, so all the dependencies
-    recursively.  For example,
-
-<programlisting>
-allowedRequisites = [ foobar ];
-</programlisting>
-
-    enforces that the output of a derivation cannot have any other
-    runtime dependency than <varname>foobar</varname>, and in addition
-    it enforces that <varname>foobar</varname> itself doesn't
-    introduce any other dependency itself.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id="adv-attr-disallowedReferences"><term><varname>disallowedReferences</varname></term>
-
-    <listitem><para>The optional attribute
-    <varname>disallowedReferences</varname> specifies a list of illegal
-    references (dependencies) of the output of the builder.  For
-    example,
-
-<programlisting>
-disallowedReferences = [ foo ];
-</programlisting>
-
-    enforces that the output of a derivation cannot have a direct runtime
-    dependencies on the derivation <varname>foo</varname>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-disallowedRequisites"><term><varname>disallowedRequisites</varname></term>
-
-    <listitem><para>This attribute is similar to
-    <varname>disallowedReferences</varname>, but it specifies illegal
-    requisites for the whole closure, so all the dependencies
-    recursively.  For example,
-
-<programlisting>
-disallowedRequisites = [ foobar ];
-</programlisting>
-
-    enforces that the output of a derivation cannot have any
-    runtime dependency on <varname>foobar</varname> or any other derivation
-    depending recursively on <varname>foobar</varname>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-exportReferencesGraph"><term><varname>exportReferencesGraph</varname></term>
-
-    <listitem><para>This attribute allows builders access to the
-    references graph of their inputs.  The attribute is a list of
-    inputs in the Nix store whose references graph the builder needs
-    to know.  The value of this attribute should be a list of pairs
-    <literal>[ <emphasis>name1</emphasis>
-    <emphasis>path1</emphasis> <emphasis>name2</emphasis>
-    <emphasis>path2</emphasis> <emphasis>...</emphasis>
-    ]</literal>.  The references graph of each
-    <emphasis>pathN</emphasis> will be stored in a text file
-    <emphasis>nameN</emphasis> in the temporary build directory.
-    The text files have the format used by <command>nix-store
-    --register-validity</command> (with the deriver fields left
-    empty).  For example, when the following derivation is built:
-
-<programlisting>
-derivation {
-  ...
-  exportReferencesGraph = [ "libfoo-graph" libfoo ];
-};
-</programlisting>
-
-    the references graph of <literal>libfoo</literal> is placed in the
-    file <filename>libfoo-graph</filename> in the temporary build
-    directory.</para>
-
-    <para><varname>exportReferencesGraph</varname> is useful for
-    builders that want to do something with the closure of a store
-    path.  Examples include the builders in NixOS that generate the
-    initial ramdisk for booting Linux (a <command>cpio</command>
-    archive containing the closure of the boot script) and the
-    ISO-9660 image for the installation CD (which is populated with a
-    Nix store containing the closure of a bootable NixOS
-    configuration).</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-impureEnvVars"><term><varname>impureEnvVars</varname></term>
-
-    <listitem><para>This attribute allows you to specify a list of
-    environment variables that should be passed from the environment
-    of the calling user to the builder.  Usually, the environment is
-    cleared completely when the builder is executed, but with this
-    attribute you can allow specific environment variables to be
-    passed unmodified.  For example, <function>fetchurl</function> in
-    Nixpkgs has the line
-
-<programlisting>
-impureEnvVars = [ "http_proxy" "https_proxy" <emphasis>...</emphasis> ];
-</programlisting>
-
-    to make it use the proxy server configuration specified by the
-    user in the environment variables <literal>http_proxy</literal> and
-    friends.</para>
-
-    <para>This attribute is only allowed in <link
-    linkend="fixed-output-drvs">fixed-output derivations</link>, where
-    impurities such as these are okay since (the hash of) the output
-    is known in advance.  It is ignored for all other
-    derivations.</para>
-
-    <warning><para><varname>impureEnvVars</varname> implementation takes
-    environment variables from the current builder process. When a daemon is
-    building its environmental variables are used. Without the daemon, the
-    environmental variables come from the environment of the
-    <command>nix-build</command>.</para></warning></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="fixed-output-drvs">
-    <term xml:id="adv-attr-outputHash"><varname>outputHash</varname></term>
-    <term xml:id="adv-attr-outputHashAlgo"><varname>outputHashAlgo</varname></term>
-    <term xml:id="adv-attr-outputHashMode"><varname>outputHashMode</varname></term>
-
-    <listitem><para>These attributes declare that the derivation is a
-    so-called <emphasis>fixed-output derivation</emphasis>, which
-    means that a cryptographic hash of the output is already known in
-    advance.  When the build of a fixed-output derivation finishes,
-    Nix computes the cryptographic hash of the output and compares it
-    to the hash declared with these attributes.  If there is a
-    mismatch, the build fails.</para>
-
-    <para>The rationale for fixed-output derivations is derivations
-    such as those produced by the <function>fetchurl</function>
-    function.  This function downloads a file from a given URL.  To
-    ensure that the downloaded file has not been modified, the caller
-    must also specify a cryptographic hash of the file.  For example,
-
-<programlisting>
-fetchurl {
-  url = "http://ftp.gnu.org/pub/gnu/hello/hello-2.1.1.tar.gz";
-  sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-}
-</programlisting>
-
-    It sometimes happens that the URL of the file changes, e.g.,
-    because servers are reorganised or no longer available.  We then
-    must update the call to <function>fetchurl</function>, e.g.,
-
-<programlisting>
-fetchurl {
-  url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-  sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-}
-</programlisting>
-
-    If a <function>fetchurl</function> derivation was treated like a
-    normal derivation, the output paths of the derivation and
-    <emphasis>all derivations depending on it</emphasis> would change.
-    For instance, if we were to change the URL of the Glibc source
-    distribution in Nixpkgs (a package on which almost all other
-    packages depend) massive rebuilds would be needed.  This is
-    unfortunate for a change which we know cannot have a real effect
-    as it propagates upwards through the dependency graph.</para>
-
-    <para>For fixed-output derivations, on the other hand, the name of
-    the output path only depends on the <varname>outputHash*</varname>
-    and <varname>name</varname> attributes, while all other attributes
-    are ignored for the purpose of computing the output path.  (The
-    <varname>name</varname> attribute is included because it is part
-    of the path.)</para>
-
-    <para>As an example, here is the (simplified) Nix expression for
-    <varname>fetchurl</varname>:
-
-<programlisting>
-{ stdenv, curl }: # The <command>curl</command> program is used for downloading.
-
-{ url, sha256 }:
-
-stdenv.mkDerivation {
-  name = baseNameOf (toString url);
-  builder = ./builder.sh;
-  buildInputs = [ curl ];
-
-  # This is a fixed-output derivation; the output must be a regular
-  # file with SHA256 hash <varname>sha256</varname>.
-  outputHashMode = "flat";
-  outputHashAlgo = "sha256";
-  outputHash = sha256;
-
-  inherit url;
-}
-</programlisting>
-
-    </para>
-
-    <para>The <varname>outputHashAlgo</varname> attribute specifies
-    the hash algorithm used to compute the hash.  It can currently be
-    <literal>"sha1"</literal>, <literal>"sha256"</literal> or
-    <literal>"sha512"</literal>.</para>
-
-    <para>The <varname>outputHashMode</varname> attribute determines
-    how the hash is computed.  It must be one of the following two
-    values:
-
-    <variablelist>
-
-      <varlistentry><term><literal>"flat"</literal></term>
-
-        <listitem><para>The output must be a non-executable regular
-        file.  If it isn’t, the build fails.  The hash is simply
-        computed over the contents of that file (so it’s equal to what
-        Unix commands like <command>sha256sum</command> or
-        <command>sha1sum</command> produce).</para>
-
-        <para>This is the default.</para></listitem>
-
-      </varlistentry>
-
-      <varlistentry><term><literal>"recursive"</literal></term>
-
-        <listitem><para>The hash is computed over the NAR archive dump
-        of the output (i.e., the result of <link
-        linkend="refsec-nix-store-dump"><command>nix-store
-        --dump</command></link>).  In this case, the output can be
-        anything, including a directory tree.</para></listitem>
-
-      </varlistentry>
-
-    </variablelist>
-
-    </para>
-
-    <para>The <varname>outputHash</varname> attribute, finally, must
-    be a string containing the hash in either hexadecimal or base-32
-    notation.  (See the <link
-    linkend="sec-nix-hash"><command>nix-hash</command> command</link>
-    for information about converting to and from base-32
-    notation.)</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-passAsFile"><term><varname>passAsFile</varname></term>
-
-    <listitem><para>A list of names of attributes that should be
-    passed via files rather than environment variables.  For example,
-    if you have
-
-    <programlisting>
-passAsFile = ["big"];
-big = "a very long string";
-    </programlisting>
-
-    then when the builder runs, the environment variable
-    <literal>bigPath</literal> will contain the absolute path to a
-    temporary file containing <literal>a very long
-    string</literal>. That is, for any attribute
-    <emphasis>x</emphasis> listed in
-    <varname>passAsFile</varname>, Nix will pass an environment
-    variable <literal><emphasis>x</emphasis>Path</literal> holding
-    the path of the file containing the value of attribute
-    <emphasis>x</emphasis>. This is useful when you need to pass
-    large strings to a builder, since most operating systems impose a
-    limit on the size of the environment (typically, a few hundred
-    kilobyte).</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-preferLocalBuild"><term><varname>preferLocalBuild</varname></term>
-
-    <listitem><para>If this attribute is set to
-    <literal>true</literal> and <link
-    linkend="chap-distributed-builds">distributed building is
-    enabled</link>, then, if possible, the derivaton will be built
-    locally instead of forwarded to a remote machine.  This is
-    appropriate for trivial builders where the cost of doing a
-    download or remote build would exceed the cost of building
-    locally.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id="adv-attr-allowSubstitutes"><term><varname>allowSubstitutes</varname></term>
-
-    <listitem>
-    <para>If this attribute is set to
-    <literal>false</literal>, then Nix will always build this
-    derivation; it will not try to substitute its outputs. This is
-    useful for very trivial derivations (such as
-    <function>writeText</function> in Nixpkgs) that are cheaper to
-    build than to substitute from a binary cache.</para>
-
-    <note><para>You need to have a builder configured which satisfies
-    the derivation’s <literal>system</literal> attribute, since the
-    derivation cannot be substituted. Thus it is usually a good idea
-    to align <literal>system</literal> with
-    <literal>builtins.currentSystem</literal> when setting
-    <literal>allowSubstitutes</literal> to <literal>false</literal>.
-    For most trivial derivations this should be the case.
-    </para></note>
-    </listitem>
-
-  </varlistentry>
-
-
-</variablelist>
-
-</section>
diff --git a/doc/manual/expressions/arguments-variables.xml b/doc/manual/expressions/arguments-variables.xml
deleted file mode 100644
index a4375c777..000000000
--- a/doc/manual/expressions/arguments-variables.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-arguments'>
-
-<title>Arguments and Variables</title>
-
-<para>The Nix expression in <xref linkend='ex-hello-nix' /> is a
-function; it is missing some arguments that have to be filled in
-somewhere.  In the Nix Packages collection this is done in the file
-<filename>pkgs/top-level/all-packages.nix</filename>, where all Nix
-expressions for packages are imported and called with the appropriate
-arguments. Here are some fragments of
-<filename>all-packages.nix</filename>, with annotations of what they
-mean:</para>
-
-<programlisting>
-...
-
-rec { ①
-
-  hello = import ../applications/misc/hello/ex-1 ② { ③
-    inherit fetchurl stdenv perl;
-  };
-
-  perl = import ../development/interpreters/perl { ④
-    inherit fetchurl stdenv;
-  };
-
-  fetchurl = import ../build-support/fetchurl {
-    inherit stdenv; ...
-  };
-
-  stdenv = ...;
-
-}
-</programlisting>
-
-<orderedlist>
-
-  <listitem>
-    <para>This file defines a set of attributes, all of which are
-    concrete derivations (i.e., not functions).  In fact, we define a
-    <emphasis>mutually recursive</emphasis> set of attributes.  That
-    is, the attributes can refer to each other.  This is precisely
-    what we want since we want to <quote>plug</quote> the
-    various packages into each other.</para>
-  </listitem>
-
-  <listitem>
-
-    <para>Here we <emphasis>import</emphasis> the Nix expression for
-    GNU Hello.  The import operation just loads and returns the
-    specified Nix expression. In fact, we could just have put the
-    contents of <xref linkend='ex-hello-nix' /> in
-    <filename>all-packages.nix</filename> at this point.  That
-    would be completely equivalent, but it would make the file rather
-    bulky.</para>
-
-    <para>Note that we refer to
-    <filename>../applications/misc/hello/ex-1</filename>, not
-    <filename>../applications/misc/hello/ex-1/default.nix</filename>.
-    When you try to import a directory, Nix automatically appends
-    <filename>/default.nix</filename> to the file name.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>This is where the actual composition takes place.  Here we
-    <emphasis>call</emphasis> the function imported from
-    <filename>../applications/misc/hello/ex-1</filename> with a set
-    containing the things that the function expects, namely
-    <varname>fetchurl</varname>, <varname>stdenv</varname>, and
-    <varname>perl</varname>.  We use inherit again to use the
-    attributes defined in the surrounding scope (we could also have
-    written <literal>fetchurl = fetchurl;</literal>, etc.).</para>
-
-    <para>The result of this function call is an actual derivation
-    that can be built by Nix (since when we fill in the arguments of
-    the function, what we get is its body, which is the call to
-    <varname>stdenv.mkDerivation</varname> in <xref
-    linkend='ex-hello-nix' />).</para>
-
-    <note><para>Nixpkgs has a convenience function
-    <function>callPackage</function> that imports and calls a
-    function, filling in any missing arguments by passing the
-    corresponding attribute from the Nixpkgs set, like this:
-
-<programlisting>
-hello = callPackage ../applications/misc/hello/ex-1 { };
-</programlisting>
-
-    If necessary, you can set or override arguments:
-
-<programlisting>
-hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
-</programlisting>
-
-    </para></note>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Likewise, we have to instantiate Perl,
-    <varname>fetchurl</varname>, and the standard environment.</para>
-
-  </listitem>
-
-</orderedlist>
-
-</section>
diff --git a/doc/manual/expressions/build-script.xml b/doc/manual/expressions/build-script.xml
deleted file mode 100644
index 5c55954fc..000000000
--- a/doc/manual/expressions/build-script.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-build-script'>
-
-<title>Build Script</title>
-
-<para>Here is the builder referenced
-from Hello's Nix expression (stored in
-<filename>pkgs/applications/misc/hello/ex-1/builder.sh</filename>):</para>
-
-<programlisting>
-source $stdenv/setup ①
-
-PATH=$perl/bin:$PATH ②
-
-tar xvfz $src ③
-cd hello-*
-./configure --prefix=$out ④
-make ⑤
-make install</programlisting>
-
-<para>The builder can actually be made a lot shorter by using the
-<emphasis>generic builder</emphasis> functions provided by
-<varname>stdenv</varname>, but here we write out the build steps to
-elucidate what a builder does.  It performs the following
-steps:</para>
-
-<orderedlist>
-
-  <listitem>
-
-    <para>When Nix runs a builder, it initially completely clears the
-    environment (except for the attributes declared in the
-    derivation).  This is done to prevent undeclared inputs from being
-    used in the build process. If for example the
-    <literal>PATH</literal> contained <filename>/usr/bin</filename>,
-    then you might accidentally use
-    <filename>/usr/bin/gcc</filename>.</para>
-
-    <para>So the first step is to set up the environment.  This is
-    done by calling the <filename>setup</filename> script of the
-    standard environment.  The environment variable
-    <literal>stdenv</literal> points to the location of the standard
-    environment being used.  (It wasn't specified explicitly as an
-    attribute in <xref linkend='ex-hello-nix' />, but
-    <varname>mkDerivation</varname> adds it automatically.)</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Since Hello needs Perl, we have to make sure that Perl is in
-    the <literal>PATH</literal>.  The <literal>perl</literal> environment
-    variable points to the location of the Perl package (since it
-    was passed in as an attribute to the derivation), so
-    <filename><emphasis>$perl</emphasis>/bin</filename> is the
-    directory containing the Perl interpreter.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Now we have to unpack the sources.  The
-    <varname>src</varname> attribute was bound to the result of
-    fetching the Hello source tarball from the network, so the
-    <literal>src</literal> environment variable points to the location in
-    the Nix store to which the tarball was downloaded.  After
-    unpacking, we <command>cd</command> to the resulting source
-    directory.</para>
-
-    <para>The whole build is performed in a temporary directory
-    created in <varname>/tmp</varname>, by the way.  This directory is
-    removed after the builder finishes, so there is no need to clean
-    up the sources afterwards.  Also, the temporary directory is
-    always newly created, so you don't have to worry about files from
-    previous builds interfering with the current build.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>GNU Hello is a typical Autoconf-based package, so we first
-    have to run its <filename>configure</filename> script.  In Nix
-    every package is stored in a separate location in the Nix store,
-    for instance
-    <filename>/nix/store/9a54ba97fb71b65fda531012d0443ce2-hello-2.1.1</filename>.
-    Nix computes this path by cryptographically hashing all attributes
-    of the derivation.  The path is passed to the builder through the
-    <literal>out</literal> environment variable.  So here we give
-    <filename>configure</filename> the parameter
-    <literal>--prefix=$out</literal> to cause Hello to be installed in
-    the expected location.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Finally we build Hello (<literal>make</literal>) and install
-    it into the location specified by <literal>out</literal>
-    (<literal>make install</literal>).</para>
-
-  </listitem>
-
-</orderedlist>
-
-<para>If you are wondering about the absence of error checking on the
-result of various commands called in the builder: this is because the
-shell script is evaluated with Bash's <option>-e</option> option,
-which causes the script to be aborted if any command fails without an
-error check.</para>
-
-</section>
diff --git a/doc/manual/expressions/builtins.xml b/doc/manual/expressions/builtins.xml
deleted file mode 100644
index 4ad481ad3..000000000
--- a/doc/manual/expressions/builtins.xml
+++ /dev/null
@@ -1,1663 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='ssec-builtins'>
-
-<title>Built-in Functions</title>
-
-<para>This section lists the functions and constants built into the
-Nix expression evaluator.  (The built-in function
-<function>derivation</function> is discussed above.)  Some built-ins,
-such as <function>derivation</function>, are always in scope of every
-Nix expression; you can just access them right away.  But to prevent
-polluting the namespace too much, most built-ins are not in scope.
-Instead, you can access them through the <varname>builtins</varname>
-built-in value, which is a set that contains all built-in functions
-and values.  For instance, <function>derivation</function> is also
-available as <function>builtins.derivation</function>.</para>
-
-
-<variablelist>
-
-
-  <varlistentry xml:id='builtin-abort'>
-    <term><function>abort</function> <emphasis>s</emphasis></term>
-    <term><function>builtins.abort</function> <emphasis>s</emphasis></term>
-
-    <listitem><para>Abort Nix expression evaluation, print error
-    message <emphasis>s</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-add'>
-    <term><function>builtins.add</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis>
-    </term>
-
-    <listitem><para>Return the sum of the numbers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-all'>
-    <term><function>builtins.all</function>
-    <emphasis>pred</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if the function
-    <emphasis>pred</emphasis> returns <literal>true</literal>
-    for all elements of <emphasis>list</emphasis>,
-    and <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-any'>
-    <term><function>builtins.any</function>
-    <emphasis>pred</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if the function
-    <emphasis>pred</emphasis> returns <literal>true</literal>
-    for at least one element of <emphasis>list</emphasis>,
-    and <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-attrNames'>
-    <term><function>builtins.attrNames</function>
-    <emphasis>set</emphasis></term>
-
-    <listitem><para>Return the names of the attributes in the set
-    <emphasis>set</emphasis> in an alphabetically sorted list.  For instance,
-    <literal>builtins.attrNames { y = 1; x = "foo"; }</literal>
-    evaluates to <literal>[ "x" "y" ]</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-attrValues'>
-    <term><function>builtins.attrValues</function>
-    <emphasis>set</emphasis></term>
-
-    <listitem><para>Return the values of the attributes in the set
-    <emphasis>set</emphasis> in the order corresponding to the
-    sorted attribute names.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-baseNameOf'>
-    <term><function>baseNameOf</function> <emphasis>s</emphasis></term>
-
-    <listitem><para>Return the <emphasis>base name</emphasis> of the
-    string <emphasis>s</emphasis>, that is, everything following
-    the final slash in the string.  This is similar to the GNU
-    <command>basename</command> command.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-bitAnd'>
-    <term><function>builtins.bitAnd</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the bitwise AND of the integers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-bitOr'>
-    <term><function>builtins.bitOr</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the bitwise OR of the integers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-bitXor'>
-    <term><function>builtins.bitXor</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the bitwise XOR of the integers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-builtins'>
-    <term><varname>builtins</varname></term>
-
-    <listitem><para>The set <varname>builtins</varname> contains all
-    the built-in functions and values.  You can use
-    <varname>builtins</varname> to test for the availability of
-    features in the Nix installation, e.g.,
-
-<programlisting>
-if builtins ? getEnv then builtins.getEnv "PATH" else ""</programlisting>
-
-    This allows a Nix expression to fall back gracefully on older Nix
-    installations that don’t have the desired built-in
-    function.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-compareVersions'>
-    <term><function>builtins.compareVersions</function>
-    <emphasis>s1</emphasis> <emphasis>s2</emphasis></term>
-
-    <listitem><para>Compare two strings representing versions and
-    return <literal>-1</literal> if version
-    <emphasis>s1</emphasis> is older than version
-    <emphasis>s2</emphasis>, <literal>0</literal> if they are
-    the same, and <literal>1</literal> if
-    <emphasis>s1</emphasis> is newer than
-    <emphasis>s2</emphasis>.  The version comparison algorithm
-    is the same as the one used by <link
-    linkend="ssec-version-comparisons"><command>nix-env
-    -u</command></link>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-concatLists'>
-    <term><function>builtins.concatLists</function>
-    <emphasis>lists</emphasis></term>
-
-    <listitem><para>Concatenate a list of lists into a single
-    list.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-concatStringsSep'>
-    <term><function>builtins.concatStringsSep</function>
-    <emphasis>separator</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Concatenate a list of strings with a separator
-    between each element, e.g. <literal>concatStringsSep "/"
-    ["usr" "local" "bin"] == "usr/local/bin"</literal></para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-currentSystem'>
-    <term><varname>builtins.currentSystem</varname></term>
-
-    <listitem><para>The built-in value <varname>currentSystem</varname>
-    evaluates to the Nix platform identifier for the Nix installation
-    on which the expression is being evaluated, such as
-    <literal>"i686-linux"</literal> or
-    <literal>"x86_64-darwin"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <!--
-  <varlistentry><term><function>currentTime</function></term>
-
-    <listitem><para>The built-in value <varname>currentTime</varname>
-    returns the current system time in seconds since 00:00:00 1/1/1970
-    UTC.  Due to the evaluation model of Nix expressions
-    (<emphasis>maximal laziness</emphasis>), it always yields the same
-    value within an execution of Nix.</para></listitem>
-
-  </varlistentry>
-  -->
-
-
-  <!--
-  <varlistentry><term><function>dependencyClosure</function></term>
-
-    <listitem><para>TODO</para></listitem>
-
-  </varlistentry>
-  -->
-
-
-  <varlistentry xml:id='builtin-deepSeq'>
-    <term><function>builtins.deepSeq</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>This is like <literal>seq
-    <emphasis>e1</emphasis>
-    <emphasis>e2</emphasis></literal>, except that
-    <emphasis>e1</emphasis> is evaluated
-    <emphasis>deeply</emphasis>: if it’s a list or set, its elements
-    or attributes are also evaluated recursively.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-derivation'>
-    <term><function>derivation</function>
-    <emphasis>attrs</emphasis></term>
-    <term><function>builtins.derivation</function>
-    <emphasis>attrs</emphasis></term>
-
-    <listitem><para><function>derivation</function> is described in
-    <xref linkend='ssec-derivation' />.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-dirOf'>
-    <term><function>dirOf</function> <emphasis>s</emphasis></term>
-    <term><function>builtins.dirOf</function> <emphasis>s</emphasis></term>
-
-    <listitem><para>Return the directory part of the string
-    <emphasis>s</emphasis>, that is, everything before the final
-    slash in the string.  This is similar to the GNU
-    <command>dirname</command> command.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-div'>
-    <term><function>builtins.div</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the quotient of the numbers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-elem'>
-    <term><function>builtins.elem</function>
-    <emphasis>x</emphasis> <emphasis>xs</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if a value equal to
-    <emphasis>x</emphasis> occurs in the list
-    <emphasis>xs</emphasis>, and <literal>false</literal>
-    otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-elemAt'>
-    <term><function>builtins.elemAt</function>
-    <emphasis>xs</emphasis> <emphasis>n</emphasis></term>
-
-    <listitem><para>Return element <emphasis>n</emphasis> from
-    the list <emphasis>xs</emphasis>.  Elements are counted
-    starting from 0.  A fatal error occurs if the index is out of
-    bounds.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-fetchurl'>
-    <term><function>builtins.fetchurl</function>
-    <emphasis>url</emphasis></term>
-
-    <listitem><para>Download the specified URL and return the path of
-    the downloaded file. This function is not available if <link
-    linkend="conf-restrict-eval">restricted evaluation mode</link> is
-    enabled.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-fetchTarball'>
-    <term><function>fetchTarball</function>
-    <emphasis>url</emphasis></term>
-    <term><function>builtins.fetchTarball</function>
-    <emphasis>url</emphasis></term>
-
-    <listitem><para>Download the specified URL, unpack it and return
-    the path of the unpacked tree. The file must be a tape archive
-    (<filename>.tar</filename>) compressed with
-    <literal>gzip</literal>, <literal>bzip2</literal> or
-    <literal>xz</literal>. The top-level path component of the files
-    in the tarball is removed, so it is best if the tarball contains a
-    single directory at top level. The typical use of the function is
-    to obtain external Nix expression dependencies, such as a
-    particular version of Nixpkgs, e.g.
-
-<programlisting>
-with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
-
-stdenv.mkDerivation { … }
-</programlisting>
-    </para>
-
-    <para>The fetched tarball is cached for a certain amount of time
-    (1 hour by default) in <filename>~/.cache/nix/tarballs/</filename>.
-    You can change the cache timeout either on the command line with
-    <option>--option tarball-ttl <emphasis>number of seconds</emphasis></option> or
-    in the Nix configuration file with this option:
-    <literal><xref linkend="conf-tarball-ttl" /> <emphasis>number of seconds to cache</emphasis></literal>.
-    </para>
-
-    <para>Note that when obtaining the hash with <varname>nix-prefetch-url
-    </varname> the option <varname>--unpack</varname> is required.
-    </para>
-
-    <para>This function can also verify the contents against a hash.
-    In that case, the function takes a set instead of a URL. The set
-    requires the attribute <varname>url</varname> and the attribute
-    <varname>sha256</varname>, e.g.
-
-<programlisting>
-with import (fetchTarball {
-  url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
-  sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
-}) {};
-
-stdenv.mkDerivation { … }
-</programlisting>
-
-    </para>
-
-    <para>This function is not available if <link
-    linkend="conf-restrict-eval">restricted evaluation mode</link> is
-    enabled.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-fetchGit'>
-    <term>
-      <function>builtins.fetchGit</function>
-      <emphasis>args</emphasis>
-    </term>
-
-    <listitem>
-      <para>
-        Fetch a path from git. <emphasis>args</emphasis> can be
-        a URL, in which case the HEAD of the repo at that URL is
-        fetched. Otherwise, it can be an attribute with the following
-        attributes (all except <varname>url</varname> optional):
-      </para>
-
-      <variablelist>
-        <varlistentry>
-          <term>url</term>
-          <listitem>
-            <para>
-              The URL of the repo.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>name</term>
-          <listitem>
-            <para>
-              The name of the directory the repo should be exported to
-              in the store. Defaults to the basename of the URL.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>rev</term>
-          <listitem>
-            <para>
-              The git revision to fetch. Defaults to the tip of
-              <varname>ref</varname>.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>ref</term>
-          <listitem>
-            <para>
-              The git ref to look for the requested revision under.
-              This is often a branch or tag name. Defaults to
-              <literal>HEAD</literal>.
-            </para>
-
-            <para>
-              By default, the <varname>ref</varname> value is prefixed
-              with <literal>refs/heads/</literal>. As of Nix 2.3.0
-              Nix will not prefix <literal>refs/heads/</literal> if
-              <varname>ref</varname> starts with <literal>refs/</literal>.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>submodules</term>
-          <listitem>
-            <para>
-              A Boolean parameter that specifies whether submodules
-              should be checked out. Defaults to
-              <literal>false</literal>.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-
-      <para>Here are some examples of how to use
-      <literal>fetchGit</literal>.</para>
-
-      <itemizedlist>
-
-        <listitem>
-          <para>To fetch a private repository over SSH:</para>
-
-          <programlisting>builtins.fetchGit {
-  url = "git@github.com:my-secret/repository.git";
-  ref = "master";
-  rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
-}</programlisting>
-
-        </listitem>
-
-        <listitem>
-          <para>To fetch an arbitrary reference:</para>
-
-          <programlisting>builtins.fetchGit {
-  url = "https://github.com/NixOS/nix.git";
-  ref = "refs/heads/0.5-release";
-}</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>
-            If the revision you're looking for is in the default branch
-            of the git repository you don't strictly need to specify
-            the branch name in the <varname>ref</varname> attribute.
-          </para>
-          <para>
-            However, if the revision you're looking for is in a future
-            branch for the non-default branch you will need to specify
-            the the <varname>ref</varname> attribute as well.
-          </para>
-
-          <programlisting>builtins.fetchGit {
-  url = "https://github.com/nixos/nix.git";
-  rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-  ref = "1.11-maintenance";
-}</programlisting>
-
-          <note>
-            <para>
-              It is nice to always specify the branch which a revision
-              belongs to. Without the branch being specified, the
-              fetcher might fail if the default branch changes.
-              Additionally, it can be confusing to try a commit from a
-              non-default branch and see the fetch fail. If the branch
-              is specified the fault is much more obvious.
-            </para>
-          </note>
-        </listitem>
-
-        <listitem>
-          <para>
-            If the revision you're looking for is in the default branch
-            of the git repository you may omit the
-            <varname>ref</varname> attribute.
-          </para>
-          <programlisting>builtins.fetchGit {
-  url = "https://github.com/nixos/nix.git";
-  rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-}</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>To fetch a specific tag:</para>
-          <programlisting>builtins.fetchGit {
-  url = "https://github.com/nixos/nix.git";
-  ref = "refs/tags/1.9";
-}</programlisting>
-        </listitem>
-
-        <listitem>
-          <para>To fetch the latest version of a remote branch:</para>
-        <programlisting>builtins.fetchGit {
-  url = "ssh://git@github.com/nixos/nix.git";
-  ref = "master";
-}</programlisting>
-          <note><para>Nix will refetch the branch in accordance to
-          <xref linkend="conf-tarball-ttl" />.</para></note>
-          <note><para>This behavior is disabled in <emphasis>Pure
-          evaluation mode</emphasis>.</para></note>
-        </listitem>
-      </itemizedlist>
-    </listitem>
-  </varlistentry>
-
-
-  <varlistentry><term><function>builtins.filter</function>
-  <emphasis>f</emphasis> <emphasis>xs</emphasis></term>
-
-    <listitem><para>Return a list consisting of the elements of
-    <emphasis>xs</emphasis> for which the function
-    <emphasis>f</emphasis> returns
-    <literal>true</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-filterSource'>
-    <term><function>builtins.filterSource</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem>
-
-      <para>This function allows you to copy sources into the Nix
-      store while filtering certain files.  For instance, suppose that
-      you want to use the directory <filename>source-dir</filename> as
-      an input to a Nix expression, e.g.
-
-<programlisting>
-stdenv.mkDerivation {
-  ...
-  src = ./source-dir;
-}
-</programlisting>
-
-      However, if <filename>source-dir</filename> is a Subversion
-      working copy, then all those annoying <filename>.svn</filename>
-      subdirectories will also be copied to the store.  Worse, the
-      contents of those directories may change a lot, causing lots of
-      spurious rebuilds.  With <function>filterSource</function> you
-      can filter out the <filename>.svn</filename> directories:
-
-<programlisting>
-  src = builtins.filterSource
-    (path: type: type != "directory" || baseNameOf path != ".svn")
-    ./source-dir;
-</programlisting>
-
-      </para>
-
-      <para>Thus, the first argument <emphasis>e1</emphasis>
-      must be a predicate function that is called for each regular
-      file, directory or symlink in the source tree
-      <emphasis>e2</emphasis>.  If the function returns
-      <literal>true</literal>, the file is copied to the Nix store,
-      otherwise it is omitted.  The function is called with two
-      arguments.  The first is the full path of the file.  The second
-      is a string that identifies the type of the file, which is
-      either <literal>"regular"</literal>,
-      <literal>"directory"</literal>, <literal>"symlink"</literal> or
-      <literal>"unknown"</literal> (for other kinds of files such as
-      device nodes or fifos — but note that those cannot be copied to
-      the Nix store, so if the predicate returns
-      <literal>true</literal> for them, the copy will fail). If you
-      exclude a directory, the entire corresponding subtree of
-      <emphasis>e2</emphasis> will be excluded.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-foldl-prime'>
-    <term><function>builtins.foldl’</function>
-    <emphasis>op</emphasis> <emphasis>nul</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Reduce a list by applying a binary operator, from
-    left to right, e.g. <literal>foldl’ op nul [x0 x1 x2 ...] = op (op
-    (op nul x0) x1) x2) ...</literal>. The operator is applied
-    strictly, i.e., its arguments are evaluated first. For example,
-    <literal>foldl’ (x: y: x + y) 0 [1 2 3]</literal> evaluates to
-    6.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-functionArgs'>
-    <term><function>builtins.functionArgs</function>
-    <emphasis>f</emphasis></term>
-
-    <listitem><para>
-    Return a set containing the names of the formal arguments expected
-    by the function <emphasis>f</emphasis>.
-    The value of each attribute is a Boolean denoting whether the corresponding
-    argument has a default value.  For instance,
-    <literal>functionArgs ({ x, y ? 123}: ...)  =  { x = false; y = true; }</literal>.
-    </para>
-
-    <para>"Formal argument" here refers to the attributes pattern-matched by
-    the function.  Plain lambdas are not included, e.g.
-    <literal>functionArgs (x: ...)  =  { }</literal>.
-    </para></listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-fromJSON'>
-    <term><function>builtins.fromJSON</function> <emphasis>e</emphasis></term>
-
-    <listitem><para>Convert a JSON string to a Nix
-    value. For example,
-
-<programlisting>
-builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
-</programlisting>
-
-    returns the value <literal>{ x = [ 1 2 3 ]; y = null;
-    }</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-genList'>
-    <term><function>builtins.genList</function>
-    <emphasis>generator</emphasis> <emphasis>length</emphasis></term>
-
-    <listitem><para>Generate list of size
-    <emphasis>length</emphasis>, with each element
-    <emphasis>i</emphasis> equal to the value returned by
-    <emphasis>generator</emphasis> <literal>i</literal>. For
-    example,
-
-<programlisting>
-builtins.genList (x: x * x) 5
-</programlisting>
-
-    returns the list <literal>[ 0 1 4 9 16 ]</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-getAttr'>
-    <term><function>builtins.getAttr</function>
-    <emphasis>s</emphasis> <emphasis>set</emphasis></term>
-
-    <listitem><para><function>getAttr</function> returns the attribute
-    named <emphasis>s</emphasis> from
-    <emphasis>set</emphasis>.  Evaluation aborts if the
-    attribute doesn’t exist.  This is a dynamic version of the
-    <literal>.</literal> operator, since <emphasis>s</emphasis>
-    is an expression rather than an identifier.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-getEnv'>
-    <term><function>builtins.getEnv</function>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para><function>getEnv</function> returns the value of
-    the environment variable <emphasis>s</emphasis>, or an empty
-    string if the variable doesn’t exist.  This function should be
-    used with care, as it can introduce all sorts of nasty environment
-    dependencies in your Nix expression.</para>
-
-    <para><function>getEnv</function> is used in Nix Packages to
-    locate the file <filename>~/.nixpkgs/config.nix</filename>, which
-    contains user-local settings for Nix Packages.  (That is, it does
-    a <literal>getEnv "HOME"</literal> to locate the user’s home
-    directory.)</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-hasAttr'>
-    <term><function>builtins.hasAttr</function>
-    <emphasis>s</emphasis> <emphasis>set</emphasis></term>
-
-    <listitem><para><function>hasAttr</function> returns
-    <literal>true</literal> if <emphasis>set</emphasis> has an
-    attribute named <emphasis>s</emphasis>, and
-    <literal>false</literal> otherwise.  This is a dynamic version of
-    the <literal>?</literal>  operator, since
-    <emphasis>s</emphasis> is an expression rather than an
-    identifier.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-hashString'>
-    <term><function>builtins.hashString</function>
-    <emphasis>type</emphasis> <emphasis>s</emphasis></term>
-
-    <listitem><para>Return a base-16 representation of the
-    cryptographic hash of string <emphasis>s</emphasis>.  The
-    hash algorithm specified by <emphasis>type</emphasis> must
-    be one of <literal>"md5"</literal>, <literal>"sha1"</literal>,
-    <literal>"sha256"</literal> or <literal>"sha512"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-hashFile'>
-    <term><function>builtins.hashFile</function>
-    <emphasis>type</emphasis> <emphasis>p</emphasis></term>
-
-    <listitem><para>Return a base-16 representation of the
-    cryptographic hash of the file at path <emphasis>p</emphasis>.  The
-    hash algorithm specified by <emphasis>type</emphasis> must
-    be one of <literal>"md5"</literal>, <literal>"sha1"</literal>,
-    <literal>"sha256"</literal> or <literal>"sha512"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-head'>
-    <term><function>builtins.head</function>
-    <emphasis>list</emphasis></term>
-
-    <listitem><para>Return the first element of a list; abort
-    evaluation if the argument isn’t a list or is an empty list.  You
-    can test whether a list is empty by comparing it with
-    <literal>[]</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-import'>
-    <term><function>import</function>
-    <emphasis>path</emphasis></term>
-    <term><function>builtins.import</function>
-    <emphasis>path</emphasis></term>
-
-    <listitem><para>Load, parse and return the Nix expression in the
-    file <emphasis>path</emphasis>.  If <emphasis>path
-    </emphasis> is a directory, the file <filename>default.nix
-    </filename> in that directory is loaded.  Evaluation aborts if the
-    file doesn’t exist or contains an incorrect Nix expression.
-    <function>import</function> implements Nix’s module system: you
-    can put any Nix expression (such as a set or a function) in a
-    separate file, and use it from Nix expressions in other
-    files.</para>
-
-    <note><para>Unlike some languages, <function>import</function> is a regular
-    function in Nix. Paths using the angle bracket syntax (e.g., <function>
-    import</function> <emphasis>&lt;foo&gt;</emphasis>) are normal path
-    values (see <xref linkend='ssec-values' />).</para></note>
-
-    <para>A Nix expression loaded by <function>import</function> must
-    not contain any <emphasis>free variables</emphasis> (identifiers
-    that are not defined in the Nix expression itself and are not
-    built-in).  Therefore, it cannot refer to variables that are in
-    scope at the call site.  For instance, if you have a calling
-    expression
-
-<programlisting>
-rec {
-  x = 123;
-  y = import ./foo.nix;
-}</programlisting>
-
-    then the following <filename>foo.nix</filename> will give an
-    error:
-
-<programlisting>
-x + 456</programlisting>
-
-    since <varname>x</varname> is not in scope in
-    <filename>foo.nix</filename>.  If you want <varname>x</varname>
-    to be available in <filename>foo.nix</filename>, you should pass
-    it as a function argument:
-
-<programlisting>
-rec {
-  x = 123;
-  y = import ./foo.nix x;
-}</programlisting>
-
-    and
-
-<programlisting>
-x: x + 456</programlisting>
-
-    (The function argument doesn’t have to be called
-    <varname>x</varname> in <filename>foo.nix</filename>; any name
-    would work.)</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-intersectAttrs'>
-    <term><function>builtins.intersectAttrs</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return a set consisting of the attributes in the
-    set <emphasis>e2</emphasis> that also exist in the set
-    <emphasis>e1</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isAttrs'>
-    <term><function>builtins.isAttrs</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a set, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isList'>
-    <term><function>builtins.isList</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a list, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isFunction'><term><function>builtins.isFunction</function>
-  <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a function, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isString'>
-    <term><function>builtins.isString</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a string, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isInt'>
-    <term><function>builtins.isInt</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to an int, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isFloat'>
-    <term><function>builtins.isFloat</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a float, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-isBool'>
-    <term><function>builtins.isBool</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a bool, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry><term><function>builtins.isPath</function>
-  <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to a path, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-isNull'>
-    <term><function>isNull</function>
-    <emphasis>e</emphasis></term>
-    <term><function>builtins.isNull</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if
-    <emphasis>e</emphasis> evaluates to <literal>null</literal>,
-    and <literal>false</literal> otherwise.</para>
-
-    <warning><para>This function is <emphasis>deprecated</emphasis>;
-    just write <literal>e == null</literal> instead.</para></warning>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-length'>
-    <term><function>builtins.length</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return the length of the list
-    <emphasis>e</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-lessThan'>
-    <term><function>builtins.lessThan</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if the number
-    <emphasis>e1</emphasis> is less than the number
-    <emphasis>e2</emphasis>, and <literal>false</literal>
-    otherwise.  Evaluation aborts if either
-    <emphasis>e1</emphasis> or <emphasis>e2</emphasis>
-    does not evaluate to a number.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-listToAttrs'>
-    <term><function>builtins.listToAttrs</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Construct a set from a list specifying the names
-    and values of each attribute.  Each element of the list should be
-    a set consisting of a string-valued attribute
-    <varname>name</varname> specifying the name of the attribute, and
-    an attribute <varname>value</varname> specifying its value.
-    Example:
-
-<programlisting>
-builtins.listToAttrs
-  [ { name = "foo"; value = 123; }
-    { name = "bar"; value = 456; }
-  ]
-</programlisting>
-
-    evaluates to
-
-<programlisting>
-{ foo = 123; bar = 456; }
-</programlisting>
-
-    </para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-map'>
-    <term><function>map</function>
-    <emphasis>f</emphasis> <emphasis>list</emphasis></term>
-    <term><function>builtins.map</function>
-    <emphasis>f</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Apply the function <emphasis>f</emphasis> to
-    each element in the list <emphasis>list</emphasis>.  For
-    example,
-
-<programlisting>
-map (x: "foo" + x) [ "bar" "bla" "abc" ]</programlisting>
-
-    evaluates to <literal>[ "foobar" "foobla" "fooabc"
-    ]</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-match'>
-    <term><function>builtins.match</function>
-    <emphasis>regex</emphasis> <emphasis>str</emphasis></term>
-
-    <listitem><para>Returns a list if the <link
-    xlink:href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04">extended
-    POSIX regular expression</link> <emphasis>regex</emphasis>
-    matches <emphasis>str</emphasis> precisely, otherwise returns
-    <literal>null</literal>.  Each item in the list is a regex group.
-
-<programlisting>
-builtins.match "ab" "abc"
-</programlisting>
-
-Evaluates to <literal>null</literal>.
-
-<programlisting>
-builtins.match "abc" "abc"
-</programlisting>
-
-Evaluates to <literal>[ ]</literal>.
-
-<programlisting>
-builtins.match "a(b)(c)" "abc"
-</programlisting>
-
-Evaluates to <literal>[ "b" "c" ]</literal>.
-
-<programlisting>
-builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
-</programlisting>
-
-Evaluates to <literal>[ "foo" ]</literal>.
-
-    </para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-mul'>
-    <term><function>builtins.mul</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the product of the numbers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-parseDrvName'>
-    <term><function>builtins.parseDrvName</function>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para>Split the string <emphasis>s</emphasis> into
-    a package name and version.  The package name is everything up to
-    but not including the first dash followed by a digit, and the
-    version is everything following that dash.  The result is returned
-    in a set <literal>{ name, version }</literal>.  Thus,
-    <literal>builtins.parseDrvName "nix-0.12pre12876"</literal>
-    returns <literal>{ name = "nix"; version = "0.12pre12876";
-    }</literal>.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-path'>
-    <term>
-      <function>builtins.path</function>
-      <emphasis>args</emphasis>
-    </term>
-
-    <listitem>
-      <para>
-        An enrichment of the built-in path type, based on the attributes
-        present in <emphasis>args</emphasis>. All are optional
-        except <varname>path</varname>:
-      </para>
-
-      <variablelist>
-        <varlistentry>
-          <term>path</term>
-          <listitem>
-            <para>The underlying path.</para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>name</term>
-          <listitem>
-            <para>
-              The name of the path when added to the store. This can
-              used to reference paths that have nix-illegal characters
-              in their names, like <literal>@</literal>.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>filter</term>
-          <listitem>
-            <para>
-              A function of the type expected by
-              <link linkend="builtin-filterSource">builtins.filterSource</link>,
-              with the same semantics.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>recursive</term>
-          <listitem>
-            <para>
-              When <literal>false</literal>, when
-              <varname>path</varname> is added to the store it is with a
-              flat hash, rather than a hash of the NAR serialization of
-              the file. Thus, <varname>path</varname> must refer to a
-              regular file, not a directory. This allows similar
-              behavior to <literal>fetchurl</literal>. Defaults to
-              <literal>true</literal>.
-            </para>
-          </listitem>
-        </varlistentry>
-        <varlistentry>
-          <term>sha256</term>
-          <listitem>
-            <para>
-              When provided, this is the expected hash of the file at
-              the path. Evaluation will fail if the hash is incorrect,
-              and providing a hash allows
-              <literal>builtins.path</literal> to be used even when the
-              <literal>pure-eval</literal> nix config option is on.
-            </para>
-          </listitem>
-        </varlistentry>
-      </variablelist>
-    </listitem>
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-pathExists'>
-    <term><function>builtins.pathExists</function>
-    <emphasis>path</emphasis></term>
-
-    <listitem><para>Return <literal>true</literal> if the path
-    <emphasis>path</emphasis> exists at evaluation time, and
-    <literal>false</literal> otherwise.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-placeholder'>
-    <term><function>builtins.placeholder</function>
-    <emphasis>output</emphasis></term>
-
-    <listitem><para>Return a placeholder string for the specified
-    <emphasis>output</emphasis> that will be substituted by the
-    corresponding output path at build time. Typical outputs would be
-    <literal>"out"</literal>, <literal>"bin"</literal> or
-    <literal>"dev"</literal>.</para></listitem>
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-readDir'>
-    <term><function>builtins.readDir</function>
-    <emphasis>path</emphasis></term>
-
-    <listitem><para>Return the contents of the directory
-    <emphasis>path</emphasis> as a set mapping directory entries
-    to the corresponding file type. For instance, if directory
-    <filename>A</filename> contains a regular file
-    <filename>B</filename> and another directory
-    <filename>C</filename>, then <literal>builtins.readDir
-    ./A</literal> will return the set
-
-<programlisting>
-{ B = "regular"; C = "directory"; }</programlisting>
-
-    The possible values for the file type are
-    <literal>"regular"</literal>, <literal>"directory"</literal>,
-    <literal>"symlink"</literal> and
-    <literal>"unknown"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-readFile'>
-    <term><function>builtins.readFile</function>
-    <emphasis>path</emphasis></term>
-
-    <listitem><para>Return the contents of the file
-    <emphasis>path</emphasis> as a string.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-removeAttrs'>
-    <term><function>removeAttrs</function>
-    <emphasis>set</emphasis> <emphasis>list</emphasis></term>
-    <term><function>builtins.removeAttrs</function>
-    <emphasis>set</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Remove the attributes listed in
-    <emphasis>list</emphasis> from
-    <emphasis>set</emphasis>.  The attributes don’t have to
-    exist in <emphasis>set</emphasis>. For instance,
-
-<programlisting>
-removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]</programlisting>
-
-    evaluates to <literal>{ y = 2; }</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-replaceStrings'>
-    <term><function>builtins.replaceStrings</function>
-    <emphasis>from</emphasis> <emphasis>to</emphasis> <emphasis>s</emphasis></term>
-
-    <listitem><para>Given string <emphasis>s</emphasis>, replace
-    every occurrence of the strings in <emphasis>from</emphasis>
-    with the corresponding string in
-    <emphasis>to</emphasis>. For example,
-
-<programlisting>
-builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
-</programlisting>
-
-    evaluates to <literal>"fabir"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-seq'>
-    <term><function>builtins.seq</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Evaluate <emphasis>e1</emphasis>, then
-    evaluate and return <emphasis>e2</emphasis>. This ensures
-    that a computation is strict in the value of
-    <emphasis>e1</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-sort'>
-    <term><function>builtins.sort</function>
-    <emphasis>comparator</emphasis> <emphasis>list</emphasis></term>
-
-    <listitem><para>Return <emphasis>list</emphasis> in sorted
-    order. It repeatedly calls the function
-    <emphasis>comparator</emphasis> with two elements. The
-    comparator should return <literal>true</literal> if the first
-    element is less than the second, and <literal>false</literal>
-    otherwise. For example,
-
-<programlisting>
-builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
-</programlisting>
-
-    produces the list <literal>[ 42 77 147 249 483 526
-    ]</literal>.</para>
-
-    <para>This is a stable sort: it preserves the relative order of
-    elements deemed equal by the comparator.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-split'>
-    <term><function>builtins.split</function>
-    <emphasis>regex</emphasis> <emphasis>str</emphasis></term>
-
-    <listitem><para>Returns a list composed of non matched strings interleaved
-    with the lists of the <link
-    xlink:href="http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04">extended
-    POSIX regular expression</link> <emphasis>regex</emphasis> matches
-    of <emphasis>str</emphasis>. Each item in the lists of matched
-    sequences is a regex group.
-
-<programlisting>
-builtins.split "(a)b" "abc"
-</programlisting>
-
-Evaluates to <literal>[ "" [ "a" ] "c" ]</literal>.
-
-<programlisting>
-builtins.split "([ac])" "abc"
-</programlisting>
-
-Evaluates to <literal>[ "" [ "a" ] "b" [ "c" ] "" ]</literal>.
-
-<programlisting>
-builtins.split "(a)|(c)" "abc"
-</programlisting>
-
-Evaluates to <literal>[ "" [ "a" null ] "b" [ null "c" ] "" ]</literal>.
-
-<programlisting>
-builtins.split "([[:upper:]]+)" "  FOO   "
-</programlisting>
-
-Evaluates to <literal>[ "  " [ "FOO" ] "   " ]</literal>.
-
-    </para></listitem>
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-splitVersion'>
-    <term><function>builtins.splitVersion</function>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para>Split a string representing a version into its
-    components, by the same version splitting logic underlying the
-    version comparison in <link linkend="ssec-version-comparisons">
-    <command>nix-env -u</command></link>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-stringLength'>
-    <term><function>builtins.stringLength</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return the length of the string
-    <emphasis>e</emphasis>.  If <emphasis>e</emphasis> is
-    not a string, evaluation is aborted.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-sub'>
-    <term><function>builtins.sub</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Return the difference between the numbers
-    <emphasis>e1</emphasis> and
-    <emphasis>e2</emphasis>.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-substring'>
-    <term><function>builtins.substring</function>
-    <emphasis>start</emphasis> <emphasis>len</emphasis>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para>Return the substring of
-    <emphasis>s</emphasis> from character position
-    <emphasis>start</emphasis> (zero-based) up to but not
-    including <emphasis>start + len</emphasis>.  If
-    <emphasis>start</emphasis> is greater than the length of the
-    string, an empty string is returned, and if <emphasis>start +
-    len</emphasis> lies beyond the end of the string, only the
-    substring up to the end of the string is returned.
-    <emphasis>start</emphasis> must be
-    non-negative. For example,
-
-<programlisting>
-builtins.substring 0 3 "nixos"
-</programlisting>
-
-   evaluates to <literal>"nix"</literal>.
-   </para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-tail'>
-    <term><function>builtins.tail</function>
-    <emphasis>list</emphasis></term>
-
-    <listitem><para>Return the second to last elements of a list;
-    abort evaluation if the argument isn’t a list or is an empty
-    list.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-throw'>
-    <term><function>throw</function>
-    <emphasis>s</emphasis></term>
-    <term><function>builtins.throw</function>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para>Throw an error message
-    <emphasis>s</emphasis>.  This usually aborts Nix expression
-    evaluation, but in <command>nix-env -qa</command> and other
-    commands that try to evaluate a set of derivations to get
-    information about those derivations, a derivation that throws an
-    error is silently skipped (which is not the case for
-    <function>abort</function>).</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-toFile'>
-    <term><function>builtins.toFile</function>
-    <emphasis>name</emphasis>
-    <emphasis>s</emphasis></term>
-
-    <listitem><para>Store the string <emphasis>s</emphasis> in a
-    file in the Nix store and return its path.  The file has suffix
-    <emphasis>name</emphasis>.  This file can be used as an
-    input to derivations.  One application is to write builders
-    “inline”.  For instance, the following Nix expression combines
-    <xref linkend='ex-hello-nix' /> and <xref
-    linkend='ex-hello-builder' /> into one file:
-
-<programlisting>
-{ stdenv, fetchurl, perl }:
-
-stdenv.mkDerivation {
-  name = "hello-2.1.1";
-
-  builder = builtins.toFile "builder.sh" "
-    source $stdenv/setup
-
-    PATH=$perl/bin:$PATH
-
-    tar xvfz $src
-    cd hello-*
-    ./configure --prefix=$out
-    make
-    make install
-  ";
-
-  src = fetchurl {
-    url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-    sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-  };
-  inherit perl;
-}</programlisting>
-
-    </para>
-
-    <para>It is even possible for one file to refer to another, e.g.,
-
-<programlisting>
-  builder = let
-    configFile = builtins.toFile "foo.conf" "
-      # This is some dummy configuration file.
-      <emphasis>...</emphasis>
-    ";
-  in builtins.toFile "builder.sh" "
-    source $stdenv/setup
-    <emphasis>...</emphasis>
-    cp ${configFile} $out/etc/foo.conf
-  ";</programlisting>
-
-    Note that <literal>${configFile}</literal> is an antiquotation
-    (see <xref linkend='ssec-values' />), so the result of the
-    expression <literal>configFile</literal> (i.e., a path like
-    <filename>/nix/store/m7p7jfny445k...-foo.conf</filename>) will be
-    spliced into the resulting string.</para>
-
-    <para>It is however <emphasis>not</emphasis> allowed to have files
-    mutually referring to each other, like so:
-
-<programlisting>
-let
-  foo = builtins.toFile "foo" "...${bar}...";
-  bar = builtins.toFile "bar" "...${foo}...";
-in foo</programlisting>
-
-    This is not allowed because it would cause a cyclic dependency in
-    the computation of the cryptographic hashes for
-    <varname>foo</varname> and <varname>bar</varname>.</para>
-    <para>It is also not possible to reference the result of a derivation.
-    If you are using Nixpkgs, the <literal>writeTextFile</literal> function is able to
-    do that.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-toJSON'>
-    <term><function>builtins.toJSON</function> <emphasis>e</emphasis></term>
-
-    <listitem><para>Return a string containing a JSON representation
-    of <emphasis>e</emphasis>.  Strings, integers, floats, booleans,
-    nulls and lists are mapped to their JSON equivalents.  Sets
-    (except derivations) are represented as objects.  Derivations are
-    translated to a JSON string containing the derivation’s output
-    path.  Paths are copied to the store and represented as a JSON
-    string of the resulting store path.</para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-toPath'>
-    <term><function>builtins.toPath</function> <emphasis>s</emphasis></term>
-
-    <listitem><para> DEPRECATED. Use <literal>/. + "/path"</literal>
-    to convert a string into an absolute path. For relative paths,
-    use <literal>./. + "/path"</literal>.
-    </para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-toString'>
-    <term><function>toString</function> <emphasis>e</emphasis></term>
-    <term><function>builtins.toString</function> <emphasis>e</emphasis></term>
-
-    <listitem><para>Convert the expression
-    <emphasis>e</emphasis> to a string.
-    <emphasis>e</emphasis> can be:</para>
-    <itemizedlist>
-      <listitem><para>A string (in which case the string is returned unmodified).</para></listitem>
-      <listitem><para>A path (e.g., <literal>toString /foo/bar</literal> yields <literal>"/foo/bar"</literal>.</para></listitem>
-      <listitem><para>A set containing <literal>{ __toString = self: ...; }</literal>.</para></listitem>
-      <listitem><para>An integer.</para></listitem>
-      <listitem><para>A list, in which case the string representations of its elements are joined with spaces.</para></listitem>
-      <listitem><para>A Boolean (<literal>false</literal> yields <literal>""</literal>, <literal>true</literal> yields <literal>"1"</literal>).</para></listitem>
-      <listitem><para><literal>null</literal>, which yields the empty string.</para></listitem>
-    </itemizedlist>
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-toXML'>
-    <term><function>builtins.toXML</function> <emphasis>e</emphasis></term>
-
-    <listitem><para>Return a string containing an XML representation
-    of <emphasis>e</emphasis>.  The main application for
-    <function>toXML</function> is to communicate information with the
-    builder in a more structured format than plain environment
-    variables.</para>
-
-    <!-- TODO: more formally describe the schema of the XML
-    representation -->
-
-    <para>Here is an example where this is
-    the case:
-    </para>
-
-<programlisting><![CDATA[
-{ stdenv, fetchurl, libxslt, jira, uberwiki }:
-
-stdenv.mkDerivation (rec {
-  name = "web-server";
-
-  buildInputs = [ libxslt ];
-
-  builder = builtins.toFile "builder.sh" "
-    source $stdenv/setup
-    mkdir $out
-    echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml]]> ① <![CDATA[
-  ";
-
-  stylesheet = builtins.toFile "stylesheet.xsl"]]> ② <![CDATA[
-   "<?xml version='1.0' encoding='UTF-8'?>
-    <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-      <xsl:template match='/'>
-        <Configure>
-          <xsl:for-each select='/expr/list/attrs'>
-            <Call name='addWebApplication'>
-              <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
-              <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
-            </Call>
-          </xsl:for-each>
-        </Configure>
-      </xsl:template>
-    </xsl:stylesheet>
-  ";
-
-  servlets = builtins.toXML []]> ③ <![CDATA[
-    { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
-    { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
-  ];
-})]]></programlisting>
-
-    <para>The builder is supposed to generate the configuration file
-    for a <link xlink:href='http://jetty.mortbay.org/'>Jetty servlet
-    container</link>.  A servlet container contains a number of
-    servlets (<filename>*.war</filename> files) each exported under a
-    specific URI prefix.  So the servlet configuration is a list of
-    sets containing the <varname>path</varname> and
-    <varname>war</varname> of the servlet (<xref
-    linkend='ex-toxml-co-servlets' />).  This kind of information is
-    difficult to communicate with the normal method of passing
-    information through an environment variable, which just
-    concatenates everything together into a string (which might just
-    work in this case, but wouldn’t work if fields are optional or
-    contain lists themselves).  Instead the Nix expression is
-    converted to an XML representation with
-    <function>toXML</function>, which is unambiguous and can easily be
-    processed with the appropriate tools.  For instance, in the
-    example an XSLT stylesheet (at point ②) is applied to it (at point
-    ①) to generate the XML configuration file for the Jetty server.
-    The XML representation produced at point ③ by
-    <function>toXML</function> is as follows:</para>
-
-<programlisting><![CDATA[<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <list>
-    <attrs>
-      <attr name="path">
-        <string value="/bugtracker" />
-      </attr>
-      <attr name="war">
-        <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
-      </attr>
-    </attrs>
-    <attrs>
-      <attr name="path">
-        <string value="/wiki" />
-      </attr>
-      <attr name="war">
-        <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
-      </attr>
-    </attrs>
-  </list>
-</expr>]]></programlisting>
-
-    <para>Note that <xref linkend='ex-toxml' /> uses the <function
-    linkend='builtin-toFile'>toFile</function> built-in to write the
-    builder and the stylesheet “inline” in the Nix expression.  The
-    path of the stylesheet is spliced into the builder using the
-    syntax <literal>xsltproc ${stylesheet}</literal>.</para>
-
-    </listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-trace'>
-    <term><function>builtins.trace</function>
-    <emphasis>e1</emphasis> <emphasis>e2</emphasis></term>
-
-    <listitem><para>Evaluate <emphasis>e1</emphasis> and print its
-    abstract syntax representation on standard error.  Then return
-    <emphasis>e2</emphasis>.  This function is useful for
-    debugging.</para></listitem>
-
-  </varlistentry>
-
-  <varlistentry xml:id='builtin-tryEval'>
-    <term><function>builtins.tryEval</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Try to shallowly evaluate <emphasis>e</emphasis>.
-    Return a set containing the attributes <literal>success</literal>
-    (<literal>true</literal> if <emphasis>e</emphasis> evaluated
-    successfully, <literal>false</literal> if an error was thrown) and
-    <literal>value</literal>, equalling <emphasis>e</emphasis>
-    if successful and <literal>false</literal> otherwise. Note that this
-    doesn't evaluate <emphasis>e</emphasis> deeply, so
-    <literal>let e = { x = throw ""; }; in (builtins.tryEval e).success
-    </literal> will be <literal>true</literal>. Using <literal>builtins.deepSeq
-    </literal> one can get the expected result: <literal>let e = { x = throw "";
-    }; in (builtins.tryEval (builtins.deepSeq e e)).success</literal> will be
-    <literal>false</literal>.
-    </para></listitem>
-
-  </varlistentry>
-
-
-  <varlistentry xml:id='builtin-typeOf'>
-    <term><function>builtins.typeOf</function>
-    <emphasis>e</emphasis></term>
-
-    <listitem><para>Return a string representing the type of the value
-    <emphasis>e</emphasis>, namely <literal>"int"</literal>,
-    <literal>"bool"</literal>, <literal>"string"</literal>,
-    <literal>"path"</literal>, <literal>"null"</literal>,
-    <literal>"set"</literal>, <literal>"list"</literal>,
-    <literal>"lambda"</literal> or
-    <literal>"float"</literal>.</para></listitem>
-
-  </varlistentry>
-
-
-</variablelist>
-
-
-</section>
diff --git a/doc/manual/expressions/derivations.xml b/doc/manual/expressions/derivations.xml
deleted file mode 100644
index 0625bcdfe..000000000
--- a/doc/manual/expressions/derivations.xml
+++ /dev/null
@@ -1,210 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-derivation">
-
-<title>Derivations</title>
-
-<para>The most important built-in function is
-<function>derivation</function>, which is used to describe a single
-derivation (a build action).  It takes as input a set, the attributes
-of which specify the inputs of the build.</para>
-
-<itemizedlist>
-
-  <listitem xml:id="attr-system"><para>There must be an attribute
-  named <varname>system</varname> whose value must be a string
-  specifying a Nix system type, such as
-  <literal>"i686-linux"</literal> or
-  <literal>"x86_64-darwin"</literal>. (To figure out your system type,
-  run <literal>nix -vv --version</literal>.) The build can only be
-  performed on a machine and operating system matching the system
-  type.  (Nix can automatically forward builds for other platforms by
-  forwarding them to other machines; see <xref
-  linkend='chap-distributed-builds' />.)</para></listitem>
-
-  <listitem><para>There must be an attribute named
-  <varname>name</varname> whose value must be a string.  This is used
-  as a symbolic name for the package by <command>nix-env</command>,
-  and it is appended to the output paths of the
-  derivation.</para></listitem>
-
-  <listitem><para>There must be an attribute named
-  <varname>builder</varname> that identifies the program that is
-  executed to perform the build.  It can be either a derivation or a
-  source (a local file reference, e.g.,
-  <filename>./builder.sh</filename>).</para></listitem>
-
-  <listitem><para>Every attribute is passed as an environment variable
-  to the builder.  Attribute values are translated to environment
-  variables as follows:
-
-    <itemizedlist>
-
-      <listitem><para>Strings and numbers are just passed
-      verbatim.</para></listitem>
-
-      <listitem><para>A <emphasis>path</emphasis> (e.g.,
-      <filename>../foo/sources.tar</filename>) causes the referenced
-      file to be copied to the store; its location in the store is put
-      in the environment variable.  The idea is that all sources
-      should reside in the Nix store, since all inputs to a derivation
-      should reside in the Nix store.</para></listitem>
-
-      <listitem><para>A <emphasis>derivation</emphasis> causes that
-      derivation to be built prior to the present derivation; its
-      default output path is put in the environment
-      variable.</para></listitem>
-
-      <listitem><para>Lists of the previous types are also allowed.
-      They are simply concatenated, separated by
-      spaces.</para></listitem>
-
-      <listitem><para><literal>true</literal> is passed as the string
-      <literal>1</literal>, <literal>false</literal> and
-      <literal>null</literal> are passed as an empty string.
-      </para></listitem>
-    </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>The optional attribute <varname>args</varname>
-  specifies command-line arguments to be passed to the builder.  It
-  should be a list.</para></listitem>
-
-  <listitem><para>The optional attribute <varname>outputs</varname>
-  specifies a list of symbolic outputs of the derivation.  By default,
-  a derivation produces a single output path, denoted as
-  <literal>out</literal>.  However, derivations can produce multiple
-  output paths.  This is useful because it allows outputs to be
-  downloaded or garbage-collected separately.  For instance, imagine a
-  library package that provides a dynamic library, header files, and
-  documentation.  A program that links against the library doesn’t
-  need the header files and documentation at runtime, and it doesn’t
-  need the documentation at build time.  Thus, the library package
-  could specify:
-<programlisting>
-outputs = [ "lib" "headers" "doc" ];
-</programlisting>
-  This will cause Nix to pass environment variables
-  <literal>lib</literal>, <literal>headers</literal> and
-  <literal>doc</literal> to the builder containing the intended store
-  paths of each output.  The builder would typically do something like
-<programlisting>
-./configure --libdir=$lib/lib --includedir=$headers/include --docdir=$doc/share/doc
-</programlisting>
-  for an Autoconf-style package.  You can refer to each output of a
-  derivation by selecting it as an attribute, e.g.
-<programlisting>
-buildInputs = [ pkg.lib pkg.headers ];
-</programlisting>
-  The first element of <varname>outputs</varname> determines the
-  <emphasis>default output</emphasis>.  Thus, you could also write
-<programlisting>
-buildInputs = [ pkg pkg.headers ];
-</programlisting>
-  since <literal>pkg</literal> is equivalent to
-  <literal>pkg.lib</literal>.</para></listitem>
-
-</itemizedlist>
-
-<para>The function <function>mkDerivation</function> in the Nixpkgs
-standard environment is a wrapper around
-<function>derivation</function> that adds a default value for
-<varname>system</varname> and always uses Bash as the builder, to
-which the supplied builder is passed as a command-line argument.  See
-the Nixpkgs manual for details.</para>
-
-<para>The builder is executed as follows:
-
-<itemizedlist>
-
-  <listitem><para>A temporary directory is created under the directory
-  specified by <literal>TMPDIR</literal> (default
-  <filename>/tmp</filename>) where the build will take place.  The
-  current directory is changed to this directory.</para></listitem>
-
-  <listitem><para>The environment is cleared and set to the derivation
-  attributes, as specified above.</para></listitem>
-
-  <listitem><para>In addition, the following variables are set:
-
-  <itemizedlist>
-
-    <listitem><para><literal>NIX_BUILD_TOP</literal> contains the path of
-    the temporary directory for this build.</para></listitem>
-
-    <listitem><para>Also, <literal>TMPDIR</literal>,
-    <literal>TEMPDIR</literal>, <literal>TMP</literal>, <literal>TEMP</literal>
-    are set to point to the temporary directory.  This is to prevent
-    the builder from accidentally writing temporary files anywhere
-    else.  Doing so might cause interference by other
-    processes.</para></listitem>
-
-    <listitem><para><literal>PATH</literal> is set to
-    <filename>/path-not-set</filename> to prevent shells from
-    initialising it to their built-in default value.</para></listitem>
-
-    <listitem><para><literal>HOME</literal> is set to
-    <filename>/homeless-shelter</filename> to prevent programs from
-    using <filename>/etc/passwd</filename> or the like to find the
-    user's home directory, which could cause impurity.  Usually, when
-    <literal>HOME</literal> is set, it is used as the location of the home
-    directory, even if it points to a non-existent
-    path.</para></listitem>
-
-    <listitem><para><literal>NIX_STORE</literal> is set to the path of the
-    top-level Nix store directory (typically,
-    <filename>/nix/store</filename>).</para></listitem>
-
-    <listitem><para>For each output declared in
-    <varname>outputs</varname>, the corresponding environment variable
-    is set to point to the intended path in the Nix store for that
-    output.  Each output path is a concatenation of the cryptographic
-    hash of all build inputs, the <varname>name</varname> attribute
-    and the output name.  (The output name is omitted if it’s
-    <literal>out</literal>.)</para></listitem>
-
-  </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>If an output path already exists, it is removed.
-  Also, locks are acquired to prevent multiple Nix instances from
-  performing the same build at the same time.</para></listitem>
-
-  <listitem><para>A log of the combined standard output and error is
-  written to <filename>/nix/var/log/nix</filename>.</para></listitem>
-
-  <listitem><para>The builder is executed with the arguments specified
-  by the attribute <varname>args</varname>.  If it exits with exit
-  code 0, it is considered to have succeeded.</para></listitem>
-
-  <listitem><para>The temporary directory is removed (unless the
-  <option>-K</option> option was specified).</para></listitem>
-
-  <listitem><para>If the build was successful, Nix scans each output
-  path for references to input paths by looking for the hash parts of
-  the input paths.  Since these are potential runtime dependencies,
-  Nix registers them as dependencies of the output
-  paths.</para></listitem>
-
-  <listitem><para>After the build, Nix sets the last-modified
-  timestamp on all files in the build result to 1 (00:00:01 1/1/1970
-  UTC), sets the group to the default group, and sets the mode of the
-  file to 0444 or 0555 (i.e., read-only, with execute permission
-  enabled if the file was originally executable).  Note that possible
-  <literal>setuid</literal> and <literal>setgid</literal> bits are
-  cleared.  Setuid and setgid programs are not currently supported by
-  Nix.  This is because the Nix archives used in deployment have no
-  concept of ownership information, and because it makes the build
-  result dependent on the user performing the build.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-<xi:include href="advanced-attributes.xml" />
-
-</section>
diff --git a/doc/manual/expressions/expression-language.xml b/doc/manual/expressions/expression-language.xml
deleted file mode 100644
index 240ef80f1..000000000
--- a/doc/manual/expressions/expression-language.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-expression-language">
-
-<title>Nix Expression Language</title>
-
-<para>The Nix expression language is a pure, lazy, functional
-language.  Purity means that operations in the language don't have
-side-effects (for instance, there is no variable assignment).
-Laziness means that arguments to functions are evaluated only when
-they are needed.  Functional means that functions are
-<quote>normal</quote> values that can be passed around and manipulated
-in interesting ways.  The language is not a full-featured, general
-purpose language.  Its main job is to describe packages,
-compositions of packages, and the variability within
-packages.</para>
-
-<para>This section presents the various features of the
-language.</para>
-
-<xi:include href="language-values.xml" />
-<xi:include href="language-constructs.xml" />
-<xi:include href="language-operators.xml" />
-<xi:include href="derivations.xml" />
-<xi:include href="builtins.xml" />
-
-
-</chapter>
diff --git a/doc/manual/expressions/expression-syntax.xml b/doc/manual/expressions/expression-syntax.xml
deleted file mode 100644
index 853e40b58..000000000
--- a/doc/manual/expressions/expression-syntax.xml
+++ /dev/null
@@ -1,146 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-expression-syntax'>
-
-<title>Expression Syntax</title>
-
-<para>Here is a Nix expression for GNU Hello:</para>
-
-<programlisting>
-{ stdenv, fetchurl, perl }: ①
-
-stdenv.mkDerivation { ②
-  name = "hello-2.1.1"; ③
-  builder = ./builder.sh; ④
-  src = fetchurl { ⑤
-    url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-    sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-  };
-  inherit perl; ⑥
-}</programlisting>
-
-<para>This file is actually already in the Nix Packages collection in
-<filename>pkgs/applications/misc/hello/ex-1/default.nix</filename>.
-It is customary to place each package in a separate directory and call
-the single Nix expression in that directory
-<filename>default.nix</filename>.  The file has the following elements
-(referenced from the figure by number):
-
-<orderedlist>
-
-  <listitem>
-
-    <para>This states that the expression is a
-    <emphasis>function</emphasis> that expects to be called with three
-    arguments: <varname>stdenv</varname>, <varname>fetchurl</varname>,
-    and <varname>perl</varname>.  They are needed to build Hello, but
-    we don't know how to build them here; that's why they are function
-    arguments.  <varname>stdenv</varname> is a package that is used
-    by almost all Nix Packages packages; it provides a
-    <quote>standard</quote> environment consisting of the things you
-    would expect in a basic Unix environment: a C/C++ compiler (GCC,
-    to be precise), the Bash shell, fundamental Unix tools such as
-    <command>cp</command>, <command>grep</command>,
-    <command>tar</command>, etc.  <varname>fetchurl</varname> is a
-    function that downloads files.  <varname>perl</varname> is the
-    Perl interpreter.</para>
-
-    <para>Nix functions generally have the form <literal>{ x, y, ...,
-    z }: e</literal> where <varname>x</varname>, <varname>y</varname>,
-    etc. are the names of the expected arguments, and where
-    <emphasis>e</emphasis> is the body of the function.  So
-    here, the entire remainder of the file is the body of the
-    function; when given the required arguments, the body should
-    describe how to build an instance of the Hello package.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>So we have to build a package.  Building something from
-    other stuff is called a <emphasis>derivation</emphasis> in Nix (as
-    opposed to sources, which are built by humans instead of
-    computers).  We perform a derivation by calling
-    <varname>stdenv.mkDerivation</varname>.
-    <varname>mkDerivation</varname> is a function provided by
-    <varname>stdenv</varname> that builds a package from a set of
-    <emphasis>attributes</emphasis>.  A set is just a list of
-    key/value pairs where each key is a string and each value is an
-    arbitrary Nix expression.  They take the general form <literal>{
-    <emphasis>name1</emphasis> =
-    <emphasis>expr1</emphasis>; <emphasis>...</emphasis>
-    <emphasis>nameN</emphasis> =
-    <emphasis>exprN</emphasis>; }</literal>.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>The attribute <varname>name</varname> specifies the symbolic
-    name and version of the package.  Nix doesn't really care about
-    these things, but they are used by for instance <command>nix-env
-    -q</command> to show a <quote>human-readable</quote> name for
-    packages.  This attribute is required by
-    <varname>mkDerivation</varname>.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>The attribute <varname>builder</varname> specifies the
-    builder.  This attribute can sometimes be omitted, in which case
-    <varname>mkDerivation</varname> will fill in a default builder
-    (which does a <literal>configure; make; make install</literal>, in
-    essence).  Hello is sufficiently simple that the default builder
-    would suffice, but in this case, we will show an actual builder
-    for educational purposes.  The value
-    <command>./builder.sh</command> refers to the shell script shown
-    in <xref linkend='ex-hello-builder' />, discussed below.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>The builder has to know what the sources of the package
-    are.  Here, the attribute <varname>src</varname> is bound to the
-    result of a call to the <command>fetchurl</command> function.
-    Given a URL and a SHA-256 hash of the expected contents of the file
-    at that URL, this function builds a derivation that downloads the
-    file and checks its hash.  So the sources are a dependency that
-    like all other dependencies is built before Hello itself is
-    built.</para>
-
-    <para>Instead of <varname>src</varname> any other name could have
-    been used, and in fact there can be any number of sources (bound
-    to different attributes).  However, <varname>src</varname> is
-    customary, and it's also expected by the default builder (which we
-    don't use in this example).</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Since the derivation requires Perl, we have to pass the
-    value of the <varname>perl</varname> function argument to the
-    builder.  All attributes in the set are actually passed as
-    environment variables to the builder, so declaring an attribute
-
-    <programlisting>
-perl = perl;</programlisting>
-
-    will do the trick: it binds an attribute <varname>perl</varname>
-    to the function argument which also happens to be called
-    <varname>perl</varname>.  However, it looks a bit silly, so there
-    is a shorter syntax.  The <literal>inherit</literal> keyword
-    causes the specified attributes to be bound to whatever variables
-    with the same name happen to be in scope.</para>
-
-  </listitem>
-
-</orderedlist>
-
-</para>
-
-</section>
diff --git a/doc/manual/expressions/generic-builder.xml b/doc/manual/expressions/generic-builder.xml
deleted file mode 100644
index a6f258abc..000000000
--- a/doc/manual/expressions/generic-builder.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-generic-builder'>
-
-<title>Generic Builder Syntax</title>
-
-<para>Recall from <xref linkend='ex-hello-builder' /> that the builder
-looked something like this:
-
-<programlisting>
-PATH=$perl/bin:$PATH
-tar xvfz $src
-cd hello-*
-./configure --prefix=$out
-make
-make install</programlisting>
-
-The builders for almost all Unix packages look like this — set up some
-environment variables, unpack the sources, configure, build, and
-install.  For this reason the standard environment provides some Bash
-functions that automate the build process.  Here is what a builder
-using the generic build facilities looks like:</para>
-
-<programlisting>
-buildInputs="$perl" ①
-
-source $stdenv/setup ②
-
-genericBuild ③</programlisting>
-
-<para>Here is what each line means:
-
-<orderedlist>
-
-  <listitem>
-
-    <para>The <literal>buildInputs</literal> variable tells
-    <filename>setup</filename> to use the indicated packages as
-    <quote>inputs</quote>.  This means that if a package provides a
-    <filename>bin</filename> subdirectory, it's added to
-    <literal>PATH</literal>; if it has a <filename>include</filename>
-    subdirectory, it's added to GCC's header search path; and so
-    on. (This is implemented in a modular way:
-    <filename>setup</filename> tries to source the file
-    <filename><emphasis>pkg</emphasis>/nix-support/setup-hook</filename>
-    of all dependencies.  These “setup hooks” can then set up whatever
-    environment variables they want; for instance, the setup hook for
-    Perl sets the <literal>PERL5LIB</literal> environment variable to
-    contain the <filename>lib/site_perl</filename> directories of all
-    inputs.)
-    </para>
-
-  </listitem>
-
-  <listitem arearefs='ex-hello-builder2-co-2'>
-
-    <para>The function <function>genericBuild</function> is defined in
-    the file <literal>$stdenv/setup</literal>.</para>
-
-  </listitem>
-
-  <listitem arearefs='ex-hello-builder2-co-3'>
-
-    <para>The final step calls the shell function
-    <function>genericBuild</function>, which performs the steps that
-    were done explicitly in <xref linkend='ex-hello-builder' />.  The
-    generic builder is smart enough to figure out whether to unpack
-    the sources using <command>gzip</command>,
-    <command>bzip2</command>, etc.  It can be customised in many ways;
-    see the Nixpkgs manual for details.</para>
-
-  </listitem>
-
-</orderedlist>
-
-</para>
-
-<para>Discerning readers will note that the
-<literal>buildInputs</literal> could just as well have been set in the Nix
-expression, like this:
-
-<programlisting>
-  buildInputs = [ perl ];</programlisting>
-
-The <varname>perl</varname> attribute can then be removed, and the
-builder becomes even shorter:
-
-<programlisting>
-source $stdenv/setup
-genericBuild</programlisting>
-
-In fact, <varname>mkDerivation</varname> provides a default builder
-that looks exactly like that, so it is actually possible to omit the
-builder for Hello entirely.</para>
-
-</section>
diff --git a/doc/manual/expressions/language-constructs.xml b/doc/manual/expressions/language-constructs.xml
deleted file mode 100644
index e1c589f61..000000000
--- a/doc/manual/expressions/language-constructs.xml
+++ /dev/null
@@ -1,408 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-constructs">
-
-<title>Language Constructs</title>
-
-<section><title>Recursive sets</title>
-
-<para>Recursive sets are just normal sets, but the attributes can
-refer to each other.  For example,
-
-<programlisting>
-rec {
-  x = y;
-  y = 123;
-}.x
-</programlisting>
-
-evaluates to <literal>123</literal>.  Note that without
-<literal>rec</literal> the binding <literal>x = y;</literal> would
-refer to the variable <varname>y</varname> in the surrounding scope,
-if one exists, and would be invalid if no such variable exists.  That
-is, in a normal (non-recursive) set, attributes are not added to the
-lexical scope; in a recursive set, they are.</para>
-
-<para>Recursive sets of course introduce the danger of infinite
-recursion.  For example, the expression
-
-<programlisting>
-rec {
-  x = y;
-  y = x;
-}.x</programlisting>
-
-will crash with an <literal>infinite recursion encountered</literal>
-error message.</para>
-
-</section>
-
-
-<section xml:id="sect-let-expressions"><title>Let-expressions</title>
-
-<para>A let-expression allows you to define local variables for an
-expression.  For instance,
-
-<programlisting>
-let
-  x = "foo";
-  y = "bar";
-in x + y</programlisting>
-
-evaluates to <literal>"foobar"</literal>.
-
-</para>
-
-</section>
-
-
-<section><title>Inheriting attributes</title>
-
-<para>When defining a set or in a let-expression it is often convenient to copy variables
-from the surrounding lexical scope (e.g., when you want to propagate
-attributes).  This can be shortened using the
-<literal>inherit</literal> keyword.  For instance,
-
-<programlisting>
-let x = 123; in
-{ inherit x;
-  y = 456;
-}</programlisting>
-
-is equivalent to
-
-<programlisting>
-let x = 123; in
-{ x = x;
-  y = 456;
-}</programlisting>
-
-and both evaluate to <literal>{ x = 123; y = 456; }</literal>. (Note that
-this works because <varname>x</varname> is added to the lexical scope
-by the <literal>let</literal> construct.)  It is also possible to
-inherit attributes from another set.  For instance, in this fragment
-from <filename>all-packages.nix</filename>,
-
-<programlisting>
-  graphviz = (import ../tools/graphics/graphviz) {
-    inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
-    inherit (xlibs) libXaw;
-  };
-
-  xlibs = {
-    libX11 = ...;
-    libXaw = ...;
-    ...
-  }
-
-  libpng = ...;
-  libjpg = ...;
-  ...</programlisting>
-
-the set used in the function call to the function defined in
-<filename>../tools/graphics/graphviz</filename> inherits a number of
-variables from the surrounding scope (<varname>fetchurl</varname>
-... <varname>yacc</varname>), but also inherits
-<varname>libXaw</varname> (the X Athena Widgets) from the
-<varname>xlibs</varname> (X11 client-side libraries) set.</para>
-
-<para>
-Summarizing the fragment
-
-<programlisting>
-...
-inherit x y z;
-inherit (src-set) a b c;
-...</programlisting>
-
-is equivalent to
-
-<programlisting>
-...
-x = x; y = y; z = z;
-a = src-set.a; b = src-set.b; c = src-set.c;
-...</programlisting>
-
-when used while defining local variables in a let-expression or
-while defining a set.</para>
-
-</section>
-
-
-<section xml:id="ss-functions"><title>Functions</title>
-
-<para>Functions have the following form:
-
-<programlisting>
-<emphasis>pattern</emphasis>: <emphasis>body</emphasis></programlisting>
-
-The pattern specifies what the argument of the function must look
-like, and binds variables in the body to (parts of) the
-argument.  There are three kinds of patterns:</para>
-
-<itemizedlist>
-
-
-  <listitem><para>If a pattern is a single identifier, then the
-  function matches any argument.  Example:
-
-  <programlisting>
-let negate = x: !x;
-    concat = x: y: x + y;
-in if negate true then concat "foo" "bar" else ""</programlisting>
-
-  Note that <function>concat</function> is a function that takes one
-  argument and returns a function that takes another argument.  This
-  allows partial parameterisation (i.e., only filling some of the
-  arguments of a function); e.g.,
-
-  <programlisting>
-map (concat "foo") [ "bar" "bla" "abc" ]</programlisting>
-
-  evaluates to <literal>[ "foobar" "foobla"
-  "fooabc" ]</literal>.</para></listitem>
-
-
-  <listitem><para>A <emphasis>set pattern</emphasis> of the form
-  <literal>{ name1, name2, …, nameN }</literal> matches a set
-  containing the listed attributes, and binds the values of those
-  attributes to variables in the function body.  For example, the
-  function
-
-<programlisting>
-{ x, y, z }: z + y + x</programlisting>
-
-  can only be called with a set containing exactly the attributes
-  <varname>x</varname>, <varname>y</varname> and
-  <varname>z</varname>.  No other attributes are allowed.  If you want
-  to allow additional arguments, you can use an ellipsis
-  (<literal>...</literal>):
-
-<programlisting>
-{ x, y, z, ... }: z + y + x</programlisting>
-
-  This works on any set that contains at least the three named
-  attributes.</para>
-
-  <para>It is possible to provide <emphasis>default values</emphasis>
-  for attributes, in which case they are allowed to be missing.  A
-  default value is specified by writing
-  <literal><emphasis>name</emphasis> ?
-  <emphasis>e</emphasis></literal>, where
-  <emphasis>e</emphasis> is an arbitrary expression.  For example,
-
-<programlisting>
-{ x, y ? "foo", z ? "bar" }: z + y + x</programlisting>
-
-  specifies a function that only requires an attribute named
-  <varname>x</varname>, but optionally accepts <varname>y</varname>
-  and <varname>z</varname>.</para></listitem>
-
-
-  <listitem><para>An <literal>@</literal>-pattern provides a means of referring
-  to the whole value being matched:
-
-<programlisting> args@{ x, y, z, ... }: z + y + x + args.a</programlisting>
-
-but can also be written as:
-
-<programlisting> { x, y, z, ... } @ args: z + y + x + args.a</programlisting>
-
-  Here <varname>args</varname> is bound to the entire argument, which
-  is further matched against the pattern <literal>{ x, y, z,
-  ... }</literal>. <literal>@</literal>-pattern makes mainly sense with an 
-  ellipsis(<literal>...</literal>) as you can access attribute names as 
-  <literal>a</literal>, using <literal>args.a</literal>, which was given as an
-  additional attribute to the function.
-  </para>
-
-  <warning>
-   <para>
-    The <literal>args@</literal> expression is bound to the argument passed to the function which
-    means that attributes with defaults that aren't explicitly specified in the function call
-    won't cause an evaluation error, but won't exist in <literal>args</literal>.
-   </para>
-   <para>
-    For instance
-<programlisting>
-let
-  function = args@{ a ? 23, ... }: args;
-in
- function {}
-</programlisting>
-    will evaluate to an empty attribute set.
-   </para>
-  </warning></listitem>
-
-</itemizedlist>
-
-<para>Note that functions do not have names.  If you want to give them
-a name, you can bind them to an attribute, e.g.,
-
-<programlisting>
-let concat = { x, y }: x + y;
-in concat { x = "foo"; y = "bar"; }</programlisting>
-
-</para>
-
-</section>
-
-
-<section><title>Conditionals</title>
-
-<para>Conditionals look like this:
-
-<programlisting>
-if <emphasis>e1</emphasis> then <emphasis>e2</emphasis> else <emphasis>e3</emphasis></programlisting>
-
-where <emphasis>e1</emphasis> is an expression that should
-evaluate to a Boolean value (<literal>true</literal> or
-<literal>false</literal>).</para>
-
-</section>
-
-
-<section><title>Assertions</title>
-
-<para>Assertions are generally used to check that certain requirements
-on or between features and dependencies hold.  They look like this:
-
-<programlisting>
-assert <emphasis>e1</emphasis>; <emphasis>e2</emphasis></programlisting>
-
-where <emphasis>e1</emphasis> is an expression that should
-evaluate to a Boolean value.  If it evaluates to
-<literal>true</literal>, <emphasis>e2</emphasis> is returned;
-otherwise expression evaluation is aborted and a backtrace is printed.</para>
-
-<para>Here is a Nix expression for the Subversion package that shows
-how assertions can be used:.</para>
-
-<programlisting>
-{ localServer ? false
-, httpServer ? false
-, sslSupport ? false
-, pythonBindings ? false
-, javaSwigBindings ? false
-, javahlBindings ? false
-, stdenv, fetchurl
-, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
-}:
-
-assert localServer -> db4 != null; ①
-assert httpServer -> httpd != null &amp;&amp; httpd.expat == expat; ②
-assert sslSupport -> openssl != null &amp;&amp; (httpServer -> httpd.openssl == openssl); ③
-assert pythonBindings -> swig != null &amp;&amp; swig.pythonSupport;
-assert javaSwigBindings -> swig != null &amp;&amp; swig.javaSupport;
-assert javahlBindings -> j2sdk != null;
-
-stdenv.mkDerivation {
-  name = "subversion-1.1.1";
-  ...
-  openssl = if sslSupport then openssl else null; ④
-  ...
-}</programlisting>
-
-<para>The points of interest are:</para>
-
-<orderedlist>
-
-  <listitem>
-    <para>This assertion states that if Subversion is to have support
-    for local repositories, then Berkeley DB is needed.  So if the
-    Subversion function is called with the
-    <varname>localServer</varname> argument set to
-    <literal>true</literal> but the <varname>db4</varname> argument
-    set to <literal>null</literal>, then the evaluation fails.</para>
-  </listitem>
-
-  <listitem>
-    <para>This is a more subtle condition: if Subversion is built with
-    Apache (<literal>httpServer</literal>) support, then the Expat
-    library (an XML library) used by Subversion should be same as the
-    one used by Apache.  This is because in this configuration
-    Subversion code ends up being linked with Apache code, and if the
-    Expat libraries do not match, a build- or runtime link error or
-    incompatibility might occur.</para>
-  </listitem>
-
-  <listitem>
-    <para>This assertion says that in order for Subversion to have SSL
-    support (so that it can access <literal>https</literal> URLs), an
-    OpenSSL library must be passed.  Additionally, it says that
-    <emphasis>if</emphasis> Apache support is enabled, then Apache's
-    OpenSSL should match Subversion's.  (Note that if Apache support
-    is not enabled, we don't care about Apache's OpenSSL.)</para>
-  </listitem>
-
-  <listitem>
-    <para>The conditional here is not really related to assertions,
-    but is worth pointing out: it ensures that if SSL support is
-    disabled, then the Subversion derivation is not dependent on
-    OpenSSL, even if a non-<literal>null</literal> value was passed.
-    This prevents an unnecessary rebuild of Subversion if OpenSSL
-    changes.</para>
-  </listitem>
-
-</orderedlist>
-
-</section>
-
-
-
-<section><title>With-expressions</title>
-
-<para>A <emphasis>with-expression</emphasis>,
-
-<programlisting>
-with <emphasis>e1</emphasis>; <emphasis>e2</emphasis></programlisting>
-
-introduces the set <emphasis>e1</emphasis> into the lexical
-scope of the expression <emphasis>e2</emphasis>.  For instance,
-
-<programlisting>
-let as = { x = "foo"; y = "bar"; };
-in with as; x + y</programlisting>
-
-evaluates to <literal>"foobar"</literal> since the
-<literal>with</literal> adds the <varname>x</varname> and
-<varname>y</varname> attributes of <varname>as</varname> to the
-lexical scope in the expression <literal>x + y</literal>.  The most
-common use of <literal>with</literal> is in conjunction with the
-<function>import</function> function.  E.g.,
-
-<programlisting>
-with (import ./definitions.nix); ...</programlisting>
-
-makes all attributes defined in the file
-<filename>definitions.nix</filename> available as if they were defined
-locally in a <literal>let</literal>-expression.</para>
-
-<para>The bindings introduced by <literal>with</literal> do not shadow bindings
-introduced by other means, e.g.
-
-<programlisting>
-let a = 3; in with { a = 1; }; let a = 4; in with { a = 2; }; ...</programlisting>
-
-establishes the same scope as
-
-<programlisting>
-let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...</programlisting>
-
-</para>
-
-</section>
-
-
-<section><title>Comments</title>
-
-<para>Comments can be single-line, started with a <literal>#</literal>
-character, or inline/multi-line, enclosed within <literal>/*
-... */</literal>.</para>
-
-</section>
-
-
-</section>
diff --git a/doc/manual/expressions/language-operators.xml b/doc/manual/expressions/language-operators.xml
deleted file mode 100644
index 7f69bfcef..000000000
--- a/doc/manual/expressions/language-operators.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-language-operators">
-
-<title>Operators</title>
-
-<para><xref linkend='table-operators' /> lists the operators in the
-Nix expression language, in order of precedence (from strongest to
-weakest binding).</para>
-
-<table xml:id='table-operators'>
-  <title>Operators</title>
-  <tgroup cols='3'>
-    <thead>
-      <row>
-        <entry>Name</entry>
-        <entry>Syntax</entry>
-        <entry>Associativity</entry>
-        <entry>Description</entry>
-        <entry>Precedence</entry>
-      </row>
-    </thead>
-    <tbody>
-      <row>
-        <entry>Select</entry>
-        <entry><emphasis>e</emphasis> <literal>.</literal>
-        <emphasis>attrpath</emphasis>
-        [ <literal>or</literal> <emphasis>def</emphasis> ]
-        </entry>
-        <entry>none</entry>
-        <entry>Select attribute denoted by the attribute path
-        <emphasis>attrpath</emphasis> from set
-        <emphasis>e</emphasis>.  (An attribute path is a
-        dot-separated list of attribute names.)  If the attribute
-        doesn’t exist, return <emphasis>def</emphasis> if
-        provided, otherwise abort evaluation.</entry>
-        <entry>1</entry>
-      </row>
-      <row>
-        <entry>Application</entry>
-        <entry><emphasis>e1</emphasis> <emphasis>e2</emphasis></entry>
-        <entry>left</entry>
-        <entry>Call function <emphasis>e1</emphasis> with
-        argument <emphasis>e2</emphasis>.</entry>
-        <entry>2</entry>
-      </row>
-      <row>
-        <entry>Arithmetic Negation</entry>
-        <entry><literal>-</literal> <emphasis>e</emphasis></entry>
-        <entry>none</entry>
-        <entry>Arithmetic negation.</entry>
-        <entry>3</entry>
-      </row>
-      <row>
-        <entry>Has Attribute</entry>
-        <entry><emphasis>e</emphasis> <literal>?</literal>
-        <emphasis>attrpath</emphasis></entry>
-        <entry>none</entry>
-        <entry>Test whether set <emphasis>e</emphasis> contains
-        the attribute denoted by <emphasis>attrpath</emphasis>;
-        return <literal>true</literal> or
-        <literal>false</literal>.</entry>
-        <entry>4</entry>
-      </row>
-      <row>
-        <entry>List Concatenation</entry>
-        <entry><emphasis>e1</emphasis> <literal>++</literal> <emphasis>e2</emphasis></entry>
-        <entry>right</entry>
-        <entry>List concatenation.</entry>
-        <entry>5</entry>
-      </row>
-      <row>
-        <entry>Multiplication</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>*</literal> <emphasis>e2</emphasis>,
-        </entry>
-        <entry>left</entry>
-        <entry>Arithmetic multiplication.</entry>
-        <entry>6</entry>
-      </row>
-      <row>
-        <entry>Division</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>/</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>left</entry>
-        <entry>Arithmetic division.</entry>
-        <entry>6</entry>
-      </row>
-      <row>
-        <entry>Addition</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>+</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>left</entry>
-        <entry>Arithmetic addition.</entry>
-        <entry>7</entry>
-      </row>
-      <row>
-        <entry>Subtraction</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>-</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>left</entry>
-        <entry>Arithmetic subtraction.</entry>
-        <entry>7</entry>
-      </row>
-      <row>
-        <entry>String Concatenation</entry>
-        <entry>
-          <emphasis>string1</emphasis> <literal>+</literal> <emphasis>string2</emphasis>
-        </entry>
-        <entry>left</entry>
-        <entry>String concatenation.</entry>
-        <entry>7</entry>
-      </row>
-      <row>
-        <entry>Not</entry>
-        <entry><literal>!</literal> <emphasis>e</emphasis></entry>
-        <entry>none</entry>
-        <entry>Boolean negation.</entry>
-        <entry>8</entry>
-      </row>
-      <row>
-        <entry>Update</entry>
-        <entry><emphasis>e1</emphasis> <literal>//</literal>
-        <emphasis>e2</emphasis></entry>
-        <entry>right</entry>
-        <entry>Return a set consisting of the attributes in
-        <emphasis>e1</emphasis> and
-        <emphasis>e2</emphasis> (with the latter taking
-        precedence over the former in case of equally named
-        attributes).</entry>
-        <entry>9</entry>
-      </row>
-      <row>
-        <entry>Less Than</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>&lt;</literal> <emphasis>e2</emphasis>,
-        </entry>
-        <entry>none</entry>
-        <entry>Arithmetic comparison.</entry>
-        <entry>10</entry>
-      </row>
-      <row>
-        <entry>Less Than or Equal To</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>&lt;=</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>none</entry>
-        <entry>Arithmetic comparison.</entry>
-        <entry>10</entry>
-      </row>
-      <row>
-        <entry>Greater Than</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>&gt;</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>none</entry>
-        <entry>Arithmetic comparison.</entry>
-        <entry>10</entry>
-      </row>
-      <row>
-        <entry>Greater Than or Equal To</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>&gt;=</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>none</entry>
-        <entry>Arithmetic comparison.</entry>
-        <entry>10</entry>
-      </row>
-      <row>
-        <entry>Equality</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>==</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>none</entry>
-        <entry>Equality.</entry>
-        <entry>11</entry>
-      </row>
-      <row>
-        <entry>Inequality</entry>
-        <entry>
-          <emphasis>e1</emphasis> <literal>!=</literal> <emphasis>e2</emphasis>
-        </entry>
-        <entry>none</entry>
-        <entry>Inequality.</entry>
-        <entry>11</entry>
-      </row>
-      <row>
-        <entry>Logical AND</entry>
-        <entry><emphasis>e1</emphasis> <literal>&amp;&amp;</literal>
-        <emphasis>e2</emphasis></entry>
-        <entry>left</entry>
-        <entry>Logical AND.</entry>
-        <entry>12</entry>
-      </row>
-      <row>
-        <entry>Logical OR</entry>
-        <entry><emphasis>e1</emphasis> <literal>||</literal>
-        <emphasis>e2</emphasis></entry>
-        <entry>left</entry>
-        <entry>Logical OR.</entry>
-        <entry>13</entry>
-      </row>
-      <row>
-        <entry>Logical Implication</entry>
-        <entry><emphasis>e1</emphasis> <literal>-></literal>
-        <emphasis>e2</emphasis></entry>
-        <entry>none</entry>
-        <entry>Logical implication (equivalent to
-        <literal>!<emphasis>e1</emphasis> ||
-        <emphasis>e2</emphasis></literal>).</entry>
-        <entry>14</entry>
-      </row>
-    </tbody>
-  </tgroup>
-</table>
-
-</section>
diff --git a/doc/manual/expressions/language-values.xml b/doc/manual/expressions/language-values.xml
deleted file mode 100644
index 5520a4938..000000000
--- a/doc/manual/expressions/language-values.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='ssec-values'>
-
-<title>Values</title>
-
-
-<section><title>Simple Values</title>
-
-<para>Nix has the following basic data types:
-
-<itemizedlist>
-
-  <listitem>
-
-    <para><emphasis>Strings</emphasis> can be written in three
-    ways.</para>
-
-    <para>The most common way is to enclose the string between double
-    quotes, e.g., <literal>"foo bar"</literal>.  Strings can span
-    multiple lines.  The special characters <literal>"</literal> and
-    <literal>\</literal> and the character sequence
-    <literal>${</literal> must be escaped by prefixing them with a
-    backslash (<literal>\</literal>).  Newlines, carriage returns and
-    tabs can be written as <literal>\n</literal>,
-    <literal>\r</literal> and <literal>\t</literal>,
-    respectively.</para>
-
-    <para>You can include the result of an expression into a string by
-    enclosing it in
-    <literal>${<emphasis>...</emphasis>}</literal>, a feature
-    known as <emphasis>antiquotation</emphasis>.  The enclosed
-    expression must evaluate to something that can be coerced into a
-    string (meaning that it must be a string, a path, or a
-    derivation).  For instance, rather than writing
-
-<programlisting>
-"--with-freetype2-library=" + freetype + "/lib"</programlisting>
-
-    (where <varname>freetype</varname> is a derivation), you can
-    instead write the more natural
-
-<programlisting>
-"--with-freetype2-library=${freetype}/lib"</programlisting>
-
-    The latter is automatically translated to the former.  A more
-    complicated example (from the Nix expression for <link
-    xlink:href='http://www.trolltech.com/products/qt'>Qt</link>):
-
-<programlisting>
-configureFlags = "
-  -system-zlib -system-libpng -system-libjpeg
-  ${if openglSupport then "-dlopen-opengl
-    -L${mesa}/lib -I${mesa}/include
-    -L${libXmu}/lib -I${libXmu}/include" else ""}
-  ${if threadSupport then "-thread" else "-no-thread"}
-";</programlisting>
-
-    Note that Nix expressions and strings can be arbitrarily nested;
-    in this case the outer string contains various antiquotations that
-    themselves contain strings (e.g., <literal>"-thread"</literal>),
-    some of which in turn contain expressions (e.g.,
-    <literal>${mesa}</literal>).</para>
-
-    <para>The second way to write string literals is as an
-    <emphasis>indented string</emphasis>, which is enclosed between
-    pairs of <emphasis>double single-quotes</emphasis>, like so:
-
-<programlisting>
-''
-  This is the first line.
-  This is the second line.
-    This is the third line.
-''</programlisting>
-
-    This kind of string literal intelligently strips indentation from
-    the start of each line.  To be precise, it strips from each line a
-    number of spaces equal to the minimal indentation of the string as
-    a whole (disregarding the indentation of empty lines).  For
-    instance, the first and second line are indented two space, while
-    the third line is indented four spaces.  Thus, two spaces are
-    stripped from each line, so the resulting string is
-
-<programlisting>
-"This is the first line.\nThis is the second line.\n  This is the third line.\n"</programlisting>
-
-    </para>
-
-    <para>Note that the whitespace and newline following the opening
-    <literal>''</literal> is ignored if there is no non-whitespace
-    text on the initial line.</para>
-
-    <para>Antiquotation
-    (<literal>${<emphasis>expr</emphasis>}</literal>) is
-    supported in indented strings.</para>
-
-    <para>Since <literal>${</literal> and <literal>''</literal> have
-    special meaning in indented strings, you need a way to quote them.
-    <literal>$</literal> can be escaped by prefixing it with
-    <literal>''</literal> (that is, two single quotes), i.e.,
-    <literal>''$</literal>. <literal>''</literal> can be escaped by
-    prefixing it with <literal>'</literal>, i.e.,
-    <literal>'''</literal>. <literal>$</literal> removes any special meaning
-    from the following <literal>$</literal>. Linefeed, carriage-return and tab
-    characters can be written as <literal>''\n</literal>,
-    <literal>''\r</literal>, <literal>''\t</literal>, and <literal>''\</literal>
-    escapes any other character.
-
-    </para>
-
-    <para>Indented strings are primarily useful in that they allow
-    multi-line string literals to follow the indentation of the
-    enclosing Nix expression, and that less escaping is typically
-    necessary for strings representing languages such as shell scripts
-    and configuration files because <literal>''</literal> is much less
-    common than <literal>"</literal>.  Example:
-
-<programlisting>
-stdenv.mkDerivation {
-  <emphasis>...</emphasis>
-  postInstall =
-    ''
-      mkdir $out/bin $out/etc
-      cp foo $out/bin
-      echo "Hello World" > $out/etc/foo.conf
-      ${if enableBar then "cp bar $out/bin" else ""}
-    '';
-  <emphasis>...</emphasis>
-}
-</programlisting>
-
-    </para>
-
-    <para>Finally, as a convenience, <emphasis>URIs</emphasis> as
-    defined in appendix B of <link
-    xlink:href='http://www.ietf.org/rfc/rfc2396.txt'>RFC 2396</link>
-    can be written <emphasis>as is</emphasis>, without quotes.  For
-    instance, the string
-    <literal>"http://example.org/foo.tar.bz2"</literal>
-    can also be written as
-    <literal>http://example.org/foo.tar.bz2</literal>.</para>
-
-  </listitem>
-
-  <listitem><para>Numbers, which can be <emphasis>integers</emphasis> (like
-  <literal>123</literal>) or <emphasis>floating point</emphasis> (like
-  <literal>123.43</literal> or <literal>.27e13</literal>).</para>
-
-  <para>Numbers are type-compatible: pure integer operations will always
-  return integers, whereas any operation involving at least one floating point
-  number will have a floating point number as a result.</para></listitem>
-
-  <listitem><para><emphasis>Paths</emphasis>, e.g.,
-  <filename>/bin/sh</filename> or <filename>./builder.sh</filename>.
-  A path must contain at least one slash to be recognised as such. For
-  instance, <filename>builder.sh</filename> is not a path: it's parsed
-  as an expression that selects the attribute <varname>sh</varname>
-  from the variable <varname>builder</varname>. If the file name is
-  relative, i.e., if it does not begin with a slash, it is made
-  absolute at parse time relative to the directory of the Nix
-  expression that contained it.  For instance, if a Nix expression in
-  <filename>/foo/bar/bla.nix</filename> refers to
-  <filename>../xyzzy/fnord.nix</filename>, the absolute path is
-  <filename>/foo/xyzzy/fnord.nix</filename>.</para>
-
-  <para>If the first component of a path is a <literal>~</literal>,
-  it is interpreted as if the rest of the path were relative to the
-  user's home directory. e.g. <filename>~/foo</filename> would be
-  equivalent to <filename>/home/edolstra/foo</filename> for a user
-  whose home directory is <filename>/home/edolstra</filename>.
-  </para>
-
-  <para>Paths can also be specified between angle brackets, e.g.
-  <literal>&lt;nixpkgs&gt;</literal>. This means that the directories
-  listed in the environment variable
-  <literal linkend="env-NIX_PATH">NIX_PATH</literal> will be searched
-  for the given file or directory name.
-  </para>
-
-  </listitem>
-
-  <listitem><para><emphasis>Booleans</emphasis> with values
-  <literal>true</literal> and
-  <literal>false</literal>.</para></listitem>
-
-  <listitem><para>The null value, denoted as
-  <literal>null</literal>.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
-
-
-<section><title>Lists</title>
-
-<para>Lists are formed by enclosing a whitespace-separated list of
-values between square brackets.  For example,
-
-<programlisting>
-[ 123 ./foo.nix "abc" (f { x = y; }) ]</programlisting>
-
-defines a list of four elements, the last being the result of a call
-to the function <varname>f</varname>.  Note that function calls have
-to be enclosed in parentheses.  If they had been omitted, e.g.,
-
-<programlisting>
-[ 123 ./foo.nix "abc" f { x = y; } ]</programlisting>
-
-the result would be a list of five elements, the fourth one being a
-function and the fifth being a set.</para>
-
-<para>Note that lists are only lazy in values, and they are strict in length.
-</para>
-
-</section>
-
-
-<section><title>Sets</title>
-
-<para>Sets are really the core of the language, since ultimately the
-Nix language is all about creating derivations, which are really just
-sets of attributes to be passed to build scripts.</para>
-
-<para>Sets are just a list of name/value pairs (called
-<emphasis>attributes</emphasis>) enclosed in curly brackets, where
-each value is an arbitrary expression terminated by a semicolon.  For
-example:
-
-<programlisting>
-{ x = 123;
-  text = "Hello";
-  y = f { bla = 456; };
-}</programlisting>
-
-This defines a set with attributes named <varname>x</varname>,
-<varname>text</varname>, <varname>y</varname>.  The order of the
-attributes is irrelevant.  An attribute name may only occur
-once.</para>
-
-<para>Attributes can be selected from a set using the
-<literal>.</literal> operator.  For instance,
-
-<programlisting>
-{ a = "Foo"; b = "Bar"; }.a</programlisting>
-
-evaluates to <literal>"Foo"</literal>.  It is possible to provide a
-default value in an attribute selection using the
-<literal>or</literal> keyword.  For example,
-
-<programlisting>
-{ a = "Foo"; b = "Bar"; }.c or "Xyzzy"</programlisting>
-
-will evaluate to <literal>"Xyzzy"</literal> because there is no
-<varname>c</varname> attribute in the set.</para>
-
-<para>You can use arbitrary double-quoted strings as attribute
-names:
-
-<programlisting>
-{ "foo ${bar}" = 123; "nix-1.0" = 456; }."foo ${bar}"
-</programlisting>
-
-This will evaluate to <literal>123</literal> (Assuming
-<literal>bar</literal> is antiquotable). In the case where an
-attribute name is just a single antiquotation, the quotes can be
-dropped:
-
-<programlisting>
-{ foo = 123; }.${bar} or 456 </programlisting>
-
-This will evaluate to <literal>123</literal> if
-<literal>bar</literal> evaluates to <literal>"foo"</literal> when
-coerced to a string and <literal>456</literal> otherwise (again
-assuming <literal>bar</literal> is antiquotable).</para>
-
-<para>In the special case where an attribute name inside of a set declaration
-evaluates to <literal>null</literal> (which is normally an error, as
-<literal>null</literal> is not antiquotable), that attribute is simply not
-added to the set:
-
-<programlisting>
-{ ${if foo then "bar" else null} = true; }</programlisting>
-
-This will evaluate to <literal>{}</literal> if <literal>foo</literal>
-evaluates to <literal>false</literal>.</para>
-
-<para>A set that has a <literal>__functor</literal> attribute whose value
-is callable (i.e. is itself a function or a set with a
-<literal>__functor</literal> attribute whose value is callable) can be
-applied as if it were a function, with the set itself passed in first
-, e.g.,
-
-<programlisting>
-let add = { __functor = self: x: x + self.x; };
-    inc = add // { x = 1; };
-in inc 1
-</programlisting>
-
-evaluates to <literal>2</literal>. This can be used to attach metadata to a
-function without the caller needing to treat it specially, or to implement
-a form of object-oriented programming, for example.
-
-</para>
-
-</section>
-
-
-</section>
diff --git a/doc/manual/expressions/simple-building-testing.xml b/doc/manual/expressions/simple-building-testing.xml
deleted file mode 100644
index f82223df9..000000000
--- a/doc/manual/expressions/simple-building-testing.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-building-simple'>
-
-<title>Building and Testing</title>
-
-<para>You can now try to build Hello.  Of course, you could do
-<literal>nix-env -i hello</literal>, but you may not want to install a
-possibly broken package just yet.  The best way to test the package is by
-using the command <command linkend="sec-nix-build">nix-build</command>,
-which builds a Nix expression and creates a symlink named
-<filename>result</filename> in the current directory:
-
-<screen>
-$ nix-build -A hello
-building path `/nix/store/632d2b22514d...-hello-2.1.1'
-hello-2.1.1/
-hello-2.1.1/intl/
-hello-2.1.1/intl/ChangeLog
-<emphasis>...</emphasis>
-
-$ ls -l result
-lrwxrwxrwx ... 2006-09-29 10:43 result -> /nix/store/632d2b22514d...-hello-2.1.1
-
-$ ./result/bin/hello
-Hello, world!</screen>
-
-The <link linkend='opt-attr'><option>-A</option></link> option selects
-the <literal>hello</literal> attribute.  This is faster than using the
-symbolic package name specified by the <literal>name</literal>
-attribute (which also happens to be <literal>hello</literal>) and is
-unambiguous (there can be multiple packages with the symbolic name
-<literal>hello</literal>, but there can be only one attribute in a set
-named <literal>hello</literal>).</para>
-
-<para><command>nix-build</command> registers the
-<filename>./result</filename> symlink as a garbage collection root, so
-unless and until you delete the <filename>./result</filename> symlink,
-the output of the build will be safely kept on your system.  You can
-use <command>nix-build</command>’s <option
-linkend='opt-out-link'>-o</option> switch to give the symlink another
-name.</para>
-
-<para>Nix has transactional semantics.  Once a build finishes
-successfully, Nix makes a note of this in its database: it registers
-that the path denoted by <literal>out</literal> is now
-<quote>valid</quote>.  If you try to build the derivation again, Nix
-will see that the path is already valid and finish immediately.  If a
-build fails, either because it returns a non-zero exit code, because
-Nix or the builder are killed, or because the machine crashes, then
-the output paths will not be registered as valid.  If you try to build
-the derivation again, Nix will remove the output paths if they exist
-(e.g., because the builder died half-way through <literal>make
-install</literal>) and try again.  Note that there is no
-<quote>negative caching</quote>: Nix doesn't remember that a build
-failed, and so a failed build can always be repeated.  This is because
-Nix cannot distinguish between permanent failures (e.g., a compiler
-error due to a syntax error in the source) and transient failures
-(e.g., a disk full condition).</para>
-
-<para>Nix also performs locking.  If you run multiple Nix builds
-simultaneously, and they try to build the same derivation, the first
-Nix instance that gets there will perform the build, while the others
-block (or perform other derivations if available) until the build
-finishes:
-
-<screen>
-$ nix-build -A hello
-waiting for lock on `/nix/store/0h5b7hp8d4hqfrw8igvx97x1xawrjnac-hello-2.1.1x'</screen>
-
-So it is always safe to run multiple instances of Nix in parallel
-(which isn’t the case with, say, <command>make</command>).</para>
-
-</section>
diff --git a/doc/manual/expressions/simple-expression.xml b/doc/manual/expressions/simple-expression.xml
deleted file mode 100644
index ad97220a8..000000000
--- a/doc/manual/expressions/simple-expression.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-simple-expression">
-
-<title>A Simple Nix Expression</title>
-
-<para>This section shows how to add and test the <link
-xlink:href='http://www.gnu.org/software/hello/hello.html'>GNU Hello
-package</link> to the Nix Packages collection.  Hello is a program
-that prints out the text <quote>Hello, world!</quote>.</para>
-
-<para>To add a package to the Nix Packages collection, you generally
-need to do three things:
-
-<orderedlist>
-
-  <listitem><para>Write a Nix expression for the package.  This is a
-  file that describes all the inputs involved in building the package,
-  such as dependencies, sources, and so on.</para></listitem>
-
-  <listitem><para>Write a <emphasis>builder</emphasis>.  This is a
-  shell script that builds the package from the inputs. (In fact, it
-  can be written in any language, but typically it's a
-  <command>bash</command> shell script.)</para></listitem>
-
-  <listitem><para>Add the package to the file
-  <filename>pkgs/top-level/all-packages.nix</filename>.  The Nix
-  expression written in the first step is a
-  <emphasis>function</emphasis>; it requires other packages in order
-  to build it.  In this step you put it all together, i.e., you call
-  the function with the right arguments to build the actual
-  package.</para></listitem>
-
-</orderedlist>
-
-</para>
-
-<xi:include href="expression-syntax.xml" />
-<xi:include href="build-script.xml" />
-<xi:include href="arguments-variables.xml" />
-<xi:include href="simple-building-testing.xml" />
-<xi:include href="generic-builder.xml" />
-
-</chapter>
diff --git a/doc/manual/expressions/writing-nix-expressions.xml b/doc/manual/expressions/writing-nix-expressions.xml
deleted file mode 100644
index 6646dddf0..000000000
--- a/doc/manual/expressions/writing-nix-expressions.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='chap-writing-nix-expressions'>
-
-<title>Writing Nix Expressions</title>
-
-<partintro>
-<para>This chapter shows you how to write Nix expressions, which 
-instruct Nix how to build packages.  It starts with a
-simple example (a Nix expression for GNU Hello), and then moves
-on to a more in-depth look at the Nix expression language.</para>
-
-<note><para>This chapter is mostly about the Nix expression language.
-For more extensive information on adding packages to the Nix Packages
-collection (such as functions in the standard environment and coding
-conventions), please consult <link
-xlink:href="http://nixos.org/nixpkgs/manual/">its
-manual</link>.</para></note>
-</partintro>
-
-<xi:include href="simple-expression.xml" />
-<xi:include href="expression-language.xml" />
-
-</part>
diff --git a/doc/manual/glossary/glossary.xml b/doc/manual/glossary/glossary.xml
deleted file mode 100644
index e3162ed8d..000000000
--- a/doc/manual/glossary/glossary.xml
+++ /dev/null
@@ -1,199 +0,0 @@
-<appendix xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xml:id="part-glossary">
-
-<title>Glossary</title>
-
-
-<glosslist>
-
-
-<glossentry xml:id="gloss-derivation"><glossterm>derivation</glossterm>
-
-  <glossdef><para>A description of a build action.  The result of a
-  derivation is a store object.  Derivations are typically specified
-  in Nix expressions using the <link
-  linkend="ssec-derivation"><function>derivation</function>
-  primitive</link>.  These are translated into low-level
-  <emphasis>store derivations</emphasis> (implicitly by
-  <command>nix-env</command> and <command>nix-build</command>, or
-  explicitly by <command>nix-instantiate</command>).</para></glossdef>
-
-</glossentry>
-
-
-<glossentry><glossterm>store</glossterm>
-
-  <glossdef><para>The location in the file system where store objects
-  live.  Typically <filename>/nix/store</filename>.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry><glossterm>store path</glossterm>
-
-  <glossdef><para>The location in the file system of a store object,
-  i.e., an immediate child of the Nix store
-  directory.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry><glossterm>store object</glossterm>
-
-  <glossdef><para>A file that is an immediate child of the Nix store
-  directory.  These can be regular files, but also entire directory
-  trees.  Store objects can be sources (objects copied from outside of
-  the store), derivation outputs (objects produced by running a build
-  action), or derivations (files describing a build
-  action).</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-substitute"><glossterm>substitute</glossterm>
-
-  <glossdef><para>A substitute is a command invocation stored in the
-  Nix database that describes how to build a store object, bypassing
-  the normal build mechanism (i.e., derivations).  Typically, the
-  substitute builds the store object by downloading a pre-built
-  version of the store object from some server.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry><glossterm>purity</glossterm>
-
-  <glossdef><para>The assumption that equal Nix derivations when run
-  always produce the same output.  This cannot be guaranteed in
-  general (e.g., a builder can rely on external inputs such as the
-  network or the system time) but the Nix model assumes
-  it.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry><glossterm>Nix expression</glossterm>
-
-  <glossdef><para>A high-level description of software packages and
-  compositions thereof.  Deploying software using Nix entails writing
-  Nix expressions for your packages.  Nix expressions are translated
-  to derivations that are stored in the Nix store.  These derivations
-  can then be built.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-reference"><glossterm>reference</glossterm>
-
-  <glossdef>
-    <para>A store path <varname>P</varname> is said to have a
-    reference to a store path <varname>Q</varname> if the store object
-    at <varname>P</varname> contains the path <varname>Q</varname>
-    somewhere. The <emphasis>references</emphasis> of a store path are
-    the set of store paths to which it has a reference.
-    </para>
-    <para>A derivation can reference other derivations and sources
-    (but not output paths), whereas an output path only references other
-    output paths.
-    </para>
-  </glossdef>
-
-</glossentry>
-
-<glossentry xml:id="gloss-reachable"><glossterm>reachable</glossterm>
-
-  <glossdef><para>A store path <varname>Q</varname> is reachable from
-  another store path <varname>P</varname> if <varname>Q</varname> is in the
-  <link linkend="gloss-closure">closure</link> of the
-  <link linkend="gloss-reference">references</link> relation.
-  </para></glossdef>
-</glossentry>
-
-<glossentry xml:id="gloss-closure"><glossterm>closure</glossterm>
-
-  <glossdef><para>The closure of a store path is the set of store
-  paths that are directly or indirectly “reachable” from that store
-  path; that is, it’s the closure of the path under the <link
-  linkend="gloss-reference">references</link> relation. For a package, the
-  closure of its derivation is equivalent to the build-time
-  dependencies, while the closure of its output path is equivalent to its
-  runtime dependencies. For correct deployment it is necessary to deploy whole
-  closures, since otherwise at runtime files could be missing. The command
-  <command>nix-store -qR</command> prints out closures of store paths.
-  </para>
-  <para>As an example, if the store object at path <varname>P</varname> contains
-  a reference to path <varname>Q</varname>, then <varname>Q</varname> is
-  in the closure of <varname>P</varname>. Further, if <varname>Q</varname>
-  references <varname>R</varname> then <varname>R</varname> is also in
-  the closure of <varname>P</varname>.
-  </para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-output-path"><glossterm>output path</glossterm>
-
-  <glossdef><para>A store path produced by a derivation.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-deriver"><glossterm>deriver</glossterm>
-
-  <glossdef><para>The deriver of an <link
-  linkend="gloss-output-path">output path</link> is the store
-  derivation that built it.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-validity"><glossterm>validity</glossterm>
-
-  <glossdef><para>A store path is considered
-  <emphasis>valid</emphasis> if it exists in the file system, is
-  listed in the Nix database as being valid, and if all paths in its
-  closure are also valid.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-user-env"><glossterm>user environment</glossterm>
-
-  <glossdef><para>An automatically generated store object that
-  consists of a set of symlinks to “active” applications, i.e., other
-  store paths.  These are generated automatically by <link
-  linkend="sec-nix-env"><command>nix-env</command></link>.  See <xref
-  linkend="sec-profiles" />.</para>
-
-  </glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-profile"><glossterm>profile</glossterm>
-
-  <glossdef><para>A symlink to the current <link
-  linkend="gloss-user-env">user environment</link> of a user, e.g.,
-  <filename>/nix/var/nix/profiles/default</filename>.</para></glossdef>
-
-</glossentry>
-
-
-<glossentry xml:id="gloss-nar"><glossterm>NAR</glossterm>
-
-  <glossdef><para>A <emphasis>N</emphasis>ix
-  <emphasis>AR</emphasis>chive.  This is a serialisation of a path in
-  the Nix store.  It can contain regular files, directories and
-  symbolic links.  NARs are generated and unpacked using
-  <command>nix-store --dump</command> and <command>nix-store
-  --restore</command>.</para></glossdef>
-
-</glossentry>
-
-
-
-</glosslist>
-
-
-</appendix>
diff --git a/doc/manual/hacking.xml b/doc/manual/hacking.xml
deleted file mode 100644
index 5d9f08d38..000000000
--- a/doc/manual/hacking.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<appendix xmlns="http://docbook.org/ns/docbook"
-          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xml:id="chap-hacking">
-
-<title>Hacking</title>
-
-<para>This section provides some notes on how to hack on Nix. To get
-the latest version of Nix from GitHub:
-<screen>
-$ git clone https://github.com/NixOS/nix.git
-$ cd nix
-</screen>
-</para>
-
-<para>To build Nix for the current operating system/architecture use
-
-<screen>
-$ nix-build
-</screen>
-
-or if you have a flakes-enabled nix:
-
-<screen>
-$ nix build
-</screen>
-
-This will build <literal>defaultPackage</literal> attribute defined in the <literal>flake.nix</literal> file.
-
-To build for other platforms add one of the following suffixes to it: aarch64-linux,
-i686-linux, x86_64-darwin, x86_64-linux.
-
-i.e.
-
-<screen>
-$ nix-build -A defaultPackage.x86_64-linux
-</screen>
-
-</para>
-
-<para>To build all dependencies and start a shell in which all
-environment variables are set up so that those dependencies can be
-found:
-<screen>
-$ nix-shell
-</screen>
-To build Nix itself in this shell:
-<screen>
-[nix-shell]$ ./bootstrap.sh
-[nix-shell]$ ./configure $configureFlags
-[nix-shell]$ make -j $NIX_BUILD_CORES
-</screen>
-To install it in <literal>$(pwd)/inst</literal> and test it:
-<screen>
-[nix-shell]$ make install
-[nix-shell]$ make installcheck
-[nix-shell]$ ./inst/bin/nix --version
-nix (Nix) 2.4
-</screen>
-
-If you have a flakes-enabled nix you can replace:
-
-<screen>
-$ nix-shell
-</screen>
-
-by:
-
-<screen>
-$ nix develop
-</screen>
-
-</para>
-
-</appendix>
diff --git a/doc/manual/installation/building-source.xml b/doc/manual/installation/building-source.xml
deleted file mode 100644
index 469aaebe9..000000000
--- a/doc/manual/installation/building-source.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-building-source">
-
-<title>Building Nix from Source</title>
-
-<para>After unpacking or checking out the Nix sources, issue the
-following commands:
-
-<screen>
-$ ./configure <emphasis>options...</emphasis>
-$ make
-$ make install</screen>
-
-Nix requires GNU Make so you may need to invoke
-<command>gmake</command> instead.</para>
-
-<para>When building from the Git repository, these should be preceded
-by the command:
-
-<screen>
-$ ./bootstrap.sh</screen>
-
-</para>
-
-<para>The installation path can be specified by passing the
-<option>--prefix=<emphasis>prefix</emphasis></option> to
-<command>configure</command>.  The default installation directory is
-<filename>/usr/local</filename>.  You can change this to any location
-you like.  You must have write permission to the
-<emphasis>prefix</emphasis> path.</para>
-
-<para>Nix keeps its <emphasis>store</emphasis> (the place where
-packages are stored) in <filename>/nix/store</filename> by default.
-This can be changed using
-<option>--with-store-dir=<emphasis>path</emphasis></option>.</para>
-
-<warning><para>It is best <emphasis>not</emphasis> to change the Nix
-store from its default, since doing so makes it impossible to use
-pre-built binaries from the standard Nixpkgs channels — that is, all
-packages will need to be built from source.</para></warning>
-
-<para>Nix keeps state (such as its database and log files) in
-<filename>/nix/var</filename> by default.  This can be changed using
-<option>--localstatedir=<emphasis>path</emphasis></option>.</para>
-
-</section>
diff --git a/doc/manual/installation/env-variables.xml b/doc/manual/installation/env-variables.xml
deleted file mode 100644
index cbce8559a..000000000
--- a/doc/manual/installation/env-variables.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-env-variables">
-
-<title>Environment Variables</title>
-
-<para>To use Nix, some environment variables should be set.  In
-particular, <literal>PATH</literal> should contain the directories
-<filename><emphasis>prefix</emphasis>/bin</filename> and
-<filename>~/.nix-profile/bin</filename>.  The first directory contains
-the Nix tools themselves, while <filename>~/.nix-profile</filename> is
-a symbolic link to the current <emphasis>user environment</emphasis>
-(an automatically generated package consisting of symlinks to
-installed packages).  The simplest way to set the required environment
-variables is to include the file
-<filename><emphasis>prefix</emphasis>/etc/profile.d/nix.sh</filename>
-in your <filename>~/.profile</filename> (or similar), like this:</para>
-
-<screen>
-source <emphasis>prefix</emphasis>/etc/profile.d/nix.sh</screen>
-
-<section xml:id="sec-nix-ssl-cert-file">
-
-<title><literal>NIX_SSL_CERT_FILE</literal></title>
-
-<para>If you need to specify a custom certificate bundle to account
-for an HTTPS-intercepting man in the middle proxy, you must specify
-the path to the certificate bundle in the environment variable
-<literal>NIX_SSL_CERT_FILE</literal>.</para>
-
-
-<para>If you don't specify a <literal>NIX_SSL_CERT_FILE</literal>
-manually, Nix will install and use its own certificate
-bundle.</para>
-
-<procedure>
-  <step><para>Set the environment variable and install Nix</para>
-    <screen>
-$ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
-$ sh &lt;(curl -L https://nixos.org/nix/install)
-</screen></step>
-
-  <step><para>In the shell profile and rc files (for example,
-  <filename>/etc/bashrc</filename>, <filename>/etc/zshrc</filename>),
-  add the following line:</para>
-<programlisting>
-export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
-</programlisting>
-</step>
-</procedure>
-
-<note><para>You must not add the export and then do the install, as
-the Nix installer will detect the presense of Nix configuration, and
-abort.</para></note>
-
-<section xml:id="sec-nix-ssl-cert-file-with-nix-daemon-and-macos">
-<title><literal>NIX_SSL_CERT_FILE</literal> with macOS and the Nix daemon</title>
-
-<para>On macOS you must specify the environment variable for the Nix
-daemon service, then restart it:</para>
-
-<screen>
-$ sudo launchctl setenv NIX_SSL_CERT_FILE /etc/ssl/my-certificate-bundle.crt
-$ sudo launchctl kickstart -k system/org.nixos.nix-daemon
-</screen>
-</section>
-
-<section xml:id="sec-installer-proxy-settings">
-
-<title>Proxy Environment Variables</title>
-
-<para>The Nix installer has special handling for these proxy-related
-environment variables:
-<varname>http_proxy</varname>, <varname>https_proxy</varname>,
-<varname>ftp_proxy</varname>, <varname>no_proxy</varname>,
-<varname>HTTP_PROXY</varname>, <varname>HTTPS_PROXY</varname>,
-<varname>FTP_PROXY</varname>, <varname>NO_PROXY</varname>.
-</para>
-<para>If any of these variables are set when running the Nix installer,
-then the installer will create an override file at
-<filename>/etc/systemd/system/nix-daemon.service.d/override.conf</filename>
-so <command>nix-daemon</command> will use them.
-</para>
-</section>
-
-</section>
-</chapter>
diff --git a/doc/manual/installation/installation.xml b/doc/manual/installation/installation.xml
deleted file mode 100644
index 878959352..000000000
--- a/doc/manual/installation/installation.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="chap-installation">
-
-<title>Installation</title>
-
-<partintro>
-<para>This section describes how to install and configure Nix for first-time use.</para>
-</partintro>
-
-<xi:include href="supported-platforms.xml" />
-<xi:include href="installing-binary.xml" />
-<xi:include href="installing-source.xml" />
-<xi:include href="nix-security.xml" />
-<xi:include href="env-variables.xml" />
-
-<!-- TODO: should be updated
-<section><title>Upgrading Nix through Nix</title>
-
-<para>You can install the latest stable version of Nix through Nix
-itself by subscribing to the channel <link
-xlink:href="http://nixos.org/releases/nix/channels/nix-stable" />,
-or the latest unstable version by subscribing to the channel <link
-xlink:href="http://nixos.org/releases/nix/channels/nix-unstable" />.
-You can also do a <link linkend="sec-one-click">one-click
-installation</link> by clicking on the package links at <link
-xlink:href="http://nixos.org/releases/full-index-nix.html" />.</para>
-
-</section>
--->
-
-</part>
diff --git a/doc/manual/installation/installing-binary.xml b/doc/manual/installation/installing-binary.xml
deleted file mode 100644
index 439198e6c..000000000
--- a/doc/manual/installation/installing-binary.xml
+++ /dev/null
@@ -1,469 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-installing-binary">
-
-<title>Installing a Binary Distribution</title>
-
-<para>
-  If you are using Linux or macOS versions up to 10.14 (Mojave), the
-  easiest way to install Nix is to run the following command:
-</para>
-
-<screen>
-  $ sh &lt;(curl -L https://nixos.org/nix/install)
-</screen>
-
-<para>
-  If you're using macOS 10.15 (Catalina) or newer, consult
-  <link linkend="sect-macos-installation">the macOS installation instructions</link>
-  before installing.
-</para>
-
-<para>
-  As of Nix 2.1.0, the Nix installer will always default to creating a
-  single-user installation, however opting in to the multi-user
-  installation is highly recommended.
-  <!-- TODO: this explains *neither* why the default version is
-  single-user, nor why we'd recommend multi-user over the default.
-  True prospective users don't have much basis for evaluating this.
-  What's it to me? Who should pick which? Why? What if I pick wrong?
-  -->
-</para>
-
-<section xml:id="sect-single-user-installation">
-  <title>Single User Installation</title>
-
-  <para>
-    To explicitly select a single-user installation on your system:
-
-    <screen>
-  sh &lt;(curl -L https://nixos.org/nix/install) --no-daemon
-</screen>
-  </para>
-
-<para>
-This will perform a single-user installation of Nix, meaning that
-<filename>/nix</filename> is owned by the invoking user.  You should
-run this under your usual user account, <emphasis>not</emphasis> as
-root.  The script will invoke <command>sudo</command> to create
-<filename>/nix</filename> if it doesn’t already exist.  If you don’t
-have <command>sudo</command>, you should manually create
-<filename>/nix</filename> first as root, e.g.:
-
-<screen>
-$ mkdir /nix
-$ chown alice /nix
-</screen>
-
-The install script will modify the first writable file from amongst
-<filename>.bash_profile</filename>, <filename>.bash_login</filename>
-and <filename>.profile</filename> to source
-<filename>~/.nix-profile/etc/profile.d/nix.sh</filename>. You can set
-the <literal>NIX_INSTALLER_NO_MODIFY_PROFILE</literal> environment
-variable before executing the install script to disable this
-behaviour.
-</para>
-
-
-<para>You can uninstall Nix simply by running:
-
-<screen>
-$ rm -rf /nix
-</screen>
-
-</para>
-</section>
-
-<section xml:id="sect-multi-user-installation">
-  <title>Multi User Installation</title>
-  <para>
-    The multi-user Nix installation creates system users, and a system
-    service for the Nix daemon.
-  </para>
-
-  <itemizedlist>
-    <title>Supported Systems</title>
-
-    <listitem>
-      <para>Linux running systemd, with SELinux disabled</para>
-    </listitem>
-    <listitem><para>macOS</para></listitem>
-  </itemizedlist>
-
-  <para>
-    You can instruct the installer to perform a multi-user
-    installation on your system:
-  </para>
-
-  <screen>sh &lt;(curl -L https://nixos.org/nix/install) --daemon</screen>
-
-  <para>
-    The multi-user installation of Nix will create build users between
-    the user IDs 30001 and 30032, and a group with the group ID 30000.
-
-    You should run this under your usual user account,
-    <emphasis>not</emphasis> as root. The script will invoke
-    <command>sudo</command> as needed.
-  </para>
-
-  <note><para>
-    If you need Nix to use a different group ID or user ID set, you
-    will have to download the tarball manually and <link
-    linkend="sect-nix-install-binary-tarball">edit the install
-    script</link>.
-  </para></note>
-
-  <para>
-    The installer will modify <filename>/etc/bashrc</filename>, and
-    <filename>/etc/zshrc</filename> if they exist. The installer will
-    first back up these files with a
-    <literal>.backup-before-nix</literal> extension. The installer
-    will also create <filename>/etc/profile.d/nix.sh</filename>.
-  </para>
-
-  <para>You can uninstall Nix with the following commands:
-
-<screen>
-sudo rm -rf /etc/profile/nix.sh /etc/nix /nix ~root/.nix-profile ~root/.nix-defexpr ~root/.nix-channels ~/.nix-profile ~/.nix-defexpr ~/.nix-channels
-
-# If you are on Linux with systemd, you will need to run:
-sudo systemctl stop nix-daemon.socket
-sudo systemctl stop nix-daemon.service
-sudo systemctl disable nix-daemon.socket
-sudo systemctl disable nix-daemon.service
-sudo systemctl daemon-reload
-
-# If you are on macOS, you will need to run:
-sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-</screen>
-
-    There may also be references to Nix in
-    <filename>/etc/profile</filename>,
-    <filename>/etc/bashrc</filename>, and
-    <filename>/etc/zshrc</filename> which you may remove.
-  </para>
-
-</section>
-
-<section xml:id="sect-macos-installation">
-  <title>macOS Installation</title>
-
-  <para>
-    Starting with macOS 10.15 (Catalina), the root filesystem is read-only.
-    This means <filename>/nix</filename> can no longer live on your system
-    volume, and that you'll need a workaround to install Nix.
-  </para>
-
-  <para>
-    The recommended approach, which creates an unencrypted APFS volume
-    for your Nix store and a "synthetic" empty directory to mount it
-    over at <filename>/nix</filename>, is least likely to impair Nix
-    or your system.
-  </para>
-
-  <note><para>
-    With all separate-volume approaches, it's possible something on
-    your system (particularly daemons/services and restored apps) may
-    need access to your Nix store before the volume is mounted. Adding
-    additional encryption makes this more likely.
-  </para></note>
-
-  <para>
-    If you're using a recent Mac with a
-    <link xlink:href="https://www.apple.com/euro/mac/shared/docs/Apple_T2_Security_Chip_Overview.pdf">T2 chip</link>,
-    your drive will still be encrypted at rest (in which case "unencrypted"
-    is a bit of a misnomer). To use this approach, just install Nix with:
-  </para>
-
-  <screen>$ sh &lt;(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume</screen>
-
-  <para>
-    If you don't like the sound of this, you'll want to weigh the
-    other approaches and tradeoffs detailed in this section.
-  </para>
-
-  <note>
-    <title>Eventual solutions?</title>
-    <para>
-      All of the known workarounds have drawbacks, but we hope
-      better solutions will be available in the future. Some that
-      we have our eye on are:
-    </para>
-    <orderedlist>
-      <listitem>
-        <para>
-          A true firmlink would enable the Nix store to live on the
-          primary data volume without the build problems caused by
-          the symlink approach. End users cannot currently
-          create true firmlinks.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          If the Nix store volume shared FileVault encryption
-          with the primary data volume (probably by using the same
-          volume group and role), FileVault encryption could be
-          easily supported by the installer without requiring
-          manual setup by each user.
-        </para>
-      </listitem>
-    </orderedlist>
-  </note>
-
-  <section xml:id="sect-macos-installation-change-store-prefix">
-    <title>Change the Nix store path prefix</title>
-    <para>
-      Changing the default prefix for the Nix store is a simple
-      approach which enables you to leave it on your root volume,
-      where it can take full advantage of FileVault encryption if
-      enabled. Unfortunately, this approach also opts your device out
-      of some benefits that are enabled by using the same prefix
-      across systems:
-
-      <itemizedlist>
-        <listitem>
-          <para>
-            Your system won't be able to take advantage of the binary
-            cache (unless someone is able to stand up and support
-            duplicate caching infrastructure), which means you'll
-            spend more time waiting for builds.
-          </para>
-        </listitem>
-        <listitem>
-          <para>
-            It's harder to build and deploy packages to Linux systems.
-          </para>
-        </listitem>
-        <!-- TODO: may be more here -->
-      </itemizedlist>
-
-      <!-- TODO: Yes, but how?! -->
-
-      It would also possible (and often requested) to just apply this
-      change ecosystem-wide, but it's an intrusive process that has
-      side effects we want to avoid for now.
-      <!-- magnificent hand-wavy gesture -->
-    </para>
-    <para>
-    </para>
-  </section>
-
-  <section xml:id="sect-macos-installation-encrypted-volume">
-    <title>Use a separate encrypted volume</title>
-    <para>
-      If you like, you can also add encryption to the recommended
-      approach taken by the installer. You can do this by pre-creating
-      an encrypted volume before you run the installer--or you can
-      run the installer and encrypt the volume it creates later.
-      <!-- TODO: see later note about whether this needs both add-encryption and from-scratch directions -->
-    </para>
-    <para>
-      In either case, adding encryption to a second volume isn't quite
-      as simple as enabling FileVault for your boot volume. Before you
-      dive in, there are a few things to weigh:
-    </para>
-    <orderedlist>
-      <listitem>
-        <para>
-          The additional volume won't be encrypted with your existing
-          FileVault key, so you'll need another mechanism to decrypt
-          the volume.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          You can store the password in Keychain to automatically
-          decrypt the volume on boot--but it'll have to wait on Keychain
-          and may not mount before your GUI apps restore. If any of
-          your launchd agents or apps depend on Nix-installed software
-          (for example, if you use a Nix-installed login shell), the
-          restore may fail or break.
-        </para>
-        <para>
-          On a case-by-case basis, you may be able to work around this
-          problem by using <command>wait4path</command> to block
-          execution until your executable is available.
-        </para>
-        <para>
-          It's also possible to decrypt and mount the volume earlier
-          with a login hook--but this mechanism appears to be
-          deprecated and its future is unclear.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          You can hard-code the password in the clear, so that your
-          store volume can be decrypted before Keychain is available.
-        </para>
-      </listitem>
-    </orderedlist>
-    <para>
-      If you are comfortable navigating these tradeoffs, you can encrypt the volume with
-      something along the lines of:
-      <!-- TODO:
-      I don't know if this also needs from-scratch instructions?
-      can we just recommend use-the-installer-and-then-encrypt?
-      -->
-    </para>
-    <!--
-    TODO: it looks like this option can be encryptVolume|encrypt|enableFileVault
-
-    It may be more clear to use encryptVolume, here? FileVault seems
-    heavily associated with the boot-volume behavior; I worry
-    a little that it can mislead here, especially as it gets
-    copied around minus doc context...?
-    -->
-    <screen>alice$ diskutil apfs enableFileVault /nix -user disk</screen>
-
-    <!-- TODO: and then go into detail on the mount/decrypt approaches? -->
-  </section>
-
-  <section xml:id="sect-macos-installation-symlink">
-    <!--
-    Maybe a good razor is: if we'd hate having to support someone who
-    installed Nix this way, it shouldn't even be detailed?
-    -->
-    <title>Symlink the Nix store to a custom location</title>
-    <para>
-      Another simple approach is using <filename>/etc/synthetic.conf</filename>
-      to symlink the Nix store to the data volume. This option also
-      enables your store to share any configured FileVault encryption.
-      Unfortunately, builds that resolve the symlink may leak the
-      canonical path or even fail.
-    </para>
-    <para>
-      Because of these downsides, we can't recommend this approach.
-    </para>
-    <!-- Leaving out instructions for this one. -->
-  </section>
-
-  <section xml:id="sect-macos-installation-recommended-notes">
-    <title>Notes on the recommended approach</title>
-    <para>
-      This section goes into a little more detail on the recommended
-      approach. You don't need to understand it to run the installer,
-      but it can serve as a helpful reference if you run into trouble.
-    </para>
-    <orderedlist>
-      <listitem>
-        <para>
-          In order to compose user-writable locations into the new
-          read-only system root, Apple introduced a new concept called
-          <literal>firmlinks</literal>, which it describes as a
-          "bi-directional wormhole" between two filesystems. You can
-          see the current firmlinks in <filename>/usr/share/firmlinks</filename>.
-          Unfortunately, firmlinks aren't (currently?) user-configurable.
-        </para>
-
-        <para>
-          For special cases like NFS mount points or package manager roots,
-          <link xlink:href="https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man5/synthetic.conf.5.html">synthetic.conf(5)</link>
-          supports limited user-controlled file-creation (of symlinks,
-          and synthetic empty directories) at <filename>/</filename>.
-          To create a synthetic empty directory for mounting at <filename>/nix</filename>,
-          add the following line to <filename>/etc/synthetic.conf</filename>
-          (create it if necessary):
-        </para>
-
-        <screen>nix</screen>
-      </listitem>
-
-      <listitem>
-        <para>
-          This configuration is applied at boot time, but you can use
-          <command>apfs.util</command> to trigger creation (not deletion)
-          of new entries without a reboot:
-        </para>
-
-        <screen>alice$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B</screen>
-      </listitem>
-
-      <listitem>
-        <para>
-          Create the new APFS volume with diskutil:
-        </para>
-
-        <screen>alice$ sudo diskutil apfs addVolume diskX APFS 'Nix Store' -mountpoint /nix</screen>
-      </listitem>
-
-      <listitem>
-        <para>
-          Using <command>vifs</command>, add the new mount to
-          <filename>/etc/fstab</filename>. If it doesn't already have
-          other entries, it should look something like:
-        </para>
-
-<screen>
-#
-# Warning - this file should only be modified with vifs(8)
-#
-# Failure to do so is unsupported and may be destructive.
-#
-LABEL=Nix\040Store /nix apfs rw,nobrowse
-</screen>
-
-        <para>
-          The nobrowse setting will keep Spotlight from indexing this
-          volume, and keep it from showing up on your desktop.
-        </para>
-      </listitem>
-    </orderedlist>
-  </section>
-
-</section>
-
-<section xml:id="sect-nix-install-pinned-version-url">
-  <title>Installing a pinned Nix version from a URL</title>
-
-  <para>
-    NixOS.org hosts version-specific installation URLs for all Nix
-    versions since 1.11.16, at
-    <literal>https://releases.nixos.org/nix/nix-<emphasis>version</emphasis>/install</literal>.
-  </para>
-
-  <para>
-    These install scripts can be used the same as the main
-  NixOS.org installation script:
-
-  <screen>
-  sh &lt;(curl -L https://nixos.org/nix/install)
-</screen>
-  </para>
-
-  <para>
-    In the same directory of the install script are sha256 sums, and
-    gpg signature files.
-  </para>
-</section>
-
-<section xml:id="sect-nix-install-binary-tarball">
-  <title>Installing from a binary tarball</title>
-
-  <para>
-    You can also download a binary tarball that contains Nix and all
-    its dependencies.  (This is what the install script at
-    <uri>https://nixos.org/nix/install</uri> does automatically.)  You
-    should unpack it somewhere (e.g. in <filename>/tmp</filename>),
-    and then run the script named <command>install</command> inside
-    the binary tarball:
-
-
-<screen>
-alice$ cd /tmp
-alice$ tar xfj nix-1.8-x86_64-darwin.tar.bz2
-alice$ cd nix-1.8-x86_64-darwin
-alice$ ./install
-</screen>
-  </para>
-
-  <para>
-    If you need to edit the multi-user installation script to use
-    different group ID or a different user ID range, modify the
-    variables set in the file named
-    <filename>install-multi-user</filename>.
-  </para>
-</section>
-</chapter>
diff --git a/doc/manual/installation/installing-source.xml b/doc/manual/installation/installing-source.xml
deleted file mode 100644
index c261a109d..000000000
--- a/doc/manual/installation/installing-source.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-installing-source">
-
-<title>Installing Nix from Source</title>
-
-<para>If no binary package is available, you can download and compile
-a source distribution.</para>
-
-<xi:include href="prerequisites-source.xml" />
-<xi:include href="obtaining-source.xml" />
-<xi:include href="building-source.xml" />
-
-</chapter>
diff --git a/doc/manual/installation/multi-user.xml b/doc/manual/installation/multi-user.xml
deleted file mode 100644
index 835bd3a52..000000000
--- a/doc/manual/installation/multi-user.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-multi-user">
-
-<title>Multi-User Mode</title>
-
-<para>To allow a Nix store to be shared safely among multiple users,
-it is important that users are not able to run builders that modify
-the Nix store or database in arbitrary ways, or that interfere with
-builds started by other users.  If they could do so, they could
-install a Trojan horse in some package and compromise the accounts of
-other users.</para>
-
-<para>To prevent this, the Nix store and database are owned by some
-privileged user (usually <literal>root</literal>) and builders are
-executed under special user accounts (usually named
-<literal>nixbld1</literal>, <literal>nixbld2</literal>, etc.).  When a
-unprivileged user runs a Nix command, actions that operate on the Nix
-store (such as builds) are forwarded to a <emphasis>Nix
-daemon</emphasis> running under the owner of the Nix store/database
-that performs the operation.</para>
-
-<note><para>Multi-user mode has one important limitation: only
-<systemitem class="username">root</systemitem> and a set of trusted
-users specified in <filename>nix.conf</filename> can specify arbitrary
-binary caches. So while unprivileged users may install packages from
-arbitrary Nix expressions, they may not get pre-built
-binaries.</para></note>
-
-
-<section>
-
-<title>Setting up the build users</title>
-
-<para>The <emphasis>build users</emphasis> are the special UIDs under
-which builds are performed.  They should all be members of the
-<emphasis>build users group</emphasis> <literal>nixbld</literal>.
-This group should have no other members.  The build users should not
-be members of any other group. On Linux, you can create the group and
-users as follows:
-
-<screen>
-$ groupadd -r nixbld
-$ for n in $(seq 1 10); do useradd -c "Nix build user $n" \
-    -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
-    nixbld$n; done
-</screen>
-
-This creates 10 build users. There can never be more concurrent builds
-than the number of build users, so you may want to increase this if
-you expect to do many builds at the same time.</para>
-
-</section>
-
-
-<section>
-
-<title>Running the daemon</title>
-
-<para>The <link linkend="sec-nix-daemon">Nix daemon</link> should be
-started as follows (as <literal>root</literal>):
-
-<screen>
-$ nix-daemon</screen>
-
-You’ll want to put that line somewhere in your system’s boot
-scripts.</para>
-
-<para>To let unprivileged users use the daemon, they should set the
-<link linkend="envar-remote"><literal>NIX_REMOTE</literal> environment
-variable</link> to <literal>daemon</literal>.  So you should put a
-line like
-
-<programlisting>
-export NIX_REMOTE=daemon</programlisting>
-
-into the users’ login scripts.</para>
-
-</section>
-
-
-<section>
-
-<title>Restricting access</title>
-
-<para>To limit which users can perform Nix operations, you can use the
-permissions on the directory
-<filename>/nix/var/nix/daemon-socket</filename>.  For instance, if you
-want to restrict the use of Nix to the members of a group called
-<literal>nix-users</literal>, do
-
-<screen>
-$ chgrp nix-users /nix/var/nix/daemon-socket
-$ chmod ug=rwx,o= /nix/var/nix/daemon-socket
-</screen>
-
-This way, users who are not in the <literal>nix-users</literal> group
-cannot connect to the Unix domain socket
-<filename>/nix/var/nix/daemon-socket/socket</filename>, so they cannot
-perform Nix operations.</para>
-
-</section>
-
-
-</section>
diff --git a/doc/manual/installation/nix-security.xml b/doc/manual/installation/nix-security.xml
deleted file mode 100644
index d888ff14d..000000000
--- a/doc/manual/installation/nix-security.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-nix-security">
-
-<title>Security</title>
-
-<para>Nix has two basic security models.  First, it can be used in
-“single-user mode”, which is similar to what most other package
-management tools do: there is a single user (typically <systemitem
-class="username">root</systemitem>) who performs all package
-management operations.  All other users can then use the installed
-packages, but they cannot perform package management operations
-themselves.</para>
-
-<para>Alternatively, you can configure Nix in “multi-user mode”.  In
-this model, all users can perform package management operations — for
-instance, every user can install software without requiring root
-privileges.  Nix ensures that this is secure.  For instance, it’s not
-possible for one user to overwrite a package used by another user with
-a Trojan horse.</para>
-
-<xi:include href="single-user.xml" />
-<xi:include href="multi-user.xml" />
-
-</chapter>
\ No newline at end of file
diff --git a/doc/manual/installation/obtaining-source.xml b/doc/manual/installation/obtaining-source.xml
deleted file mode 100644
index 968822cc0..000000000
--- a/doc/manual/installation/obtaining-source.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-obtaining-source">
-
-<title>Obtaining a Source Distribution</title>
-
-<para>The source tarball of the most recent stable release can be
-downloaded from the <link
-xlink:href="http://nixos.org/nix/download.html">Nix homepage</link>.
-You can also grab the <link
-xlink:href="http://hydra.nixos.org/job/nix/master/release/latest-finished#tabs-constituents">most
-recent development release</link>.</para>
-
-<para>Alternatively, the most recent sources of Nix can be obtained
-from its <link
-xlink:href="https://github.com/NixOS/nix">Git
-repository</link>.  For example, the following command will check out
-the latest revision into a directory called
-<filename>nix</filename>:</para>
-
-<screen>
-$ git clone https://github.com/NixOS/nix</screen>
-
-<para>Likewise, specific releases can be obtained from the <link
-xlink:href="https://github.com/NixOS/nix/tags">tags</link> of the
-repository.</para>
-
-</section>
\ No newline at end of file
diff --git a/doc/manual/installation/prerequisites-source.xml b/doc/manual/installation/prerequisites-source.xml
deleted file mode 100644
index 77955eecc..000000000
--- a/doc/manual/installation/prerequisites-source.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-prerequisites-source">
-
-<title>Prerequisites</title>
-
-<itemizedlist>
-
-  <listitem><para>GNU Autoconf
-  (<link xlink:href="https://www.gnu.org/software/autoconf/"/>)
-  and the autoconf-archive macro collection
-  (<link xlink:href="https://www.gnu.org/software/autoconf-archive/"/>).
-  These are only needed to run the bootstrap script, and are not necessary
-  if your source distribution came with a pre-built
-  <literal>./configure</literal> script.</para></listitem>
-
-  <listitem><para>GNU Make.</para></listitem>
-  
-  <listitem><para>Bash Shell. The <literal>./configure</literal> script
-  relies on bashisms, so Bash is required.</para></listitem>
-
-  <listitem><para>A version of GCC or Clang that supports C++17.</para></listitem>
-
-  <listitem><para><command>pkg-config</command> to locate
-  dependencies.  If your distribution does not provide it, you can get
-  it from <link
-  xlink:href="http://www.freedesktop.org/wiki/Software/pkg-config"
-  />.</para></listitem>
-
-  <listitem><para>The OpenSSL library to calculate cryptographic hashes.
-  If your distribution does not provide it, you can get it from <link
-  xlink:href="https://www.openssl.org"/>.</para></listitem>
-
-  <listitem><para>The <literal>libbrotlienc</literal> and
-  <literal>libbrotlidec</literal> libraries to provide implementation
-  of the Brotli compression algorithm. They are available for download
-  from the official repository <link
-  xlink:href="https://github.com/google/brotli" />.</para></listitem>
-
-  <listitem><para>The bzip2 compressor program and the
-  <literal>libbz2</literal> library.  Thus you must have bzip2
-  installed, including development headers and libraries.  If your
-  distribution does not provide these, you can obtain bzip2 from <link
-  xlink:href="https://web.archive.org/web/20180624184756/http://www.bzip.org/"
-  />.</para></listitem>
-
-  <listitem><para><literal>liblzma</literal>, which is provided by
-  XZ Utils. If your distribution does not provide this, you can
-  get it from <link xlink:href="https://tukaani.org/xz/"/>.</para></listitem>
-  
-  <listitem><para>cURL and its library. If your distribution does not
-  provide it, you can get it from <link
-  xlink:href="https://curl.haxx.se/"/>.</para></listitem>
-      
-  <listitem><para>The SQLite embedded database library, version 3.6.19
-  or higher.  If your distribution does not provide it, please install
-  it from <link xlink:href="http://www.sqlite.org/" />.</para></listitem>
-
-  <listitem><para>The <link
-  xlink:href="http://www.hboehm.info/gc/">Boehm
-  garbage collector</link> to reduce the evaluator’s memory
-  consumption (optional).  To enable it, install
-  <literal>pkgconfig</literal> and the Boehm garbage collector, and
-  pass the flag <option>--enable-gc</option> to
-  <command>configure</command>.</para></listitem>
-
-  <listitem><para>The <literal>boost</literal> library of version
-  1.66.0 or higher. It can be obtained from the official web site
-  <link xlink:href="https://www.boost.org/" />.</para></listitem>
-
-  <listitem><para>The <literal>editline</literal> library of version
-  1.14.0 or higher. It can be obtained from the its repository
-  <link xlink:href="https://github.com/troglobit/editline" />.</para></listitem>
-
-  <listitem><para>Recent versions of Bison and Flex to build the
-  parser.  (This is because Nix needs GLR support in Bison and
-  reentrancy support in Flex.)  For Bison, you need version 2.6, which
-  can be obtained from the <link
-  xlink:href="ftp://alpha.gnu.org/pub/gnu/bison">GNU FTP
-  server</link>.  For Flex, you need version 2.5.35, which is
-  available on <link
-  xlink:href="http://lex.sourceforge.net/">SourceForge</link>.
-  Slightly older versions may also work, but ancient versions like the
-  ubiquitous 2.5.4a won't.  Note that these are only required if you
-  modify the parser or when you are building from the Git
-  repository.</para></listitem>
-
-  <listitem><para>The <literal>libseccomp</literal> is used to provide
-  syscall filtering on Linux. This is an optional dependency and can
-  be disabled passing a <option>--disable-seccomp-sandboxing</option>
-  option to the <command>configure</command> script (Not recommended
-  unless your system doesn't support
-  <literal>libseccomp</literal>). To get the library, visit <link
-  xlink:href="https://github.com/seccomp/libseccomp"
-  />.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/installation/single-user.xml b/doc/manual/installation/single-user.xml
deleted file mode 100644
index e9a761af3..000000000
--- a/doc/manual/installation/single-user.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-single-user">
-
-<title>Single-User Mode</title>
-
-<para>In single-user mode, all Nix operations that access the database
-in <filename><emphasis>prefix</emphasis>/var/nix/db</filename>
-or modify the Nix store in
-<filename><emphasis>prefix</emphasis>/store</filename> must be
-performed under the user ID that owns those directories.  This is
-typically <systemitem class="username">root</systemitem>.  (If you
-install from RPM packages, that’s in fact the default ownership.)
-However, on single-user machines, it is often convenient to
-<command>chown</command> those directories to your normal user account
-so that you don’t have to <command>su</command> to <systemitem
-class="username">root</systemitem> all the time.</para>
-
-</section>
\ No newline at end of file
diff --git a/doc/manual/installation/supported-platforms.xml b/doc/manual/installation/supported-platforms.xml
deleted file mode 100644
index 3e74be49d..000000000
--- a/doc/manual/installation/supported-platforms.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-supported-platforms">
-
-<title>Supported Platforms</title>
-
-<para>Nix is currently supported on the following platforms:
-
-<itemizedlist>
-
-  <listitem><para>Linux (i686, x86_64, aarch64).</para></listitem>
-
-  <listitem><para>macOS (x86_64).</para></listitem>
-
-  <!--
-  <listitem><para>FreeBSD (only tested on Intel).</para></listitem>
-  -->
-
-  <!--
-  <listitem><para>Windows through <link
-  xlink:href="http://www.cygwin.com/">Cygwin</link>.</para>
-
-  <warning><para>On Cygwin, Nix <emphasis>must</emphasis> be installed
-  on an NTFS partition.  It will not work correctly on a FAT
-  partition.</para></warning>
-
-  </listitem>
-  -->
-
-</itemizedlist>
-
-</para>
-
-</chapter>
diff --git a/doc/manual/installation/upgrading.xml b/doc/manual/installation/upgrading.xml
deleted file mode 100644
index 592f63895..000000000
--- a/doc/manual/installation/upgrading.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-upgrading-nix">
-
-  <title>Upgrading Nix</title>
-
-  <para>
-    Multi-user Nix users on macOS can upgrade Nix by running:
-    <command>sudo -i sh -c 'nix-channel --update &amp;&amp;
-    nix-env -iA nixpkgs.nix &amp;&amp;
-    launchctl remove org.nixos.nix-daemon &amp;&amp;
-    launchctl load /Library/LaunchDaemons/org.nixos.nix-daemon.plist'</command>
-  </para>
-
-
-  <para>
-    Single-user installations of Nix should run this:
-    <command>nix-channel --update; nix-env -iA nixpkgs.nix nixpkgs.cacert</command>
-  </para>
-      
-  <para>
-    Multi-user Nix users on Linux should run this with sudo:
-    <command>nix-channel --update; nix-env -iA nixpkgs.nix nixpkgs.cacert; systemctl daemon-reload; systemctl restart nix-daemon</command>
-  </para>
-</chapter>
diff --git a/doc/manual/introduction/about-nix.xml b/doc/manual/introduction/about-nix.xml
deleted file mode 100644
index 039185703..000000000
--- a/doc/manual/introduction/about-nix.xml
+++ /dev/null
@@ -1,268 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-about-nix">
-
-<title>About Nix</title>
-
-<para>Nix is a <emphasis>purely functional package manager</emphasis>.
-This means that it treats packages like values in purely functional
-programming languages such as Haskell — they are built by functions
-that don’t have side-effects, and they never change after they have
-been built.  Nix stores packages in the <emphasis>Nix
-store</emphasis>, usually the directory
-<filename>/nix/store</filename>, where each package has its own unique
-subdirectory such as
-
-<programlisting>
-/nix/store/b6gvzjyb2pg0kjfwrjmg1vfhh54ad73z-firefox-33.1/
-</programlisting>
-
-where <literal>b6gvzjyb2pg0…</literal> is a unique identifier for the
-package that captures all its dependencies (it’s a cryptographic hash
-of the package’s build dependency graph).  This enables many powerful
-features.</para>
-
-
-<section><title>Multiple versions</title>
-
-<para>You can have multiple versions or variants of a package
-installed at the same time.  This is especially important when
-different applications have dependencies on different versions of the
-same package — it prevents the “DLL hell”.  Because of the hashing
-scheme, different versions of a package end up in different paths in
-the Nix store, so they don’t interfere with each other.</para>
-
-<para>An important consequence is that operations like upgrading or
-uninstalling an application cannot break other applications, since
-these operations never “destructively” update or delete files that are
-used by other packages.</para>
-
-</section>
-
-
-<section><title>Complete dependencies</title>
-
-<para>Nix helps you make sure that package dependency specifications
-are complete.  In general, when you’re making a package for a package
-management system like RPM, you have to specify for each package what
-its dependencies are, but there are no guarantees that this
-specification is complete.  If you forget a dependency, then the
-package will build and work correctly on <emphasis>your</emphasis>
-machine if you have the dependency installed, but not on the end
-user's machine if it's not there.</para>
-
-<para>Since Nix on the other hand doesn’t install packages in “global”
-locations like <filename>/usr/bin</filename> but in package-specific
-directories, the risk of incomplete dependencies is greatly reduced.
-This is because tools such as compilers don’t search in per-packages
-directories such as
-<filename>/nix/store/5lbfaxb722zp…-openssl-0.9.8d/include</filename>,
-so if a package builds correctly on your system, this is because you
-specified the dependency explicitly. This takes care of the build-time
-dependencies.</para>
-
-<para>Once a package is built, runtime dependencies are found by
-scanning binaries for the hash parts of Nix store paths (such as
-<literal>r8vvq9kq…</literal>).  This sounds risky, but it works
-extremely well.</para>
-
-</section>
-
-
-<section><title>Multi-user support</title>
-
-<para>Nix has multi-user support.  This means that non-privileged
-users can securely install software.  Each user can have a different
-<emphasis>profile</emphasis>, a set of packages in the Nix store that
-appear in the user’s <literal>PATH</literal>.  If a user installs a
-package that another user has already installed previously, the
-package won’t be built or downloaded a second time.  At the same time,
-it is not possible for one user to inject a Trojan horse into a
-package that might be used by another user.</para>
-
-</section>
-
-
-<section><title>Atomic upgrades and rollbacks</title>
-
-<para>Since package management operations never overwrite packages in
-the Nix store but just add new versions in different paths, they are
-<emphasis>atomic</emphasis>.  So during a package upgrade, there is no
-time window in which the package has some files from the old version
-and some files from the new version — which would be bad because a
-program might well crash if it’s started during that period.</para>
-
-<para>And since packages aren’t overwritten, the old versions are still
-there after an upgrade.  This means that you can <emphasis>roll
-back</emphasis> to the old version:</para>
-
-<screen>
-$ nix-env --upgrade <emphasis>some-packages</emphasis>
-$ nix-env --rollback
-</screen>
-
-</section>
-
-
-<section><title>Garbage collection</title>
-
-<para>When you uninstall a package like this…
-
-<screen>
-$ nix-env --uninstall firefox
-</screen>
-
-the package isn’t deleted from the system right away (after all, you
-might want to do a rollback, or it might be in the profiles of other
-users).  Instead, unused packages can be deleted safely by running the
-<emphasis>garbage collector</emphasis>:
-
-<screen>
-$ nix-collect-garbage
-</screen>
-
-This deletes all packages that aren’t in use by any user profile or by
-a currently running program.</para>
-
-</section>
-
-
-<section><title>Functional package language</title>
-
-<para>Packages are built from <emphasis>Nix expressions</emphasis>,
-which is a simple functional language.  A Nix expression describes
-everything that goes into a package build action (a “derivation”):
-other packages, sources, the build script, environment variables for
-the build script, etc.  Nix tries very hard to ensure that Nix
-expressions are <emphasis>deterministic</emphasis>: building a Nix
-expression twice should yield the same result.</para>
-
-<para>Because it’s a functional language, it’s easy to support
-building variants of a package: turn the Nix expression into a
-function and call it any number of times with the appropriate
-arguments.  Due to the hashing scheme, variants don’t conflict with
-each other in the Nix store.</para>
-
-</section>
-
-
-<section><title>Transparent source/binary deployment</title>
-
-<para>Nix expressions generally describe how to build a package from
-source, so an installation action like
-
-<screen>
-$ nix-env --install firefox
-</screen>
-
-<emphasis>could</emphasis> cause quite a bit of build activity, as not
-only Firefox but also all its dependencies (all the way up to the C
-library and the compiler) would have to built, at least if they are
-not already in the Nix store.  This is a <emphasis>source deployment
-model</emphasis>.  For most users, building from source is not very
-pleasant as it takes far too long.  However, Nix can automatically
-skip building from source and instead use a <emphasis>binary
-cache</emphasis>, a web server that provides pre-built binaries. For
-instance, when asked to build
-<literal>/nix/store/b6gvzjyb2pg0…-firefox-33.1</literal> from source,
-Nix would first check if the file
-<uri>https://cache.nixos.org/b6gvzjyb2pg0….narinfo</uri> exists, and
-if so, fetch the pre-built binary referenced from there; otherwise, it
-would fall back to building from source.</para>
-
-</section>
-
-
-<!--
-<section><title>Binary patching</title>
-
-<para>In addition to downloading binaries automatically if they’re
-available, Nix can download binary deltas that patch an existing
-package in the Nix store into a new version.  This speeds up
-upgrades.</para>
-
-</section>
--->
-
-
-<section><title>Nix Packages collection</title>
-
-<para>We provide a large set of Nix expressions containing hundreds of
-existing Unix packages, the <emphasis>Nix Packages
-collection</emphasis> (Nixpkgs).</para>
-
-</section>
-
-
-<section><title>Managing build environments</title>
-
-<para>Nix is extremely useful for developers as it makes it easy to
-automatically set up the build environment for a package. Given a
-Nix expression that describes the dependencies of your package, the
-command <command>nix-shell</command> will build or download those
-dependencies if they’re not already in your Nix store, and then start
-a Bash shell in which all necessary environment variables (such as
-compiler search paths) are set.</para>
-
-<para>For example, the following command gets all dependencies of the
-Pan newsreader, as described by <link
-xlink:href="https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix">its
-Nix expression</link>:</para>
-
-<screen>
-$ nix-shell '&lt;nixpkgs>' -A pan
-</screen>
-
-<para>You’re then dropped into a shell where you can edit, build and test
-the package:</para>
-
-<screen>
-[nix-shell]$ tar xf $src
-[nix-shell]$ cd pan-*
-[nix-shell]$ ./configure
-[nix-shell]$ make
-[nix-shell]$ ./pan/gui/pan
-</screen>
-
-<!--
-<para>Since Nix packages are reproducible and have complete dependency
-specifications, Nix makes an excellent basis for <a
-href="[%root%]hydra">a continuous build system</a>.</para>
--->
-
-</section>
-
-
-<section><title>Portability</title>
-
-<para>Nix runs on Linux and macOS.</para>
-
-</section>
-
-
-<section><title>NixOS</title>
-
-<para>NixOS is a Linux distribution based on Nix.  It uses Nix not
-just for package management but also to manage the system
-configuration (e.g., to build configuration files in
-<filename>/etc</filename>).  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 <link
-xlink:href="http://nixos.org/">NixOS homepage</link>.</para>
-
-</section>
-
-
-<section><title>License</title>
-
-<para>Nix is released under the terms of the <link
-xlink:href="http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html">GNU
-LGPLv2.1 or (at your option) any later version</link>.</para>
-
-</section>
-
-
-</chapter>
diff --git a/doc/manual/introduction/introduction.xml b/doc/manual/introduction/introduction.xml
deleted file mode 100644
index 12b2cc761..000000000
--- a/doc/manual/introduction/introduction.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="chap-introduction">
-
-<title>Introduction</title>
-
-<xi:include href="about-nix.xml" />
-<xi:include href="quick-start.xml" />
-
-</part>
diff --git a/doc/manual/introduction/quick-start.xml b/doc/manual/introduction/quick-start.xml
deleted file mode 100644
index 5d9a55e4e..000000000
--- a/doc/manual/introduction/quick-start.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="chap-quick-start">
-
-<title>Quick Start</title>
-
-<para>This chapter is for impatient people who don't like reading
-documentation.  For more in-depth information you are kindly referred
-to subsequent chapters.</para>
-
-<procedure>
-
-<step><para>Install single-user Nix by running the following:
-
-<screen>
-$ bash &lt;(curl -L https://nixos.org/nix/install)
-</screen>
-
-This will install Nix in <filename>/nix</filename>. The install script
-will create <filename>/nix</filename> using <command>sudo</command>,
-so make sure you have sufficient rights.  (For other installation
-methods, see <xref linkend="chap-installation"/>.)</para></step>
-
-<step><para>See what installable packages are currently available
-in the channel:
-
-<screen>
-$ nix-env -qa
-docbook-xml-4.3
-docbook-xml-4.5
-firefox-33.0.2
-hello-2.9
-libxslt-1.1.28
-<emphasis>...</emphasis></screen>
-
-</para></step>
-
-<step><para>Install some packages from the channel:
-
-<screen>
-$ nix-env -i hello</screen>
-
-This should download pre-built packages; it should not build them
-locally (if it does, something went wrong).</para></step>
-
-<step><para>Test that they work:
-
-<screen>
-$ which hello
-/home/eelco/.nix-profile/bin/hello
-$ hello
-Hello, world!
-</screen>
-
-</para></step>
-
-<step><para>Uninstall a package:
-
-<screen>
-$ nix-env -e hello</screen>
-
-</para></step>
-
-<step><para>You can also test a package without installing it:
-
-<screen>
-$ nix-shell -p hello
-</screen>
-
-This builds or downloads GNU Hello and its dependencies, then drops
-you into a Bash shell where the <command>hello</command> command is
-present, all without affecting your normal environment:
-
-<screen>
-[nix-shell:~]$ hello
-Hello, world!
-
-[nix-shell:~]$ exit
-
-$ hello
-hello: command not found
-</screen>
-
-</para></step>
-
-<step><para>To keep up-to-date with the channel, do:
-
-<screen>
-$ nix-channel --update nixpkgs
-$ nix-env -u '*'</screen>
-
-The latter command will upgrade each installed package for which there
-is a “newer” version (as determined by comparing the version
-numbers).</para></step>
-
-<step><para>If you're unhappy with the result of a
-<command>nix-env</command> action (e.g., an upgraded package turned
-out not to work properly), you can go back:
-
-<screen>
-$ nix-env --rollback</screen>
-
-</para></step>
-
-<step><para>You should periodically run the Nix garbage collector
-to get rid of unused packages, since uninstalls or upgrades don't
-actually delete them:
-
-<screen>
-$ nix-collect-garbage -d</screen>
-
-<!--
-The first command deletes old “generations” of your profile (making
-rollbacks impossible, but also making the packages in those old
-generations available for garbage collection), while the second
-command actually deletes them.-->
-
-</para></step>
-
-</procedure>
-
-</chapter>
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 13d937f8d..2d730a60e 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -2,14 +2,6 @@ ifeq ($(doc_generate),yes)
 
 MANUAL_SRCS := $(call rwildcard, $(d)/src, *.md)
 
-#$(d)/version.txt:
-#	$(trace-gen) echo -n $(PACKAGE_VERSION) > $@
-
-clean-files += $(d)/version.txt
-
-dist-files += $(d)/version.txt
-
-
 # Generate man pages.
 man-pages := $(foreach n, \
   nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
@@ -38,5 +30,4 @@ install: $(docdir)/manual/index.html
 $(docdir)/manual/index.html: $(MANUAL_SRCS)
 	$(trace-gen) mdbook build doc/manual -d $(docdir)/manual
 
-
 endif
diff --git a/doc/manual/manual.xml b/doc/manual/manual.xml
deleted file mode 100644
index 87d9de28a..000000000
--- a/doc/manual/manual.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<book xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0">
-
-  <info>
-    <title>Nix Package Manager Guide</title>
-    <subtitle>Version <xi:include href="version.txt" parse="text" /></subtitle>
-
-    <author>
-      <personname>
-        <firstname>Eelco</firstname>
-        <surname>Dolstra</surname>
-      </personname>
-      <contrib>Author</contrib>
-    </author>
-
-    <copyright>
-      <year>2004-2018</year>
-      <holder>Eelco Dolstra</holder>
-    </copyright>
-
-  </info>
-
-  <!--
-  <preface>
-    <title>Preface</title>
-    <para>This manual describes how to set up and use the Nix package
-    manager.</para>
-  </preface>
-  -->
-
-  <xi:include href="introduction/introduction.xml" />
-  <xi:include href="installation/installation.xml" />
-  <xi:include href="installation/upgrading.xml" />
-  <xi:include href="packages/package-management.xml" />
-  <xi:include href="expressions/writing-nix-expressions.xml" />
-  <xi:include href="advanced-topics/advanced-topics.xml" />
-  <xi:include href="command-ref/command-ref.xml" />
-  <xi:include href="glossary/glossary.xml" />
-  <xi:include href="hacking.xml" />
-  <xi:include href="release-notes/release-notes.xml" />
-
-<!--
-<appendix>
-    <title>Nix Release Notes</title>
-    <xi:include href="release-notes/release-notes.xml"
-                xpointer="xmlns(x=http://docbook.org/ns/docbook)xpointer(x:article/x:section)" />
-  </appendix>
--->
-
-</book>
diff --git a/doc/manual/nix-lang-ref.xml b/doc/manual/nix-lang-ref.xml
deleted file mode 100644
index 86273ac3d..000000000
--- a/doc/manual/nix-lang-ref.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<appendix>
-  <title>Nix Language Reference</title>
-
-  <sect1>
-    <title>Grammar</title>
-
-    <productionset>
-      <title>Expressions</title>
-      
-      <production id="nix.expr">
-        <lhs>Expr</lhs>
-        <rhs>
-          <nonterminal def="#nix.expr_function" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_function">
-        <lhs>ExprFunction</lhs>
-        <rhs>
-          '{' <nonterminal def="#nix.formals" /> '}' ':' <nonterminal def="#nix.expr_function" />
-          <sbr />|
-          <nonterminal def="#nix.expr_assert" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_assert">
-        <lhs>ExprAssert</lhs>
-        <rhs>
-          'assert' <nonterminal def="#nix.expr" /> ';' <nonterminal def="#nix.expr_assert" />
-          <sbr />|
-          <nonterminal def="#nix.expr_if" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_if">
-        <lhs>ExprIf</lhs>
-        <rhs>
-          'if' <nonterminal def="#nix.expr" /> 'then' <nonterminal def="#nix.expr" />
-          'else' <nonterminal def="#nix.expr" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_op">
-        <lhs>ExprOp</lhs>
-        <rhs>
-          '!' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '==' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '!=' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '&amp;&amp;' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '||' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '->' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '//' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '~' <nonterminal def="#nix.expr_op" />
-          <sbr />|
-          <nonterminal def="#nix.expr_op" /> '?' <nonterminal def="#nix.id" />
-          <sbr />|
-          <nonterminal def="#nix.expr_app" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_app">
-        <lhs>ExprApp</lhs>
-        <rhs>
-          <nonterminal def="#nix.expr_app" /> '.' <nonterminal def="#nix.expr_select" />
-          <sbr />|
-          <nonterminal def="#nix.expr_select" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_select">
-        <lhs>ExprSelect</lhs>
-        <rhs>
-          <nonterminal def="#nix.expr_select" /> <nonterminal def="#nix.id" />
-          <sbr />|
-          <nonterminal def="#nix.expr_simple" />
-        </rhs>
-      </production>
-      
-      <production id="nix.expr_simple">
-        <lhs>ExprSimple</lhs>
-        <rhs>
-          <nonterminal def="#nix.id" /> |
-          <nonterminal def="#nix.int" /> |
-          <nonterminal def="#nix.str" /> |
-          <nonterminal def="#nix.path" /> |
-          <nonterminal def="#nix.uri" />
-          <sbr />|
-          'true' | 'false' | 'null'
-          <sbr />|
-          '(' <nonterminal def="#nix.expr" /> ')'
-          <sbr />|
-          '{' <nonterminal def="#nix.bind" />* '}'
-          <sbr />|
-          'let' '{' <nonterminal def="#nix.bind" />* '}'
-          <sbr />|
-          'rec' '{' <nonterminal def="#nix.bind" />* '}'
-          <sbr />|
-          '[' <nonterminal def="#nix.expr_select" />* ']'
-        </rhs>
-      </production>
-
-      <production id="nix.bind">
-        <lhs>Bind</lhs>
-        <rhs>
-          <nonterminal def="#nix.id" /> '=' <nonterminal def="#nix.expr" /> ';'
-          <sbr />|
-          'inherit' ('(' <nonterminal def="#nix.expr" /> ')')? <nonterminal def="#nix.id" />* ';'
-        </rhs>
-      </production>
-
-      <production id="nix.formals">
-        <lhs>Formals</lhs>
-        <rhs>
-          <nonterminal def="#nix.formal" /> ',' <nonterminal def="#nix.formals" />
-          | <nonterminal def="#nix.formal" />
-        </rhs>
-      </production>
-          
-      <production id="nix.formal">
-        <lhs>Formal</lhs>
-        <rhs>
-          <nonterminal def="#nix.id" />
-          <sbr />|
-          <nonterminal def="#nix.id" /> '?' <nonterminal def="#nix.expr" />
-        </rhs>
-      </production>
-          
-    </productionset>
-
-    <productionset>
-      <title>Terminals</title>
-
-      <production id="nix.id">
-        <lhs>Id</lhs>
-        <rhs>[a-zA-Z\_][a-zA-Z0-9\_\']*</rhs>
-      </production>
-    
-      <production id="nix.int">
-        <lhs>Int</lhs>
-        <rhs>[0-9]+</rhs>
-      </production>
-    
-      <production id="nix.str">
-        <lhs>Str</lhs>
-        <rhs>\"[^\n\"]*\"</rhs>
-      </production>
-
-      <production id="nix.path">
-        <lhs>Path</lhs>
-        <rhs>[a-zA-Z0-9\.\_\-\+]*(\/[a-zA-Z0-9\.\_\-\+]+)+</rhs>
-      </production>
-    
-      <production id="nix.uri">
-        <lhs>Uri</lhs>
-        <rhs>[a-zA-Z][a-zA-Z0-9\+\-\.]*\:[a-zA-Z0-9\%\/\?\:\@\&amp;\=\+\$\,\-\_\.\!\~\*\']+</rhs>
-      </production>
-
-      <production id="nix.ws">
-        <lhs>Whitespace</lhs>
-        <rhs>
-          [ \t\n]+
-          <sbr />|
-          \#[^\n]*
-          <sbr />|
-          \/\*(.|\n)*\*\/
-        </rhs>
-      </production>
-
-    </productionset>
-    
-  </sect1>
-
-</appendix>
diff --git a/doc/manual/packages/basic-package-mgmt.xml b/doc/manual/packages/basic-package-mgmt.xml
deleted file mode 100644
index b8a2c7ab3..000000000
--- a/doc/manual/packages/basic-package-mgmt.xml
+++ /dev/null
@@ -1,194 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-basic-package-mgmt">
-
-<title>Basic Package Management</title>
-
-<para>The main command for package management is <link
-linkend="sec-nix-env"><command>nix-env</command></link>.  You can use
-it to install, upgrade, and erase packages, and to query what
-packages are installed or are available for installation.</para>
-
-<para>In Nix, different users can have different “views”
-on the set of installed applications.  That is, there might be lots of
-applications present on the system (possibly in many different
-versions), but users can have a specific selection of those active —
-where “active” just means that it appears in a directory
-in the user’s <literal>PATH</literal>.  Such a view on the set of
-installed applications is called a <emphasis>user
-environment</emphasis>, which is just a directory tree consisting of
-symlinks to the files of the active applications.  </para>
-
-<para>Components are installed from a set of <emphasis>Nix
-expressions</emphasis> that tell Nix how to build those packages,
-including, if necessary, their dependencies.  There is a collection of
-Nix expressions called the Nixpkgs package collection that contains
-packages ranging from basic development stuff such as GCC and Glibc,
-to end-user applications like Mozilla Firefox.  (Nix is however not
-tied to the Nixpkgs package collection; you could write your own Nix
-expressions based on Nixpkgs, or completely new ones.)</para>
-
-<para>You can manually download the latest version of Nixpkgs from
-<link xlink:href='http://nixos.org/nixpkgs/download.html'/>. However,
-it’s much more convenient to use the Nixpkgs
-<emphasis>channel</emphasis>, since it makes it easy to stay up to
-date with new versions of Nixpkgs. (Channels are described in more
-detail in <xref linkend="sec-channels"/>.) Nixpkgs is automatically
-added to your list of “subscribed” channels when you install
-Nix. If this is not the case for some reason, you can add it as
-follows:
-
-<screen>
-$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-$ nix-channel --update
-</screen>
-
-</para>
-
-<note><para>On NixOS, you’re automatically subscribed to a NixOS
-channel corresponding to your NixOS major release
-(e.g. <uri>http://nixos.org/channels/nixos-14.12</uri>). A NixOS
-channel is identical to the Nixpkgs channel, except that it contains
-only Linux binaries and is updated only if a set of regression tests
-succeed.</para></note>
-
-<para>You can view the set of available packages in Nixpkgs:
-
-<screen>
-$ nix-env -qa
-aterm-2.2
-bash-3.0
-binutils-2.15
-bison-1.875d
-blackdown-1.4.2
-bzip2-1.0.2
-…</screen>
-
-The flag <option>-q</option> specifies a query operation, and
-<option>-a</option> means that you want to show the “available” (i.e.,
-installable) packages, as opposed to the installed packages. If you
-downloaded Nixpkgs yourself, or if you checked it out from GitHub,
-then you need to pass the path to your Nixpkgs tree using the
-<option>-f</option> flag:
-
-<screen>
-$ nix-env -qaf <emphasis>/path/to/nixpkgs</emphasis>
-</screen>
-
-where <emphasis>/path/to/nixpkgs</emphasis> is where you’ve
-unpacked or checked out Nixpkgs.</para>
-
-<para>You can select specific packages by name:
-
-<screen>
-$ nix-env -qa firefox
-firefox-34.0.5
-firefox-with-plugins-34.0.5
-</screen>
-
-and using regular expressions:
-
-<screen>
-$ nix-env -qa 'firefox.*'
-</screen>
-
-</para>
-
-<para>It is also possible to see the <emphasis>status</emphasis> of
-available packages, i.e., whether they are installed into the user
-environment and/or present in the system:
-
-<screen>
-$ nix-env -qas
-…
--PS bash-3.0
---S binutils-2.15
-IPS bison-1.875d
-…</screen>
-
-The first character (<literal>I</literal>) indicates whether the
-package is installed in your current user environment.  The second
-(<literal>P</literal>) indicates whether it is present on your system
-(in which case installing it into your user environment would be a
-very quick operation).  The last one (<literal>S</literal>) indicates
-whether there is a so-called <emphasis>substitute</emphasis> for the
-package, which is Nix’s mechanism for doing binary deployment.  It
-just means that Nix knows that it can fetch a pre-built package from
-somewhere (typically a network server) instead of building it
-locally.</para>
-
-<para>You can install a package using <literal>nix-env -i</literal>.
-For instance,
-
-<screen>
-$ nix-env -i subversion</screen>
-
-will install the package called <literal>subversion</literal> (which
-is, of course, the <link
-xlink:href='http://subversion.tigris.org/'>Subversion version
-management system</link>).</para>
-
-<note><para>When you ask Nix to install a package, it will first try
-to get it in pre-compiled form from a <emphasis>binary
-cache</emphasis>. By default, Nix will use the binary cache
-<uri>https://cache.nixos.org</uri>; it contains binaries for most
-packages in Nixpkgs. Only if no binary is available in the binary
-cache, Nix will build the package from source. So if <literal>nix-env
--i subversion</literal> results in Nix building stuff from source,
-then either the package is not built for your platform by the Nixpkgs
-build servers, or your version of Nixpkgs is too old or too new. For
-instance, if you have a very recent checkout of Nixpkgs, then the
-Nixpkgs build servers may not have had a chance to build everything
-and upload the resulting binaries to
-<uri>https://cache.nixos.org</uri>. The Nixpkgs channel is only
-updated after all binaries have been uploaded to the cache, so if you
-stick to the Nixpkgs channel (rather than using a Git checkout of the
-Nixpkgs tree), you will get binaries for most packages.</para></note>
-
-<para>Naturally, packages can also be uninstalled:
-
-<screen>
-$ nix-env -e subversion</screen>
-
-</para>
-
-<para>Upgrading to a new version is just as easy.  If you have a new
-release of Nix Packages, you can do:
-
-<screen>
-$ nix-env -u subversion</screen>
-
-This will <emphasis>only</emphasis> upgrade Subversion if there is a
-“newer” version in the new set of Nix expressions, as
-defined by some pretty arbitrary rules regarding ordering of version
-numbers (which generally do what you’d expect of them).  To just
-unconditionally replace Subversion with whatever version is in the Nix
-expressions, use <parameter>-i</parameter> instead of
-<parameter>-u</parameter>; <parameter>-i</parameter> will remove
-whatever version is already installed.</para>
-
-<para>You can also upgrade all packages for which there are newer
-versions:
-
-<screen>
-$ nix-env -u</screen>
-
-</para>
-
-<para>Sometimes it’s useful to be able to ask what
-<command>nix-env</command> would do, without actually doing it.  For
-instance, to find out what packages would be upgraded by
-<literal>nix-env -u</literal>, you can do
-
-<screen>
-$ nix-env -u --dry-run
-(dry run; not doing anything)
-upgrading `libxslt-1.1.0' to `libxslt-1.1.10'
-upgrading `graphviz-1.10' to `graphviz-1.12'
-upgrading `coreutils-5.0' to `coreutils-5.2.1'</screen>
-
-</para>
-
-</chapter>
diff --git a/doc/manual/packages/binary-cache-substituter.xml b/doc/manual/packages/binary-cache-substituter.xml
deleted file mode 100644
index c6ceb9c80..000000000
--- a/doc/manual/packages/binary-cache-substituter.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="ssec-binary-cache-substituter">
-
-<title>Serving a Nix store via HTTP</title>
-
-<para>You can easily share the Nix store of a machine via HTTP. This
-allows other machines to fetch store paths from that machine to speed
-up installations. It uses the same <emphasis>binary cache</emphasis>
-mechanism that Nix usually uses to fetch pre-built binaries from
-<uri>https://cache.nixos.org</uri>.</para>
-
-<para>The daemon that handles binary cache requests via HTTP,
-<command>nix-serve</command>, is not part of the Nix distribution, but
-you can install it from Nixpkgs:
-
-<screen>
-$ nix-env -i nix-serve
-</screen>
-
-You can then start the server, listening for HTTP connections on
-whatever port you like:
-
-<screen>
-$ nix-serve -p 8080
-</screen>
-
-To check whether it works, try the following on the client:
-
-<screen>
-$ curl http://avalon:8080/nix-cache-info
-</screen>
-
-which should print something like:
-
-<screen>
-StoreDir: /nix/store
-WantMassQuery: 1
-Priority: 30
-</screen>
-
-</para>
-
-<para>On the client side, you can tell Nix to use your binary cache
-using <option>--option extra-binary-caches</option>, e.g.:
-
-<screen>
-$ nix-env -i firefox --option extra-binary-caches http://avalon:8080/
-</screen>
-
-The option <option>extra-binary-caches</option> tells Nix to use this
-binary cache in addition to your default caches, such as
-<uri>https://cache.nixos.org</uri>. Thus, for any path in the closure
-of Firefox, Nix will first check if the path is available on the
-server <literal>avalon</literal> or another binary caches. If not, it
-will fall back to building from source.</para>
-
-<para>You can also tell Nix to always use your binary cache by adding
-a line to the <filename linkend="sec-conf-file">nix.conf</filename>
-configuration file like this:
-
-<programlisting>
-binary-caches = http://avalon:8080/ https://cache.nixos.org/
-</programlisting>
-
-</para>
-
-</section>
diff --git a/doc/manual/packages/channels.xml b/doc/manual/packages/channels.xml
deleted file mode 100644
index 494a81966..000000000
--- a/doc/manual/packages/channels.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-channels">
-
-<title>Channels</title>
-
-<para>If you want to stay up to date with a set of packages, it’s not
-very convenient to manually download the latest set of Nix expressions
-for those packages and upgrade using <command>nix-env</command>.
-Fortunately, there’s a better way: <emphasis>Nix
-channels</emphasis>.</para>
-
-<para>A Nix channel is just a URL that points to a place that contains
-a set of Nix expressions and a manifest.  Using the command <link
-linkend="sec-nix-channel"><command>nix-channel</command></link> you
-can automatically stay up to date with whatever is available at that
-URL.</para>
-      
-<para>To see the list of official NixOS channels, visit <link
-xlink:href="https://nixos.org/channels" />.</para>
-
-<para>You can “subscribe” to a channel using
-<command>nix-channel --add</command>, e.g.,
-
-<screen>
-$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable</screen>
-
-subscribes you to a channel that always contains that latest version
-of the Nix Packages collection.  (Subscribing really just means that
-the URL is added to the file <filename>~/.nix-channels</filename>,
-where it is read by subsequent calls to <command>nix-channel
---update</command>.) You can “unsubscribe” using <command>nix-channel
---remove</command>:
-
-<screen>
-$ nix-channel --remove nixpkgs
-</screen>
-</para>
-
-<para>To obtain the latest Nix expressions available in a channel, do
-
-<screen>
-$ nix-channel --update</screen>
-
-This downloads and unpacks the Nix expressions in every channel
-(downloaded from <literal><emphasis>url</emphasis>/nixexprs.tar.bz2</literal>).
-It also makes the union of each channel’s Nix expressions available by
-default to <command>nix-env</command> operations (via the symlink
-<filename>~/.nix-defexpr/channels</filename>).  Consequently, you can
-then say
-
-<screen>
-$ nix-env -u</screen>
-
-to upgrade all packages in your profile to the latest versions
-available in the subscribed channels.</para>
-
-</chapter>
diff --git a/doc/manual/packages/copy-closure.xml b/doc/manual/packages/copy-closure.xml
deleted file mode 100644
index a336fb293..000000000
--- a/doc/manual/packages/copy-closure.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="ssec-copy-closure">
-
-<title>Copying Closures via SSH</title>
-
-<para>The command <command
-linkend="sec-nix-copy-closure">nix-copy-closure</command> copies a Nix
-store path along with all its dependencies to or from another machine
-via the SSH protocol.  It doesn’t copy store paths that are already
-present on the target machine.  For example, the following command
-copies Firefox with all its dependencies:
-
-<screen>
-$ nix-copy-closure --to alice@itchy.example.org $(type -p firefox)</screen>
-
-See <xref linkend='sec-nix-copy-closure' /> for details.</para>
-
-<para>With <command linkend='refsec-nix-store-export'>nix-store
---export</command> and <command
-linkend='refsec-nix-store-import'>nix-store --import</command> you can
-write the closure of a store path (that is, the path and all its
-dependencies) to a file, and then unpack that file into another Nix
-store.  For example,
-
-<screen>
-$ nix-store --export $(nix-store -qR $(type -p firefox)) > firefox.closure</screen>
-
-writes the closure of Firefox to a file.  You can then copy this file
-to another machine and install the closure:
-
-<screen>
-$ nix-store --import &lt; firefox.closure</screen>
-
-Any store paths in the closure that are already present in the target
-store are ignored.  It is also possible to pipe the export into
-another command, e.g. to copy and install a closure directly to/on
-another machine:
-
-<screen>
-$ nix-store --export $(nix-store -qR $(type -p firefox)) | bzip2 | \
-    ssh alice@itchy.example.org "bunzip2 | nix-store --import"</screen>
-
-However, <command>nix-copy-closure</command> is generally more
-efficient because it only copies paths that are not already present in
-the target Nix store.</para>
-
-</section>
diff --git a/doc/manual/packages/garbage-collection.xml b/doc/manual/packages/garbage-collection.xml
deleted file mode 100644
index b506f22b0..000000000
--- a/doc/manual/packages/garbage-collection.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='sec-garbage-collection'>
-
-<title>Garbage Collection</title>
-
-<para><command>nix-env</command> operations such as upgrades
-(<option>-u</option>) and uninstall (<option>-e</option>) never
-actually delete packages from the system.  All they do (as shown
-above) is to create a new user environment that no longer contains
-symlinks to the “deleted” packages.</para>
-
-<para>Of course, since disk space is not infinite, unused packages
-should be removed at some point.  You can do this by running the Nix
-garbage collector.  It will remove from the Nix store any package
-not used (directly or indirectly) by any generation of any
-profile.</para>
-
-<para>Note however that as long as old generations reference a
-package, it will not be deleted.  After all, we wouldn’t be able to
-do a rollback otherwise.  So in order for garbage collection to be
-effective, you should also delete (some) old generations.  Of course,
-this should only be done if you are certain that you will not need to
-roll back.</para>
-
-<para>To delete all old (non-current) generations of your current
-profile:
-
-<screen>
-$ nix-env --delete-generations old</screen>
-
-Instead of <literal>old</literal> you can also specify a list of
-generations, e.g.,
-
-<screen>
-$ nix-env --delete-generations 10 11 14</screen>
-
-To delete all generations older than a specified number of days
-(except the current generation), use the <literal>d</literal>
-suffix. For example,
-
-<screen>
-$ nix-env --delete-generations 14d</screen>
-
-deletes all generations older than two weeks.</para>
-
-<para>After removing appropriate old generations you can run the
-garbage collector as follows:
-
-<screen>
-$ nix-store --gc</screen>
-
-The behaviour of the gargage collector is affected by the 
-<literal>keep-derivations</literal> (default: true) and <literal>keep-outputs</literal>
-(default: false) options in the Nix configuration file. The defaults will ensure
-that all derivations that are build-time dependencies of garbage collector roots
-will be kept and that all output paths that are runtime dependencies
-will be kept as well. All other derivations or paths will be collected. 
-(This is usually what you want, but while you are developing
-it may make sense to keep outputs to ensure that rebuild times are quick.)
-
-If you are feeling uncertain, you can also first view what files would
-be deleted:
-
-<screen>
-$ nix-store --gc --print-dead</screen>
-
-Likewise, the option <option>--print-live</option> will show the paths
-that <emphasis>won’t</emphasis> be deleted.</para>
-
-<para>There is also a convenient little utility
-<command>nix-collect-garbage</command>, which when invoked with the
-<option>-d</option> (<option>--delete-old</option>) switch deletes all
-old generations of all profiles in
-<filename>/nix/var/nix/profiles</filename>.  So
-
-<screen>
-$ nix-collect-garbage -d</screen>
-
-is a quick and easy way to clean up your system.</para>
-
-<xi:include href="garbage-collector-roots.xml" />
-
-</chapter>
diff --git a/doc/manual/packages/garbage-collector-roots.xml b/doc/manual/packages/garbage-collector-roots.xml
deleted file mode 100644
index 9c91862b0..000000000
--- a/doc/manual/packages/garbage-collector-roots.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-gc-roots">
-
-<title>Garbage Collector Roots</title>
-
-<para>The roots of the garbage collector are all store paths to which
-there are symlinks in the directory
-<filename><emphasis>prefix</emphasis>/nix/var/nix/gcroots</filename>.
-For instance, the following command makes the path
-<filename>/nix/store/d718ef...-foo</filename> a root of the collector:
-
-<screen>
-$ ln -s /nix/store/d718ef...-foo /nix/var/nix/gcroots/bar</screen>
-	
-That is, after this command, the garbage collector will not remove
-<filename>/nix/store/d718ef...-foo</filename> or any of its
-dependencies.</para>
-
-<para>Subdirectories of
-<filename><emphasis>prefix</emphasis>/nix/var/nix/gcroots</filename>
-are also searched for symlinks.  Symlinks to non-store paths are
-followed and searched for roots, but symlinks to non-store paths
-<emphasis>inside</emphasis> the paths reached in that way are not
-followed to prevent infinite recursion.</para>
-
-</section>
\ No newline at end of file
diff --git a/doc/manual/packages/package-management.xml b/doc/manual/packages/package-management.xml
deleted file mode 100644
index 61e55faeb..000000000
--- a/doc/manual/packages/package-management.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<part xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id='chap-package-management'>
-
-<title>Package Management</title>
-
-<partintro>
-<para>This chapter discusses how to do package management with Nix,
-i.e., how to obtain, install, upgrade, and erase packages.  This is
-the “user’s” perspective of the Nix system — people
-who want to <emphasis>create</emphasis> packages should consult
-<xref linkend='chap-writing-nix-expressions' />.</para>
-</partintro>
-
-<xi:include href="basic-package-mgmt.xml" />
-<xi:include href="profiles.xml" />
-<xi:include href="garbage-collection.xml" />
-<xi:include href="channels.xml" />
-<xi:include href="sharing-packages.xml" />
-
-</part>
diff --git a/doc/manual/packages/profiles.xml b/doc/manual/packages/profiles.xml
deleted file mode 100644
index 3b8c5e293..000000000
--- a/doc/manual/packages/profiles.xml
+++ /dev/null
@@ -1,154 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-profiles">
-
-<title>Profiles</title>
-
-<para>Profiles and user environments are Nix’s mechanism for
-implementing the ability to allow different users to have different
-configurations, and to do atomic upgrades and rollbacks.  To
-understand how they work, it’s useful to know a bit about how Nix
-works.  In Nix, packages are stored in unique locations in the
-<emphasis>Nix store</emphasis> (typically,
-<filename>/nix/store</filename>).  For instance, a particular version
-of the Subversion package might be stored in a directory
-<filename>/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3/</filename>,
-while another version might be stored in
-<filename>/nix/store/5mq2jcn36ldlmh93yj1n8s9c95pj7c5s-subversion-1.1.2</filename>.
-The long strings prefixed to the directory names are cryptographic
-hashes (to be precise, 160-bit truncations of SHA-256 hashes encoded
-in a base-32 notation) of <emphasis>all</emphasis> inputs involved in
-building the package — sources, dependencies, compiler flags, and so
-on.  So if two packages differ in any way, they end up in different
-locations in the file system, so they don’t interfere with each other.
-Here is what a part of a typical Nix store looks like:</para>
-
-<mediaobject>
-  <imageobject>
-    <imagedata fileref='../figures/user-environments.png' format='PNG' />
-  </imageobject>
-</mediaobject>
-
-<para>Of course, you wouldn’t want to type
-
-<screen>
-$ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn</screen>
-
-every time you want to run Subversion.  Of course we could set up the
-<literal>PATH</literal> environment variable to include the
-<filename>bin</filename> directory of every package we want to use,
-but this is not very convenient since changing <literal>PATH</literal>
-doesn’t take effect for already existing processes.  The solution Nix
-uses is to create directory trees of symlinks to
-<emphasis>activated</emphasis> packages.  These are called
-<emphasis>user environments</emphasis> and they are packages
-themselves (though automatically generated by
-<command>nix-env</command>), so they too reside in the Nix store.  For
-instance, in the figure above, the user environment
-<filename>/nix/store/0c1p5z4kda11...-user-env</filename> contains a
-symlink to just Subversion 1.1.2 (arrows in the figure indicate
-symlinks).  This would be what we would obtain if we had done
-
-<screen>
-$ nix-env -i subversion</screen>
-
-on a set of Nix expressions that contained Subversion 1.1.2.</para>
-
-<para>This doesn’t in itself solve the problem, of course; you
-wouldn’t want to type
-<filename>/nix/store/0c1p5z4kda11...-user-env/bin/svn</filename>
-either.  That’s why there are symlinks outside of the store that point
-to the user environments in the store; for instance, the symlinks
-<filename>default-42-link</filename> and
-<filename>default-43-link</filename> in the example.  These are called
-<emphasis>generations</emphasis> since every time you perform a
-<command>nix-env</command> operation, a new user environment is
-generated based on the current one.  For instance, generation 43 was
-created from generation 42 when we did
-
-<screen>
-$ nix-env -i subversion firefox</screen>
-
-on a set of Nix expressions that contained Firefox and a new version
-of Subversion.</para>
-
-<para>Generations are grouped together into
-<emphasis>profiles</emphasis> so that different users don’t interfere
-with each other if they don’t want to.  For example:
-
-<screen>
-$ ls -l /nix/var/nix/profiles/
-...
-lrwxrwxrwx  1 eelco ... default-42-link -> /nix/store/0c1p5z4kda11...-user-env
-lrwxrwxrwx  1 eelco ... default-43-link -> /nix/store/3aw2pdyx2jfc...-user-env
-lrwxrwxrwx  1 eelco ... default -> default-43-link</screen>
-
-This shows a profile called <filename>default</filename>.  The file
-<filename>default</filename> itself is actually a symlink that points
-to the current generation.  When we do a <command>nix-env</command>
-operation, a new user environment and generation link are created
-based on the current one, and finally the <filename>default</filename>
-symlink is made to point at the new generation.  This last step is
-atomic on Unix, which explains how we can do atomic upgrades.  (Note
-that the building/installing of new packages doesn’t interfere in
-any way with old packages, since they are stored in different
-locations in the Nix store.)</para>
-
-<para>If you find that you want to undo a <command>nix-env</command>
-operation, you can just do
-
-<screen>
-$ nix-env --rollback</screen>
-
-which will just make the current generation link point at the previous
-link.  E.g., <filename>default</filename> would be made to point at
-<filename>default-42-link</filename>.  You can also switch to a
-specific generation:
-
-<screen>
-$ nix-env --switch-generation 43</screen>
-
-which in this example would roll forward to generation 43 again.  You
-can also see all available generations:
-
-<screen>
-$ nix-env --list-generations</screen></para>
-
-<para>You generally wouldn’t have
-<filename>/nix/var/nix/profiles/<emphasis>some-profile</emphasis>/bin</filename>
-in your <literal>PATH</literal>.  Rather, there is a symlink
-<filename>~/.nix-profile</filename> that points to your current
-profile.  This means that you should put
-<filename>~/.nix-profile/bin</filename> in your <literal>PATH</literal>
-(and indeed, that’s what the initialisation script
-<filename>/nix/etc/profile.d/nix.sh</filename> does).  This makes it
-easier to switch to a different profile.  You can do that using the
-command <command>nix-env --switch-profile</command>:
-
-<screen>
-$ nix-env --switch-profile /nix/var/nix/profiles/my-profile
-
-$ nix-env --switch-profile /nix/var/nix/profiles/default</screen>
-
-These commands switch to the <filename>my-profile</filename> and
-default profile, respectively.  If the profile doesn’t exist, it will
-be created automatically.  You should be careful about storing a
-profile in another location than the <filename>profiles</filename>
-directory, since otherwise it might not be used as a root of the
-garbage collector (see <xref linkend='sec-garbage-collection'
-/>).</para>
-
-<para>All <command>nix-env</command> operations work on the profile
-pointed to by <command>~/.nix-profile</command>, but you can override
-this using the <option>--profile</option> option (abbreviation
-<option>-p</option>):
-
-<screen>
-$ nix-env -p /nix/var/nix/profiles/other-profile -i subversion</screen>
-
-This will <emphasis>not</emphasis> change the
-<command>~/.nix-profile</command> symlink.</para>
-
-</chapter>
diff --git a/doc/manual/packages/s3-substituter.xml b/doc/manual/packages/s3-substituter.xml
deleted file mode 100644
index aa5df2026..000000000
--- a/doc/manual/packages/s3-substituter.xml
+++ /dev/null
@@ -1,191 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="ssec-s3-substituter">
-
-<title>Serving a Nix store via S3</title>
-
-<para>Nix has built-in support for storing and fetching store paths
-from Amazon S3 and S3-compatible services. This uses the same
-<emphasis>binary</emphasis> cache mechanism that Nix usually uses to
-fetch prebuilt binaries from <uri>cache.nixos.org</uri>.</para>
-
-<para>The following options can be specified as URL parameters to
-the S3 URL:</para>
-
-<variablelist>
-  <varlistentry><term><literal>profile</literal></term>
-  <listitem>
-    <para>
-      The name of the AWS configuration profile to use. By default
-      Nix will use the <literal>default</literal> profile.
-    </para>
-  </listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>region</literal></term>
-  <listitem>
-    <para>
-      The region of the S3 bucket. <literal>us–east-1</literal> by
-      default.
-    </para>
-
-    <para>
-      If your bucket is not in <literal>us–east-1</literal>, you
-      should always explicitly specify the region parameter.
-    </para>
-  </listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>endpoint</literal></term>
-  <listitem>
-    <para>
-      The URL to your S3-compatible service, for when not using
-      Amazon S3. Do not specify this value if you're using Amazon
-      S3.
-    </para>
-    <note><para>This endpoint must support HTTPS and will use
-    path-based addressing instead of virtual host based
-    addressing.</para></note>
-  </listitem>
-  </varlistentry>
-
-  <varlistentry><term><literal>scheme</literal></term>
-  <listitem>
-    <para>
-      The scheme used for S3 requests, <literal>https</literal>
-      (default) or <literal>http</literal>.  This option allows you to
-      disable HTTPS for binary caches which don't support it.
-    </para>
-    <note><para>HTTPS should be used if the cache might contain
-    sensitive information.</para></note>
-  </listitem>
-  </varlistentry>
-</variablelist>
-
-<para>In this example we will use the bucket named
-<literal>example-nix-cache</literal>.</para>
-
-<section xml:id="ssec-s3-substituter-anonymous-reads">
-  <title>Anonymous Reads to your S3-compatible binary cache</title>
-
-  <para>If your binary cache is publicly accessible and does not
-  require authentication, the simplest and easiest way to use Nix with
-  your S3 compatible binary cache is to use the HTTP URL for that
-  cache.</para>
-
-  <para>For AWS S3 the binary cache URL for example bucket will be
-  exactly <uri>https://example-nix-cache.s3.amazonaws.com</uri> or
-  <uri>s3://example-nix-cache</uri>. For S3 compatible binary caches,
-  consult that cache's documentation.</para>
-
-  <para>Your bucket will need the following bucket policy:</para>
-
-  <programlisting><![CDATA[
-{
-    "Id": "DirectReads",
-    "Version": "2012-10-17",
-    "Statement": [
-        {
-            "Sid": "AllowDirectReads",
-            "Action": [
-                "s3:GetObject",
-                "s3:GetBucketLocation"
-            ],
-            "Effect": "Allow",
-            "Resource": [
-                "arn:aws:s3:::example-nix-cache",
-                "arn:aws:s3:::example-nix-cache/*"
-            ],
-            "Principal": "*"
-        }
-    ]
-}
-]]></programlisting>
-</section>
-
-<section xml:id="ssec-s3-substituter-authenticated-reads">
-  <title>Authenticated Reads to your S3 binary cache</title>
-
-  <para>For AWS S3 the binary cache URL for example bucket will be
-  exactly <uri>s3://example-nix-cache</uri>.</para>
-
-  <para>Nix will use the <link
-  xlink:href="https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html">default
-  credential provider chain</link> for authenticating requests to
-  Amazon S3.</para>
-
-  <para>Nix supports authenticated reads from Amazon S3 and S3
-  compatible binary caches.</para>
-
-  <para>Your bucket will need a bucket policy allowing the desired
-  users to perform the <literal>s3:GetObject</literal> and
-  <literal>s3:GetBucketLocation</literal> action on all objects in the
-  bucket. The anonymous policy in <xref
-  linkend="ssec-s3-substituter-anonymous-reads" /> can be updated to
-  have a restricted <literal>Principal</literal> to support
-  this.</para>
-</section>
-
-
-<section xml:id="ssec-s3-substituter-authenticated-writes">
-  <title>Authenticated Writes to your S3-compatible binary cache</title>
-
-  <para>Nix support fully supports writing to Amazon S3 and S3
-  compatible buckets. The binary cache URL for our example bucket will
-  be <uri>s3://example-nix-cache</uri>.</para>
-
-  <para>Nix will use the <link
-  xlink:href="https://docs.aws.amazon.com/sdk-for-cpp/v1/developer-guide/credentials.html">default
-  credential provider chain</link> for authenticating requests to
-  Amazon S3.</para>
-
-  <para>Your account will need the following IAM policy to
-  upload to the cache:</para>
-
-  <programlisting><![CDATA[
-{
-  "Version": "2012-10-17",
-  "Statement": [
-    {
-      "Sid": "UploadToCache",
-      "Effect": "Allow",
-      "Action": [
-        "s3:AbortMultipartUpload",
-        "s3:GetBucketLocation",
-        "s3:GetObject",
-        "s3:ListBucket",
-        "s3:ListBucketMultipartUploads",
-        "s3:ListMultipartUploadParts",
-        "s3:PutObject"
-      ],
-      "Resource": [
-        "arn:aws:s3:::example-nix-cache",
-        "arn:aws:s3:::example-nix-cache/*"
-      ]
-    }
-  ]
-}
-]]></programlisting>
-
-</section>
-
-<section><title>Examples</title>
-
-<para>To upload with a specific credential profile for Amazon S3:</para>
-
-<screen>
-nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;region=eu-west-2' nixpkgs.hello
-</screen>
-
-<para>To upload to an S3-compatible binary cache:</para>
-
-<screen>
-nix copy --to 's3://example-nix-cache?profile=cache-upload&amp;scheme=https&amp;endpoint=minio.example.com' nixpkgs.hello
-</screen>
-
-</section>
-
-</section>
diff --git a/doc/manual/packages/sharing-packages.xml b/doc/manual/packages/sharing-packages.xml
deleted file mode 100644
index bb6c52b8f..000000000
--- a/doc/manual/packages/sharing-packages.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<chapter xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-sharing-packages">
-
-<title>Sharing Packages Between Machines</title>
-
-<para>Sometimes you want to copy a package from one machine to
-another.  Or, you want to install some packages and you know that
-another machine already has some or all of those packages or their
-dependencies.  In that case there are mechanisms to quickly copy
-packages between machines.</para>
-
-<xi:include href="binary-cache-substituter.xml" />
-<xi:include href="copy-closure.xml" />
-<xi:include href="ssh-substituter.xml" />
-<xi:include href="s3-substituter.xml" />
-
-</chapter>
diff --git a/doc/manual/packages/ssh-substituter.xml b/doc/manual/packages/ssh-substituter.xml
deleted file mode 100644
index 8db3f9662..000000000
--- a/doc/manual/packages/ssh-substituter.xml
+++ /dev/null
@@ -1,73 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xmlns:xi="http://www.w3.org/2001/XInclude"
-         version="5.0"
-         xml:id="ssec-ssh-substituter">
-
-<title>Serving a Nix store via SSH</title>
-
-<para>You can tell Nix to automatically fetch needed binaries from a
-remote Nix store via SSH. For example, the following installs Firefox,
-automatically fetching any store paths in Firefox’s closure if they
-are available on the server <literal>avalon</literal>:
-
-<screen>
-$ nix-env -i firefox --substituters ssh://alice@avalon
-</screen>
-
-This works similar to the binary cache substituter that Nix usually
-uses, only using SSH instead of HTTP: if a store path
-<literal>P</literal> is needed, Nix will first check if it’s available
-in the Nix store on <literal>avalon</literal>. If not, it will fall
-back to using the binary cache substituter, and then to building from
-source.</para>
-
-<note><para>The SSH substituter currently does not allow you to enter
-an SSH passphrase interactively. Therefore, you should use
-<command>ssh-add</command> to load the decrypted private key into
-<command>ssh-agent</command>.</para></note>
-
-<para>You can also copy the closure of some store path, without
-installing it into your profile, e.g.
-
-<screen>
-$ nix-store -r /nix/store/m85bxg…-firefox-34.0.5 --substituters ssh://alice@avalon
-</screen>
-
-This is essentially equivalent to doing
-
-<screen>
-$ nix-copy-closure --from alice@avalon /nix/store/m85bxg…-firefox-34.0.5
-</screen>
-
-</para>
-
-<para>You can use SSH’s <emphasis>forced command</emphasis> feature to
-set up a restricted user account for SSH substituter access, allowing
-read-only access to the local Nix store, but nothing more. For
-example, add the following lines to <filename>sshd_config</filename>
-to restrict the user <literal>nix-ssh</literal>:
-
-<programlisting>
-Match User nix-ssh
-  AllowAgentForwarding no
-  AllowTcpForwarding no
-  PermitTTY no
-  PermitTunnel no
-  X11Forwarding no
-  ForceCommand nix-store --serve
-Match All
-</programlisting>
-
-On NixOS, you can accomplish the same by adding the following to your
-<filename>configuration.nix</filename>:
-
-<programlisting>
-nix.sshServe.enable = true;
-nix.sshServe.keys = [ "ssh-dss AAAAB3NzaC1k... bob@example.org" ];
-</programlisting>
-
-where the latter line lists the public keys of users that are allowed
-to connect.</para>
-
-</section>
diff --git a/doc/manual/release-notes/release-notes.xml b/doc/manual/release-notes/release-notes.xml
deleted file mode 100644
index 2655d68e3..000000000
--- a/doc/manual/release-notes/release-notes.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<appendix xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="sec-relnotes">
-
-<title>Nix Release Notes</title>
-
-<!--
-<partintro>
-<para>This section lists the release notes for each stable version of Nix.</para>
-</partintro>
--->
-
-<xi:include href="rl-2.3.xml" />
-<xi:include href="rl-2.2.xml" />
-<xi:include href="rl-2.1.xml" />
-<xi:include href="rl-2.0.xml" />
-<xi:include href="rl-1.11.10.xml" />
-<xi:include href="rl-1.11.xml" />
-<xi:include href="rl-1.10.xml" />
-<xi:include href="rl-1.9.xml" />
-<xi:include href="rl-1.8.xml" />
-<xi:include href="rl-1.7.xml" />
-<xi:include href="rl-1.6.1.xml" />
-<xi:include href="rl-1.6.xml" />
-<xi:include href="rl-1.5.2.xml" />
-<xi:include href="rl-1.5.xml" />
-<xi:include href="rl-1.4.xml" />
-<xi:include href="rl-1.3.xml" />
-<xi:include href="rl-1.2.xml" />
-<xi:include href="rl-1.1.xml" />
-<xi:include href="rl-1.0.xml" />
-<xi:include href="rl-0.16.xml" />
-<xi:include href="rl-0.15.xml" />
-<xi:include href="rl-0.14.xml" />
-<xi:include href="rl-0.13.xml" />
-<xi:include href="rl-0.12.xml" />
-<xi:include href="rl-0.11.xml" />
-<xi:include href="rl-0.10.1.xml" />
-<xi:include href="rl-0.10.xml" />
-<xi:include href="rl-0.9.2.xml" />
-<xi:include href="rl-0.9.1.xml" />
-<xi:include href="rl-0.9.xml" />
-<xi:include href="rl-0.8.1.xml" />
-<xi:include href="rl-0.8.xml" />
-<xi:include href="rl-0.7.xml" />
-<xi:include href="rl-0.6.xml" />
-<xi:include href="rl-0.5.xml" />
-
-</appendix>
diff --git a/doc/manual/release-notes/rl-0.10.1.xml b/doc/manual/release-notes/rl-0.10.1.xml
deleted file mode 100644
index 95829323d..000000000
--- a/doc/manual/release-notes/rl-0.10.1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.10.1">
-
-<title>Release 0.10.1 (2006-10-11)</title>
-
-<para>This release fixes two somewhat obscure bugs that occur when
-evaluating Nix expressions that are stored inside the Nix store
-(<literal>NIX-67</literal>).  These do not affect most users.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.10.xml b/doc/manual/release-notes/rl-0.10.xml
deleted file mode 100644
index 01f70acfd..000000000
--- a/doc/manual/release-notes/rl-0.10.xml
+++ /dev/null
@@ -1,323 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.10">
-
-<title>Release 0.10 (2006-10-06)</title>
-
-<note><para>This version of Nix uses Berkeley DB 4.4 instead of 4.3.
-The database is upgraded automatically, but you should be careful not
-to use old versions of Nix that still use Berkeley DB 4.3.  In
-particular, if you use a Nix installed through Nix, you should run
-
-<screen>
-$ nix-store --clear-substitutes</screen>
-
-first.</para></note>
-
-<warning><para>Also, the database schema has changed slighted to fix a
-performance issue (see below).  When you run any Nix 0.10 command for
-the first time, the database will be upgraded automatically.  This is
-irreversible.</para></warning>
-
-<itemizedlist>
-
-
-  <!-- Usability / features -->
-
-
-  <listitem><para><command>nix-env</command> usability improvements:
-
-    <itemizedlist>
-
-      <listitem><para>An option <option>--compare-versions</option>
-      (or <option>-c</option>) has been added to <command>nix-env
-      --query</command> to allow you to compare installed versions of
-      packages to available versions, or vice versa.  An easy way to
-      see if you are up to date with what’s in your subscribed
-      channels is <literal>nix-env -qc \*</literal>.</para></listitem>
-
-      <listitem><para><literal>nix-env --query</literal> now takes as
-      arguments a list of package names about which to show
-      information, just like <option>--install</option>, etc.: for
-      example, <literal>nix-env -q gcc</literal>.  Note that to show
-      all derivations, you need to specify
-      <literal>\*</literal>.</para></listitem>
-
-      <listitem><para><literal>nix-env -i
-      <emphasis>pkgname</emphasis></literal> will now install
-      the highest available version of
-      <emphasis>pkgname</emphasis>, rather than installing all
-      available versions (which would probably give collisions)
-      (<literal>NIX-31</literal>).</para></listitem>
-
-      <listitem><para><literal>nix-env (-i|-u) --dry-run</literal> now
-      shows exactly which missing paths will be built or
-      substituted.</para></listitem>
-
-      <listitem><para><literal>nix-env -qa --description</literal>
-      shows human-readable descriptions of packages, provided that
-      they have a <literal>meta.description</literal> attribute (which
-      most packages in Nixpkgs don’t have yet).</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para>New language features:
-
-    <itemizedlist>
-
-      <listitem><para>Reference scanning (which happens after each
-      build) is much faster and takes a constant amount of
-      memory.</para></listitem>
-
-      <listitem><para>String interpolation.  Expressions like
-
-<programlisting>
-"--with-freetype2-library=" + freetype + "/lib"</programlisting>
-
-      can now be written as
-
-<programlisting>
-"--with-freetype2-library=${freetype}/lib"</programlisting>
-
-      You can write arbitrary expressions within
-      <literal>${<emphasis>...</emphasis>}</literal>, not just
-      identifiers.</para></listitem>
-
-      <listitem><para>Multi-line string literals.</para></listitem>
-
-      <listitem><para>String concatenations can now involve
-      derivations, as in the example <code>"--with-freetype2-library="
-      + freetype + "/lib"</code>.  This was not previously possible
-      because we need to register that a derivation that uses such a
-      string is dependent on <literal>freetype</literal>.  The
-      evaluator now properly propagates this information.
-      Consequently, the subpath operator (<literal>~</literal>) has
-      been deprecated.</para></listitem>
-
-      <listitem><para>Default values of function arguments can now
-      refer to other function arguments; that is, all arguments are in
-      scope in the default values
-      (<literal>NIX-45</literal>).</para></listitem>
-
-      <!--
-      <listitem><para>TODO: domain checks (r5895).</para></listitem>
-      -->
-
-      <listitem><para>Lots of new built-in primitives, such as
-      functions for list manipulation and integer arithmetic.  See the
-      manual for a complete list.  All primops are now available in
-      the set <varname>builtins</varname>, allowing one to test for
-      the availability of primop in a backwards-compatible
-      way.</para></listitem>
-
-      <listitem><para>Real let-expressions: <literal>let x = ...;
-      ... z = ...; in ...</literal>.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para>New commands <command>nix-pack-closure</command> and
-  <command>nix-unpack-closure</command> than can be used to easily
-  transfer a store path with all its dependencies to another machine.
-  Very convenient whenever you have some package on your machine and
-  you want to copy it somewhere else.</para></listitem>
-
-
-  <listitem><para>XML support:
-
-    <itemizedlist>
-
-      <listitem><para><literal>nix-env -q --xml</literal> prints the
-      installed or available packages in an XML representation for
-      easy processing by other tools.</para></listitem>
-
-      <listitem><para><literal>nix-instantiate --eval-only
-      --xml</literal> prints an XML representation of the resulting
-      term.  (The new flag <option>--strict</option> forces ‘deep’
-      evaluation of the result, i.e., list elements and attributes are
-      evaluated recursively.)</para></listitem>
-
-      <listitem><para>In Nix expressions, the primop
-      <function>builtins.toXML</function> converts a term to an XML
-      representation.  This is primarily useful for passing structured
-      information to builders.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para>You can now unambiguously specify which derivation to
-  build or install in <command>nix-env</command>,
-  <command>nix-instantiate</command> and <command>nix-build</command>
-  using the <option>--attr</option> / <option>-A</option> flags, which
-  takes an attribute name as argument.  (Unlike symbolic package names
-  such as <literal>subversion-1.4.0</literal>, attribute names in an
-  attribute set are unique.)  For instance, a quick way to perform a
-  test build of a package in Nixpkgs is <literal>nix-build
-  pkgs/top-level/all-packages.nix -A
-  <emphasis>foo</emphasis></literal>.  <literal>nix-env -q
-  --attr</literal> shows the attribute names corresponding to each
-  derivation.</para></listitem>
-
-
-  <listitem><para>If the top-level Nix expression used by
-  <command>nix-env</command>, <command>nix-instantiate</command> or
-  <command>nix-build</command> evaluates to a function whose arguments
-  all have default values, the function will be called automatically.
-  Also, the new command-line switch <option>--arg
-  <emphasis>name</emphasis>
-  <emphasis>value</emphasis></option> can be used to specify
-  function arguments on the command line.</para></listitem>
-
-
-  <listitem><para><literal>nix-install-package --url
-  <emphasis>URL</emphasis></literal> allows a package to be
-  installed directly from the given URL.</para></listitem>
-
-
-  <listitem><para>Nix now works behind an HTTP proxy server; just set
-  the standard environment variables <literal>http_proxy</literal>,
-  <literal>https_proxy</literal>, <literal>ftp_proxy</literal> or
-  <literal>all_proxy</literal> appropriately.  Functions such as
-  <function>fetchurl</function> in Nixpkgs also respect these
-  variables.</para></listitem>
-
-
-  <listitem><para><literal>nix-build -o
-  <emphasis>symlink</emphasis></literal> allows the symlink to
-  the build result to be named something other than
-  <literal>result</literal>.</para></listitem>
-
-
-  <!-- Stability / performance / etc. -->
-
-
-  <listitem><para>Platform support:
-
-    <itemizedlist>
-
-      <listitem><para>Support for 64-bit platforms, provided a <link
-      xlink:href="http://bugzilla.sen.cwi.nl:8080/show_bug.cgi?id=606">suitably
-      patched ATerm library</link> is used.  Also, files larger than 2
-      GiB are now supported.</para></listitem>
-
-      <listitem><para>Added support for Cygwin (Windows,
-      <literal>i686-cygwin</literal>), Mac OS X on Intel
-      (<literal>i686-darwin</literal>) and Linux on PowerPC
-      (<literal>powerpc-linux</literal>).</para></listitem>
-
-      <listitem><para>Users of SMP and multicore machines will
-      appreciate that the number of builds to be performed in parallel
-      can now be specified in the configuration file in the
-      <literal>build-max-jobs</literal> setting.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para>Garbage collector improvements:
-
-    <itemizedlist>
-
-      <listitem><para>Open files (such as running programs) are now
-      used as roots of the garbage collector.  This prevents programs
-      that have been uninstalled from being garbage collected while
-      they are still running.  The script that detects these
-      additional runtime roots
-      (<filename>find-runtime-roots.pl</filename>) is inherently
-      system-specific, but it should work on Linux and on all
-      platforms that have the <command>lsof</command>
-      utility.</para></listitem>
-
-      <listitem><para><literal>nix-store --gc</literal>
-      (a.k.a. <command>nix-collect-garbage</command>) prints out the
-      number of bytes freed on standard output.  <literal>nix-store
-      --gc --print-dead</literal> shows how many bytes would be freed
-      by an actual garbage collection.</para></listitem>
-
-      <listitem><para><literal>nix-collect-garbage -d</literal>
-      removes all old generations of <emphasis>all</emphasis> profiles
-      before calling the actual garbage collector (<literal>nix-store
-      --gc</literal>).  This is an easy way to get rid of all old
-      packages in the Nix store.</para></listitem>
-
-      <listitem><para><command>nix-store</command> now has an
-      operation <option>--delete</option> to delete specific paths
-      from the Nix store.  It won’t delete reachable (non-garbage)
-      paths unless <option>--ignore-liveness</option> is
-      specified.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para>Berkeley DB 4.4’s process registry feature is used
-  to recover from crashed Nix processes.</para></listitem>
-
-  <!--  <listitem><para>TODO: shared stores.</para></listitem> -->
-
-  <listitem><para>A performance issue has been fixed with the
-  <literal>referer</literal> table, which stores the inverse of the
-  <literal>references</literal> table (i.e., it tells you what store
-  paths refer to a given path).  Maintaining this table could take a
-  quadratic amount of time, as well as a quadratic amount of Berkeley
-  DB log file space (in particular when running the garbage collector)
-  (<literal>NIX-23</literal>).</para></listitem>
-
-  <listitem><para>Nix now catches the <literal>TERM</literal> and
-  <literal>HUP</literal> signals in addition to the
-  <literal>INT</literal> signal.  So you can now do a <literal>killall
-  nix-store</literal> without triggering a database
-  recovery.</para></listitem>
-
-  <listitem><para><command>bsdiff</command> updated to version
-  4.3.</para></listitem>
-
-  <listitem><para>Substantial performance improvements in expression
-  evaluation and <literal>nix-env -qa</literal>, all thanks to <link
-  xlink:href="http://valgrind.org/">Valgrind</link>.  Memory use has
-  been reduced by a factor 8 or so.  Big speedup by memoisation of
-  path hashing.</para></listitem>
-
-  <listitem><para>Lots of bug fixes, notably:
-
-    <itemizedlist>
-
-      <listitem><para>Make sure that the garbage collector can run
-      successfully when the disk is full
-      (<literal>NIX-18</literal>).</para></listitem>
-
-      <listitem><para><command>nix-env</command> now locks the profile
-      to prevent races between concurrent <command>nix-env</command>
-      operations on the same profile
-      (<literal>NIX-7</literal>).</para></listitem>
-
-      <listitem><para>Removed misleading messages from
-      <literal>nix-env -i</literal> (e.g., <literal>installing
-      `foo'</literal> followed by <literal>uninstalling
-      `foo'</literal>) (<literal>NIX-17</literal>).</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>Nix source distributions are a lot smaller now since
-  we no longer include a full copy of the Berkeley DB source
-  distribution (but only the bits we need).</para></listitem>
-
-  <listitem><para>Header files are now installed so that external
-  programs can use the Nix libraries.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.11.xml b/doc/manual/release-notes/rl-0.11.xml
deleted file mode 100644
index 7ad0ab5b7..000000000
--- a/doc/manual/release-notes/rl-0.11.xml
+++ /dev/null
@@ -1,261 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.11">
-
-<title>Release 0.11 (2007-12-31)</title>
-
-<para>Nix 0.11 has many improvements over the previous stable release.
-The most important improvement is secure multi-user support.  It also
-features many usability enhancements and language extensions, many of
-them prompted by NixOS, the purely functional Linux distribution based
-on Nix.  Here is an (incomplete) list:</para>
-
-
-<itemizedlist>
-
-
-  <listitem><para>Secure multi-user support.  A single Nix store can
-  now be shared between multiple (possible untrusted) users.  This is
-  an important feature for NixOS, where it allows non-root users to
-  install software.  The old setuid method for sharing a store between
-  multiple users has been removed.  Details for setting up a
-  multi-user store can be found in the manual.</para></listitem>
-
-
-  <listitem><para>The new command <command>nix-copy-closure</command>
-  gives you an easy and efficient way to exchange software between
-  machines.  It copies the missing parts of the closure of a set of
-  store path to or from a remote machine via
-  <command>ssh</command>.</para></listitem>
-
-
-  <listitem><para>A new kind of string literal: strings between double
-  single-quotes (<literal>''</literal>) have indentation
-  “intelligently” removed.  This allows large strings (such as shell
-  scripts or configuration file fragments in NixOS) to cleanly follow
-  the indentation of the surrounding expression.  It also requires
-  much less escaping, since <literal>''</literal> is less common in
-  most languages than <literal>"</literal>.</para></listitem>
-
-
-  <listitem><para><command>nix-env</command> <option>--set</option>
-  modifies the current generation of a profile so that it contains
-  exactly the specified derivation, and nothing else.  For example,
-  <literal>nix-env -p /nix/var/nix/profiles/browser --set
-  firefox</literal> lets the profile named
-  <filename>browser</filename> contain just Firefox.</para></listitem>
-
-
-  <listitem><para><command>nix-env</command> now maintains
-  meta-information about installed packages in profiles.  The
-  meta-information is the contents of the <varname>meta</varname>
-  attribute of derivations, such as <varname>description</varname> or
-  <varname>homepage</varname>.  The command <literal>nix-env -q --xml
-  --meta</literal> shows all meta-information.</para></listitem>
-
-
-  <listitem><para><command>nix-env</command> now uses the
-  <varname>meta.priority</varname> attribute of derivations to resolve
-  filename collisions between packages.  Lower priority values denote
-  a higher priority.  For instance, the GCC wrapper package and the
-  Binutils package in Nixpkgs both have a file
-  <filename>bin/ld</filename>, so previously if you tried to install
-  both you would get a collision.  Now, on the other hand, the GCC
-  wrapper declares a higher priority than Binutils, so the former’s
-  <filename>bin/ld</filename> is symlinked in the user
-  environment.</para></listitem>
-
-
-  <listitem><para><command>nix-env -i / -u</command>: instead of
-  breaking package ties by version, break them by priority and version
-  number.  That is, if there are multiple packages with the same name,
-  then pick the package with the highest priority, and only use the
-  version if there are multiple packages with the same
-  priority.</para>
-
-  <para>This makes it possible to mark specific versions/variant in
-  Nixpkgs more or less desirable than others.  A typical example would
-  be a beta version of some package (e.g.,
-  <literal>gcc-4.2.0rc1</literal>) which should not be installed even
-  though it is the highest version, except when it is explicitly
-  selected (e.g., <literal>nix-env -i
-  gcc-4.2.0rc1</literal>).</para></listitem>
-
-
-  <listitem><para><command>nix-env --set-flag</command> allows meta
-  attributes of installed packages to be modified.  There are several
-  attributes that can be usefully modified, because they affect the
-  behaviour of <command>nix-env</command> or the user environment
-  build script:
-
-    <itemizedlist>
-
-      <listitem><para><varname>meta.priority</varname> can be changed
-      to resolve filename clashes (see above).</para></listitem>
-
-      <listitem><para><varname>meta.keep</varname> can be set to
-      <literal>true</literal> to prevent the package from being
-      upgraded or replaced.  Useful if you want to hang on to an older
-      version of a package.</para></listitem>
-
-      <listitem><para><varname>meta.active</varname> can be set to
-      <literal>false</literal> to “disable” the package.  That is, no
-      symlinks will be generated to the files of the package, but it
-      remains part of the profile (so it won’t be garbage-collected).
-      Set it back to <literal>true</literal> to re-enable the
-      package.</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-
-  <listitem><para><command>nix-env -q</command> now has a flag
-  <option>--prebuilt-only</option> (<option>-b</option>) that causes
-  <command>nix-env</command> to show only those derivations whose
-  output is already in the Nix store or that can be substituted (i.e.,
-  downloaded from somewhere).  In other words, it shows the packages
-  that can be installed “quickly”, i.e., don’t need to be built from
-  source.  The <option>-b</option> flag is also available in
-  <command>nix-env -i</command> and <command>nix-env -u</command> to
-  filter out derivations for which no pre-built binary is
-  available.</para></listitem>
-
-
-  <listitem><para>The new option <option>--argstr</option> (in
-  <command>nix-env</command>, <command>nix-instantiate</command> and
-  <command>nix-build</command>) is like <option>--arg</option>, except
-  that the value is a string.  For example, <literal>--argstr system
-  i686-linux</literal> is equivalent to <literal>--arg system
-  \"i686-linux\"</literal> (note that <option>--argstr</option>
-  prevents annoying quoting around shell arguments).</para></listitem>
-
-
-  <listitem><para><command>nix-store</command> has a new operation
-  <option>--read-log</option> (<option>-l</option>)
-  <parameter>paths</parameter> that shows the build log of the given
-  paths.</para></listitem>
-
-
-  <!--
-  <listitem><para>TODO: semantic cleanups of string concatenation
-  etc. (mostly in r6740).</para></listitem>
-  -->
-
-
-  <listitem><para>Nix now uses Berkeley DB 4.5.  The database is
-  upgraded automatically, but you should be careful not to use old
-  versions of Nix that still use Berkeley DB 4.4.</para></listitem>
-
-
-  <!-- foo
-  <listitem><para>TODO: option <option>- -reregister</option> in
-  <command>nix-store - -register-validity</command>.</para></listitem>
-  -->
-
-
-  <listitem><para>The option <option>--max-silent-time</option>
-  (corresponding to the configuration setting
-  <literal>build-max-silent-time</literal>) allows you to set a
-  timeout on builds — if a build produces no output on
-  <literal>stdout</literal> or <literal>stderr</literal> for the given
-  number of seconds, it is terminated.  This is useful for recovering
-  automatically from builds that are stuck in an infinite
-  loop.</para></listitem>
-
-
-  <listitem><para><command>nix-channel</command>: each subscribed
-  channel is its own attribute in the top-level expression generated
-  for the channel.  This allows disambiguation (e.g. <literal>nix-env
-  -i -A nixpkgs_unstable.firefox</literal>).</para></listitem>
-
-
-  <listitem><para>The substitutes table has been removed from the
-  database.  This makes operations such as <command>nix-pull</command>
-  and <command>nix-channel --update</command> much, much
-  faster.</para></listitem>
-
-
-  <listitem><para><command>nix-pull</command> now supports
-  bzip2-compressed manifests.  This speeds up
-  channels.</para></listitem>
-
-
-  <listitem><para><command>nix-prefetch-url</command> now has a
-  limited form of caching.  This is used by
-  <command>nix-channel</command> to prevent unnecessary downloads when
-  the channel hasn’t changed.</para></listitem>
-
-
-  <listitem><para><command>nix-prefetch-url</command> now by default
-  computes the SHA-256 hash of the file instead of the MD5 hash.  In
-  calls to <function>fetchurl</function> you should pass the
-  <literal>sha256</literal> attribute instead of
-  <literal>md5</literal>.  You can pass either a hexadecimal or a
-  base-32 encoding of the hash.</para></listitem>
-
-
-  <listitem><para>Nix can now perform builds in an automatically
-  generated “chroot”.  This prevents a builder from accessing stuff
-  outside of the Nix store, and thus helps ensure purity.  This is an
-  experimental feature.</para></listitem>
-
-
-  <listitem><para>The new command <command>nix-store
-  --optimise</command> reduces Nix store disk space usage by finding
-  identical files in the store and hard-linking them to each other.
-  It typically reduces the size of the store by something like
-  25-35%.</para></listitem>
-
-
-  <listitem><para><filename>~/.nix-defexpr</filename> can now be a
-  directory, in which case the Nix expressions in that directory are
-  combined into an attribute set, with the file names used as the
-  names of the attributes.  The command <command>nix-env
-  --import</command> (which set the
-  <filename>~/.nix-defexpr</filename> symlink) is
-  removed.</para></listitem>
-
-
-  <listitem><para>Derivations can specify the new special attribute
-  <varname>allowedReferences</varname> to enforce that the references
-  in the output of a derivation are a subset of a declared set of
-  paths.  For example, if <varname>allowedReferences</varname> is an
-  empty list, then the output must not have any references.  This is
-  used in NixOS to check that generated files such as initial ramdisks
-  for booting Linux don’t have any dependencies.</para></listitem>
-
-
-  <listitem><para>The new attribute
-  <varname>exportReferencesGraph</varname> allows builders access to
-  the references graph of their inputs.  This is used in NixOS for
-  tasks such as generating ISO-9660 images that contain a Nix store
-  populated with the closure of certain paths.</para></listitem>
-
-
-  <listitem><para>Fixed-output derivations (like
-  <function>fetchurl</function>) can define the attribute
-  <varname>impureEnvVars</varname> to allow external environment
-  variables to be passed to builders.  This is used in Nixpkgs to
-  support proxy configuration, among other things.</para></listitem>
-
-
-  <listitem><para>Several new built-in functions:
-  <function>builtins.attrNames</function>,
-  <function>builtins.filterSource</function>,
-  <function>builtins.isAttrs</function>,
-  <function>builtins.isFunction</function>,
-  <function>builtins.listToAttrs</function>,
-  <function>builtins.stringLength</function>,
-  <function>builtins.sub</function>,
-  <function>builtins.substring</function>,
-  <function>throw</function>,
-  <function>builtins.trace</function>,
-  <function>builtins.readFile</function>.</para></listitem>
-
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.12.xml b/doc/manual/release-notes/rl-0.12.xml
deleted file mode 100644
index c30124786..000000000
--- a/doc/manual/release-notes/rl-0.12.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.12">
-
-<title>Release 0.12 (2008-11-20)</title>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix no longer uses Berkeley DB to store Nix store metadata.
-    The principal advantages of the new storage scheme are: it works
-    properly over decent implementations of NFS (allowing Nix stores
-    to be shared between multiple machines); no recovery is needed
-    when a Nix process crashes; no write access is needed for
-    read-only operations; no more running out of Berkeley DB locks on
-    certain operations.</para>
-
-    <para>You still need to compile Nix with Berkeley DB support if
-    you want Nix to automatically convert your old Nix store to the
-    new schema.  If you don’t need this, you can build Nix with the
-    <filename>configure</filename> option
-    <option>--disable-old-db-compat</option>.</para>
-
-    <para>After the automatic conversion to the new schema, you can
-    delete the old Berkeley DB files:
-
-    <screen>
-$ cd /nix/var/nix/db
-$ rm __db* log.* derivers references referrers reserved validpaths DB_CONFIG</screen>
-
-    The new metadata is stored in the directories
-    <filename>/nix/var/nix/db/info</filename> and
-    <filename>/nix/var/nix/db/referrer</filename>.  Though the
-    metadata is stored in human-readable plain-text files, they are
-    not intended to be human-editable, as Nix is rather strict about
-    the format.</para>
-
-    <para>The new storage schema may or may not require less disk
-    space than the Berkeley DB environment, mostly depending on the
-    cluster size of your file system.  With 1 KiB clusters (which
-    seems to be the <literal>ext3</literal> default nowadays) it
-    usually takes up much less space.</para>
-  </listitem>
-
-  <listitem><para>There is a new substituter that copies paths
-  directly from other (remote) Nix stores mounted somewhere in the
-  filesystem.  For instance, you can speed up an installation by
-  mounting some remote Nix store that already has the packages in
-  question via NFS or <literal>sshfs</literal>.  The environment
-  variable <literal>NIX_OTHER_STORES</literal> specifies the locations of
-  the remote Nix directories,
-  e.g. <literal>/mnt/remote-fs/nix</literal>.</para></listitem>
-
-  <listitem><para>New <command>nix-store</command> operations
-  <option>--dump-db</option> and <option>--load-db</option> to dump
-  and reload the Nix database.</para></listitem>
-
-  <listitem><para>The garbage collector has a number of new options to
-  allow only some of the garbage to be deleted.  The option
-  <option>--max-freed <emphasis>N</emphasis></option> tells the
-  collector to stop after at least <emphasis>N</emphasis> bytes
-  have been deleted.  The option <option>--max-links
-  <emphasis>N</emphasis></option> tells it to stop after the
-  link count on <filename>/nix/store</filename> has dropped below
-  <emphasis>N</emphasis>.  This is useful for very large Nix
-  stores on filesystems with a 32000 subdirectories limit (like
-  <literal>ext3</literal>).  The option <option>--use-atime</option>
-  causes store paths to be deleted in order of ascending last access
-  time.  This allows non-recently used stuff to be deleted.  The
-  option <option>--max-atime <emphasis>time</emphasis></option>
-  specifies an upper limit to the last accessed time of paths that may
-  be deleted.  For instance,
-
-    <screen>
-    $ nix-store --gc -v --max-atime $(date +%s -d "2 months ago")</screen>
-
-  deletes everything that hasn’t been accessed in two months.</para></listitem>
-
-  <listitem><para><command>nix-env</command> now uses optimistic
-  profile locking when performing an operation like installing or
-  upgrading, instead of setting an exclusive lock on the profile.
-  This allows multiple <command>nix-env -i / -u / -e</command>
-  operations on the same profile in parallel.  If a
-  <command>nix-env</command> operation sees at the end that the profile
-  was changed in the meantime by another process, it will just
-  restart.  This is generally cheap because the build results are
-  still in the Nix store.</para></listitem>
-
-  <listitem><para>The option <option>--dry-run</option> is now
-  supported by <command>nix-store -r</command> and
-  <command>nix-build</command>.</para></listitem>
-
-  <listitem><para>The information previously shown by
-  <option>--dry-run</option> (i.e., which derivations will be built
-  and which paths will be substituted) is now always shown by
-  <command>nix-env</command>, <command>nix-store -r</command> and
-  <command>nix-build</command>.  The total download size of
-  substitutable paths is now also shown.  For instance, a build will
-  show something like
-
-    <screen>
-the following derivations will be built:
-  /nix/store/129sbxnk5n466zg6r1qmq1xjv9zymyy7-activate-configuration.sh.drv
-  /nix/store/7mzy971rdm8l566ch8hgxaf89x7lr7ik-upstart-jobs.drv
-  ...
-the following paths will be downloaded/copied (30.02 MiB):
-  /nix/store/4m8pvgy2dcjgppf5b4cj5l6wyshjhalj-samba-3.2.4
-  /nix/store/7h1kwcj29ip8vk26rhmx6bfjraxp0g4l-libunwind-0.98.6
-  ...</screen>
-
-  </para></listitem>
-
-  <listitem><para>Language features:
-
-    <itemizedlist>
-
-      <listitem><para>@-patterns as in Haskell.  For instance, in a
-      function definition
-
-      <programlisting>f = args @ {x, y, z}: <emphasis>...</emphasis>;</programlisting>
-
-      <varname>args</varname> refers to the argument as a whole, which
-      is further pattern-matched against the attribute set pattern
-      <literal>{x, y, z}</literal>.</para></listitem>
-
-      <listitem><para>“<literal>...</literal>” (ellipsis) patterns.
-      An attribute set pattern can now say <literal>...</literal>  at
-      the end of the attribute name list to specify that the function
-      takes <emphasis>at least</emphasis> the listed attributes, while
-      ignoring additional attributes.  For instance,
-
-      <programlisting>{stdenv, fetchurl, fuse, ...}: <emphasis>...</emphasis></programlisting>
-
-      defines a function that accepts any attribute set that includes
-      at least the three listed attributes.</para></listitem>
-
-      <listitem><para>New primops:
-      <varname>builtins.parseDrvName</varname> (split a package name
-      string like <literal>"nix-0.12pre12876"</literal> into its name
-      and version components, e.g. <literal>"nix"</literal> and
-      <literal>"0.12pre12876"</literal>),
-      <varname>builtins.compareVersions</varname> (compare two version
-      strings using the same algorithm that <command>nix-env</command>
-      uses), <varname>builtins.length</varname> (efficiently compute
-      the length of a list), <varname>builtins.mul</varname> (integer
-      multiplication), <varname>builtins.div</varname> (integer
-      division).
-      <!-- <varname>builtins.genericClosure</varname> -->
-      </para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para><command>nix-prefetch-url</command> now supports
-  <literal>mirror://</literal> URLs, provided that the environment
-  variable <literal>NIXPKGS_ALL</literal> points at a Nixpkgs
-  tree.</para></listitem>
-
-  <listitem><para>Removed the commands
-  <command>nix-pack-closure</command> and
-  <command>nix-unpack-closure</command>.   You can do almost the same
-  thing but much more efficiently by doing <literal>nix-store --export
-  $(nix-store -qR <emphasis>paths</emphasis>) > closure</literal> and
-  <literal>nix-store --import &lt;
-  closure</literal>.</para></listitem>
-
-  <listitem><para>Lots of bug fixes, including a big performance bug in
-  the handling of <literal>with</literal>-expressions.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.13.xml b/doc/manual/release-notes/rl-0.13.xml
deleted file mode 100644
index 8cb0ae9a5..000000000
--- a/doc/manual/release-notes/rl-0.13.xml
+++ /dev/null
@@ -1,106 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.13">
-
-<title>Release 0.13 (2009-11-05)</title>
-
-<para>This is primarily a bug fix release.  It has some new
-features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Syntactic sugar for writing nested attribute sets.  Instead of
-
-<programlisting>
-{
-  foo = {
-    bar = 123;
-    xyzzy = true;
-  };
-  a = { b = { c = "d"; }; };
-}
-</programlisting>
-
-    you can write
-
-<programlisting>
-{
-  foo.bar = 123;
-  foo.xyzzy = true;
-  a.b.c = "d";
-}
-</programlisting>
-
-    This is useful, for instance, in NixOS configuration files.</para>
-
-  </listitem>
-
-  <listitem>
-    <para>Support for Nix channels generated by Hydra, the Nix-based
-    continuous build system.  (Hydra generates NAR archives on the
-    fly, so the size and hash of these archives isn’t known in
-    advance.)</para>
-  </listitem>
-
-  <listitem>
-    <para>Support <literal>i686-linux</literal> builds directly on
-    <literal>x86_64-linux</literal> Nix installations.  This is
-    implemented using the <function>personality()</function> syscall,
-    which causes <command>uname</command> to return
-    <literal>i686</literal> in child processes.</para>
-  </listitem>
-
-  <listitem>
-    <para>Various improvements to the <literal>chroot</literal>
-    support.  Building in a <literal>chroot</literal> works quite well
-    now.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix no longer blocks if it tries to build a path and another
-    process is already building the same path.  Instead it tries to
-    build another buildable path first.  This improves
-    parallelism.</para>
-  </listitem>
-
-  <listitem>
-    <para>Support for large (> 4 GiB) files in NAR archives.</para>
-  </listitem>
-
-  <listitem>
-    <para>Various (performance) improvements to the remote build
-    mechanism.</para>
-  </listitem>
-
-  <listitem>
-    <para>New primops: <varname>builtins.addErrorContext</varname> (to
-    add a string to stack traces — useful for debugging),
-    <varname>builtins.isBool</varname>,
-    <varname>builtins.isString</varname>,
-    <varname>builtins.isInt</varname>,
-    <varname>builtins.intersectAttrs</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>OpenSolaris support (Sander van der Burg).</para>
-  </listitem>
-
-  <listitem>
-    <para>Stack traces are no longer displayed unless the
-    <option>--show-trace</option> option is used.</para>
-  </listitem>
-
-  <listitem>
-    <para>The scoping rules for <literal>inherit
-    (<emphasis>e</emphasis>) ...</literal> in recursive
-    attribute sets have changed.  The expression
-    <emphasis>e</emphasis> can now refer to the attributes
-    defined in the containing set.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.14.xml b/doc/manual/release-notes/rl-0.14.xml
deleted file mode 100644
index e5fe9da78..000000000
--- a/doc/manual/release-notes/rl-0.14.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.14">
-
-<title>Release 0.14 (2010-02-04)</title>
-
-<para>This release has the following improvements:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>The garbage collector now starts deleting garbage much
-    faster than before.  It no longer determines liveness of all paths
-    in the store, but does so on demand.</para>
-  </listitem>
-
-  <listitem>
-    <para>Added a new operation, <command>nix-store --query
-    --roots</command>, that shows the garbage collector roots that
-    directly or indirectly point to the given store paths.</para>
-  </listitem>
-
-  <listitem>
-    <para>Removed support for converting Berkeley DB-based Nix
-    databases to the new schema.</para>
-  </listitem>
-
-  <listitem>
-    <para>Removed the <option>--use-atime</option> and
-    <option>--max-atime</option> garbage collector options.  They were
-    not very useful in practice.</para>
-  </listitem>
-
-  <listitem>
-    <para>On Windows, Nix now requires Cygwin 1.7.x.</para>
-  </listitem>
-
-  <listitem>
-    <para>A few bug fixes.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.15.xml b/doc/manual/release-notes/rl-0.15.xml
deleted file mode 100644
index 9f58a8efc..000000000
--- a/doc/manual/release-notes/rl-0.15.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.15">
-
-<title>Release 0.15 (2010-03-17)</title>
-
-<para>This is a bug-fix release.  Among other things, it fixes
-building on Mac OS X (Snow Leopard), and improves the contents of
-<filename>/etc/passwd</filename> and <filename>/etc/group</filename>
-in <literal>chroot</literal> builds.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.16.xml b/doc/manual/release-notes/rl-0.16.xml
deleted file mode 100644
index 7039d4b0b..000000000
--- a/doc/manual/release-notes/rl-0.16.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-0.16">
-
-<title>Release 0.16 (2010-08-17)</title>
-
-<para>This release has the following improvements:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>The Nix expression evaluator is now much faster in most
-    cases: typically, <link
-    xlink:href="http://www.mail-archive.com/nix-dev@cs.uu.nl/msg04113.html">3
-    to 8 times compared to the old implementation</link>.  It also
-    uses less memory.  It no longer depends on the ATerm
-    library.</para>
-  </listitem>
-
-  <listitem>
-    <para>
-      Support for configurable parallelism inside builders.  Build
-      scripts have always had the ability to perform multiple build
-      actions in parallel (for instance, by running <command>make -j
-      2</command>), but this was not desirable because the number of
-      actions to be performed in parallel was not configurable.  Nix
-      now has an option <option>--cores
-      <emphasis>N</emphasis></option> as well as a configuration
-      setting <varname>build-cores =
-      <emphasis>N</emphasis></varname> that causes the
-      environment variable <literal>NIX_BUILD_CORES</literal> to be set to
-      <emphasis>N</emphasis> when the builder is invoked.  The
-      builder can use this at its discretion to perform a parallel
-      build, e.g., by calling <command>make -j
-      <emphasis>N</emphasis></command>.  In Nixpkgs, this can be
-      enabled on a per-package basis by setting the derivation
-      attribute <varname>enableParallelBuilding</varname> to
-      <literal>true</literal>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-store -q</command> now supports XML output
-    through the <option>--xml</option> flag.</para>
-  </listitem>
-
-  <listitem>
-    <para>Several bug fixes.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.5.xml b/doc/manual/release-notes/rl-0.5.xml
deleted file mode 100644
index e9f8bf270..000000000
--- a/doc/manual/release-notes/rl-0.5.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.5">
-
-<title>Release 0.5 and earlier</title>
-
-<para>Please refer to the Subversion commit log messages.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.6.xml b/doc/manual/release-notes/rl-0.6.xml
deleted file mode 100644
index 23fbee173..000000000
--- a/doc/manual/release-notes/rl-0.6.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.6">
-
-<title>Release 0.6 (2004-11-14)</title>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Rewrite of the normalisation engine.
-
-    <itemizedlist>
-
-      <listitem><para>Multiple builds can now be performed in parallel
-      (option <option>-j</option>).</para></listitem>
-
-      <listitem><para>Distributed builds.  Nix can now call a shell
-      script to forward builds to Nix installations on remote
-      machines, which may or may not be of the same platform
-      type.</para></listitem>
-
-      <listitem><para>Option <option>--fallback</option> allows
-      recovery from broken substitutes.</para></listitem>
-
-      <listitem><para>Option <option>--keep-going</option> causes
-      building of other (unaffected) derivations to continue if one
-      failed.</para></listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem><para>Improvements to the garbage collector (i.e., it
-  should actually work now).</para></listitem>
-
-  <listitem><para>Setuid Nix installations allow a Nix store to be
-  shared among multiple users.</para></listitem>
-
-  <listitem><para>Substitute registration is much faster
-  now.</para></listitem>
-
-  <listitem><para>A utility <command>nix-build</command> to build a
-  Nix expression and create a symlink to the result int the current
-  directory; useful for testing Nix derivations.</para></listitem>
-
-  <listitem><para>Manual updates.</para></listitem>
-
-  <listitem>
-
-    <para><command>nix-env</command> changes:
-
-    <itemizedlist>
-
-      <listitem><para>Derivations for other platforms are filtered out
-      (which can be overridden using
-      <option>--system-filter</option>).</para></listitem>
-
-      <listitem><para><option>--install</option> by default now
-      uninstall previous derivations with the same
-      name.</para></listitem>
-
-      <listitem><para><option>--upgrade</option> allows upgrading to a
-      specific version.</para></listitem>
-
-      <listitem><para>New operation
-      <option>--delete-generations</option> to remove profile
-      generations (necessary for effective garbage
-      collection).</para></listitem>
-
-      <listitem><para>Nicer output (sorted,
-      columnised).</para></listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem><para>More sensible verbosity levels all around (builder
-  output is now shown always, unless <option>-Q</option> is
-  given).</para></listitem>
-
-  <listitem>
-
-    <para>Nix expression language changes:
-
-    <itemizedlist>
-
-      <listitem><para>New language construct: <literal>with
-      <emphasis>E1</emphasis>;
-      <emphasis>E2</emphasis></literal> brings all attributes
-      defined in the attribute set <emphasis>E1</emphasis> in
-      scope in <emphasis>E2</emphasis>.</para></listitem>
-
-      <listitem><para>Added a <function>map</function>
-      function.</para></listitem>
-
-      <listitem><para>Various new operators (e.g., string
-      concatenation).</para></listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem><para>Expression evaluation is much
-  faster.</para></listitem>
-
-  <listitem><para>An Emacs mode for editing Nix expressions (with
-  syntax highlighting and indentation) has been
-  added.</para></listitem>
-
-  <listitem><para>Many bug fixes.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.7.xml b/doc/manual/release-notes/rl-0.7.xml
deleted file mode 100644
index 6f95db436..000000000
--- a/doc/manual/release-notes/rl-0.7.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.7">
-
-<title>Release 0.7 (2005-01-12)</title>
-
-<itemizedlist>
-
-  <listitem><para>Binary patching.  When upgrading components using
-  pre-built binaries (through nix-pull / nix-channel), Nix can
-  automatically download and apply binary patches to already installed
-  components instead of full downloads.  Patching is “smart”: if there
-  is a <emphasis>sequence</emphasis> of patches to an installed
-  component, Nix will use it.  Patches are currently generated
-  automatically between Nixpkgs (pre-)releases.</para></listitem>
-
-  <listitem><para>Simplifications to the substitute
-  mechanism.</para></listitem>
-
-  <listitem><para>Nix-pull now stores downloaded manifests in
-  <filename>/nix/var/nix/manifests</filename>.</para></listitem>
-
-  <listitem><para>Metadata on files in the Nix store is canonicalised
-  after builds: the last-modified timestamp is set to 0 (00:00:00
-  1/1/1970), the mode is set to 0444 or 0555 (readable and possibly
-  executable by all; setuid/setgid bits are dropped), and the group is
-  set to the default.  This ensures that the result of a build and an
-  installation through a substitute is the same; and that timestamp
-  dependencies are revealed.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.8.1.xml b/doc/manual/release-notes/rl-0.8.1.xml
deleted file mode 100644
index f7ffca0f8..000000000
--- a/doc/manual/release-notes/rl-0.8.1.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.8.1">
-
-<title>Release 0.8.1 (2005-04-13)</title>
-
-<para>This is a bug fix release.</para>
-
-<itemizedlist>
-
-  <listitem><para>Patch downloading was broken.</para></listitem>
-
-  <listitem><para>The garbage collector would not delete paths that
-  had references from invalid (but substitutable)
-  paths.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.8.xml b/doc/manual/release-notes/rl-0.8.xml
deleted file mode 100644
index 1adb91a23..000000000
--- a/doc/manual/release-notes/rl-0.8.xml
+++ /dev/null
@@ -1,246 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.8">
-
-<title>Release 0.8 (2005-04-11)</title>
-
-<para>NOTE: the hashing scheme in Nix 0.8 changed (as detailed below).
-As a result, <command>nix-pull</command> manifests and channels built
-for Nix 0.7 and below will not work anymore.  However, the Nix
-expression language has not changed, so you can still build from
-source.  Also, existing user environments continue to work.  Nix 0.8
-will automatically upgrade the database schema of previous
-installations when it is first run.</para>
-
-<para>If you get the error message
-
-<screen>
-you have an old-style manifest `/nix/var/nix/manifests/[...]'; please
-delete it</screen>
-
-you should delete previously downloaded manifests:
-
-<screen>
-$ rm /nix/var/nix/manifests/*</screen>
-
-If <command>nix-channel</command> gives the error message
-
-<screen>
-manifest `http://catamaran.labs.cs.uu.nl/dist/nix/channels/[channel]/MANIFEST'
-is too old (i.e., for Nix &lt;= 0.7)</screen>
-
-then you should unsubscribe from the offending channel
-(<command>nix-channel --remove
-<emphasis>URL</emphasis></command>; leave out
-<literal>/MANIFEST</literal>), and subscribe to the same URL, with
-<literal>channels</literal> replaced by <literal>channels-v3</literal>
-(e.g., <link
-xlink:href='http://catamaran.labs.cs.uu.nl/dist/nix/channels-v3/nixpkgs-unstable'
-/>).</para>
-
-<para>Nix 0.8 has the following improvements:
-
-<itemizedlist>
-
-  <listitem><para>The cryptographic hashes used in store paths are now
-  160 bits long, but encoded in base-32 so that they are still only 32
-  characters long (e.g.,
-  <filename>/nix/store/csw87wag8bqlqk7ipllbwypb14xainap-atk-1.9.0</filename>).
-  (This is actually a 160 bit truncation of a SHA-256
-  hash.)</para></listitem>
-
-  <listitem><para>Big cleanups and simplifications of the basic store
-  semantics.  The notion of “closure store expressions” is gone (and
-  so is the notion of “successors”); the file system references of a
-  store path are now just stored in the database.</para>
-
-  <para>For instance, given any store path, you can query its closure:
-
-  <screen>
-$ nix-store -qR $(which firefox)
-... lots of paths ...</screen>
-
-  Also, Nix now remembers for each store path the derivation that
-  built it (the “deriver”):
-
-  <screen>
-$ nix-store -qR $(which firefox)
-/nix/store/4b0jx7vq80l9aqcnkszxhymsf1ffa5jd-firefox-1.0.1.drv</screen>
-
-  So to see the build-time dependencies, you can do
-
-  <screen>
-$ nix-store -qR $(nix-store -qd $(which firefox))</screen>
-
-  or, in a nicer format:
-
-  <screen>
-$ nix-store -q --tree $(nix-store -qd $(which firefox))</screen>
-
-  </para>
-
-  <para>File system references are also stored in reverse.  For
-  instance, you can query all paths that directly or indirectly use a
-  certain Glibc:
-
-  <screen>
-$ nix-store -q --referrers-closure \
-    /nix/store/8lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4</screen>
-
-  </para>
-
-  </listitem>
-
-  <listitem><para>The concept of fixed-output derivations has been
-  formalised.  Previously, functions such as
-  <function>fetchurl</function> in Nixpkgs used a hack (namely,
-  explicitly specifying a store path hash) to prevent changes to, say,
-  the URL of the file from propagating upwards through the dependency
-  graph, causing rebuilds of everything.  This can now be done cleanly
-  by specifying the <varname>outputHash</varname> and
-  <varname>outputHashAlgo</varname> attributes.  Nix itself checks
-  that the content of the output has the specified hash.  (This is
-  important for maintaining certain invariants necessary for future
-  work on secure shared stores.)</para></listitem>
-
-  <listitem><para>One-click installation :-) It is now possible to
-  install any top-level component in Nixpkgs directly, through the web
-  — see, e.g., <link
-  xlink:href='http://catamaran.labs.cs.uu.nl/dist/nixpkgs-0.8/' />.
-  All you have to do is associate
-  <filename>/nix/bin/nix-install-package</filename> with the MIME type
-  <literal>application/nix-package</literal> (or the extension
-  <filename>.nixpkg</filename>), and clicking on a package link will
-  cause it to be installed, with all appropriate dependencies.  If you
-  just want to install some specific application, this is easier than
-  subscribing to a channel.</para></listitem>
-
-  <listitem><para><command>nix-store -r
-  <emphasis>PATHS</emphasis></command> now builds all the
-  derivations PATHS in parallel.  Previously it did them sequentially
-  (though exploiting possible parallelism between subderivations).
-  This is nice for build farms.</para></listitem>
-
-  <listitem><para><command>nix-channel</command> has new operations
-  <option>--list</option> and
-  <option>--remove</option>.</para></listitem>
-
-  <listitem><para>New ways of installing components into user
-  environments:
-
-  <itemizedlist>
-
-    <listitem><para>Copy from another user environment:
-
-    <screen>
-$ nix-env -i --from-profile .../other-profile firefox</screen>
-
-    </para></listitem>
-
-    <listitem><para>Install a store derivation directly (bypassing the
-    Nix expression language entirely):
-
-    <screen>
-$ nix-env -i /nix/store/z58v41v21xd3...-aterm-2.3.1.drv</screen>
-
-    (This is used to implement <command>nix-install-package</command>,
-    which is therefore immune to evolution in the Nix expression
-    language.)</para></listitem>
-
-    <listitem><para>Install an already built store path directly:
-
-    <screen>
-$ nix-env -i /nix/store/hsyj5pbn0d9i...-aterm-2.3.1</screen>
-
-    </para></listitem>
-
-    <listitem><para>Install the result of a Nix expression specified
-    as a command-line argument:
-
-    <screen>
-$ nix-env -f .../i686-linux.nix -i -E 'x: x.firefoxWrapper'</screen>
-
-    The difference with the normal installation mode is that
-    <option>-E</option> does not use the <varname>name</varname>
-    attributes of derivations.  Therefore, this can be used to
-    disambiguate multiple derivations with the same
-    name.</para></listitem>
-
-  </itemizedlist></para></listitem>
-
-  <listitem><para>A hash of the contents of a store path is now stored
-  in the database after a successful build.  This allows you to check
-  whether store paths have been tampered with: <command>nix-store
-  --verify --check-contents</command>.</para></listitem>
-
-  <listitem>
-
-    <para>Implemented a concurrent garbage collector.  It is now
-    always safe to run the garbage collector, even if other Nix
-    operations are happening simultaneously.</para>
-
-    <para>However, there can still be GC races if you use
-    <command>nix-instantiate</command> and <command>nix-store
-    --realise</command> directly to build things.  To prevent races,
-    use the <option>--add-root</option> flag of those commands.</para>
-
-  </listitem>
-
-  <listitem><para>The garbage collector now finally deletes paths in
-  the right order (i.e., topologically sorted under the “references”
-  relation), thus making it safe to interrupt the collector without
-  risking a store that violates the closure
-  invariant.</para></listitem>
-
-  <listitem><para>Likewise, the substitute mechanism now downloads
-  files in the right order, thus preserving the closure invariant at
-  all times.</para></listitem>
-
-  <listitem><para>The result of <command>nix-build</command> is now
-  registered as a root of the garbage collector.  If the
-  <filename>./result</filename> link is deleted, the GC root
-  disappears automatically.</para></listitem>
-
-  <listitem>
-
-    <para>The behaviour of the garbage collector can be changed
-    globally by setting options in
-    <filename>/nix/etc/nix/nix.conf</filename>.
-
-    <itemizedlist>
-
-      <listitem><para><literal>gc-keep-derivations</literal> specifies
-      whether deriver links should be followed when searching for live
-      paths.</para></listitem>
-
-      <listitem><para><literal>gc-keep-outputs</literal> specifies
-      whether outputs of derivations should be followed when searching
-      for live paths.</para></listitem>
-
-      <listitem><para><literal>env-keep-derivations</literal>
-      specifies whether user environments should store the paths of
-      derivations when they are added (thus keeping the derivations
-      alive).</para></listitem>
-
-    </itemizedlist>
-
-  </para></listitem>
-
-  <listitem><para>New <command>nix-env</command> query flags
-  <option>--drv-path</option> and
-  <option>--out-path</option>.</para></listitem>
-
-  <listitem><para><command>fetchurl</command> allows SHA-1 and SHA-256
-  in addition to MD5.  Just specify the attribute
-  <varname>sha1</varname> or <varname>sha256</varname> instead of
-  <varname>md5</varname>.</para></listitem>
-
-  <listitem><para>Manual updates.</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.9.1.xml b/doc/manual/release-notes/rl-0.9.1.xml
deleted file mode 100644
index 85d11f416..000000000
--- a/doc/manual/release-notes/rl-0.9.1.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.9.1">
-
-<title>Release 0.9.1 (2005-09-20)</title>
-
-<para>This bug fix release addresses a problem with the ATerm library
-when the <option>--with-aterm</option> flag in
-<command>configure</command> was <emphasis>not</emphasis> used.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.9.2.xml b/doc/manual/release-notes/rl-0.9.2.xml
deleted file mode 100644
index cb705e98a..000000000
--- a/doc/manual/release-notes/rl-0.9.2.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.9.2">
-
-<title>Release 0.9.2 (2005-09-21)</title>
-
-<para>This bug fix release fixes two problems on Mac OS X:
-
-<itemizedlist>
-
-  <listitem><para>If Nix was linked against statically linked versions
-  of the ATerm or Berkeley DB library, there would be dynamic link
-  errors at runtime.</para></listitem>
-
-  <listitem><para><command>nix-pull</command> and
-  <command>nix-push</command> intermittently failed due to race
-  conditions involving pipes and child processes with error messages
-  such as <literal>open2: open(GLOB(0x180b2e4), >&amp;=9) failed: Bad
-  file descriptor at /nix/bin/nix-pull line 77</literal> (issue
-  <literal>NIX-14</literal>).</para></listitem>
-
-</itemizedlist>
-
-</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-0.9.xml b/doc/manual/release-notes/rl-0.9.xml
deleted file mode 100644
index fd1e633f7..000000000
--- a/doc/manual/release-notes/rl-0.9.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ch-relnotes-0.9">
-
-<title>Release 0.9 (2005-09-16)</title>
-
-<para>NOTE: this version of Nix uses Berkeley DB 4.3 instead of 4.2.
-The database is upgraded automatically, but you should be careful not
-to use old versions of Nix that still use Berkeley DB 4.2.  In
-particular, if you use a Nix installed through Nix, you should run
-
-<screen>
-$ nix-store --clear-substitutes</screen>
-
-first.</para>
-
-
-<itemizedlist>
-
-  <listitem><para>Unpacking of patch sequences is much faster now
-  since we no longer do redundant unpacking and repacking of
-  intermediate paths.</para></listitem>
-
-  <listitem><para>Nix now uses Berkeley DB 4.3.</para></listitem>
-
-  <listitem><para>The <function>derivation</function> primitive is
-  lazier.  Attributes of dependent derivations can mutually refer to
-  each other (as long as there are no data dependencies on the
-  <varname>outPath</varname> and <varname>drvPath</varname> attributes
-  computed by <function>derivation</function>).</para>
-
-  <para>For example, the expression <literal>derivation
-  attrs</literal> now evaluates to (essentially)
-
-  <programlisting>
-attrs // {
-  type = "derivation";
-  outPath = derivation! attrs;
-  drvPath = derivation! attrs;
-}</programlisting>
-
-  where <function>derivation!</function> is a primop that does the
-  actual derivation instantiation (i.e., it does what
-  <function>derivation</function> used to do).  The advantage is that
-  it allows commands such as <command>nix-env -qa</command> and
-  <command>nix-env -i</command> to be much faster since they no longer
-  need to instantiate all derivations, just the
-  <varname>name</varname> attribute.</para>
-
-  <para>Also, it allows derivations to cyclically reference each
-  other, for example,
-
-  <programlisting>
-webServer = derivation {
-  ...
-  hostName = "svn.cs.uu.nl";
-  services = [svnService];
-};
-&#x20;
-svnService = derivation {
-  ...
-  hostName = webServer.hostName;
-};</programlisting>
-
-  Previously, this would yield a black hole (infinite recursion).</para>
-
-  </listitem>
-
-  <listitem><para><command>nix-build</command> now defaults to using
-  <filename>./default.nix</filename> if no Nix expression is
-  specified.</para></listitem>
-
-  <listitem><para><command>nix-instantiate</command>, when applied to
-  a Nix expression that evaluates to a function, will call the
-  function automatically if all its arguments have
-  defaults.</para></listitem>
-
-  <listitem><para>Nix now uses libtool to build dynamic libraries.
-  This reduces the size of executables.</para></listitem>
-
-  <listitem><para>A new list concatenation operator
-  <literal>++</literal>.  For example, <literal>[1 2 3] ++ [4 5
-  6]</literal> evaluates to <literal>[1 2 3 4 5
-  6]</literal>.</para></listitem>
-
-  <listitem><para>Some currently undocumented primops to support
-  low-level build management using Nix (i.e., using Nix as a Make
-  replacement).  See the commit messages for <literal>r3578</literal>
-  and <literal>r3580</literal>.</para></listitem>
-
-  <listitem><para>Various bug fixes and performance
-  improvements.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.0.xml b/doc/manual/release-notes/rl-1.0.xml
deleted file mode 100644
index 41081a19f..000000000
--- a/doc/manual/release-notes/rl-1.0.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.0">
-
-<title>Release 1.0 (2012-05-11)</title>
-
-<para>There have been numerous improvements and bug fixes since the
-previous release.  Here are the most significant:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix can now optionally use the Boehm garbage collector.
-    This significantly reduces the Nix evaluator’s memory footprint,
-    especially when evaluating large NixOS system configurations.  It
-    can be enabled using the <option>--enable-gc</option> configure
-    option.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now uses SQLite for its database.  This is faster and
-    more flexible than the old <emphasis>ad hoc</emphasis> format.
-    SQLite is also used to cache the manifests in
-    <filename>/nix/var/nix/manifests</filename>, resulting in a
-    significant speedup.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now has an search path for expressions.  The search path
-    is set using the environment variable <literal>NIX_PATH</literal> and
-    the <option>-I</option> command line option.  In Nix expressions,
-    paths between angle brackets are used to specify files that must
-    be looked up in the search path.  For instance, the expression
-    <literal>&lt;nixpkgs/default.nix></literal> looks for a file
-    <filename>nixpkgs/default.nix</filename> relative to every element
-    in the search path.</para>
-  </listitem>
-
-  <listitem>
-    <para>The new command <command>nix-build --run-env</command>
-    builds all dependencies of a derivation, then starts a shell in an
-    environment containing all variables from the derivation.  This is
-    useful for reproducing the environment of a derivation for
-    development.</para>
-  </listitem>
-
-  <listitem>
-    <para>The new command <command>nix-store --verify-path</command>
-    verifies that the contents of a store path have not
-    changed.</para>
-  </listitem>
-
-  <listitem>
-    <para>The new command <command>nix-store --print-env</command>
-    prints out the environment of a derivation in a format that can be
-    evaluated by a shell.</para>
-  </listitem>
-
-  <listitem>
-    <para>Attribute names can now be arbitrary strings.  For instance,
-    you can write <literal>{ "foo-1.2" = …; "bla bla" = …; }."bla
-    bla"</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Attribute selection can now provide a default value using
-    the <literal>or</literal> operator.  For instance, the expression
-    <literal>x.y.z or e</literal> evaluates to the attribute
-    <literal>x.y.z</literal> if it exists, and <literal>e</literal>
-    otherwise.</para>
-  </listitem>
-
-  <listitem>
-    <para>The right-hand side of the <literal>?</literal> operator can
-    now be an attribute path, e.g., <literal>attrs ?
-    a.b.c</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>On Linux, Nix will now make files in the Nix store immutable
-    on filesystems that support it.  This prevents accidental
-    modification of files in the store by the root user.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix has preliminary support for derivations with multiple
-    outputs.  This is useful because it allows parts of a package to
-    be deployed and garbage-collected separately.  For instance,
-    development parts of a package such as header files or static
-    libraries would typically not be part of the closure of an
-    application, resulting in reduced disk usage and installation
-    time.</para>
-  </listitem>
-
-  <listitem>
-    <para>The Nix store garbage collector is faster and holds the
-    global lock for a shorter amount of time.</para>
-  </listitem>
-
-  <listitem>
-    <para>The option <option>--timeout</option> (corresponding to the
-    configuration setting <literal>build-timeout</literal>) allows you
-    to set an absolute timeout on builds — if a build runs for more than
-    the given number of seconds, it is terminated.  This is useful for
-    recovering automatically from builds that are stuck in an infinite
-    loop but keep producing output, and for which
-    <literal>--max-silent-time</literal> is ineffective.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix development has moved to GitHub (<link
-    xlink:href="https://github.com/NixOS/nix" />).</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.1.xml b/doc/manual/release-notes/rl-1.1.xml
deleted file mode 100644
index f7dadb7cb..000000000
--- a/doc/manual/release-notes/rl-1.1.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.1">
-
-<title>Release 1.1 (2012-07-18)</title>
-
-<para>This release has the following improvements:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>On Linux, when doing a chroot build, Nix now uses various
-    namespace features provided by the Linux kernel to improve
-    build isolation.  Namely:
-    <itemizedlist>
-      <listitem><para>The private network namespace ensures that
-      builders cannot talk to the outside world (or vice versa): each
-      build only sees a private loopback interface.  This also means
-      that two concurrent builds can listen on the same port (e.g. as
-      part of a test) without conflicting with each
-      other.</para></listitem>
-      <listitem><para>The PID namespace causes each build to start as
-      PID 1.  Processes outside of the chroot are not visible to those
-      on the inside.  On the other hand, processes inside the chroot
-      <emphasis>are</emphasis> visible from the outside (though with
-      different PIDs).</para></listitem>
-      <listitem><para>The IPC namespace prevents the builder from
-      communicating with outside processes using SysV IPC mechanisms
-      (shared memory, message queues, semaphores).  It also ensures
-      that all IPC objects are destroyed when the builder
-      exits.</para></listitem>
-      <listitem><para>The UTS namespace ensures that builders see a
-      hostname of <literal>localhost</literal> rather than the actual
-      hostname.</para></listitem>
-      <listitem><para>The private mount namespace was already used by
-      Nix to ensure that the bind-mounts used to set up the chroot are
-      cleaned up automatically.</para></listitem>
-    </itemizedlist>
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>Build logs are now compressed using
-    <command>bzip2</command>.  The command <command>nix-store
-    -l</command> decompresses them on the fly.  This can be disabled
-    by setting the option <literal>build-compress-log</literal> to
-    <literal>false</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>The creation of build logs in
-    <filename>/nix/var/log/nix/drvs</filename> can be disabled by
-    setting the new option <literal>build-keep-log</literal> to
-    <literal>false</literal>.  This is useful, for instance, for Hydra
-    build machines.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now reserves some space in
-    <filename>/nix/var/nix/db/reserved</filename> to ensure that the
-    garbage collector can run successfully if the disk is full.  This
-    is necessary because SQLite transactions fail if the disk is
-    full.</para>
-  </listitem>
-
-  <listitem>
-    <para>Added a basic <function>fetchurl</function> function.  This
-    is not intended to replace the <function>fetchurl</function> in
-    Nixpkgs, but is useful for bootstrapping; e.g., it will allow us
-    to get rid of the bootstrap binaries in the Nixpkgs source tree
-    and download them instead.  You can use it by doing
-    <literal>import &lt;nix/fetchurl.nix> { url =
-    <emphasis>url</emphasis>; sha256 =
-    "<emphasis>hash</emphasis>"; }</literal>. (Shea Levy)</para>
-  </listitem>
-
-  <listitem>
-    <para>Improved RPM spec file. (Michel Alexandre Salim)</para>
-  </listitem>
-
-  <listitem>
-    <para>Support for on-demand socket-based activation in the Nix
-    daemon with <command>systemd</command>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Added a manpage for
-    <citerefentry><refentrytitle>nix.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
-  </listitem>
-
-  <listitem>
-    <para>When using the Nix daemon, the <option>-s</option> flag in
-    <command>nix-env -qa</command> is now much faster.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.10.xml b/doc/manual/release-notes/rl-1.10.xml
deleted file mode 100644
index 689a95466..000000000
--- a/doc/manual/release-notes/rl-1.10.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.10">
-
-<title>Release 1.10 (2015-09-03)</title>
-
-<para>This is primarily a bug fix release. It also has a number of new
-features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>A number of builtin functions have been added to reduce
-    Nixpkgs/NixOS evaluation time and memory consumption:
-    <function>all</function>,
-    <function>any</function>,
-    <function>concatStringsSep</function>,
-    <function>foldl’</function>,
-    <function>genList</function>,
-    <function>replaceStrings</function>,
-    <function>sort</function>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The garbage collector is more robust when the disk is full.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix supports a new API for building derivations that doesn’t
-    require a <literal>.drv</literal> file to be present on disk; it
-    only requires an in-memory representation of the derivation. This
-    is used by the Hydra continuous build system to make remote builds
-    more efficient.</para>
-  </listitem>
-
-  <listitem>
-    <para>The function <literal>&lt;nix/fetchurl.nix></literal> now
-    uses a <emphasis>builtin</emphasis> builder (i.e. it doesn’t
-    require starting an external process; the download is performed by
-    Nix itself). This ensures that derivation paths don’t change when
-    Nix is upgraded, and obviates the need for ugly hacks to support
-    chroot execution.</para>
-  </listitem>
-
-  <listitem>
-    <para><option>--version -v</option> now prints some configuration
-    information, in particular what compile-time optional features are
-    enabled, and the paths of various directories.</para>
-  </listitem>
-
-  <listitem>
-    <para>Build users have their supplementary groups set correctly.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Eelco Dolstra, Guillaume
-Maudoux, Iwan Aucamp, Jaka Hudoklin, Kirill Elagin, Ludovic Courtès,
-Manolis Ragkousis, Nicolas B. Pierron and Shea Levy.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.11.10.xml b/doc/manual/release-notes/rl-1.11.10.xml
deleted file mode 100644
index 415388b3e..000000000
--- a/doc/manual/release-notes/rl-1.11.10.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.11.10">
-
-<title>Release 1.11.10 (2017-06-12)</title>
-
-<para>This release fixes a security bug in Nix’s “build user” build
-isolation mechanism. Previously, Nix builders had the ability to
-create setuid binaries owned by a <literal>nixbld</literal>
-user. Such a binary could then be used by an attacker to assume a
-<literal>nixbld</literal> identity and interfere with subsequent
-builds running under the same UID.</para>
-
-<para>To prevent this issue, Nix now disallows builders to create
-setuid and setgid binaries. On Linux, this is done using a seccomp BPF
-filter. Note that this imposes a small performance penalty (e.g. 1%
-when building GNU Hello). Using seccomp, we now also prevent the
-creation of extended attributes and POSIX ACLs since these cannot be
-represented in the NAR format and (in the case of POSIX ACLs) allow
-bypassing regular Nix store permissions. On macOS, the restriction is
-implemented using the existing sandbox mechanism, which now uses a
-minimal “allow all except the creation of setuid/setgid binaries”
-profile when regular sandboxing is disabled. On other platforms, the
-“build user” mechanism is now disabled.</para>
-
-<para>Thanks go to Linus Heckemann for discovering and reporting this
-bug.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.11.xml b/doc/manual/release-notes/rl-1.11.xml
deleted file mode 100644
index 28f6d4ac8..000000000
--- a/doc/manual/release-notes/rl-1.11.xml
+++ /dev/null
@@ -1,141 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.11">
-
-<title>Release 1.11 (2016-01-19)</title>
-
-<para>This is primarily a bug fix release. It also has a number of new
-features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para><command>nix-prefetch-url</command> can now download URLs
-    specified in a Nix expression. For example,
-
-<screen>
-$ nix-prefetch-url -A hello.src
-</screen>
-
-    will prefetch the file specified by the
-    <function>fetchurl</function> call in the attribute
-    <literal>hello.src</literal> from the Nix expression in the
-    current directory, and print the cryptographic hash of the
-    resulting file on stdout. This differs from <literal>nix-build -A
-    hello.src</literal> in that it doesn't verify the hash, and is
-    thus useful when you’re updating a Nix expression.</para>
-
-    <para>You can also prefetch the result of functions that unpack a
-    tarball, such as <function>fetchFromGitHub</function>. For example:
-
-<screen>
-$ nix-prefetch-url --unpack https://github.com/NixOS/patchelf/archive/0.8.tar.gz
-</screen>
-
-    or from a Nix expression:
-
-<screen>
-$ nix-prefetch-url -A nix-repl.src
-</screen>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-    <para>The builtin function
-    <function>&lt;nix/fetchurl.nix></function> now supports
-    downloading and unpacking NARs. This removes the need to have
-    multiple downloads in the Nixpkgs stdenv bootstrap process (like a
-    separate busybox binary for Linux, or curl/mkdir/sh/bzip2 for
-    Darwin). Now all those files can be combined into a single NAR,
-    optionally compressed using <command>xz</command>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now supports SHA-512 hashes for verifying fixed-output
-    derivations, and in <function>builtins.hashString</function>.</para>
-  </listitem>
-
-  <listitem>
-    <para>
-      The new flag <option>--option build-repeat
-      <emphasis>N</emphasis></option> will cause every build to
-      be executed <emphasis>N</emphasis>+1 times. If the build
-      output differs between any round, the build is rejected, and the
-      output paths are not registered as valid. This is primarily
-      useful to verify build determinism. (We already had a
-      <option>--check</option> option to repeat a previously succeeded
-      build. However, with <option>--check</option>, non-deterministic
-      builds are registered in the DB. Preventing that is useful for
-      Hydra to ensure that non-deterministic builds don't end up
-      getting published to the binary cache.)
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>
-      The options <option>--check</option> and <option>--option
-      build-repeat <emphasis>N</emphasis></option>, if they
-      detect a difference between two runs of the same derivation and
-      <option>-K</option> is given, will make the output of the other
-      run available under
-      <filename><emphasis>store-path</emphasis>-check</filename>. This
-      makes it easier to investigate the non-determinism using tools
-      like <command>diffoscope</command>, e.g.,
-
-<screen>
-$ nix-build pkgs/stdenv/linux -A stage1.pkgs.zlib --check -K
-error: derivation ‘/nix/store/l54i8wlw2265…-zlib-1.2.8.drv’ may not
-be deterministic: output ‘/nix/store/11a27shh6n2i…-zlib-1.2.8’
-differs from ‘/nix/store/11a27shh6n2i…-zlib-1.2.8-check’
-
-$ diffoscope /nix/store/11a27shh6n2i…-zlib-1.2.8 /nix/store/11a27shh6n2i…-zlib-1.2.8-check
-…
-├── lib/libz.a
-│   ├── metadata
-│   │ @@ -1,15 +1,15 @@
-│   │ -rw-r--r-- 30001/30000   3096 Jan 12 15:20 2016 adler32.o
-…
-│   │ +rw-r--r-- 30001/30000   3096 Jan 12 15:28 2016 adler32.o
-…
-</screen>
-
-    </para></listitem>
-
-  <listitem>
-    <para>Improved FreeBSD support.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env -qa --xml --meta</command> now prints
-    license information.</para>
-  </listitem>
-
-  <listitem>
-    <para>The maximum number of parallel TCP connections that the
-    binary cache substituter will use has been decreased from 150 to
-    25. This should prevent upsetting some broken NAT routers, and
-    also improves performance.</para>
-  </listitem>
-
-  <listitem>
-    <para>All "chroot"-containing strings got renamed to "sandbox".
-      In particular, some Nix options got renamed, but the old names
-      are still accepted as lower-priority aliases.
-    </para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Anders Claesson, Anthony
-Cowley, Bjørn Forsman, Brian McKenna, Danny Wilson, davidak, Eelco Dolstra,
-Fabian Schmitthenner, FrankHB, Ilya Novoselov, janus, Jim Garrison, John
-Ericson, Jude Taylor, Ludovic Courtès, Manuel Jacob, Mathnerd314,
-Pascal Wittmann, Peter Simons, Philip Potter, Preston Bennes, Rommel
-M. Martinez, Sander van der Burg, Shea Levy, Tim Cuthbertson, Tuomas
-Tynkkynen, Utku Demir and Vladimír Čunát.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.2.xml b/doc/manual/release-notes/rl-1.2.xml
deleted file mode 100644
index f065f3ccc..000000000
--- a/doc/manual/release-notes/rl-1.2.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.2">
-
-<title>Release 1.2 (2012-12-06)</title>
-
-<para>This release has the following improvements and changes:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix has a new binary substituter mechanism: the
-    <emphasis>binary cache</emphasis>.  A binary cache contains
-    pre-built binaries of Nix packages.  Whenever Nix wants to build a
-    missing Nix store path, it will check a set of binary caches to
-    see if any of them has a pre-built binary of that path.  The
-    configuration setting <option>binary-caches</option> contains a
-    list of URLs of binary caches.  For instance, doing
-<screen>
-$ nix-env -i thunderbird --option binary-caches http://cache.nixos.org
-</screen>
-    will install Thunderbird and its dependencies, using the available
-    pre-built binaries in <uri>http://cache.nixos.org</uri>.
-    The main advantage over the old “manifest”-based method of getting
-    pre-built binaries is that you don’t have to worry about your
-    manifest being in sync with the Nix expressions you’re installing
-    from; i.e., you don’t need to run <command>nix-pull</command> to
-    update your manifest.  It’s also more scalable because you don’t
-    need to redownload a giant manifest file every time.
-    </para>
-
-    <para>A Nix channel can provide a binary cache URL that will be
-    used automatically if you subscribe to that channel.  If you use
-    the Nixpkgs or NixOS channels
-    (<uri>http://nixos.org/channels</uri>) you automatically get the
-    cache <uri>http://cache.nixos.org</uri>.</para>
-
-    <para>Binary caches are created using <command>nix-push</command>.
-    For details on the operation and format of binary caches, see the
-    <command>nix-push</command> manpage.  More details are provided in
-    <link xlink:href="https://nixos.org/nix-dev/2012-September/009826.html">this
-    nix-dev posting</link>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Multiple output support should now be usable.  A derivation
-    can declare that it wants to produce multiple store paths by
-    saying something like
-<programlisting>
-outputs = [ "lib" "headers" "doc" ];
-</programlisting>
-    This will cause Nix to pass the intended store path of each output
-    to the builder through the environment variables
-    <literal>lib</literal>, <literal>headers</literal> and
-    <literal>doc</literal>.  Other packages can refer to a specific
-    output by referring to
-    <literal><emphasis>pkg</emphasis>.<emphasis>output</emphasis></literal>,
-    e.g.
-<programlisting>
-buildInputs = [ pkg.lib pkg.headers ];
-</programlisting>
-    If you install a package with multiple outputs using
-    <command>nix-env</command>, each output path will be symlinked
-    into the user environment.</para>
-  </listitem>
-
-  <listitem>
-    <para>Dashes are now valid as part of identifiers and attribute
-    names.</para>
-  </listitem>
-
-  <listitem>
-    <para>The new operation <command>nix-store --repair-path</command>
-    allows corrupted or missing store paths to be repaired by
-    redownloading them.  <command>nix-store --verify --check-contents
-    --repair</command> will scan and repair all paths in the Nix
-    store.  Similarly, <command>nix-env</command>,
-    <command>nix-build</command>, <command>nix-instantiate</command>
-    and <command>nix-store --realise</command> have a
-    <option>--repair</option> flag to detect and fix bad paths by
-    rebuilding or redownloading them.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix no longer sets the immutable bit on files in the Nix
-    store.  Instead, the recommended way to guard the Nix store
-    against accidental modification on Linux is to make it a read-only
-    bind mount, like this:
-
-<screen>
-$ mount --bind /nix/store /nix/store
-$ mount -o remount,ro,bind /nix/store
-</screen>
-
-    Nix will automatically make <filename>/nix/store</filename>
-    writable as needed (using a private mount namespace) to allow
-    modifications.</para>
-  </listitem>
-
-  <listitem>
-    <para>Store optimisation (replacing identical files in the store
-    with hard links) can now be done automatically every time a path
-    is added to the store.  This is enabled by setting the
-    configuration option <literal>auto-optimise-store</literal> to
-    <literal>true</literal> (disabled by default).</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now supports <command>xz</command> compression for NARs
-    in addition to <command>bzip2</command>.  It compresses about 30%
-    better on typical archives and decompresses about twice as
-    fast.</para>
-  </listitem>
-
-  <listitem>
-    <para>Basic Nix expression evaluation profiling: setting the
-    environment variable <literal>NIX_COUNT_CALLS</literal> to
-    <literal>1</literal> will cause Nix to print how many times each
-    primop or function was executed.</para>
-  </listitem>
-
-  <listitem>
-    <para>New primops: <varname>concatLists</varname>,
-    <varname>elem</varname>, <varname>elemAt</varname> and
-    <varname>filter</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>The command <command>nix-copy-closure</command> has a new
-    flag <option>--use-substitutes</option> (<option>-s</option>) to
-    download missing paths on the target machine using the substitute
-    mechanism.</para>
-  </listitem>
-
-  <listitem>
-    <para>The command <command>nix-worker</command> has been renamed
-    to <command>nix-daemon</command>.  Support for running the Nix
-    worker in “slave” mode has been removed.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <option>--help</option> flag of every Nix command now
-    invokes <command>man</command>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Chroot builds are now supported on systemd machines.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Eelco Dolstra, Florian
-Friesdorf, Mats Erik Andersson and Shea Levy.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.3.xml b/doc/manual/release-notes/rl-1.3.xml
deleted file mode 100644
index e2009ee3b..000000000
--- a/doc/manual/release-notes/rl-1.3.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.3">
-
-<title>Release 1.3 (2013-01-04)</title>
-
-<para>This is primarily a bug fix release.  When this version is first
-run on Linux, it removes any immutable bits from the Nix store and
-increases the schema version of the Nix store.  (The previous release
-removed support for setting the immutable bit; this release clears any
-remaining immutable bits to make certain operations more
-efficient.)</para>
-
-<para>This release has contributions from Eelco Dolstra and Stuart
-Pernsteiner.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.4.xml b/doc/manual/release-notes/rl-1.4.xml
deleted file mode 100644
index 8114ce6b5..000000000
--- a/doc/manual/release-notes/rl-1.4.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.4">
-
-<title>Release 1.4 (2013-02-26)</title>
-
-<para>This release fixes a security bug in multi-user operation.  It
-was possible for derivations to cause the mode of files outside of the
-Nix store to be changed to 444 (read-only but world-readable) by
-creating hard links to those files (<link
-xlink:href="https://github.com/NixOS/nix/commit/5526a282b5b44e9296e61e07d7d2626a79141ac4">details</link>).</para>
-
-<para>There are also the following improvements:</para>
-
-<itemizedlist>
-
-  <listitem><para>New built-in function:
-  <function>builtins.hashString</function>.</para></listitem>
-
-  <listitem><para>Build logs are now stored in
-  <filename>/nix/var/log/nix/drvs/<emphasis>XX</emphasis>/</filename>,
-  where <emphasis>XX</emphasis> is the first two characters of
-  the derivation.  This is useful on machines that keep a lot of build
-  logs (such as Hydra servers).</para></listitem>
-
-  <listitem><para>The function <function>corepkgs/fetchurl</function>
-  can now make the downloaded file executable.  This will allow
-  getting rid of all bootstrap binaries in the Nixpkgs source
-  tree.</para></listitem>
-
-  <listitem><para>Language change: The expression <literal>"${./path}
-  ..."</literal> now evaluates to a string instead of a
-  path.</para></listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.5.1.xml b/doc/manual/release-notes/rl-1.5.1.xml
deleted file mode 100644
index 035c8dbcb..000000000
--- a/doc/manual/release-notes/rl-1.5.1.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.5.1">
-
-<title>Release 1.5.1 (2013-02-28)</title>
-
-<para>The bug fix to the bug fix had a bug itself, of course.  But
-this time it will work for sure!</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.5.2.xml b/doc/manual/release-notes/rl-1.5.2.xml
deleted file mode 100644
index 7e81dd243..000000000
--- a/doc/manual/release-notes/rl-1.5.2.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.5.2">
-
-<title>Release 1.5.2 (2013-05-13)</title>
-
-<para>This is primarily a bug fix release.  It has contributions from
-Eelco Dolstra, Lluís Batlle i Rossell and Shea Levy.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.5.xml b/doc/manual/release-notes/rl-1.5.xml
deleted file mode 100644
index 8e279d769..000000000
--- a/doc/manual/release-notes/rl-1.5.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.5">
-
-<title>Release 1.5 (2013-02-27)</title>
-
-<para>This is a brown paper bag release to fix a regression introduced
-by the hard link security fix in 1.4.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.6.1.xml b/doc/manual/release-notes/rl-1.6.1.xml
deleted file mode 100644
index 982871b51..000000000
--- a/doc/manual/release-notes/rl-1.6.1.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.6.1">
-
-<title>Release 1.6.1 (2013-10-28)</title>
-
-<para>This is primarily a bug fix release.  Changes of interest
-are:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix 1.6 accidentally changed the semantics of antiquoted
-    paths in strings, such as <literal>"${/foo}/bar"</literal>.  This
-    release reverts to the Nix 1.5.3 behaviour.</para>
-  </listitem>
-
-  <listitem>
-    <para>Previously, Nix optimised expressions such as
-    <literal>"${<emphasis>expr</emphasis>}"</literal> to
-    <emphasis>expr</emphasis>.  Thus it neither checked whether
-    <emphasis>expr</emphasis> could be coerced to a string, nor
-    applied such coercions.  This meant that
-    <literal>"${123}"</literal> evaluatued to <literal>123</literal>,
-    and <literal>"${./foo}"</literal> evaluated to
-    <literal>./foo</literal> (even though
-    <literal>"${./foo} "</literal> evaluates to
-    <literal>"/nix/store/<emphasis>hash</emphasis>-foo "</literal>).
-    Nix now checks the type of antiquoted expressions and
-    applies coercions.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now shows the exact position of undefined variables.  In
-    particular, undefined variable errors in a <literal>with</literal>
-    previously didn't show <emphasis>any</emphasis> position
-    information, so this makes it a lot easier to fix such
-    errors.</para>
-  </listitem>
-
-  <listitem>
-    <para>Undefined variables are now treated consistently.
-    Previously, the <function>tryEval</function> function would catch
-    undefined variables inside a <literal>with</literal> but not
-    outside.  Now <function>tryEval</function> never catches undefined
-    variables.</para>
-  </listitem>
-
-  <listitem>
-    <para>Bash completion in <command>nix-shell</command> now works
-    correctly.</para>
-  </listitem>
-
-  <listitem>
-    <para>Stack traces are less verbose: they no longer show calls to
-    builtin functions and only show a single line for each derivation
-    on the call stack.</para>
-  </listitem>
-
-  <listitem>
-    <para>New built-in function: <function>builtins.typeOf</function>,
-    which returns the type of its argument as a string.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.6.xml b/doc/manual/release-notes/rl-1.6.xml
deleted file mode 100644
index cdb52ed0b..000000000
--- a/doc/manual/release-notes/rl-1.6.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.6.0">
-
-<title>Release 1.6 (2013-09-10)</title>
-
-<para>In addition to the usual bug fixes, this release has several new
-features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>The command <command>nix-build --run-env</command> has been
-    renamed to <command>nix-shell</command>.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> now sources
-    <filename>$stdenv/setup</filename> <emphasis>inside</emphasis> the
-    interactive shell, rather than in a parent shell.  This ensures
-    that shell functions defined by <literal>stdenv</literal> can be
-    used in the interactive shell.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> has a new flag
-    <option>--pure</option> to clear the environment, so you get an
-    environment that more closely corresponds to the “real” Nix build.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> now sets the shell prompt
-    (<literal>PS1</literal>) to ensure that Nix shells are distinguishable
-    from your regular shells.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env</command> no longer requires a
-    <literal>*</literal> argument to match all packages, so
-    <literal>nix-env -qa</literal> is equivalent to <literal>nix-env
-    -qa '*'</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env -i</command> has a new flag
-    <option>--remove-all</option> (<option>-r</option>) to remove all
-    previous packages from the profile.  This makes it easier to do
-    declarative package management similar to NixOS’s
-    <option>environment.systemPackages</option>.  For instance, if you
-    have a specification <filename>my-packages.nix</filename> like this:
-
-<programlisting>
-with import &lt;nixpkgs> {};
-[ thunderbird
-  geeqie
-  ...
-]
-</programlisting>
-
-    then after any change to this file, you can run:
-
-<screen>
-$ nix-env -f my-packages.nix -ir
-</screen>
-
-    to update your profile to match the specification.</para>
-  </listitem>
-
-  <listitem>
-    <para>The ‘<literal>with</literal>’ language construct is now more
-    lazy.  It only evaluates its argument if a variable might actually
-    refer to an attribute in the argument.  For instance, this now
-    works:
-
-<programlisting>
-let
-  pkgs = with pkgs; { foo = "old"; bar = foo; } // overrides;
-  overrides = { foo = "new"; };
-in pkgs.bar
-</programlisting>
-
-    This evaluates to <literal>"new"</literal>, while previously it
-    gave an “infinite recursion” error.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now has proper integer arithmetic operators. For
-    instance, you can write <literal>x + y</literal> instead of
-    <literal>builtins.add x y</literal>, or <literal>x &lt;
-    y</literal> instead of <literal>builtins.lessThan x y</literal>.
-    The comparison operators also work on strings.</para>
-  </listitem>
-
-  <listitem>
-    <para>On 64-bit systems, Nix integers are now 64 bits rather than
-    32 bits.</para>
-  </listitem>
-
-  <listitem>
-    <para>When using the Nix daemon, the <command>nix-daemon</command>
-    worker process now runs on the same CPU as the client, on systems
-    that support setting CPU affinity.  This gives a significant speedup
-    on some systems.</para>
-  </listitem>
-
-  <listitem>
-    <para>If a stack overflow occurs in the Nix evaluator, you now get
-    a proper error message (rather than “Segmentation fault”) on some
-    systems.</para>
-  </listitem>
-
-  <listitem>
-    <para>In addition to directories, you can now bind-mount regular
-    files in chroots through the (now misnamed) option
-    <option>build-chroot-dirs</option>.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Domen Kožar, Eelco Dolstra,
-Florian Friesdorf, Gergely Risko, Ivan Kozik, Ludovic Courtès and Shea
-Levy.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.7.xml b/doc/manual/release-notes/rl-1.7.xml
deleted file mode 100644
index e736c15a2..000000000
--- a/doc/manual/release-notes/rl-1.7.xml
+++ /dev/null
@@ -1,263 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.7">
-
-<title>Release 1.7 (2014-04-11)</title>
-
-<para>In addition to the usual bug fixes, this release has the
-following new features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Antiquotation is now allowed inside of quoted attribute
-    names (e.g. <literal>set."${foo}"</literal>). In the case where
-    the attribute name is just a single antiquotation, the quotes can
-    be dropped (e.g. the above example can be written
-    <literal>set.${foo}</literal>). If an attribute name inside of a
-    set declaration evaluates to <literal>null</literal> (e.g.
-    <literal>{ ${null} = false; }</literal>), then that attribute is
-    not added to the set.</para>
-  </listitem>
-
-  <listitem>
-    <para>Experimental support for cryptographically signed binary
-    caches.  See <link
-    xlink:href="https://github.com/NixOS/nix/commit/0fdf4da0e979f992db75cc17376e455ddc5a96d8">the
-    commit for details</link>.</para>
-  </listitem>
-
-  <listitem>
-    <para>An experimental new substituter,
-    <command>download-via-ssh</command>, that fetches binaries from
-    remote machines via SSH.  Specifying the flags <literal>--option
-    use-ssh-substituter true --option ssh-substituter-hosts
-    <emphasis>user@hostname</emphasis></literal> will cause Nix
-    to download binaries from the specified machine, if it has
-    them.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-store -r</command> and
-    <command>nix-build</command> have a new flag,
-    <option>--check</option>, that builds a previously built
-    derivation again, and prints an error message if the output is not
-    exactly the same. This helps to verify whether a derivation is
-    truly deterministic.  For example:
-
-<screen>
-$ nix-build '&lt;nixpkgs>' -A patchelf
-<emphasis>…</emphasis>
-$ nix-build '&lt;nixpkgs>' -A patchelf --check
-<emphasis>…</emphasis>
-error: derivation `/nix/store/1ipvxs…-patchelf-0.6' may not be deterministic:
-  hash mismatch in output `/nix/store/4pc1dm…-patchelf-0.6.drv'
-</screen>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-    <para>The <command>nix-instantiate</command> flags
-    <option>--eval-only</option> and <option>--parse-only</option>
-    have been renamed to <option>--eval</option> and
-    <option>--parse</option>, respectively.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-instantiate</command>,
-    <command>nix-build</command> and <command>nix-shell</command> now
-    have a flag <option>--expr</option> (or <option>-E</option>) that
-    allows you to specify the expression to be evaluated as a command
-    line argument.  For instance, <literal>nix-instantiate --eval -E
-    '1 + 2'</literal> will print <literal>3</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> improvements:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>It has a new flag, <option>--packages</option> (or
-        <option>-p</option>), that sets up a build environment
-        containing the specified packages from Nixpkgs. For example,
-        the command
-
-<screen>
-$ nix-shell -p sqlite xorg.libX11 hello
-</screen>
-
-        will start a shell in which the given packages are
-        present.</para>
-      </listitem>
-
-      <listitem>
-        <para>It now uses <filename>shell.nix</filename> as the
-        default expression, falling back to
-        <filename>default.nix</filename> if the former doesn’t
-        exist.  This makes it convenient to have a
-        <filename>shell.nix</filename> in your project to set up a
-        nice development environment.</para>
-      </listitem>
-
-      <listitem>
-        <para>It evaluates the derivation attribute
-        <varname>shellHook</varname>, if set. Since
-        <literal>stdenv</literal> does not normally execute this hook,
-        it allows you to do <command>nix-shell</command>-specific
-        setup.</para>
-      </listitem>
-
-      <listitem>
-        <para>It preserves the user’s timezone setting.</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </listitem>
-
-  <listitem>
-    <para>In chroots, Nix now sets up a <filename>/dev</filename>
-    containing only a minimal set of devices (such as
-    <filename>/dev/null</filename>). Note that it only does this if
-    you <emphasis>don’t</emphasis> have <filename>/dev</filename>
-    listed in your <option>build-chroot-dirs</option> setting;
-    otherwise, it will bind-mount the <literal>/dev</literal> from
-    outside the chroot.</para>
-
-    <para>Similarly, if you don’t have <filename>/dev/pts</filename> listed
-    in <option>build-chroot-dirs</option>, Nix will mount a private
-    <literal>devpts</literal> filesystem on the chroot’s
-    <filename>/dev/pts</filename>.</para>
-
-  </listitem>
-
-  <listitem>
-    <para>New built-in function: <function>builtins.toJSON</function>,
-    which returns a JSON representation of a value.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env -q</command> has a new flag
-    <option>--json</option> to print a JSON representation of the
-    installed or available packages.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env</command> now supports meta attributes with
-    more complex values, such as attribute sets.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <option>-A</option> flag now allows attribute names with
-    dots in them, e.g.
-
-<screen>
-$ nix-instantiate --eval '&lt;nixos>' -A 'config.systemd.units."nscd.service".text'
-</screen>
-
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The <option>--max-freed</option> option to
-    <command>nix-store --gc</command> now accepts a unit
-    specifier. For example, <literal>nix-store --gc --max-freed
-    1G</literal> will free up to 1 gigabyte of disk space.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-collect-garbage</command> has a new flag
-    <option>--delete-older-than</option>
-    <emphasis>N</emphasis><literal>d</literal>, which deletes
-    all user environment generations older than
-    <emphasis>N</emphasis> days.  Likewise, <command>nix-env
-    --delete-generations</command> accepts a
-    <emphasis>N</emphasis><literal>d</literal> age limit.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now heuristically detects whether a build failure was
-    due to a disk-full condition. In that case, the build is not
-    flagged as “permanently failed”. This is mostly useful for Hydra,
-    which needs to distinguish between permanent and transient build
-    failures.</para>
-  </listitem>
-
-  <listitem>
-    <para>There is a new symbol <literal>__curPos</literal> that
-    expands to an attribute set containing its file name and line and
-    column numbers, e.g. <literal>{ file = "foo.nix"; line = 10;
-    column = 5; }</literal>.  There also is a new builtin function,
-    <varname>unsafeGetAttrPos</varname>, that returns the position of
-    an attribute.  This is used by Nixpkgs to provide location
-    information in error messages, e.g.
-
-<screen>
-$ nix-build '&lt;nixpkgs>' -A libreoffice --argstr system x86_64-darwin
-error: the package ‘libreoffice-4.0.5.2’ in ‘.../applications/office/libreoffice/default.nix:263’
-  is not supported on ‘x86_64-darwin’
-</screen>
-
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The garbage collector is now more concurrent with other Nix
-    processes because it releases certain locks earlier.</para>
-  </listitem>
-
-  <listitem>
-    <para>The binary tarball installer has been improved.  You can now
-    install Nix by running:
-
-<screen>
-$ bash &lt;(curl https://nixos.org/nix/install)
-</screen>
-
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>More evaluation errors include position information. For
-    instance, selecting a missing attribute will print something like
-
-<screen>
-error: attribute `nixUnstabl' missing, at /etc/nixos/configurations/misc/eelco/mandark.nix:216:15
-</screen>
-
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The command <command>nix-setuid-helper</command> is
-    gone.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix no longer uses Automake, but instead has a
-    non-recursive, GNU Make-based build system.</para>
-  </listitem>
-
-  <listitem>
-    <para>All installed libraries now have the prefix
-    <literal>libnix</literal>.  In particular, this gets rid of
-    <literal>libutil</literal>, which could clash with libraries with
-    the same name from other packages.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now requires a compiler that supports C++11.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Danny Wilson, Domen Kožar,
-Eelco Dolstra, Ian-Woo Kim, Ludovic Courtès, Maxim Ivanov, Petr
-Rockai, Ricardo M. Correia and Shea Levy.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.8.xml b/doc/manual/release-notes/rl-1.8.xml
deleted file mode 100644
index d7e2e99ad..000000000
--- a/doc/manual/release-notes/rl-1.8.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.8">
-
-<title>Release 1.8 (2014-12-14)</title>
-
-<itemizedlist>
-
-  <listitem><para>Breaking change: to address a race condition, the
-  remote build hook mechanism now uses <command>nix-store
-  --serve</command> on the remote machine. This requires build slaves
-  to be updated to Nix 1.8.</para></listitem>
-
-  <listitem><para>Nix now uses HTTPS instead of HTTP to access the
-  default binary cache,
-  <literal>cache.nixos.org</literal>.</para></listitem>
-
-  <listitem><para><command>nix-env</command> selectors are now regular
-  expressions. For instance, you can do
-
-<screen>
-$ nix-env -qa '.*zip.*'
-</screen>
-
-  to query all packages with a name containing
-  <literal>zip</literal>.</para></listitem>
-
-  <listitem><para><command>nix-store --read-log</command> can now
-  fetch remote build logs. If a build log is not available locally,
-  then ‘nix-store -l’ will now try to download it from the servers
-  listed in the ‘log-servers’ option in nix.conf. For instance, if you
-  have the configuration option
-
-<programlisting>
-log-servers = http://hydra.nixos.org/log
-</programlisting>
-
-then it will try to get logs from
-<literal>http://hydra.nixos.org/log/<emphasis>base name of the
-store path</emphasis></literal>. This allows you to do things like:
-
-<screen>
-$ nix-store -l $(which xterm)
-</screen>
-
-  and get a log even if <command>xterm</command> wasn't built
-  locally.</para></listitem>
-
-  <listitem><para>New builtin functions:
-  <function>attrValues</function>, <function>deepSeq</function>,
-  <function>fromJSON</function>, <function>readDir</function>,
-  <function>seq</function>.</para></listitem>
-
-  <listitem><para><command>nix-instantiate --eval</command> now has a
-  <option>--json</option> flag to print the resulting value in JSON
-  format.</para></listitem>
-
-  <listitem><para><command>nix-copy-closure</command> now uses
-  <command>nix-store --serve</command> on the remote side to send or
-  receive closures. This fixes a race condition between
-  <command>nix-copy-closure</command> and the garbage
-  collector.</para></listitem>
-
-  <listitem><para>Derivations can specify the new special attribute
-  <varname>allowedRequisites</varname>, which has a similar meaning to
-  <varname>allowedReferences</varname>. But instead of only enforcing
-  to explicitly specify the immediate references, it requires the
-  derivation to specify all the dependencies recursively (hence the
-  name, requisites) that are used by the resulting
-  output.</para></listitem>
-
-  <listitem><para>On Mac OS X, Nix now handles case collisions when
-  importing closures from case-sensitive file systems. This is mostly
-  useful for running NixOps on Mac OS X.</para></listitem>
-
-  <listitem><para>The Nix daemon has new configuration options
-  <option>allowed-users</option> (specifying the users and groups that
-  are allowed to connect to the daemon) and
-  <option>trusted-users</option> (specifying the users and groups that
-  can perform privileged operations like specifying untrusted binary
-  caches).</para></listitem>
-
-  <listitem><para>The configuration option
-  <option>build-cores</option> now defaults to the number of available
-  CPU cores.</para></listitem>
-
-  <listitem><para>Build users are now used by default when Nix is
-  invoked as root. This prevents builds from accidentally running as
-  root.</para></listitem>
-
-  <listitem><para>Nix now includes systemd units and Upstart
-  jobs.</para></listitem>
-
-  <listitem><para>Speed improvements to <command>nix-store
-  --optimise</command>.</para></listitem>
-
-  <listitem><para>Language change: the <literal>==</literal> operator
-  now ignores string contexts (the “dependencies” of a
-  string).</para></listitem>
-
-  <listitem><para>Nix now filters out Nix-specific ANSI escape
-  sequences on standard error. They are supposed to be invisible, but
-  some terminals show them anyway.</para></listitem>
-
-  <listitem><para>Various commands now automatically pipe their output
-  into the pager as specified by the <literal>PAGER</literal> environment
-  variable.</para></listitem>
-
-  <listitem><para>Several improvements to reduce memory consumption in
-  the evaluator.</para></listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from Adam Szkoda, Aristid
-Breitkreuz, Bob van der Linden, Charles Strahan, darealshinji, Eelco
-Dolstra, Gergely Risko, Joel Taylor, Ludovic Courtès, Marko Durkovic,
-Mikey Ariel, Paul Colomiets, Ricardo M.  Correia, Ricky Elrod, Robert
-Helgesson, Rob Vermaas, Russell O'Connor, Shea Levy, Shell Turner,
-Sönke Hahn, Steve Purcell, Vladimír Čunát and Wout Mertens.</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-1.9.xml b/doc/manual/release-notes/rl-1.9.xml
deleted file mode 100644
index cc6558b1a..000000000
--- a/doc/manual/release-notes/rl-1.9.xml
+++ /dev/null
@@ -1,216 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-1.9">
-
-<title>Release 1.9 (2015-06-12)</title>
-
-<para>In addition to the usual bug fixes, this release has the
-following new features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Signed binary cache support. You can enable signature
-    checking by adding the following to <filename>nix.conf</filename>:
-
-<programlisting>
-signed-binary-caches = *
-binary-cache-public-keys = cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-</programlisting>
-
-    This will prevent Nix from downloading any binary from the cache
-    that is not signed by one of the keys listed in
-    <option>binary-cache-public-keys</option>.</para>
-
-    <para>Signature checking is only supported if you built Nix with
-    the <literal>libsodium</literal> package.</para>
-
-    <para>Note that while Nix has had experimental support for signed
-    binary caches since version 1.7, this release changes the
-    signature format in a backwards-incompatible way.</para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Automatic downloading of Nix expression tarballs. In various
-    places, you can now specify the URL of a tarball containing Nix
-    expressions (such as Nixpkgs), which will be downloaded and
-    unpacked automatically. For example:</para>
-
-    <itemizedlist>
-
-      <listitem><para>In <command>nix-env</command>:
-
-<screen>
-$ nix-env -f https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz -iA firefox
-</screen>
-
-      This installs Firefox from the latest tested and built revision
-      of the NixOS 14.12 channel.</para></listitem>
-
-      <listitem><para>In <command>nix-build</command> and
-      <command>nix-shell</command>:
-
-<screen>
-$ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
-</screen>
-
-      This builds GNU Hello from the latest revision of the Nixpkgs
-      master branch.</para></listitem>
-
-      <listitem><para>In the Nix search path (as specified via
-      <literal>NIX_PATH</literal> or <option>-I</option>). For example, to
-      start a shell containing the Pan package from a specific version
-      of Nixpkgs:
-
-<screen>
-$ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
-</screen>
-
-      </para></listitem>
-
-      <listitem><para>In <command>nixos-rebuild</command> (on NixOS):
-
-<screen>
-$ nixos-rebuild test -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz
-</screen>
-
-      </para></listitem>
-
-      <listitem><para>In Nix expressions, via the new builtin function <function>fetchTarball</function>:
-
-<programlisting>
-with import (fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-14.12.tar.gz) {}; …
-</programlisting>
-
-      (This is not allowed in restricted mode.)</para></listitem>
-
-    </itemizedlist>
-
-  </listitem>
-
-  <listitem>
-
-    <para><command>nix-shell</command> improvements:</para>
-
-    <itemizedlist>
-
-      <listitem><para><command>nix-shell</command> now has a flag
-      <option>--run</option> to execute a command in the
-      <command>nix-shell</command> environment,
-      e.g. <literal>nix-shell --run make</literal>. This is like
-      the existing <option>--command</option> flag, except that it
-      uses a non-interactive shell (ensuring that hitting Ctrl-C won’t
-      drop you into the child shell).</para></listitem>
-
-      <listitem><para><command>nix-shell</command> can now be used as
-      a <literal>#!</literal>-interpreter. This allows you to write
-      scripts that dynamically fetch their own dependencies. For
-      example, here is a Haskell script that, when invoked, first
-      downloads GHC and the Haskell packages on which it depends:
-
-<programlisting>
-#! /usr/bin/env nix-shell
-#! nix-shell -i runghc -p haskellPackages.ghc haskellPackages.HTTP
-
-import Network.HTTP
-
-main = do
-  resp &lt;- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
-  body &lt;- getResponseBody resp
-  print (take 100 body)
-</programlisting>
-
-      Of course, the dependencies are cached in the Nix store, so the
-      second invocation of this script will be much
-      faster.</para></listitem>
-
-    </itemizedlist>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Chroot improvements:</para>
-
-    <itemizedlist>
-
-      <listitem><para>Chroot builds are now supported on Mac OS X
-      (using its sandbox mechanism).</para></listitem>
-
-      <listitem><para>If chroots are enabled, they are now used for
-      all derivations, including fixed-output derivations (such as
-      <function>fetchurl</function>). The latter do have network
-      access, but can no longer access the host filesystem. If you
-      need the old behaviour, you can set the option
-      <option>build-use-chroot</option> to
-      <literal>relaxed</literal>.</para></listitem>
-
-      <listitem><para>On Linux, if chroots are enabled, builds are
-      performed in a private PID namespace once again. (This
-      functionality was lost in Nix 1.8.)</para></listitem>
-
-      <listitem><para>Store paths listed in
-      <option>build-chroot-dirs</option> are now automatically
-      expanded to their closure. For instance, if you want
-      <filename>/nix/store/…-bash/bin/sh</filename> mounted in your
-      chroot as <filename>/bin/sh</filename>, you only need to say
-      <literal>build-chroot-dirs =
-      /bin/sh=/nix/store/…-bash/bin/sh</literal>; it is no longer
-      necessary to specify the dependencies of Bash.</para></listitem>
-
-    </itemizedlist>
-
-  </listitem>
-
-  <listitem><para>The new derivation attribute
-  <varname>passAsFile</varname> allows you to specify that the
-  contents of derivation attributes should be passed via files rather
-  than environment variables. This is useful if you need to pass very
-  long strings that exceed the size limit of the environment. The
-  Nixpkgs function <function>writeTextFile</function> uses
-  this.</para></listitem>
-
-  <listitem><para>You can now use <literal>~</literal> in Nix file
-  names to refer to your home directory, e.g. <literal>import
-  ~/.nixpkgs/config.nix</literal>.</para></listitem>
-
-  <listitem><para>Nix has a new option <option>restrict-eval</option>
-  that allows limiting what paths the Nix evaluator has access to. By
-  passing <literal>--option restrict-eval true</literal> to Nix, the
-  evaluator will throw an exception if an attempt is made to access
-  any file outside of the Nix search path. This is primarily intended
-  for Hydra to ensure that a Hydra jobset only refers to its declared
-  inputs (and is therefore reproducible).</para></listitem>
-
-  <listitem><para><command>nix-env</command> now only creates a new
-  “generation” symlink in <filename>/nix/var/nix/profiles</filename>
-  if something actually changed.</para></listitem>
-
-  <listitem><para>The environment variable <literal>NIX_PAGER</literal>
-  can now be set to override <literal>PAGER</literal>. You can set it to
-  <literal>cat</literal> to disable paging for Nix commands
-  only.</para></listitem>
-
-  <listitem><para>Failing <literal>&lt;...></literal>
-  lookups now show position information.</para></listitem>
-
-  <listitem><para>Improved Boehm GC use: we disabled scanning for
-  interior pointers, which should reduce the “<literal>Repeated
-  allocation of very large block</literal>” warnings and associated
-  retention of memory.</para></listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from aszlig, Benjamin Staffin,
-Charles Strahan, Christian Theune, Daniel Hahler, Danylo Hlynskyi
-Daniel Peebles, Dan Peebles, Domen Kožar, Eelco Dolstra, Harald van
-Dijk, Hoang Xuan Phu, Jaka Hudoklin, Jeff Ramnani, j-keck, Linquize,
-Luca Bruno, Michael Merickel, Oliver Dunkl, Rob Vermaas, Rok Garbas,
-Shea Levy, Tobias Geerinckx-Rice and William A. Kennington III.</para>
-
-</section>
-
diff --git a/doc/manual/release-notes/rl-2.0.xml b/doc/manual/release-notes/rl-2.0.xml
deleted file mode 100644
index 6bef003ca..000000000
--- a/doc/manual/release-notes/rl-2.0.xml
+++ /dev/null
@@ -1,1012 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-2.0">
-
-<title>Release 2.0 (2018-02-22)</title>
-
-<para>The following incompatible changes have been made:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>The manifest-based substituter mechanism
-    (<command>download-using-manifests</command>) has been <link
-    xlink:href="https://github.com/NixOS/nix/commit/867967265b80946dfe1db72d40324b4f9af988ed">removed</link>. It
-    has been superseded by the binary cache substituter mechanism
-    since several years. As a result, the following programs have been
-    removed:
-
-    <itemizedlist>
-      <listitem><para><command>nix-pull</command></para></listitem>
-      <listitem><para><command>nix-generate-patches</command></para></listitem>
-      <listitem><para><command>bsdiff</command></para></listitem>
-      <listitem><para><command>bspatch</command></para></listitem>
-    </itemizedlist>
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The “copy from other stores” substituter mechanism
-    (<command>copy-from-other-stores</command> and the
-    <literal>NIX_OTHER_STORES</literal> environment variable) has been
-    removed. It was primarily used by the NixOS installer to copy
-    available paths from the installation medium. The replacement is
-    to use a chroot store as a substituter
-    (e.g. <literal>--substituters /mnt</literal>), or to build into a
-    chroot store (e.g. <literal>--store /mnt --substituters /</literal>).</para>
-  </listitem>
-
-  <listitem>
-    <para>The command <command>nix-push</command> has been removed as
-    part of the effort to eliminate Nix's dependency on Perl. You can
-    use <command>nix copy</command> instead, e.g. <literal>nix copy
-    --to file:///tmp/my-binary-cache <emphasis>paths…</emphasis></literal></para>
-  </listitem>
-
-  <listitem>
-    <para>The “nested” log output feature (<option>--log-type
-    pretty</option>) has been removed. As a result,
-    <command>nix-log2xml</command> was also removed.</para>
-  </listitem>
-
-  <listitem>
-    <para>OpenSSL-based signing has been <link
-    xlink:href="https://github.com/NixOS/nix/commit/f435f8247553656774dd1b2c88e9de5d59cab203">removed</link>. This
-    feature was never well-supported. A better alternative is provided
-    by the <option>secret-key-files</option> and
-    <option>trusted-public-keys</option> options.</para>
-  </listitem>
-
-  <listitem>
-    <para>Failed build caching has been <link
-    xlink:href="https://github.com/NixOS/nix/commit/8cffec84859cec8b610a2a22ab0c4d462a9351ff">removed</link>. This
-    feature was introduced to support the Hydra continuous build
-    system, but Hydra no longer uses it.</para>
-  </listitem>
-
-  <listitem>
-    <para><filename>nix-mode.el</filename> has been removed from
-    Nix. It is now <link
-    xlink:href="https://github.com/NixOS/nix-mode">a separate
-    repository</link> and can be installed through the MELPA package
-    repository.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has the following new features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>It introduces a new command named <command>nix</command>,
-    which is intended to eventually replace all
-    <command>nix-*</command> commands with a more consistent and
-    better designed user interface. It currently provides replacements
-    for some (but not all) of the functionality provided by
-    <command>nix-store</command>, <command>nix-build</command>,
-    <command>nix-shell -p</command>, <command>nix-env -qa</command>,
-    <command>nix-instantiate --eval</command>,
-    <command>nix-push</command> and
-    <command>nix-copy-closure</command>. It has the following major
-    features:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Unlike the legacy commands, it has a consistent way to
-        refer to packages and package-like arguments (like store
-        paths). For example, the following commands all copy the GNU
-        Hello package to a remote machine:
-
-        <screen>nix copy --to ssh://machine nixpkgs.hello</screen>
-        <screen>nix copy --to ssh://machine /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10</screen>
-        <screen>nix copy --to ssh://machine '(with import &lt;nixpkgs> {}; hello)'</screen>
-
-        By contrast, <command>nix-copy-closure</command> only accepted
-        store paths as arguments.</para>
-      </listitem>
-
-      <listitem>
-        <para>It is self-documenting: <option>--help</option> shows
-        all available command-line arguments. If
-        <option>--help</option> is given after a subcommand, it shows
-        examples for that subcommand. <command>nix
-        --help-config</command> shows all configuration
-        options.</para>
-      </listitem>
-
-      <listitem>
-        <para>It is much less verbose. By default, it displays a
-        single-line progress indicator that shows how many packages
-        are left to be built or downloaded, and (if there are running
-        builds) the most recent line of builder output. If a build
-        fails, it shows the last few lines of builder output. The full
-        build log can be retrieved using <command>nix
-        log</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para>It <link
-        xlink:href="https://github.com/NixOS/nix/commit/b8283773bd64d7da6859ed520ee19867742a03ba">provides</link>
-        all <filename>nix.conf</filename> configuration options as
-        command line flags. For example, instead of <literal>--option
-        http-connections 100</literal> you can write
-        <literal>--http-connections 100</literal>. Boolean options can
-        be written as
-        <literal>--<emphasis>foo</emphasis></literal> or
-        <literal>--no-<emphasis>foo</emphasis></literal>
-        (e.g. <option>--no-auto-optimise-store</option>).</para>
-      </listitem>
-
-      <listitem>
-        <para>Many subcommands have a <option>--json</option> flag to
-        write results to stdout in JSON format.</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <warning><para>Please note that the <command>nix</command> command
-    is a work in progress and the interface is subject to
-    change.</para></warning>
-
-    <para>It provides the following high-level (“porcelain”)
-    subcommands:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para><command>nix build</command> is a replacement for
-        <command>nix-build</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix run</command> executes a command in an
-        environment in which the specified packages are available. It
-        is (roughly) a replacement for <command>nix-shell
-        -p</command>. Unlike that command, it does not execute the
-        command in a shell, and has a flag (<command>-c</command>)
-        that specifies the unquoted command line to be
-        executed.</para>
-
-        <para>It is particularly useful in conjunction with chroot
-        stores, allowing Linux users who do not have permission to
-        install Nix in <command>/nix/store</command> to still use
-        binary substitutes that assume
-        <command>/nix/store</command>. For example,
-
-        <screen>nix run --store ~/my-nix nixpkgs.hello -c hello --greeting 'Hi everybody!'</screen>
-
-        downloads (or if not substitutes are available, builds) the
-        GNU Hello package into
-        <filename>~/my-nix/nix/store</filename>, then runs
-        <command>hello</command> in a mount namespace where
-        <filename>~/my-nix/nix/store</filename> is mounted onto
-        <command>/nix/store</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix search</command> replaces <command>nix-env
-        -qa</command>. It searches the available packages for
-        occurrences of a search string in the attribute name, package
-        name or description. Unlike <command>nix-env -qa</command>, it
-        has a cache to speed up subsequent searches.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix copy</command> copies paths between
-        arbitrary Nix stores, generalising
-        <command>nix-copy-closure</command> and
-        <command>nix-push</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix repl</command> replaces the external
-        program <command>nix-repl</command>. It provides an
-        interactive environment for evaluating and building Nix
-        expressions. Note that it uses <literal>linenoise-ng</literal>
-        instead of GNU Readline.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix upgrade-nix</command> upgrades Nix to the
-        latest stable version. This requires that Nix is installed in
-        a profile. (Thus it won’t work on NixOS, or if it’s installed
-        outside of the Nix store.)</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix verify</command> checks whether store paths
-        are unmodified and/or “trusted” (see below). It replaces
-        <command>nix-store --verify</command> and <command>nix-store
-        --verify-path</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix log</command> shows the build log of a
-        package or path. If the build log is not available locally, it
-        will try to obtain it from the configured substituters (such
-        as <uri>cache.nixos.org</uri>, which now provides build
-        logs).</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix edit</command> opens the source code of a
-        package in your editor.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix eval</command> replaces
-        <command>nix-instantiate --eval</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command
-        xlink:href="https://github.com/NixOS/nix/commit/d41c5eb13f4f3a37d80dbc6d3888644170c3b44a">nix
-        why-depends</command> shows why one store path has another in
-        its closure. This is primarily useful to finding the causes of
-        closure bloat. For example,
-
-        <screen>nix why-depends nixpkgs.vlc nixpkgs.libdrm.dev</screen>
-
-        shows a chain of files and fragments of file contents that
-        cause the VLC package to have the “dev” output of
-        <literal>libdrm</literal> in its closure — an undesirable
-        situation.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix path-info</command> shows information about
-        store paths, replacing <command>nix-store -q</command>. A
-        useful feature is the option <option>--closure-size</option>
-        (<option>-S</option>). For example, the following command show
-        the closure sizes of every path in the current NixOS system
-        closure, sorted by size:
-
-        <screen>nix path-info -rS /run/current-system | sort -nk2</screen>
-
-        </para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix optimise-store</command> replaces
-        <command>nix-store --optimise</command>. The main difference
-        is that it has a progress indicator.</para>
-      </listitem>
-
-    </itemizedlist>
-
-    <para>A number of low-level (“plumbing”) commands are also
-    available:</para>
-
-    <itemizedlist>
-
-      <listitem>
-        <para><command>nix ls-store</command> and <command>nix
-        ls-nar</command> list the contents of a store path or NAR
-        file. The former is primarily useful in conjunction with
-        remote stores, e.g.
-
-        <screen>nix ls-store --store https://cache.nixos.org/ -lR /nix/store/0i2jd68mp5g6h2sa5k9c85rb80sn8hi9-hello-2.10</screen>
-
-        lists the contents of path in a binary cache.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix cat-store</command> and <command>nix
-        cat-nar</command> allow extracting a file from a store path or
-        NAR file.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix dump-path</command> writes the contents of
-        a store path to stdout in NAR format. This replaces
-        <command>nix-store --dump</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command
-        xlink:href="https://github.com/NixOS/nix/commit/e8d6ee7c1b90a2fe6d824f1a875acc56799ae6e2">nix
-        show-derivation</command> displays a store derivation in JSON
-        format. This is an alternative to
-        <command>pp-aterm</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command
-        xlink:href="https://github.com/NixOS/nix/commit/970366266b8df712f5f9cedb45af183ef5a8357f">nix
-        add-to-store</command> replaces <command>nix-store
-        --add</command>.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix sign-paths</command> signs store
-        paths.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix copy-sigs</command> copies signatures from
-        one store to another.</para>
-      </listitem>
-
-      <listitem>
-        <para><command>nix show-config</command> shows all
-        configuration options and their current values.</para>
-      </listitem>
-
-    </itemizedlist>
-
-  </listitem>
-
-  <listitem>
-    <para>The store abstraction that Nix has had for a long time to
-    support store access via the Nix daemon has been extended
-    significantly. In particular, substituters (which used to be
-    external programs such as
-    <command>download-from-binary-cache</command>) are now subclasses
-    of the abstract <classname>Store</classname> class. This allows
-    many Nix commands to operate on such store types. For example,
-    <command>nix path-info</command> shows information about paths in
-    your local Nix store, while <command>nix path-info --store
-    https://cache.nixos.org/</command> shows information about paths
-    in the specified binary cache. Similarly,
-    <command>nix-copy-closure</command>, <command>nix-push</command>
-    and substitution are all instances of the general notion of
-    copying paths between different kinds of Nix stores.</para>
-
-    <para>Stores are specified using an URI-like syntax,
-    e.g. <uri>https://cache.nixos.org/</uri> or
-    <uri>ssh://machine</uri>. The following store types are supported:
-
-    <itemizedlist>
-
-      <listitem>
-
-        <para><classname>LocalStore</classname> (stori URI
-        <literal>local</literal> or an absolute path) and the misnamed
-        <classname>RemoteStore</classname> (<literal>daemon</literal>)
-        provide access to a local Nix store, the latter via the Nix
-        daemon. You can use <literal>auto</literal> or the empty
-        string to auto-select a local or daemon store depending on
-        whether you have write permission to the Nix store. It is no
-        longer necessary to set the <literal>NIX_REMOTE</literal>
-        environment variable to use the Nix daemon.</para>
-
-        <para>As noted above, <classname>LocalStore</classname> now
-        supports chroot builds, allowing the “physical” location of
-        the Nix store
-        (e.g. <filename>/home/alice/nix/store</filename>) to differ
-        from its “logical” location (typically
-        <filename>/nix/store</filename>). This allows non-root users
-        to use Nix while still getting the benefits from prebuilt
-        binaries from <uri>cache.nixos.org</uri>.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>BinaryCacheStore</classname> is the abstract
-        superclass of all binary cache stores. It supports writing
-        build logs and NAR content listings in JSON format.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>HttpBinaryCacheStore</classname>
-        (<literal>http://</literal>, <literal>https://</literal>)
-        supports binary caches via HTTP or HTTPS. If the server
-        supports <literal>PUT</literal> requests, it supports
-        uploading store paths via commands such as <command>nix
-        copy</command>.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>LocalBinaryCacheStore</classname>
-        (<literal>file://</literal>) supports binary caches in the
-        local filesystem.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>S3BinaryCacheStore</classname>
-        (<literal>s3://</literal>) supports binary caches stored in
-        Amazon S3, if enabled at compile time.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>LegacySSHStore</classname> (<literal>ssh://</literal>)
-        is used to implement remote builds and
-        <command>nix-copy-closure</command>.</para>
-
-      </listitem>
-
-      <listitem>
-
-        <para><classname>SSHStore</classname>
-        (<literal>ssh-ng://</literal>) supports arbitrary Nix
-        operations on a remote machine via the same protocol used by
-        <command>nix-daemon</command>.</para>
-
-      </listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-
-    <para>Security has been improved in various ways:
-
-    <itemizedlist>
-
-      <listitem>
-        <para>Nix now stores signatures for local store
-        paths. When paths are copied between stores (e.g., copied from
-        a binary cache to a local store), signatures are
-        propagated.</para>
-
-        <para>Locally-built paths are signed automatically using the
-        secret keys specified by the <option>secret-key-files</option>
-        store option. Secret/public key pairs can be generated using
-        <command>nix-store
-        --generate-binary-cache-key</command>.</para>
-
-        <para>In addition, locally-built store paths are marked as
-        “ultimately trusted”, but this bit is not propagated when
-        paths are copied between stores.</para>
-      </listitem>
-
-      <listitem>
-        <para>Content-addressable store paths no longer require
-        signatures — they can be imported into a store by unprivileged
-        users even if they lack signatures.</para>
-      </listitem>
-
-      <listitem>
-        <para>The command <command>nix verify</command> checks whether
-        the specified paths are trusted, i.e., have a certain number
-        of trusted signatures, are ultimately trusted, or are
-        content-addressed.</para>
-      </listitem>
-
-      <listitem>
-        <para>Substitutions from binary caches <link
-        xlink:href="https://github.com/NixOS/nix/commit/ecbc3fedd3d5bdc5a0e1a0a51b29062f2874ac8b">now</link>
-        require signatures by default. This was already the case on
-        NixOS.</para>
-      </listitem>
-
-      <listitem>
-        <para>In Linux sandbox builds, we <link
-        xlink:href="https://github.com/NixOS/nix/commit/eba840c8a13b465ace90172ff76a0db2899ab11b">now</link>
-        use <filename>/build</filename> instead of
-        <filename>/tmp</filename> as the temporary build
-        directory. This fixes potential security problems when a build
-        accidentally stores its <literal>TMPDIR</literal> in some
-        security-sensitive place, such as an RPATH.</para>
-      </listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-    <para><emphasis>Pure evaluation mode</emphasis>. With the
-    <literal>--pure-eval</literal> flag, Nix enables a variant of the existing
-    restricted evaluation mode that forbids access to anything that could cause
-    different evaluations of the same command line arguments to produce a
-    different result. This includes builtin functions such as
-    <function>builtins.getEnv</function>, but more importantly,
-    <emphasis>all</emphasis> filesystem or network access unless a content hash
-    or commit hash is specified. For example, calls to
-    <function>builtins.fetchGit</function> are only allowed if a
-    <varname>rev</varname> attribute is specified.</para>
-
-    <para>The goal of this feature is to enable true reproducibility
-    and traceability of builds (including NixOS system configurations)
-    at the evaluation level. For example, in the future,
-    <command>nixos-rebuild</command> might build configurations from a
-    Nix expression in a Git repository in pure mode. That expression
-    might fetch other repositories such as Nixpkgs via
-    <function>builtins.fetchGit</function>. The commit hash of the
-    top-level repository then uniquely identifies a running system,
-    and, in conjunction with that repository, allows it to be
-    reproduced or modified.</para>
-
-  </listitem>
-
-  <listitem>
-    <para>There are several new features to support binary
-    reproducibility (i.e. to help ensure that multiple builds of the
-    same derivation produce exactly the same output). When
-    <option>enforce-determinism</option> is set to
-    <literal>false</literal>, it’s <link
-    xlink:href="https://github.com/NixOS/nix/commit/8bdf83f936adae6f2c907a6d2541e80d4120f051">no
-    longer</link> a fatal error if build rounds produce different
-    output. Also, a hook named <option>diff-hook</option> is <link
-    xlink:href="https://github.com/NixOS/nix/commit/9a313469a4bdea2d1e8df24d16289dc2a172a169">provided</link>
-    to allow you to run tools such as <command>diffoscope</command>
-    when build rounds produce different output.</para>
-  </listitem>
-
-  <listitem>
-    <para>Configuring remote builds is a lot easier now. Provided you
-    are not using the Nix daemon, you can now just specify a remote
-    build machine on the command line, e.g. <literal>--option builders
-    'ssh://my-mac x86_64-darwin'</literal>. The environment variable
-    <literal>NIX_BUILD_HOOK</literal> has been removed and is no longer
-    needed. The environment variable <literal>NIX_REMOTE_SYSTEMS</literal>
-    is still supported for compatibility, but it is also possible to
-    specify builders in <command>nix.conf</command> by setting the
-    option <literal>builders =
-    @<emphasis>path</emphasis></literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>If a fixed-output derivation produces a result with an
-    incorrect hash, the output path is moved to the location
-    corresponding to the actual hash and registered as valid. Thus, a
-    subsequent build of the fixed-output derivation with the correct
-    hash is unnecessary.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> <link
-    xlink:href="https://github.com/NixOS/nix/commit/ea59f39326c8e9dc42dfed4bcbf597fbce58797c">now</link>
-    sets the <varname>IN_NIX_SHELL</varname> environment variable
-    during evaluation and in the shell itself. This can be used to
-    perform different actions depending on whether you’re in a Nix
-    shell or in a regular build. Nixpkgs provides
-    <varname>lib.inNixShell</varname> to check this variable during
-    evaluation.</para>
-  </listitem>
-
-  <listitem>
-    <para><literal>NIX_PATH</literal> is now lazy, so URIs in the path are
-    only downloaded if they are needed for evaluation.</para>
-  </listitem>
-
-  <listitem>
-    <para>You can now use
-    <uri>channel:<emphasis>channel-name</emphasis></uri> as a
-    short-hand for
-    <uri>https://nixos.org/channels/<emphasis>channel-name</emphasis>/nixexprs.tar.xz</uri>. For
-    example, <literal>nix-build channel:nixos-15.09 -A hello</literal>
-    will build the GNU Hello package from the
-    <literal>nixos-15.09</literal> channel. In the future, this may
-    use Git to fetch updates more efficiently.</para>
-  </listitem>
-
-  <listitem>
-    <para>When <option>--no-build-output</option> is given, the last
-    10 lines of the build log will be shown if a build
-    fails.</para>
-  </listitem>
-
-  <listitem>
-    <para>Networking has been improved:
-
-    <itemizedlist>
-
-      <listitem>
-        <para>HTTP/2 is now supported. This makes binary cache lookups
-        <link
-        xlink:href="https://github.com/NixOS/nix/commit/90ad02bf626b885a5dd8967894e2eafc953bdf92">much
-        more efficient</link>.</para>
-      </listitem>
-
-      <listitem>
-        <para>We now retry downloads on many HTTP errors, making
-        binary caches substituters more resilient to temporary
-        failures.</para>
-      </listitem>
-
-      <listitem>
-        <para>HTTP credentials can now be configured via the standard
-        <filename>netrc</filename> mechanism.</para>
-      </listitem>
-
-      <listitem>
-        <para>If S3 support is enabled at compile time,
-        <uri>s3://</uri> URIs are <link
-        xlink:href="https://github.com/NixOS/nix/commit/9ff9c3f2f80ba4108e9c945bbfda2c64735f987b">supported</link>
-        in all places where Nix allows URIs.</para>
-      </listitem>
-
-      <listitem>
-        <para>Brotli compression is now supported. In particular,
-        <uri>cache.nixos.org</uri> build logs are now compressed using
-        Brotli.</para>
-      </listitem>
-
-    </itemizedlist>
-
-    </para>
-
-  </listitem>
-
-  <listitem>
-    <para><command>nix-env</command> <link
-    xlink:href="https://github.com/NixOS/nix/commit/b0cb11722626e906a73f10dd9a0c9eea29faf43a">now</link>
-    ignores packages with bad derivation names (in particular those
-    starting with a digit or containing a dot).</para>
-  </listitem>
-
-  <listitem>
-    <para>Many configuration options have been renamed, either because
-    they were unnecessarily verbose
-    (e.g. <option>build-use-sandbox</option> is now just
-    <option>sandbox</option>) or to reflect generalised behaviour
-    (e.g. <option>binary-caches</option> is now
-    <option>substituters</option> because it allows arbitrary store
-    URIs). The old names are still supported for compatibility.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <option>max-jobs</option> option can <link
-    xlink:href="https://github.com/NixOS/nix/commit/7251d048fa812d2551b7003bc9f13a8f5d4c95a5">now</link>
-    be set to <literal>auto</literal> to use the number of CPUs in the
-    system.</para>
-  </listitem>
-
-  <listitem>
-    <para>Hashes can <link
-    xlink:href="https://github.com/NixOS/nix/commit/c0015e87af70f539f24d2aa2bc224a9d8b84276b">now</link>
-    be specified in base-64 format, in addition to base-16 and the
-    non-standard base-32.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-shell</command> now uses
-    <varname>bashInteractive</varname> from Nixpkgs, rather than the
-    <command>bash</command> command that happens to be in the caller’s
-    <literal>PATH</literal>. This is especially important on macOS where
-    the <command>bash</command> provided by the system is seriously
-    outdated and cannot execute <literal>stdenv</literal>’s setup
-    script.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix can now automatically trigger a garbage collection if
-    free disk space drops below a certain level during a build. This
-    is configured using the <option>min-free</option> and
-    <option>max-free</option> options.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-store -q --roots</command> and
-    <command>nix-store --gc --print-roots</command> now show temporary
-    and in-memory roots.</para>
-  </listitem>
-
-  <listitem>
-    <para>
-      Nix can now be extended with plugins. See the documentation of
-      the <option>plugin-files</option> option for more details.
-    </para>
-  </listitem>
-
-</itemizedlist>
-
-<para>The Nix language has the following new features:
-
-<itemizedlist>
-
-  <listitem>
-    <para>It supports floating point numbers. They are based on the
-    C++ <literal>float</literal> type and are supported by the
-    existing numerical operators. Export and import to and from JSON
-    and XML works, too.</para>
-  </listitem>
-
-  <listitem>
-    <para>Derivation attributes can now reference the outputs of the
-    derivation using the <function>placeholder</function> builtin
-    function. For example, the attribute
-
-<programlisting>
-configureFlags = "--prefix=${placeholder "out"} --includedir=${placeholder "dev"}";
-</programlisting>
-
-    will cause the <literal>configureFlags</literal> environment variable
-    to contain the actual store paths corresponding to the
-    <literal>out</literal> and <literal>dev</literal> outputs.</para>
-  </listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>The following builtin functions are new or extended:
-
-<itemizedlist>
-
-  <listitem>
-    <para><function
-    xlink:href="https://github.com/NixOS/nix/commit/38539b943a060d9cdfc24d6e5d997c0885b8aa2f">builtins.fetchGit</function>
-    allows Git repositories to be fetched at evaluation time. Thus it
-    differs from the <function>fetchgit</function> function in
-    Nixpkgs, which fetches at build time and cannot be used to fetch
-    Nix expressions during evaluation. A typical use case is to import
-    external NixOS modules from your configuration, e.g.
-
-    <programlisting>imports = [ (builtins.fetchGit https://github.com/edolstra/dwarffs + "/module.nix") ];</programlisting>
-
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>Similarly, <function>builtins.fetchMercurial</function>
-    allows you to fetch Mercurial repositories.</para>
-  </listitem>
-
-  <listitem>
-    <para><function>builtins.path</function> generalises
-    <function>builtins.filterSource</function> and path literals
-    (e.g. <literal>./foo</literal>). It allows specifying a store path
-    name that differs from the source path name
-    (e.g. <literal>builtins.path { path = ./foo; name = "bar";
-    }</literal>) and also supports filtering out unwanted
-    files.</para>
-  </listitem>
-
-  <listitem>
-    <para><function>builtins.fetchurl</function> and
-    <function>builtins.fetchTarball</function> now support
-    <varname>sha256</varname> and <varname>name</varname>
-    attributes.</para>
-  </listitem>
-
-  <listitem>
-    <para><function
-    xlink:href="https://github.com/NixOS/nix/commit/b8867a0239b1930a16f9ef3f7f3e864b01416dff">builtins.split</function>
-    splits a string using a POSIX extended regular expression as the
-    separator.</para>
-  </listitem>
-
-  <listitem>
-    <para><function
-    xlink:href="https://github.com/NixOS/nix/commit/26d92017d3b36cff940dcb7d1611c42232edb81a">builtins.partition</function>
-    partitions the elements of a list into two lists, depending on a
-    Boolean predicate.</para>
-  </listitem>
-
-  <listitem>
-    <para><literal>&lt;nix/fetchurl.nix&gt;</literal> now uses the
-    content-addressable tarball cache at
-    <uri>http://tarballs.nixos.org/</uri>, just like
-    <function>fetchurl</function> in
-    Nixpkgs. (f2682e6e18a76ecbfb8a12c17e3a0ca15c084197)</para>
-  </listitem>
-
-  <listitem>
-    <para>In restricted and pure evaluation mode, builtin functions
-    that download from the network (such as
-    <function>fetchGit</function>) are permitted to fetch underneath a
-    list of URI prefixes specified in the option
-    <option>allowed-uris</option>.</para>
-  </listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>The Nix build environment has the following changes:
-
-<itemizedlist>
-
-  <listitem>
-    <para>Values such as Booleans, integers, (nested) lists and
-    attribute sets can <link
-    xlink:href="https://github.com/NixOS/nix/commit/6de33a9c675b187437a2e1abbcb290981a89ecb1">now</link>
-    be passed to builders in a non-lossy way. If the special attribute
-    <varname>__structuredAttrs</varname> is set to
-    <literal>true</literal>, the other derivation attributes are
-    serialised in JSON format and made available to the builder via
-    the file <literal>.attrs.json</literal> in the builder’s temporary
-    directory. This obviates the need for
-    <varname>passAsFile</varname> since JSON files have no size
-    restrictions, unlike process environments.</para>
-
-    <para><link
-    xlink:href="https://github.com/NixOS/nix/commit/2d5b1b24bf70a498e4c0b378704cfdb6471cc699">As
-    a convenience to Bash builders</link>, Nix writes a script named
-    <literal>.attrs.sh</literal> to the builder’s directory that
-    initialises shell variables corresponding to all attributes that
-    are representable in Bash. This includes non-nested (associative)
-    arrays. For example, the attribute <literal>hardening.format =
-    true</literal> ends up as the Bash associative array element
-    <literal>${hardening[format]}</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>Builders can <link
-    xlink:href="https://github.com/NixOS/nix/commit/88e6bb76de5564b3217be9688677d1c89101b2a3">now</link>
-    communicate what build phase they are in by writing messages to
-    the file descriptor specified in <literal>NIX_LOG_FD</literal>. The
-    current phase is shown by the <command>nix</command> progress
-    indicator.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>In Linux sandbox builds, we <link
-    xlink:href="https://github.com/NixOS/nix/commit/a2d92bb20e82a0957067ede60e91fab256948b41">now</link>
-    provide a default <filename>/bin/sh</filename> (namely
-    <filename>ash</filename> from BusyBox).</para>
-  </listitem>
-
-  <listitem>
-    <para>In structured attribute mode,
-    <varname>exportReferencesGraph</varname> <link
-    xlink:href="https://github.com/NixOS/nix/commit/c2b0d8749f7e77afc1c4b3e8dd36b7ee9720af4a">exports</link>
-    extended information about closures in JSON format. In particular,
-    it includes the sizes and hashes of paths. This is primarily
-    useful for NixOS image builders.</para>
-  </listitem>
-
-  <listitem>
-    <para>Builds are <link
-    xlink:href="https://github.com/NixOS/nix/commit/21948deed99a3295e4d5666e027a6ca42dc00b40">now</link>
-    killed as soon as Nix receives EOF on the builder’s stdout or
-    stderr. This fixes a bug that allowed builds to hang Nix
-    indefinitely, regardless of
-    timeouts.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <option>sandbox-paths</option> configuration
-    option can now specify optional paths by appending a
-    <literal>?</literal>, e.g. <literal>/dev/nvidiactl?</literal> will
-    bind-mount <varname>/dev/nvidiactl</varname> only if it
-    exists.</para>
-  </listitem>
-
-  <listitem>
-    <para>On Linux, builds are now executed in a user
-    namespace with UID 1000 and GID 100.</para>
-  </listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>A number of significant internal changes were made:
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix no longer depends on Perl and all Perl components have
-    been rewritten in C++ or removed. The Perl bindings that used to
-    be part of Nix have been moved to a separate package,
-    <literal>nix-perl</literal>.</para>
-  </listitem>
-
-  <listitem>
-    <para>All <classname>Store</classname> classes are now
-    thread-safe. <classname>RemoteStore</classname> supports multiple
-    concurrent connections to the daemon. This is primarily useful in
-    multi-threaded programs such as
-    <command>hydra-queue-runner</command>.</para>
-  </listitem>
-
-</itemizedlist>
-
-</para>
-
-<para>This release has contributions from
-
-Adrien Devresse,
-Alexander Ried,
-Alex Cruice,
-Alexey Shmalko,
-AmineChikhaoui,
-Andy Wingo,
-Aneesh Agrawal,
-Anthony Cowley,
-Armijn Hemel,
-aszlig,
-Ben Gamari,
-Benjamin Hipple,
-Benjamin Staffin,
-Benno Fünfstück,
-Bjørn Forsman,
-Brian McKenna,
-Charles Strahan,
-Chase Adams,
-Chris Martin,
-Christian Theune,
-Chris Warburton,
-Daiderd Jordan,
-Dan Connolly,
-Daniel Peebles,
-Dan Peebles,
-davidak,
-David McFarland,
-Dmitry Kalinkin,
-Domen Kožar,
-Eelco Dolstra,
-Emery Hemingway,
-Eric Litak,
-Eric Wolf,
-Fabian Schmitthenner,
-Frederik Rietdijk,
-Gabriel Gonzalez,
-Giorgio Gallo,
-Graham Christensen,
-Guillaume Maudoux,
-Harmen,
-Iavael,
-James Broadhead,
-James Earl Douglas,
-Janus Troelsen,
-Jeremy Shaw,
-Joachim Schiele,
-Joe Hermaszewski,
-Joel Moberg,
-Johannes 'fish' Ziemke,
-Jörg Thalheim,
-Jude Taylor,
-kballou,
-Keshav Kini,
-Kjetil Orbekk,
-Langston Barrett,
-Linus Heckemann,
-Ludovic Courtès,
-Manav Rathi,
-Marc Scholten,
-Markus Hauck,
-Matt Audesse,
-Matthew Bauer,
-Matthias Beyer,
-Matthieu Coudron,
-N1X,
-Nathan Zadoks,
-Neil Mayhew,
-Nicolas B. Pierron,
-Niklas Hambüchen,
-Nikolay Amiantov,
-Ole Jørgen Brønner,
-Orivej Desh,
-Peter Simons,
-Peter Stuart,
-Pyry Jahkola,
-regnat,
-Renzo Carbonara,
-Rhys,
-Robert Vollmert,
-Scott Olson,
-Scott R. Parish,
-Sergei Trofimovich,
-Shea Levy,
-Sheena Artrip,
-Spencer Baugh,
-Stefan Junker,
-Susan Potter,
-Thomas Tuegel,
-Timothy Allen,
-Tristan Hume,
-Tuomas Tynkkynen,
-tv,
-Tyson Whitehead,
-Vladimír Čunát,
-Will Dietz,
-wmertens,
-Wout Mertens,
-zimbatm and
-Zoran Plesivčak.
-</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-2.1.xml b/doc/manual/release-notes/rl-2.1.xml
deleted file mode 100644
index 16c243fc1..000000000
--- a/doc/manual/release-notes/rl-2.1.xml
+++ /dev/null
@@ -1,133 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-2.1">
-
-<title>Release 2.1 (2018-09-02)</title>
-
-<para>This is primarily a bug fix release. It also reduces memory
-consumption in certain situations. In addition, it has the following
-new features:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>The Nix installer will no longer default to the Multi-User
-    installation for macOS. You can still <link
-    linkend="sect-multi-user-installation">instruct the installer to
-    run in multi-user mode</link>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The Nix installer now supports performing a Multi-User
-    installation for Linux computers which are running systemd. You
-    can <link
-    linkend="sect-multi-user-installation">select a Multi-User installation</link> by passing the
-    <option>--daemon</option> flag to the installer: <command>sh &lt;(curl
-    https://nixos.org/nix/install) --daemon</command>.
-    </para>
-
-    <para>The multi-user installer cannot handle systems with SELinux.
-    If your system has SELinux enabled, you can <link
-    linkend="sect-single-user-installation">force the installer to run
-    in single-user mode</link>.</para>
-  </listitem>
-
-  <listitem>
-    <para>New builtin functions:
-    <literal>builtins.bitAnd</literal>,
-    <literal>builtins.bitOr</literal>,
-    <literal>builtins.bitXor</literal>,
-    <literal>builtins.fromTOML</literal>,
-    <literal>builtins.concatMap</literal>,
-    <literal>builtins.mapAttrs</literal>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The S3 binary cache store now supports uploading NARs larger
-    than 5 GiB.</para>
-  </listitem>
-
-  <listitem>
-    <para>The S3 binary cache store now supports uploading to
-    S3-compatible services with the <literal>endpoint</literal>
-    option.</para>
-  </listitem>
-
-  <listitem>
-    <para>The flag <option>--fallback</option> is no longer required
-    to recover from disappeared NARs in binary caches.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix-daemon</command> now respects
-    <option>--store</option>.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix run</command> now respects
-    <varname>nix-support/propagated-user-env-packages</varname>.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>This release has contributions from
-
-Adrien Devresse,
-Aleksandr Pashkov,
-Alexandre Esteves,
-Amine Chikhaoui,
-Andrew Dunham,
-Asad Saeeduddin,
-aszlig,
-Ben Challenor,
-Ben Gamari,
-Benjamin Hipple,
-Bogdan Seniuc,
-Corey O'Connor,
-Daiderd Jordan,
-Daniel Peebles,
-Daniel Poelzleithner,
-Danylo Hlynskyi,
-Dmitry Kalinkin,
-Domen Kožar,
-Doug Beardsley,
-Eelco Dolstra,
-Erik Arvstedt,
-Félix Baylac-Jacqué,
-Gleb Peregud,
-Graham Christensen,
-Guillaume Maudoux,
-Ivan Kozik,
-John Arnold,
-Justin Humm,
-Linus Heckemann,
-Lorenzo Manacorda,
-Matthew Justin Bauer,
-Matthew O'Gorman,
-Maximilian Bosch,
-Michael Bishop,
-Michael Fiano,
-Michael Mercier,
-Michael Raskin,
-Michael Weiss,
-Nicolas Dudebout,
-Peter Simons,
-Ryan Trinkle,
-Samuel Dionne-Riel,
-Sean Seefried,
-Shea Levy,
-Symphorien Gibol,
-Tim Engler,
-Tim Sears,
-Tuomas Tynkkynen,
-volth,
-Will Dietz,
-Yorick van Pelt and
-zimbatm.
-</para>
-
-</section>
diff --git a/doc/manual/release-notes/rl-2.2.xml b/doc/manual/release-notes/rl-2.2.xml
deleted file mode 100644
index cc992fabb..000000000
--- a/doc/manual/release-notes/rl-2.2.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-2.2">
-
-<title>Release 2.2 (2019-01-11)</title>
-
-<para>This is primarily a bug fix release. It also has the following
-changes:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>In derivations that use structured attributes (i.e. that
-    specify set the <varname>__structuredAttrs</varname> attribute to
-    <literal>true</literal> to cause all attributes to be passed to
-    the builder in JSON format), you can now specify closure checks
-    per output, e.g.:
-
-<programlisting>
-outputChecks."out" = {
-  # The closure of 'out' must not be larger than 256 MiB.
-  maxClosureSize = 256 * 1024 * 1024;
-
-  # It must not refer to C compiler or to the 'dev' output.
-  disallowedRequisites = [ stdenv.cc "dev" ];
-};
-
-outputChecks."dev" = {
-  # The 'dev' output must not be larger than 128 KiB.
-  maxSize = 128 * 1024;
-};
-</programlisting>
-
-    </para>
-  </listitem>
-
-
-  <listitem>
-    <para>The derivation attribute
-    <varname>requiredSystemFeatures</varname> is now enforced for
-    local builds, and not just to route builds to remote builders.
-    The supported features of a machine can be specified through the
-    configuration setting <varname>system-features</varname>.</para>
-
-    <para>By default, <varname>system-features</varname> includes
-    <literal>kvm</literal> if <filename>/dev/kvm</filename>
-    exists. For compatibility, it also includes the pseudo-features
-    <literal>nixos-test</literal>, <literal>benchmark</literal> and
-    <literal>big-parallel</literal> which are used by Nixpkgs to route
-    builds to particular Hydra build machines.</para>
-
-  </listitem>
-
-  <listitem>
-    <para>Sandbox builds are now enabled by default on Linux.</para>
-  </listitem>
-
-  <listitem>
-    <para>The new command <command>nix doctor</command> shows
-    potential issues with your Nix installation.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <literal>fetchGit</literal> builtin function now uses a
-    caching scheme that puts different remote repositories in distinct
-    local repositories, rather than a single shared repository. This
-    may require more disk space but is faster.</para>
-  </listitem>
-
-  <listitem>
-    <para>The <literal>dirOf</literal> builtin function now works on
-    relative paths.</para>
-  </listitem>
-
-  <listitem>
-    <para>Nix now supports <link
-    xlink:href="https://www.w3.org/TR/SRI/">SRI hashes</link>,
-    allowing the hash algorithm and hash to be specified in a single
-    string. For example, you can write:
-
-<programlisting>
-import &lt;nix/fetchurl.nix> {
-  url = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz;
-  hash = "sha256-XSLa0FjVyADWWhFfkZ2iKTjFDda6mMXjoYMXLRSYQKQ=";
-};
-</programlisting>
-
-    instead of
-
-<programlisting>
-import &lt;nix/fetchurl.nix> {
-  url = https://nixos.org/releases/nix/nix-2.1.3/nix-2.1.3.tar.xz;
-  sha256 = "5d22dad058d5c800d65a115f919da22938c50dd6ba98c5e3a183172d149840a4";
-};
-</programlisting>
-
-    </para>
-
-    <para>In fixed-output derivations, the
-    <varname>outputHashAlgo</varname> attribute is no longer mandatory
-    if <varname>outputHash</varname> specifies the hash.</para>
-
-    <para><command>nix hash-file</command> and <command>nix
-    hash-path</command> now print hashes in SRI format by
-    default. They also use SHA-256 by default instead of SHA-512
-    because that's what we use most of the time in Nixpkgs.</para>
-  </listitem>
-
-  <listitem>
-    <para>Integers are now 64 bits on all platforms.</para>
-  </listitem>
-
-  <listitem>
-    <para>The evaluator now prints profiling statistics (enabled via
-    the <literal>NIX_SHOW_STATS</literal> and
-    <literal>NIX_COUNT_CALLS</literal> environment variables) in JSON
-    format.</para>
-  </listitem>
-
-  <listitem>
-    <para>The option <option>--xml</option> in <command>nix-store
-    --query</command> has been removed. Instead, there now is an
-    option <option>--graphml</option> to output the dependency graph
-    in GraphML format.</para>
-  </listitem>
-
-  <listitem>
-    <para>All <filename>nix-*</filename> commands are now symlinks to
-    <filename>nix</filename>. This saves a bit of disk space.</para>
-  </listitem>
-
-  <listitem>
-    <para><command>nix repl</command> now uses
-    <literal>libeditline</literal> or
-    <literal>libreadline</literal>.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
-
diff --git a/doc/manual/release-notes/rl-2.3.xml b/doc/manual/release-notes/rl-2.3.xml
deleted file mode 100644
index 83accf33e..000000000
--- a/doc/manual/release-notes/rl-2.3.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<section xmlns="http://docbook.org/ns/docbook"
-      xmlns:xlink="http://www.w3.org/1999/xlink"
-      xmlns:xi="http://www.w3.org/2001/XInclude"
-      version="5.0"
-      xml:id="ssec-relnotes-2.3">
-
-<title>Release 2.3 (2019-09-04)</title>
-
-<para>This is primarily a bug fix release. However, it makes some
-incompatible changes:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para>Nix now uses BSD file locks instead of POSIX file
-    locks. Because of this, you should not use Nix 2.3 and previous
-    releases at the same time on a Nix store.</para>
-  </listitem>
-
-</itemizedlist>
-
-<para>It also has the following changes:</para>
-
-<itemizedlist>
-
-  <listitem>
-    <para><function>builtins.fetchGit</function>'s <varname>ref</varname>
-    argument now allows specifying an absolute remote ref.
-    Nix will automatically prefix <varname>ref</varname> with
-    <literal>refs/heads</literal> only if <varname>ref</varname> doesn't
-    already begin with <literal>refs/</literal>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The installer now enables sandboxing by default on Linux when the
-    system has the necessary kernel support.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The <literal>max-jobs</literal> setting now defaults to 1.</para>
-  </listitem>
-
-  <listitem>
-    <para>New builtin functions:
-    <literal>builtins.isPath</literal>,
-    <literal>builtins.hashFile</literal>.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>The <command>nix</command> command has a new
-    <option>--print-build-logs</option> (<option>-L</option>) flag to
-    print build log output to stderr, rather than showing the last log
-    line in the progress bar. To distinguish between concurrent
-    builds, log lines are prefixed by the name of the package.
-    </para>
-  </listitem>
-
-  <listitem>
-    <para>Builds are now executed in a pseudo-terminal, and the
-    <literal>TERM</literal> environment variable is set to
-    <literal>xterm-256color</literal>. This allows many programs
-    (e.g. <command>gcc</command>, <command>clang</command>,
-    <command>cmake</command>) to print colorized log output.</para>
-  </listitem>
-
-  <listitem>
-    <para>Add <option>--no-net</option> convenience flag. This flag
-    disables substituters; sets the <literal>tarball-ttl</literal>
-    setting to infinity (ensuring that any previously downloaded files
-    are considered current); and disables retrying downloads and sets
-    the connection timeout to the minimum. This flag is enabled
-    automatically if there are no configured non-loopback network
-    interfaces.</para>
-  </listitem>
-
-  <listitem>
-    <para>Add a <literal>post-build-hook</literal> setting to run a
-    program after a build has succeeded.</para>
-  </listitem>
-
-  <listitem>
-    <para>Add a <literal>trace-function-calls</literal> setting to log
-    the duration of Nix function calls to stderr.</para>
-  </listitem>
-
-</itemizedlist>
-
-</section>
diff --git a/doc/manual/schemas.xml b/doc/manual/schemas.xml
deleted file mode 100644
index 691a517b9..000000000
--- a/doc/manual/schemas.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<locatingRules xmlns="http://thaiopensource.com/ns/locating-rules/1.0">
-  <uri pattern="*.xml" typeId="DocBook"/>
-</locatingRules>

From 2c7557481b4c9d5113a65cc7a75c8acc18031f4e Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 24 Jul 2020 21:02:51 +0000
Subject: [PATCH 034/176] `queryDerivationOutputMap` no longer assumes all
 outputs have a mapping

This assumption is broken by CA derivations. Making a PR now to do the
breaking daemon change as soon as possible (if it is already too late,
we can bump protocol intead).
---
 src/libstore/build.cc           | 10 +++++--
 src/libstore/daemon.cc          |  4 +--
 src/libstore/local-store.cc     | 12 +++++---
 src/libstore/local-store.hh     |  2 +-
 src/libstore/remote-store.cc    | 31 +++++++-------------
 src/libstore/remote-store.hh    |  2 +-
 src/libstore/store-api.cc       | 13 ++++++++-
 src/libstore/store-api.hh       | 10 +++++--
 src/libstore/worker-protocol.hh | 52 ++++++++++++++++++++++++++++++++-
 src/nix-env/nix-env.cc          |  2 +-
 10 files changed, 102 insertions(+), 36 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 62294a08c..3a55f24cb 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2756,8 +2756,12 @@ struct RestrictedStore : public LocalFSStore
     void queryReferrers(const StorePath & path, StorePathSet & referrers) override
     { }
 
-    OutputPathMap queryDerivationOutputMap(const StorePath & path) override
-    { throw Error("queryDerivationOutputMap"); }
+    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override
+    {
+        if (!goal.isAllowed(path))
+            throw InvalidPath("cannot query output map for unknown path '%s' in recursive Nix", printStorePath(path));
+        return next->queryDerivationOutputMap(path);
+    }
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override
     { throw Error("queryPathFromHashPart"); }
@@ -4918,7 +4922,7 @@ void Worker::waitForInput()
         std::vector<unsigned char> buffer(4096);
         for (auto & k : fds2) {
             if (pollStatus.at(fdToPollStatus.at(k)).revents) {
-                ssize_t rd = read(k, buffer.data(), buffer.size());
+                ssize_t rd = ::read(k, buffer.data(), buffer.size());
                 // FIXME: is there a cleaner way to handle pt close
                 // than EIO? Is this even standard?
                 if (rd == 0 || (rd == -1 && errno == EIO)) {
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 7e16529a5..82833f5c3 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -325,9 +325,9 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
     case wopQueryDerivationOutputMap: {
         auto path = store->parseStorePath(readString(from));
         logger->startWork();
-        OutputPathMap outputs = store->queryDerivationOutputMap(path);
+        auto outputs = store->queryDerivationOutputMap(path);
         logger->stopWork();
-        writeOutputPathMap(*store, to, outputs);
+        write(*store, to, outputs);
         break;
     }
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 9ea71170f..4db4f7d6a 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -774,17 +774,21 @@ StorePathSet LocalStore::queryValidDerivers(const StorePath & path)
 }
 
 
-OutputPathMap LocalStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> LocalStore::queryDerivationOutputMap(const StorePath & path)
 {
-    return retrySQLite<OutputPathMap>([&]() {
+    std::map<std::string, std::optional<StorePath>> outputs;
+    BasicDerivation drv = readDerivation(path);
+    for (auto & [outName, _] : drv.outputs) {
+        outputs.insert_or_assign(outName, std::nullopt);
+    }
+    return retrySQLite<std::map<std::string, std::optional<StorePath>>>([&]() {
         auto state(_state.lock());
 
         auto useQueryDerivationOutputs(state->stmtQueryDerivationOutputs.use()
             (queryValidPathId(*state, path)));
 
-        OutputPathMap outputs;
         while (useQueryDerivationOutputs.next())
-            outputs.emplace(
+            outputs.insert_or_assign(
                 useQueryDerivationOutputs.getStr(0),
                 parseStorePath(useQueryDerivationOutputs.getStr(1))
             );
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 355c2814f..56ef1d251 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -133,7 +133,7 @@ public:
 
     StorePathSet queryValidDerivers(const StorePath & path) override;
 
-    OutputPathMap queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 9af4364b7..3b3cdbc02 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -39,30 +39,21 @@ void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths
         out << store.printStorePath(i);
 }
 
-std::map<string, StorePath> readOutputPathMap(const Store & store, Source & from)
+
+StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
 {
-    std::map<string, StorePath> pathMap;
-    auto rawInput = readStrings<Strings>(from);
-    if (rawInput.size() % 2)
-        throw Error("got an odd number of elements from the daemon when trying to read a output path map");
-    auto curInput = rawInput.begin();
-    while (curInput != rawInput.end()) {
-        auto thisKey = *curInput++;
-        auto thisValue = *curInput++;
-        pathMap.emplace(thisKey, store.parseStorePath(thisValue));
-    }
-    return pathMap;
+	auto path = readString(from);
+	return store.parseStorePath(path);
 }
 
-void writeOutputPathMap(const Store & store, Sink & out, const std::map<string, StorePath> & pathMap)
+
+void write(const Store & store, Sink & out, const StorePath & storePath)
 {
-    out << 2*pathMap.size();
-    for (auto & i : pathMap) {
-        out << i.first;
-        out << store.printStorePath(i.second);
-    }
+	auto path = store.printStorePath(storePath);
+	out << path;
 }
 
+
 /* TODO: Separate these store impls into different files, give them better names */
 RemoteStore::RemoteStore(const Params & params)
     : Store(params)
@@ -445,12 +436,12 @@ StorePathSet RemoteStore::queryDerivationOutputs(const StorePath & path)
 }
 
 
-OutputPathMap RemoteStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> RemoteStore::queryDerivationOutputMap(const StorePath & path)
 {
     auto conn(getConnection());
     conn->to << wopQueryDerivationOutputMap << printStorePath(path);
     conn.processStderr();
-    return readOutputPathMap(*this, conn->from);
+    return read(*this, conn->from, Proxy<std::map<std::string, std::optional<StorePath>>> {});
 
 }
 
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 3c1b78b6a..b39a8de48 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -51,7 +51,7 @@ public:
 
     StorePathSet queryDerivationOutputs(const StorePath & path) override;
 
-    OutputPathMap queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
     StorePathSet querySubstitutablePaths(const StorePathSet & paths) override;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index ab21b0bd5..a624fafdd 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -330,9 +330,20 @@ bool Store::PathInfoCacheValue::isKnownNow()
     return std::chrono::steady_clock::now() < time_point + ttl;
 }
 
+OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path) {
+	auto resp = queryDerivationOutputMap(path);
+	OutputPathMap result;
+	for (auto & [outName, optOutPath] : resp) {
+		if (!optOutPath)
+			throw Error("output '%s' has no store path mapped to it", outName);
+		result.insert_or_assign(outName, *optOutPath);
+	}
+	return result;
+}
+
 StorePathSet Store::queryDerivationOutputs(const StorePath & path)
 {
-    auto outputMap = this->queryDerivationOutputMap(path);
+    auto outputMap = this->queryDerivationOutputMapAssumeTotal(path);
     StorePathSet outputPaths;
     for (auto & i: outputMap) {
         outputPaths.emplace(std::move(i.second));
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index d1cb2035f..a83a2ff10 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -423,10 +423,16 @@ public:
     /* Query the outputs of the derivation denoted by `path'. */
     virtual StorePathSet queryDerivationOutputs(const StorePath & path);
 
-    /* Query the mapping outputName=>outputPath for the given derivation */
-    virtual OutputPathMap queryDerivationOutputMap(const StorePath & path)
+    /* Query the mapping outputName => outputPath for the given derivation. All
+       outputs are mentioned so ones mising the mapping are mapped to
+       `std::nullopt`.  */
+    virtual std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path)
     { unsupported("queryDerivationOutputMap"); }
 
+    /* Query the mapping outputName=>outputPath for the given derivation.
+       Assume every output has a mapping and throw an exception otherwise. */
+    OutputPathMap queryDerivationOutputMapAssumeTotal(const StorePath & path);
+
     /* Query the full store path given the hash part of a valid store
        path, or empty if the path doesn't exist. */
     virtual std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) = 0;
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index 8b538f6da..6a6e29640 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -70,6 +70,56 @@ template<class T> T readStorePaths(const Store & store, Source & from);
 
 void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths);
 
-void writeOutputPathMap(const Store & store, Sink & out, const OutputPathMap & paths);
+/* To guide overloading */
+template<typename T>
+struct Proxy {};
+
+template<typename T>
+std::map<std::string, T> read(const Store & store, Source & from, Proxy<std::map<std::string, T>> _)
+{
+    std::map<string, T> resMap;
+    auto size = (size_t)readInt(from);
+    while (size--) {
+        auto thisKey = readString(from);
+        resMap.insert_or_assign(std::move(thisKey), read(store, from, Proxy<T> {}));
+    }
+    return resMap;
+}
+
+template<typename T>
+void write(const Store & store, Sink & out, const std::map<string, T> & resMap)
+{
+    out << resMap.size();
+    for (auto & i : resMap) {
+        out << i.first;
+        write(store, out, i.second);
+    }
+}
+
+template<typename T>
+std::optional<T> read(const Store & store, Source & from, Proxy<std::optional<T>> _)
+{
+    auto tag = readNum<uint8_t>(from);
+    switch (tag) {
+    case 0:
+        return std::nullopt;
+    case 1:
+        return read(store, from, Proxy<T> {});
+    default:
+        throw Error("got an invalid tag bit for std::optional: %#04x", tag);
+    }
+}
+
+template<typename T>
+void write(const Store & store, Sink & out, const std::optional<T> & optVal)
+{
+    out << (optVal ? 1 : 0);
+    if (optVal)
+        write(store, out, *optVal);
+}
+
+StorePath read(const Store & store, Source & from, Proxy<StorePath> _);
+
+void write(const Store & store, Sink & out, const StorePath & storePath);
 
 }
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index ddd036070..d36804658 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -381,7 +381,7 @@ static void queryInstSources(EvalState & state,
 
                 if (path.isDerivation()) {
                     elem.setDrvPath(state.store->printStorePath(path));
-                    auto outputs = state.store->queryDerivationOutputMap(path);
+                    auto outputs = state.store->queryDerivationOutputMapAssumeTotal(path);
                     elem.setOutPath(state.store->printStorePath(outputs.at("out")));
                     if (name.size() >= drvExtension.size() &&
                         string(name, name.size() - drvExtension.size()) == drvExtension)

From 6ccfdb79c7779f9eedeea73a21df694551c9893e Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 21 Jul 2020 23:38:18 +0200
Subject: [PATCH 035/176] libutil/logging: extend `internal-json` logger to
 make it more machine-readable

The new error-format is pretty nice from a UX point-of-view, however
it's fairly hard to parse the output e.g. for editor plugins such as
vim-ale[1] that use `nix-instantiate --parse` to determine syntax errors in
Nix expression files.

This patch extends the `internal-json` logger by adding the fields
`line`, `column` and `file` to easily locate an error in a file and the
field `raw_msg` which contains the error-message itself without
code-lines and additional helpers.

An exemplary output may look like this:

```
[nix-shell]$ ./inst/bin/nix-instantiate ~/test.nix --log-format minimal
{"action":"msg","column":1,"file":"/home/ma27/test.nix","level":0,"line":4,"raw_msg":"syntax error, unexpected IF, expecting $end","msg":"<full error-msg with code-lines etc>"}
```

[1] https://github.com/dense-analysis/ale
---
 doc/manual/command-ref/opt-common.xml |  9 ++++++++-
 src/libutil/logging.cc                | 27 +++++++++++++++++++++++++++
 src/libutil/tests/logging.cc          | 18 ++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml
index a68eef1d0..093bc2526 100644
--- a/doc/manual/command-ref/opt-common.xml
+++ b/doc/manual/command-ref/opt-common.xml
@@ -106,7 +106,14 @@
     </varlistentry>
 
     <varlistentry><term>internal-json</term>
-    <listitem><para>Outputs the logs in a structured manner. NOTE: the json schema is not guarantees to be stable between releases.</para></listitem>
+     <listitem>
+      <para>Outputs the logs in a structured manner.</para>
+      <warning>
+       <para>
+        While the schema itself is relatively stable, the format of the error-messages (namely of the <literal>msg</literal>-field) can change between several releases.
+       </para>
+      </warning>
+     </listitem>
     </varlistentry>
 
     <varlistentry><term>bar</term>
diff --git a/src/libutil/logging.cc b/src/libutil/logging.cc
index 832aee783..cbbf64395 100644
--- a/src/libutil/logging.cc
+++ b/src/libutil/logging.cc
@@ -184,6 +184,33 @@ struct JSONLogger : Logger {
         json["action"] = "msg";
         json["level"] = ei.level;
         json["msg"] = oss.str();
+        json["raw_msg"] = ei.hint->str();
+
+        if (ei.errPos.has_value() && (*ei.errPos)) {
+            json["line"] = ei.errPos->line;
+            json["column"] = ei.errPos->column;
+            json["file"] = ei.errPos->file;
+        } else {
+            json["line"] = nullptr;
+            json["column"] = nullptr;
+            json["file"] = nullptr;
+        }
+
+        if (loggerSettings.showTrace.get() && !ei.traces.empty()) {
+            nlohmann::json traces = nlohmann::json::array();
+            for (auto iter = ei.traces.rbegin(); iter != ei.traces.rend(); ++iter) {
+                nlohmann::json stackFrame;
+                stackFrame["raw_msg"] = iter->hint.str();
+                if (iter->pos.has_value() && (*iter->pos)) {
+                    stackFrame["line"] = iter->pos->line;
+                    stackFrame["column"] = iter->pos->column;
+                    stackFrame["file"] = iter->pos->file;
+                }
+                traces.push_back(stackFrame);
+            }
+
+            json["trace"] = traces;
+        }
 
         write(json);
     }
diff --git a/src/libutil/tests/logging.cc b/src/libutil/tests/logging.cc
index ad588055f..7e53f17c6 100644
--- a/src/libutil/tests/logging.cc
+++ b/src/libutil/tests/logging.cc
@@ -34,6 +34,24 @@ namespace nix {
         }
     }
 
+    TEST(logEI, jsonOutput) {
+        SymbolTable testTable;
+        auto problem_file = testTable.create("random.nix");
+        testing::internal::CaptureStderr();
+
+        makeJSONLogger(*logger)->logEI({
+                .name = "error name",
+                .description = "error without any code lines.",
+                .hint = hintfmt("this hint has %1% templated %2%!!",
+                    "yellow",
+                    "values"),
+                .errPos = Pos(foFile, problem_file, 02, 13)
+            });
+
+        auto str = testing::internal::GetCapturedStderr();
+        ASSERT_STREQ(str.c_str(), "\x1B[31;1merror:\x1B[0m\x1B[34;1m --- SysError --- error-unit-test\x1B[0m\nopening file '\x1B[33;1mrandom.nix\x1B[0m': \x1B[33;1mNo such file or directory\x1B[0m\n@nix {\"action\":\"msg\",\"column\":13,\"file\":\"random.nix\",\"level\":0,\"line\":2,\"msg\":\"\\u001b[31;1merror:\\u001b[0m\\u001b[34;1m --- error name --- error-unit-test\\u001b[0m\\n\\u001b[34;1mat: \\u001b[33;1m(2:13)\\u001b[34;1m in file: \\u001b[0mrandom.nix\\n\\nerror without any code lines.\\n\\nthis hint has \\u001b[33;1myellow\\u001b[0m templated \\u001b[33;1mvalues\\u001b[0m!!\",\"raw_msg\":\"this hint has \\u001b[33;1myellow\\u001b[0m templated \\u001b[33;1mvalues\\u001b[0m!!\"}\n");
+    }
+
     TEST(logEI, appendingHintsToPreviousError) {
 
         MakeError(TestError, Error);

From 1d0a7b54fa330b041a720932ee4e05dcad1d2d5c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 31 Jul 2020 15:43:25 +0200
Subject: [PATCH 036/176] Enable syntax highlighting

---
 doc/manual/highlight.pack.js                  |   6 +
 doc/manual/local.mk                           |   1 +
 doc/manual/src/advanced-topics/diff-hook.md   | 118 +++--
 .../src/advanced-topics/distributed-builds.md |  50 +-
 .../src/advanced-topics/post-build-hook.md    |  68 +--
 doc/manual/src/command-ref/conf-file.md       |  45 +-
 doc/manual/src/command-ref/env-common.md      |   8 +-
 doc/manual/src/command-ref/nix-build.md       |  38 +-
 doc/manual/src/command-ref/nix-channel.md     |  22 +-
 .../src/command-ref/nix-collect-garbage.md    |   4 +-
 .../src/command-ref/nix-copy-closure.md       |  12 +-
 doc/manual/src/command-ref/nix-env.md         | 292 +++++++-----
 doc/manual/src/command-ref/nix-hash.md        |  50 +-
 doc/manual/src/command-ref/nix-instantiate.md |  92 ++--
 .../src/command-ref/nix-prefetch-url.md       |  22 +-
 doc/manual/src/command-ref/nix-shell.md       | 142 +++---
 doc/manual/src/command-ref/nix-store.md       | 210 ++++----
 doc/manual/src/command-ref/opt-common.md      |  12 +-
 .../src/expressions/advanced-attributes.md    | 122 ++---
 .../src/expressions/arguments-variables.md    |  48 +-
 doc/manual/src/expressions/build-script.md    |  20 +-
 doc/manual/src/expressions/builtins.md        | 448 ++++++++++--------
 doc/manual/src/expressions/derivations.md     |  19 +-
 .../src/expressions/expression-syntax.md      |  66 +--
 doc/manual/src/expressions/generic-builder.md |  34 +-
 .../src/expressions/language-constructs.md    | 240 ++++++----
 doc/manual/src/expressions/language-values.md | 110 +++--
 .../expressions/simple-building-testing.md    |  32 +-
 doc/manual/src/hacking.md                     |  50 +-
 .../src/installation/building-source.md       |  12 +-
 doc/manual/src/installation/env-variables.md  |  20 +-
 .../src/installation/installing-binary.md     |  78 +--
 doc/manual/src/installation/multi-user.md     |  24 +-
 .../src/installation/obtaining-source.md      |   4 +-
 doc/manual/src/introduction.md                |  34 +-
 .../package-management/basic-package-mgmt.md  |  82 ++--
 .../binary-cache-substituter.md               |  16 +-
 doc/manual/src/package-management/channels.md |  16 +-
 .../package-management/garbage-collection.md  |  24 +-
 .../garbage-collector-roots.md                |   4 +-
 doc/manual/src/package-management/profiles.md |  48 +-
 .../src/package-management/s3-substituter.md  |  90 ++--
 .../src/package-management/ssh-substituter.md |  20 +-
 doc/manual/src/quick-start.md                 |  68 ++-
 flake.nix                                     |   1 +
 src/libstore/nar-accessor.cc                  |   3 +-
 46 files changed, 1770 insertions(+), 1155 deletions(-)
 create mode 100644 doc/manual/highlight.pack.js

diff --git a/doc/manual/highlight.pack.js b/doc/manual/highlight.pack.js
new file mode 100644
index 000000000..fba8b4a5a
--- /dev/null
+++ b/doc/manual/highlight.pack.js
@@ -0,0 +1,6 @@
+/*
+  Highlight.js 10.1.2 (edd73d24)
+  License: BSD-3-Clause
+  Copyright (c) 2006-2020, Ivan Sagalaev
+*/
+var hljs=function(){"use strict";function e(n){Object.freeze(n);var t="function"==typeof n;return Object.getOwnPropertyNames(n).forEach((function(r){!Object.hasOwnProperty.call(n,r)||null===n[r]||"object"!=typeof n[r]&&"function"!=typeof n[r]||t&&("caller"===r||"callee"===r||"arguments"===r)||Object.isFrozen(n[r])||e(n[r])})),n}class n{constructor(e){void 0===e.data&&(e.data={}),this.data=e.data}ignoreMatch(){this.ignore=!0}}function t(e){return e.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#x27;")}function r(e,...n){var t={};for(const n in e)t[n]=e[n];return n.forEach((function(e){for(const n in e)t[n]=e[n]})),t}function a(e){return e.nodeName.toLowerCase()}var i=Object.freeze({__proto__:null,escapeHTML:t,inherit:r,nodeStream:function(e){var n=[];return function e(t,r){for(var i=t.firstChild;i;i=i.nextSibling)3===i.nodeType?r+=i.nodeValue.length:1===i.nodeType&&(n.push({event:"start",offset:r,node:i}),r=e(i,r),a(i).match(/br|hr|img|input/)||n.push({event:"stop",offset:r,node:i}));return r}(e,0),n},mergeStreams:function(e,n,r){var i=0,s="",o=[];function l(){return e.length&&n.length?e[0].offset!==n[0].offset?e[0].offset<n[0].offset?e:n:"start"===n[0].event?e:n:e.length?e:n}function c(e){s+="<"+a(e)+[].map.call(e.attributes,(function(e){return" "+e.nodeName+'="'+t(e.value)+'"'})).join("")+">"}function u(e){s+="</"+a(e)+">"}function d(e){("start"===e.event?c:u)(e.node)}for(;e.length||n.length;){var g=l();if(s+=t(r.substring(i,g[0].offset)),i=g[0].offset,g===e){o.reverse().forEach(u);do{d(g.splice(0,1)[0]),g=l()}while(g===e&&g.length&&g[0].offset===i);o.reverse().forEach(c)}else"start"===g[0].event?o.push(g[0].node):o.pop(),d(g.splice(0,1)[0])}return s+t(r.substr(i))}});const s="</span>",o=e=>!!e.kind;class l{constructor(e,n){this.buffer="",this.classPrefix=n.classPrefix,e.walk(this)}addText(e){this.buffer+=t(e)}openNode(e){if(!o(e))return;let n=e.kind;e.sublanguage||(n=`${this.classPrefix}${n}`),this.span(n)}closeNode(e){o(e)&&(this.buffer+=s)}value(){return this.buffer}span(e){this.buffer+=`<span class="${e}">`}}class c{constructor(){this.rootNode={children:[]},this.stack=[this.rootNode]}get top(){return this.stack[this.stack.length-1]}get root(){return this.rootNode}add(e){this.top.children.push(e)}openNode(e){const n={kind:e,children:[]};this.add(n),this.stack.push(n)}closeNode(){if(this.stack.length>1)return this.stack.pop()}closeAllNodes(){for(;this.closeNode(););}toJSON(){return JSON.stringify(this.rootNode,null,4)}walk(e){return this.constructor._walk(e,this.rootNode)}static _walk(e,n){return"string"==typeof n?e.addText(n):n.children&&(e.openNode(n),n.children.forEach(n=>this._walk(e,n)),e.closeNode(n)),e}static _collapse(e){"string"!=typeof e&&e.children&&(e.children.every(e=>"string"==typeof e)?e.children=[e.children.join("")]:e.children.forEach(e=>{c._collapse(e)}))}}class u extends c{constructor(e){super(),this.options=e}addKeyword(e,n){""!==e&&(this.openNode(n),this.addText(e),this.closeNode())}addText(e){""!==e&&this.add(e)}addSublanguage(e,n){const t=e.root;t.kind=n,t.sublanguage=!0,this.add(t)}toHTML(){return new l(this,this.options).value()}finalize(){return!0}}function d(e){return e?"string"==typeof e?e:e.source:null}const g="(-?)(\\b0[xX][a-fA-F0-9]+|(\\b\\d+(\\.\\d*)?|\\.\\d+)([eE][-+]?\\d+)?)",h={begin:"\\\\[\\s\\S]",relevance:0},f={className:"string",begin:"'",end:"'",illegal:"\\n",contains:[h]},p={className:"string",begin:'"',end:'"',illegal:"\\n",contains:[h]},b={begin:/\b(a|an|the|are|I'm|isn't|don't|doesn't|won't|but|just|should|pretty|simply|enough|gonna|going|wtf|so|such|will|you|your|they|like|more)\b/},m=function(e,n,t={}){var a=r({className:"comment",begin:e,end:n,contains:[]},t);return a.contains.push(b),a.contains.push({className:"doctag",begin:"(?:TODO|FIXME|NOTE|BUG|OPTIMIZE|HACK|XXX):",relevance:0}),a},v=m("//","$"),x=m("/\\*","\\*/"),E=m("#","$");var _=Object.freeze({__proto__:null,IDENT_RE:"[a-zA-Z]\\w*",UNDERSCORE_IDENT_RE:"[a-zA-Z_]\\w*",NUMBER_RE:"\\b\\d+(\\.\\d+)?",C_NUMBER_RE:g,BINARY_NUMBER_RE:"\\b(0b[01]+)",RE_STARTERS_RE:"!|!=|!==|%|%=|&|&&|&=|\\*|\\*=|\\+|\\+=|,|-|-=|/=|/|:|;|<<|<<=|<=|<|===|==|=|>>>=|>>=|>=|>>>|>>|>|\\?|\\[|\\{|\\(|\\^|\\^=|\\||\\|=|\\|\\||~",SHEBANG:(e={})=>{const n=/^#![ ]*\//;return e.binary&&(e.begin=function(...e){return e.map(e=>d(e)).join("")}(n,/.*\b/,e.binary,/\b.*/)),r({className:"meta",begin:n,end:/$/,relevance:0,"on:begin":(e,n)=>{0!==e.index&&n.ignoreMatch()}},e)},BACKSLASH_ESCAPE:h,APOS_STRING_MODE:f,QUOTE_STRING_MODE:p,PHRASAL_WORDS_MODE:b,COMMENT:m,C_LINE_COMMENT_MODE:v,C_BLOCK_COMMENT_MODE:x,HASH_COMMENT_MODE:E,NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?",relevance:0},C_NUMBER_MODE:{className:"number",begin:g,relevance:0},BINARY_NUMBER_MODE:{className:"number",begin:"\\b(0b[01]+)",relevance:0},CSS_NUMBER_MODE:{className:"number",begin:"\\b\\d+(\\.\\d+)?(%|em|ex|ch|rem|vw|vh|vmin|vmax|cm|mm|in|pt|pc|px|deg|grad|rad|turn|s|ms|Hz|kHz|dpi|dpcm|dppx)?",relevance:0},REGEXP_MODE:{begin:/(?=\/[^/\n]*\/)/,contains:[{className:"regexp",begin:/\//,end:/\/[gimuy]*/,illegal:/\n/,contains:[h,{begin:/\[/,end:/\]/,relevance:0,contains:[h]}]}]},TITLE_MODE:{className:"title",begin:"[a-zA-Z]\\w*",relevance:0},UNDERSCORE_TITLE_MODE:{className:"title",begin:"[a-zA-Z_]\\w*",relevance:0},METHOD_GUARD:{begin:"\\.\\s*[a-zA-Z_]\\w*",relevance:0},END_SAME_AS_BEGIN:function(e){return Object.assign(e,{"on:begin":(e,n)=>{n.data._beginMatch=e[1]},"on:end":(e,n)=>{n.data._beginMatch!==e[1]&&n.ignoreMatch()}})}}),N="of and for in not or if then".split(" ");function w(e,n){return n?+n:function(e){return N.includes(e.toLowerCase())}(e)?0:1}const R=t,y=r,{nodeStream:O,mergeStreams:k}=i,M=Symbol("nomatch");return function(t){var a=[],i=Object.create(null),s=Object.create(null),o=[],l=!0,c=/(^(<[^>]+>|\t|)+|\n)/gm,g="Could not find the language '{}', did you forget to load/include a language module?";const h={disableAutodetect:!0,name:"Plain text",contains:[]};var f={noHighlightRe:/^(no-?highlight)$/i,languageDetectRe:/\blang(?:uage)?-([\w-]+)\b/i,classPrefix:"hljs-",tabReplace:null,useBR:!1,languages:null,__emitter:u};function p(e){return f.noHighlightRe.test(e)}function b(e,n,t,r){var a={code:n,language:e};S("before:highlight",a);var i=a.result?a.result:m(a.language,a.code,t,r);return i.code=a.code,S("after:highlight",i),i}function m(e,t,a,s){var o=t;function c(e,n){var t=E.case_insensitive?n[0].toLowerCase():n[0];return Object.prototype.hasOwnProperty.call(e.keywords,t)&&e.keywords[t]}function u(){null!=y.subLanguage?function(){if(""!==A){var e=null;if("string"==typeof y.subLanguage){if(!i[y.subLanguage])return void k.addText(A);e=m(y.subLanguage,A,!0,O[y.subLanguage]),O[y.subLanguage]=e.top}else e=v(A,y.subLanguage.length?y.subLanguage:null);y.relevance>0&&(I+=e.relevance),k.addSublanguage(e.emitter,e.language)}}():function(){if(!y.keywords)return void k.addText(A);let e=0;y.keywordPatternRe.lastIndex=0;let n=y.keywordPatternRe.exec(A),t="";for(;n;){t+=A.substring(e,n.index);const r=c(y,n);if(r){const[e,a]=r;k.addText(t),t="",I+=a,k.addKeyword(n[0],e)}else t+=n[0];e=y.keywordPatternRe.lastIndex,n=y.keywordPatternRe.exec(A)}t+=A.substr(e),k.addText(t)}(),A=""}function h(e){return e.className&&k.openNode(e.className),y=Object.create(e,{parent:{value:y}})}function p(e){return 0===y.matcher.regexIndex?(A+=e[0],1):(L=!0,0)}var b={};function x(t,r){var i=r&&r[0];if(A+=t,null==i)return u(),0;if("begin"===b.type&&"end"===r.type&&b.index===r.index&&""===i){if(A+=o.slice(r.index,r.index+1),!l){const n=Error("0 width match regex");throw n.languageName=e,n.badRule=b.rule,n}return 1}if(b=r,"begin"===r.type)return function(e){var t=e[0],r=e.rule;const a=new n(r),i=[r.__beforeBegin,r["on:begin"]];for(const n of i)if(n&&(n(e,a),a.ignore))return p(t);return r&&r.endSameAsBegin&&(r.endRe=RegExp(t.replace(/[-/\\^$*+?.()|[\]{}]/g,"\\$&"),"m")),r.skip?A+=t:(r.excludeBegin&&(A+=t),u(),r.returnBegin||r.excludeBegin||(A=t)),h(r),r.returnBegin?0:t.length}(r);if("illegal"===r.type&&!a){const e=Error('Illegal lexeme "'+i+'" for mode "'+(y.className||"<unnamed>")+'"');throw e.mode=y,e}if("end"===r.type){var s=function(e){var t=e[0],r=o.substr(e.index),a=function e(t,r,a){let i=function(e,n){var t=e&&e.exec(n);return t&&0===t.index}(t.endRe,a);if(i){if(t["on:end"]){const e=new n(t);t["on:end"](r,e),e.ignore&&(i=!1)}if(i){for(;t.endsParent&&t.parent;)t=t.parent;return t}}if(t.endsWithParent)return e(t.parent,r,a)}(y,e,r);if(!a)return M;var i=y;i.skip?A+=t:(i.returnEnd||i.excludeEnd||(A+=t),u(),i.excludeEnd&&(A=t));do{y.className&&k.closeNode(),y.skip||y.subLanguage||(I+=y.relevance),y=y.parent}while(y!==a.parent);return a.starts&&(a.endSameAsBegin&&(a.starts.endRe=a.endRe),h(a.starts)),i.returnEnd?0:t.length}(r);if(s!==M)return s}if("illegal"===r.type&&""===i)return 1;if(B>1e5&&B>3*r.index)throw Error("potential infinite loop, way more iterations than matches");return A+=i,i.length}var E=T(e);if(!E)throw console.error(g.replace("{}",e)),Error('Unknown language: "'+e+'"');var _=function(e){function n(n,t){return RegExp(d(n),"m"+(e.case_insensitive?"i":"")+(t?"g":""))}class t{constructor(){this.matchIndexes={},this.regexes=[],this.matchAt=1,this.position=0}addRule(e,n){n.position=this.position++,this.matchIndexes[this.matchAt]=n,this.regexes.push([n,e]),this.matchAt+=function(e){return RegExp(e.toString()+"|").exec("").length-1}(e)+1}compile(){0===this.regexes.length&&(this.exec=()=>null);const e=this.regexes.map(e=>e[1]);this.matcherRe=n(function(e,n="|"){for(var t=/\[(?:[^\\\]]|\\.)*\]|\(\??|\\([1-9][0-9]*)|\\./,r=0,a="",i=0;i<e.length;i++){var s=r+=1,o=d(e[i]);for(i>0&&(a+=n),a+="(";o.length>0;){var l=t.exec(o);if(null==l){a+=o;break}a+=o.substring(0,l.index),o=o.substring(l.index+l[0].length),"\\"===l[0][0]&&l[1]?a+="\\"+(+l[1]+s):(a+=l[0],"("===l[0]&&r++)}a+=")"}return a}(e),!0),this.lastIndex=0}exec(e){this.matcherRe.lastIndex=this.lastIndex;const n=this.matcherRe.exec(e);if(!n)return null;const t=n.findIndex((e,n)=>n>0&&void 0!==e),r=this.matchIndexes[t];return n.splice(0,t),Object.assign(n,r)}}class a{constructor(){this.rules=[],this.multiRegexes=[],this.count=0,this.lastIndex=0,this.regexIndex=0}getMatcher(e){if(this.multiRegexes[e])return this.multiRegexes[e];const n=new t;return this.rules.slice(e).forEach(([e,t])=>n.addRule(e,t)),n.compile(),this.multiRegexes[e]=n,n}considerAll(){this.regexIndex=0}addRule(e,n){this.rules.push([e,n]),"begin"===n.type&&this.count++}exec(e){const n=this.getMatcher(this.regexIndex);n.lastIndex=this.lastIndex;const t=n.exec(e);return t&&(this.regexIndex+=t.position+1,this.regexIndex===this.count&&(this.regexIndex=0)),t}}function i(e,n){const t=e.input[e.index-1],r=e.input[e.index+e[0].length];"."!==t&&"."!==r||n.ignoreMatch()}if(e.contains&&e.contains.includes("self"))throw Error("ERR: contains `self` is not supported at the top-level of a language.  See documentation.");return function t(s,o){const l=s;if(s.compiled)return l;s.compiled=!0,s.__beforeBegin=null,s.keywords=s.keywords||s.beginKeywords;let c=null;if("object"==typeof s.keywords&&(c=s.keywords.$pattern,delete s.keywords.$pattern),s.keywords&&(s.keywords=function(e,n){var t={};return"string"==typeof e?r("keyword",e):Object.keys(e).forEach((function(n){r(n,e[n])})),t;function r(e,r){n&&(r=r.toLowerCase()),r.split(" ").forEach((function(n){var r=n.split("|");t[r[0]]=[e,w(r[0],r[1])]}))}}(s.keywords,e.case_insensitive)),s.lexemes&&c)throw Error("ERR: Prefer `keywords.$pattern` to `mode.lexemes`, BOTH are not allowed. (see mode reference) ");return l.keywordPatternRe=n(s.lexemes||c||/\w+/,!0),o&&(s.beginKeywords&&(s.begin="\\b("+s.beginKeywords.split(" ").join("|")+")(?=\\b|\\s)",s.__beforeBegin=i),s.begin||(s.begin=/\B|\b/),l.beginRe=n(s.begin),s.endSameAsBegin&&(s.end=s.begin),s.end||s.endsWithParent||(s.end=/\B|\b/),s.end&&(l.endRe=n(s.end)),l.terminator_end=d(s.end)||"",s.endsWithParent&&o.terminator_end&&(l.terminator_end+=(s.end?"|":"")+o.terminator_end)),s.illegal&&(l.illegalRe=n(s.illegal)),void 0===s.relevance&&(s.relevance=1),s.contains||(s.contains=[]),s.contains=[].concat(...s.contains.map((function(e){return function(e){return e.variants&&!e.cached_variants&&(e.cached_variants=e.variants.map((function(n){return r(e,{variants:null},n)}))),e.cached_variants?e.cached_variants:function e(n){return!!n&&(n.endsWithParent||e(n.starts))}(e)?r(e,{starts:e.starts?r(e.starts):null}):Object.isFrozen(e)?r(e):e}("self"===e?s:e)}))),s.contains.forEach((function(e){t(e,l)})),s.starts&&t(s.starts,o),l.matcher=function(e){const n=new a;return e.contains.forEach(e=>n.addRule(e.begin,{rule:e,type:"begin"})),e.terminator_end&&n.addRule(e.terminator_end,{type:"end"}),e.illegal&&n.addRule(e.illegal,{type:"illegal"}),n}(l),l}(e)}(E),N="",y=s||_,O={},k=new f.__emitter(f);!function(){for(var e=[],n=y;n!==E;n=n.parent)n.className&&e.unshift(n.className);e.forEach(e=>k.openNode(e))}();var A="",I=0,S=0,B=0,L=!1;try{for(y.matcher.considerAll();;){B++,L?L=!1:(y.matcher.lastIndex=S,y.matcher.considerAll());const e=y.matcher.exec(o);if(!e)break;const n=x(o.substring(S,e.index),e);S=e.index+n}return x(o.substr(S)),k.closeAllNodes(),k.finalize(),N=k.toHTML(),{relevance:I,value:N,language:e,illegal:!1,emitter:k,top:y}}catch(n){if(n.message&&n.message.includes("Illegal"))return{illegal:!0,illegalBy:{msg:n.message,context:o.slice(S-100,S+100),mode:n.mode},sofar:N,relevance:0,value:R(o),emitter:k};if(l)return{illegal:!1,relevance:0,value:R(o),emitter:k,language:e,top:y,errorRaised:n};throw n}}function v(e,n){n=n||f.languages||Object.keys(i);var t=function(e){const n={relevance:0,emitter:new f.__emitter(f),value:R(e),illegal:!1,top:h};return n.emitter.addText(e),n}(e),r=t;return n.filter(T).filter(I).forEach((function(n){var a=m(n,e,!1);a.language=n,a.relevance>r.relevance&&(r=a),a.relevance>t.relevance&&(r=t,t=a)})),r.language&&(t.second_best=r),t}function x(e){return f.tabReplace||f.useBR?e.replace(c,e=>"\n"===e?f.useBR?"<br>":e:f.tabReplace?e.replace(/\t/g,f.tabReplace):e):e}function E(e){let n=null;const t=function(e){var n=e.className+" ";n+=e.parentNode?e.parentNode.className:"";const t=f.languageDetectRe.exec(n);if(t){var r=T(t[1]);return r||(console.warn(g.replace("{}",t[1])),console.warn("Falling back to no-highlight mode for this block.",e)),r?t[1]:"no-highlight"}return n.split(/\s+/).find(e=>p(e)||T(e))}(e);if(p(t))return;S("before:highlightBlock",{block:e,language:t}),f.useBR?(n=document.createElement("div")).innerHTML=e.innerHTML.replace(/\n/g,"").replace(/<br[ /]*>/g,"\n"):n=e;const r=n.textContent,a=t?b(t,r,!0):v(r),i=O(n);if(i.length){const e=document.createElement("div");e.innerHTML=a.value,a.value=k(i,O(e),r)}a.value=x(a.value),S("after:highlightBlock",{block:e,result:a}),e.innerHTML=a.value,e.className=function(e,n,t){var r=n?s[n]:t,a=[e.trim()];return e.match(/\bhljs\b/)||a.push("hljs"),e.includes(r)||a.push(r),a.join(" ").trim()}(e.className,t,a.language),e.result={language:a.language,re:a.relevance,relavance:a.relevance},a.second_best&&(e.second_best={language:a.second_best.language,re:a.second_best.relevance,relavance:a.second_best.relevance})}const N=()=>{if(!N.called){N.called=!0;var e=document.querySelectorAll("pre code");a.forEach.call(e,E)}};function T(e){return e=(e||"").toLowerCase(),i[e]||i[s[e]]}function A(e,{languageName:n}){"string"==typeof e&&(e=[e]),e.forEach(e=>{s[e]=n})}function I(e){var n=T(e);return n&&!n.disableAutodetect}function S(e,n){var t=e;o.forEach((function(e){e[t]&&e[t](n)}))}Object.assign(t,{highlight:b,highlightAuto:v,fixMarkup:x,highlightBlock:E,configure:function(e){f=y(f,e)},initHighlighting:N,initHighlightingOnLoad:function(){window.addEventListener("DOMContentLoaded",N,!1)},registerLanguage:function(e,n){var r=null;try{r=n(t)}catch(n){if(console.error("Language definition for '{}' could not be registered.".replace("{}",e)),!l)throw n;console.error(n),r=h}r.name||(r.name=e),i[e]=r,r.rawDefinition=n.bind(null,t),r.aliases&&A(r.aliases,{languageName:e})},listLanguages:function(){return Object.keys(i)},getLanguage:T,registerAliases:A,requireLanguage:function(e){var n=T(e);if(n)return n;throw Error("The '{}' language is required, but not loaded.".replace("{}",e))},autoDetection:I,inherit:y,addPlugin:function(e){o.push(e)}}),t.debugMode=function(){l=!1},t.safeMode=function(){l=!0},t.versionString="10.1.2";for(const n in _)"object"==typeof _[n]&&e(_[n]);return Object.assign(t,_),t}({})}();"object"==typeof exports&&"undefined"!=typeof module&&(module.exports=hljs);hljs.registerLanguage("xml",function(){"use strict";return function(e){var n={className:"symbol",begin:"&[a-z]+;|&#[0-9]+;|&#x[a-f0-9]+;"},a={begin:"\\s",contains:[{className:"meta-keyword",begin:"#?[a-z_][a-z1-9_-]+",illegal:"\\n"}]},s=e.inherit(a,{begin:"\\(",end:"\\)"}),t=e.inherit(e.APOS_STRING_MODE,{className:"meta-string"}),i=e.inherit(e.QUOTE_STRING_MODE,{className:"meta-string"}),c={endsWithParent:!0,illegal:/</,relevance:0,contains:[{className:"attr",begin:"[A-Za-z0-9\\._:-]+",relevance:0},{begin:/=\s*/,relevance:0,contains:[{className:"string",endsParent:!0,variants:[{begin:/"/,end:/"/,contains:[n]},{begin:/'/,end:/'/,contains:[n]},{begin:/[^\s"'=<>`]+/}]}]}]};return{name:"HTML, XML",aliases:["html","xhtml","rss","atom","xjb","xsd","xsl","plist","wsf","svg"],case_insensitive:!0,contains:[{className:"meta",begin:"<![a-z]",end:">",relevance:10,contains:[a,i,t,s,{begin:"\\[",end:"\\]",contains:[{className:"meta",begin:"<![a-z]",end:">",contains:[a,s,i,t]}]}]},e.COMMENT("\x3c!--","--\x3e",{relevance:10}),{begin:"<\\!\\[CDATA\\[",end:"\\]\\]>",relevance:10},n,{className:"meta",begin:/<\?xml/,end:/\?>/,relevance:10},{className:"tag",begin:"<style(?=\\s|>)",end:">",keywords:{name:"style"},contains:[c],starts:{end:"</style>",returnEnd:!0,subLanguage:["css","xml"]}},{className:"tag",begin:"<script(?=\\s|>)",end:">",keywords:{name:"script"},contains:[c],starts:{end:"<\/script>",returnEnd:!0,subLanguage:["javascript","handlebars","xml"]}},{className:"tag",begin:"</?",end:"/?>",contains:[{className:"name",begin:/[^\/><\s]+/,relevance:0},c]}]}}}());hljs.registerLanguage("markdown",function(){"use strict";return function(n){const e={begin:"<",end:">",subLanguage:"xml",relevance:0},a={begin:"\\[.+?\\][\\(\\[].*?[\\)\\]]",returnBegin:!0,contains:[{className:"string",begin:"\\[",end:"\\]",excludeBegin:!0,returnEnd:!0,relevance:0},{className:"link",begin:"\\]\\(",end:"\\)",excludeBegin:!0,excludeEnd:!0},{className:"symbol",begin:"\\]\\[",end:"\\]",excludeBegin:!0,excludeEnd:!0}],relevance:10},i={className:"strong",contains:[],variants:[{begin:/_{2}/,end:/_{2}/},{begin:/\*{2}/,end:/\*{2}/}]},s={className:"emphasis",contains:[],variants:[{begin:/\*(?!\*)/,end:/\*/},{begin:/_(?!_)/,end:/_/,relevance:0}]};i.contains.push(s),s.contains.push(i);var c=[e,a];return i.contains=i.contains.concat(c),s.contains=s.contains.concat(c),{name:"Markdown",aliases:["md","mkdown","mkd"],contains:[{className:"section",variants:[{begin:"^#{1,6}",end:"$",contains:c=c.concat(i,s)},{begin:"(?=^.+?\\n[=-]{2,}$)",contains:[{begin:"^[=-]*$"},{begin:"^",end:"\\n",contains:c}]}]},e,{className:"bullet",begin:"^[ \t]*([*+-]|(\\d+\\.))(?=\\s+)",end:"\\s+",excludeEnd:!0},i,s,{className:"quote",begin:"^>\\s+",contains:c,end:"$"},{className:"code",variants:[{begin:"(`{3,})(.|\\n)*?\\1`*[ ]*"},{begin:"(~{3,})(.|\\n)*?\\1~*[ ]*"},{begin:"```",end:"```+[ ]*$"},{begin:"~~~",end:"~~~+[ ]*$"},{begin:"`.+?`"},{begin:"(?=^( {4}|\\t))",contains:[{begin:"^( {4}|\\t)",end:"(\\n)$"}],relevance:0}]},{begin:"^[-\\*]{3,}",end:"$"},a,{begin:/^\[[^\n]+\]:/,returnBegin:!0,contains:[{className:"symbol",begin:/\[/,end:/\]/,excludeBegin:!0,excludeEnd:!0},{className:"link",begin:/:\s*/,end:/$/,excludeBegin:!0}]}]}}}());hljs.registerLanguage("perl",function(){"use strict";return function(e){var n={$pattern:/[\w.]+/,keyword:"getpwent getservent quotemeta msgrcv scalar kill dbmclose undef lc ma syswrite tr send umask sysopen shmwrite vec qx utime local oct semctl localtime readpipe do return format read sprintf dbmopen pop getpgrp not getpwnam rewinddir qq fileno qw endprotoent wait sethostent bless s|0 opendir continue each sleep endgrent shutdown dump chomp connect getsockname die socketpair close flock exists index shmget sub for endpwent redo lstat msgctl setpgrp abs exit select print ref gethostbyaddr unshift fcntl syscall goto getnetbyaddr join gmtime symlink semget splice x|0 getpeername recv log setsockopt cos last reverse gethostbyname getgrnam study formline endhostent times chop length gethostent getnetent pack getprotoent getservbyname rand mkdir pos chmod y|0 substr endnetent printf next open msgsnd readdir use unlink getsockopt getpriority rindex wantarray hex system getservbyport endservent int chr untie rmdir prototype tell listen fork shmread ucfirst setprotoent else sysseek link getgrgid shmctl waitpid unpack getnetbyname reset chdir grep split require caller lcfirst until warn while values shift telldir getpwuid my getprotobynumber delete and sort uc defined srand accept package seekdir getprotobyname semop our rename seek if q|0 chroot sysread setpwent no crypt getc chown sqrt write setnetent setpriority foreach tie sin msgget map stat getlogin unless elsif truncate exec keys glob tied closedir ioctl socket readlink eval xor readline binmode setservent eof ord bind alarm pipe atan2 getgrent exp time push setgrent gt lt or ne m|0 break given say state when"},t={className:"subst",begin:"[$@]\\{",end:"\\}",keywords:n},s={begin:"->{",end:"}"},r={variants:[{begin:/\$\d/},{begin:/[\$%@](\^\w\b|#\w+(::\w+)*|{\w+}|\w+(::\w*)*)/},{begin:/[\$%@][^\s\w{]/,relevance:0}]},i=[e.BACKSLASH_ESCAPE,t,r],a=[r,e.HASH_COMMENT_MODE,e.COMMENT("^\\=\\w","\\=cut",{endsWithParent:!0}),s,{className:"string",contains:i,variants:[{begin:"q[qwxr]?\\s*\\(",end:"\\)",relevance:5},{begin:"q[qwxr]?\\s*\\[",end:"\\]",relevance:5},{begin:"q[qwxr]?\\s*\\{",end:"\\}",relevance:5},{begin:"q[qwxr]?\\s*\\|",end:"\\|",relevance:5},{begin:"q[qwxr]?\\s*\\<",end:"\\>",relevance:5},{begin:"qw\\s+q",end:"q",relevance:5},{begin:"'",end:"'",contains:[e.BACKSLASH_ESCAPE]},{begin:'"',end:'"'},{begin:"`",end:"`",contains:[e.BACKSLASH_ESCAPE]},{begin:"{\\w+}",contains:[],relevance:0},{begin:"-?\\w+\\s*\\=\\>",contains:[],relevance:0}]},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\/\\/|"+e.RE_STARTERS_RE+"|\\b(split|return|print|reverse|grep)\\b)\\s*",keywords:"split return print reverse grep",relevance:0,contains:[e.HASH_COMMENT_MODE,{className:"regexp",begin:"(s|tr|y)/(\\\\.|[^/])*/(\\\\.|[^/])*/[a-z]*",relevance:10},{className:"regexp",begin:"(m|qr)?/",end:"/[a-z]*",contains:[e.BACKSLASH_ESCAPE],relevance:0}]},{className:"function",beginKeywords:"sub",end:"(\\s*\\(.*?\\))?[;{]",excludeEnd:!0,relevance:5,contains:[e.TITLE_MODE]},{begin:"-\\w\\b",relevance:0},{begin:"^__DATA__$",end:"^__END__$",subLanguage:"mojolicious",contains:[{begin:"^@@.*",end:"$",className:"comment"}]}];return t.contains=a,s.contains=a,{name:"Perl",aliases:["pl","pm"],keywords:n,contains:a}}}());hljs.registerLanguage("plaintext",function(){"use strict";return function(t){return{name:"Plain text",aliases:["text","txt"],disableAutodetect:!0}}}());hljs.registerLanguage("ini",function(){"use strict";function e(e){return e?"string"==typeof e?e:e.source:null}function n(...n){return n.map(n=>e(n)).join("")}return function(a){var s={className:"number",relevance:0,variants:[{begin:/([\+\-]+)?[\d]+_[\d_]+/},{begin:a.NUMBER_RE}]},i=a.COMMENT();i.variants=[{begin:/;/,end:/$/},{begin:/#/,end:/$/}];var t={className:"variable",variants:[{begin:/\$[\w\d"][\w\d_]*/},{begin:/\$\{(.*?)}/}]},r={className:"literal",begin:/\bon|off|true|false|yes|no\b/},l={className:"string",contains:[a.BACKSLASH_ESCAPE],variants:[{begin:"'''",end:"'''",relevance:10},{begin:'"""',end:'"""',relevance:10},{begin:'"',end:'"'},{begin:"'",end:"'"}]},c={begin:/\[/,end:/\]/,contains:[i,r,t,l,s,"self"],relevance:0},g="("+[/[A-Za-z0-9_-]+/,/"(\\"|[^"])*"/,/'[^']*'/].map(n=>e(n)).join("|")+")";return{name:"TOML, also INI",aliases:["toml"],case_insensitive:!0,illegal:/\S/,contains:[i,{className:"section",begin:/\[+/,end:/\]+/},{begin:n(g,"(\\s*\\.\\s*",g,")*",n("(?=",/\s*=\s*[^#\s]/,")")),className:"attr",starts:{end:/$/,contains:[i,c,r,t,l,s]}}]}}}());hljs.registerLanguage("json",function(){"use strict";return function(n){var e={literal:"true false null"},i=[n.C_LINE_COMMENT_MODE,n.C_BLOCK_COMMENT_MODE],t=[n.QUOTE_STRING_MODE,n.C_NUMBER_MODE],a={end:",",endsWithParent:!0,excludeEnd:!0,contains:t,keywords:e},l={begin:"{",end:"}",contains:[{className:"attr",begin:/"/,end:/"/,contains:[n.BACKSLASH_ESCAPE],illegal:"\\n"},n.inherit(a,{begin:/:/})].concat(i),illegal:"\\S"},s={begin:"\\[",end:"\\]",contains:[n.inherit(a)],illegal:"\\S"};return t.push(l,s),i.forEach((function(n){t.push(n)})),{name:"JSON",contains:t,keywords:e,illegal:"\\S"}}}());hljs.registerLanguage("ruby",function(){"use strict";return function(e){var n="[a-zA-Z_]\\w*[!?=]?|[-+~]\\@|<<|>>|=~|===?|<=>|[<>]=?|\\*\\*|[-/+%^&*~`|]|\\[\\]=?",a={keyword:"and then defined module in return redo if BEGIN retry end for self when next until do begin unless END rescue else break undef not super class case require yield alias while ensure elsif or include attr_reader attr_writer attr_accessor",literal:"true false nil"},s={className:"doctag",begin:"@[A-Za-z]+"},i={begin:"#<",end:">"},r=[e.COMMENT("#","$",{contains:[s]}),e.COMMENT("^\\=begin","^\\=end",{contains:[s],relevance:10}),e.COMMENT("^__END__","\\n$")],c={className:"subst",begin:"#\\{",end:"}",keywords:a},t={className:"string",contains:[e.BACKSLASH_ESCAPE,c],variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/`/,end:/`/},{begin:"%[qQwWx]?\\(",end:"\\)"},{begin:"%[qQwWx]?\\[",end:"\\]"},{begin:"%[qQwWx]?{",end:"}"},{begin:"%[qQwWx]?<",end:">"},{begin:"%[qQwWx]?/",end:"/"},{begin:"%[qQwWx]?%",end:"%"},{begin:"%[qQwWx]?-",end:"-"},{begin:"%[qQwWx]?\\|",end:"\\|"},{begin:/\B\?(\\\d{1,3}|\\x[A-Fa-f0-9]{1,2}|\\u[A-Fa-f0-9]{4}|\\?\S)\b/},{begin:/<<[-~]?'?(\w+)(?:.|\n)*?\n\s*\1\b/,returnBegin:!0,contains:[{begin:/<<[-~]?'?/},e.END_SAME_AS_BEGIN({begin:/(\w+)/,end:/(\w+)/,contains:[e.BACKSLASH_ESCAPE,c]})]}]},b={className:"params",begin:"\\(",end:"\\)",endsParent:!0,keywords:a},d=[t,i,{className:"class",beginKeywords:"class module",end:"$|;",illegal:/=/,contains:[e.inherit(e.TITLE_MODE,{begin:"[A-Za-z_]\\w*(::\\w+)*(\\?|\\!)?"}),{begin:"<\\s*",contains:[{begin:"("+e.IDENT_RE+"::)?"+e.IDENT_RE}]}].concat(r)},{className:"function",beginKeywords:"def",end:"$|;",contains:[e.inherit(e.TITLE_MODE,{begin:n}),b].concat(r)},{begin:e.IDENT_RE+"::"},{className:"symbol",begin:e.UNDERSCORE_IDENT_RE+"(\\!|\\?)?:",relevance:0},{className:"symbol",begin:":(?!\\s)",contains:[t,{begin:n}],relevance:0},{className:"number",begin:"(\\b0[0-7_]+)|(\\b0x[0-9a-fA-F_]+)|(\\b[1-9][0-9_]*(\\.[0-9_]+)?)|[0_]\\b",relevance:0},{begin:"(\\$\\W)|((\\$|\\@\\@?)(\\w+))"},{className:"params",begin:/\|/,end:/\|/,keywords:a},{begin:"("+e.RE_STARTERS_RE+"|unless)\\s*",keywords:"unless",contains:[i,{className:"regexp",contains:[e.BACKSLASH_ESCAPE,c],illegal:/\n/,variants:[{begin:"/",end:"/[a-z]*"},{begin:"%r{",end:"}[a-z]*"},{begin:"%r\\(",end:"\\)[a-z]*"},{begin:"%r!",end:"![a-z]*"},{begin:"%r\\[",end:"\\][a-z]*"}]}].concat(r),relevance:0}].concat(r);c.contains=d,b.contains=d;var g=[{begin:/^\s*=>/,starts:{end:"$",contains:d}},{className:"meta",begin:"^([>?]>|[\\w#]+\\(\\w+\\):\\d+:\\d+>|(\\w+-)?\\d+\\.\\d+\\.\\d(p\\d+)?[^>]+>)",starts:{end:"$",contains:d}}];return{name:"Ruby",aliases:["rb","gemspec","podspec","thor","irb"],keywords:a,illegal:/\/\*/,contains:r.concat(g).concat(d)}}}());hljs.registerLanguage("yaml",function(){"use strict";return function(e){var n="true false yes no null",a="[\\w#;/?:@&=+$,.~*\\'()[\\]]+",s={className:"string",relevance:0,variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/\S+/}],contains:[e.BACKSLASH_ESCAPE,{className:"template-variable",variants:[{begin:"{{",end:"}}"},{begin:"%{",end:"}"}]}]},i=e.inherit(s,{variants:[{begin:/'/,end:/'/},{begin:/"/,end:/"/},{begin:/[^\s,{}[\]]+/}]}),l={end:",",endsWithParent:!0,excludeEnd:!0,contains:[],keywords:n,relevance:0},t={begin:"{",end:"}",contains:[l],illegal:"\\n",relevance:0},g={begin:"\\[",end:"\\]",contains:[l],illegal:"\\n",relevance:0},b=[{className:"attr",variants:[{begin:"\\w[\\w :\\/.-]*:(?=[ \t]|$)"},{begin:'"\\w[\\w :\\/.-]*":(?=[ \t]|$)'},{begin:"'\\w[\\w :\\/.-]*':(?=[ \t]|$)"}]},{className:"meta",begin:"^---s*$",relevance:10},{className:"string",begin:"[\\|>]([0-9]?[+-])?[ ]*\\n( *)[\\S ]+\\n(\\2[\\S ]+\\n?)*"},{begin:"<%[%=-]?",end:"[%-]?%>",subLanguage:"ruby",excludeBegin:!0,excludeEnd:!0,relevance:0},{className:"type",begin:"!\\w+!"+a},{className:"type",begin:"!<"+a+">"},{className:"type",begin:"!"+a},{className:"type",begin:"!!"+a},{className:"meta",begin:"&"+e.UNDERSCORE_IDENT_RE+"$"},{className:"meta",begin:"\\*"+e.UNDERSCORE_IDENT_RE+"$"},{className:"bullet",begin:"\\-(?=[ ]|$)",relevance:0},e.HASH_COMMENT_MODE,{beginKeywords:n,keywords:{literal:n}},{className:"number",begin:"\\b[0-9]{4}(-[0-9][0-9]){0,2}([Tt \\t][0-9][0-9]?(:[0-9][0-9]){2})?(\\.[0-9]*)?([ \\t])*(Z|[-+][0-9][0-9]?(:[0-9][0-9])?)?\\b"},{className:"number",begin:e.C_NUMBER_RE+"\\b"},t,g,s],c=[...b];return c.pop(),c.push(i),l.contains=c,{name:"YAML",case_insensitive:!0,aliases:["yml","YAML"],contains:b}}}());hljs.registerLanguage("haskell",function(){"use strict";return function(e){var n={variants:[e.COMMENT("--","$"),e.COMMENT("{-","-}",{contains:["self"]})]},i={className:"meta",begin:"{-#",end:"#-}"},a={className:"meta",begin:"^#",end:"$"},s={className:"type",begin:"\\b[A-Z][\\w']*",relevance:0},l={begin:"\\(",end:"\\)",illegal:'"',contains:[i,a,{className:"type",begin:"\\b[A-Z][\\w]*(\\((\\.\\.|,|\\w+)\\))?"},e.inherit(e.TITLE_MODE,{begin:"[_a-z][\\w']*"}),n]};return{name:"Haskell",aliases:["hs"],keywords:"let in if then else case of where do module import hiding qualified type data newtype deriving class instance as default infix infixl infixr foreign export ccall stdcall cplusplus jvm dotnet safe unsafe family forall mdo proc rec",contains:[{beginKeywords:"module",end:"where",keywords:"module where",contains:[l,n],illegal:"\\W\\.|;"},{begin:"\\bimport\\b",end:"$",keywords:"import qualified as hiding",contains:[l,n],illegal:"\\W\\.|;"},{className:"class",begin:"^(\\s*)?(class|instance)\\b",end:"where",keywords:"class family instance where",contains:[s,l,n]},{className:"class",begin:"\\b(data|(new)?type)\\b",end:"$",keywords:"data family type newtype deriving",contains:[i,s,l,{begin:"{",end:"}",contains:l.contains},n]},{beginKeywords:"default",end:"$",contains:[s,l,n]},{beginKeywords:"infix infixl infixr",end:"$",contains:[e.C_NUMBER_MODE,n]},{begin:"\\bforeign\\b",end:"$",keywords:"foreign import export ccall stdcall cplusplus jvm dotnet safe unsafe",contains:[s,e.QUOTE_STRING_MODE,n]},{className:"meta",begin:"#!\\/usr\\/bin\\/env runhaskell",end:"$"},i,a,e.QUOTE_STRING_MODE,e.C_NUMBER_MODE,s,e.inherit(e.TITLE_MODE,{begin:"^[_a-z][\\w']*"}),n,{begin:"->|<-"}]}}}());hljs.registerLanguage("nix",function(){"use strict";return function(e){var n={keyword:"rec with let in inherit assert if else then",literal:"true false or and null",built_in:"import abort baseNameOf dirOf isNull builtins map removeAttrs throw toString derivation"},i={className:"subst",begin:/\$\{/,end:/}/,keywords:n},t={className:"string",contains:[i],variants:[{begin:"''",end:"''"},{begin:'"',end:'"'}]},s=[e.NUMBER_MODE,e.HASH_COMMENT_MODE,e.C_BLOCK_COMMENT_MODE,t,{begin:/[a-zA-Z0-9-_]+(\s*=)/,returnBegin:!0,relevance:0,contains:[{className:"attr",begin:/\S+/}]}];return i.contains=s,{name:"Nix",aliases:["nixos"],keywords:n,contains:s}}}());hljs.registerLanguage("bash",function(){"use strict";return function(e){const s={};Object.assign(s,{className:"variable",variants:[{begin:/\$[\w\d#@][\w\d_]*/},{begin:/\$\{/,end:/\}/,contains:[{begin:/:-/,contains:[s]}]}]});const t={className:"subst",begin:/\$\(/,end:/\)/,contains:[e.BACKSLASH_ESCAPE]},n={className:"string",begin:/"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,t]};t.contains.push(n);const a={begin:/\$\(\(/,end:/\)\)/,contains:[{begin:/\d+#[0-9a-f]+/,className:"number"},e.NUMBER_MODE,s]},i=e.SHEBANG({binary:"(fish|bash|zsh|sh|csh|ksh|tcsh|dash|scsh)",relevance:10}),c={className:"function",begin:/\w[\w\d_]*\s*\(\s*\)\s*\{/,returnBegin:!0,contains:[e.inherit(e.TITLE_MODE,{begin:/\w[\w\d_]*/})],relevance:0};return{name:"Bash",aliases:["sh","zsh"],keywords:{$pattern:/\b-?[a-z\._]+\b/,keyword:"if then else elif fi for while in do done case esac function",literal:"true false",built_in:"break cd continue eval exec exit export getopts hash pwd readonly return shift test times trap umask unset alias bind builtin caller command declare echo enable help let local logout mapfile printf read readarray source type typeset ulimit unalias set shopt autoload bg bindkey bye cap chdir clone comparguments compcall compctl compdescribe compfiles compgroups compquote comptags comptry compvalues dirs disable disown echotc echoti emulate fc fg float functions getcap getln history integer jobs kill limit log noglob popd print pushd pushln rehash sched setcap setopt stat suspend ttyctl unfunction unhash unlimit unsetopt vared wait whence where which zcompile zformat zftp zle zmodload zparseopts zprof zpty zregexparse zsocket zstyle ztcp",_:"-ne -eq -lt -gt -f -d -e -s -l -a"},contains:[i,e.SHEBANG(),c,a,e.HASH_COMMENT_MODE,n,{className:"",begin:/\\"/},{className:"string",begin:/'/,end:/'/},s]}}}());hljs.registerLanguage("shell",function(){"use strict";return function(s){return{name:"Shell Session",aliases:["console"],contains:[{className:"meta",begin:"^\\s{0,3}[/\\w\\d\\[\\]()@-]*[>%$#]",starts:{end:"$",subLanguage:"bash"}}]}}}());hljs.registerLanguage("python",function(){"use strict";return function(e){var n={keyword:"and elif is global as in if from raise for except finally print import pass return exec else break not with class assert yield try while continue del or def lambda async await nonlocal|10",built_in:"Ellipsis NotImplemented",literal:"False None True"},a={className:"meta",begin:/^(>>>|\.\.\.) /},i={className:"subst",begin:/\{/,end:/\}/,keywords:n,illegal:/#/},s={begin:/\{\{/,relevance:0},r={className:"string",contains:[e.BACKSLASH_ESCAPE],variants:[{begin:/(u|b)?r?'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(u|b)?r?"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a],relevance:10},{begin:/(fr|rf|f)'''/,end:/'''/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(fr|rf|f)"""/,end:/"""/,contains:[e.BACKSLASH_ESCAPE,a,s,i]},{begin:/(u|r|ur)'/,end:/'/,relevance:10},{begin:/(u|r|ur)"/,end:/"/,relevance:10},{begin:/(b|br)'/,end:/'/},{begin:/(b|br)"/,end:/"/},{begin:/(fr|rf|f)'/,end:/'/,contains:[e.BACKSLASH_ESCAPE,s,i]},{begin:/(fr|rf|f)"/,end:/"/,contains:[e.BACKSLASH_ESCAPE,s,i]},e.APOS_STRING_MODE,e.QUOTE_STRING_MODE]},l={className:"number",relevance:0,variants:[{begin:e.BINARY_NUMBER_RE+"[lLjJ]?"},{begin:"\\b(0o[0-7]+)[lLjJ]?"},{begin:e.C_NUMBER_RE+"[lLjJ]?"}]},t={className:"params",variants:[{begin:/\(\s*\)/,skip:!0,className:null},{begin:/\(/,end:/\)/,excludeBegin:!0,excludeEnd:!0,contains:["self",a,l,r,e.HASH_COMMENT_MODE]}]};return i.contains=[r,l,a],{name:"Python",aliases:["py","gyp","ipython"],keywords:n,illegal:/(<\/|->|\?)|=>/,contains:[a,l,{beginKeywords:"if",relevance:0},r,e.HASH_COMMENT_MODE,{variants:[{className:"function",beginKeywords:"def"},{className:"class",beginKeywords:"class"}],end:/:/,illegal:/[${=;\n,]/,contains:[e.UNDERSCORE_TITLE_MODE,t,{begin:/->/,endsWithParent:!0,keywords:"None"}]},{className:"meta",begin:/^[\t ]*@/,end:/$/},{begin:/\b(print|exec)\(/}]}}}());
\ No newline at end of file
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 2d730a60e..c9104ad7e 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -29,5 +29,6 @@ install: $(docdir)/manual/index.html
 
 $(docdir)/manual/index.html: $(MANUAL_SRCS)
 	$(trace-gen) mdbook build doc/manual -d $(docdir)/manual
+	@cp doc/manual/highlight.pack.js $(docdir)/manual/highlight.js
 
 endif
diff --git a/doc/manual/src/advanced-topics/diff-hook.md b/doc/manual/src/advanced-topics/diff-hook.md
index e2234147f..7a2622b3d 100644
--- a/doc/manual/src/advanced-topics/diff-hook.md
+++ b/doc/manual/src/advanced-topics/diff-hook.md
@@ -7,17 +7,19 @@ for determining if the results are the same.
 For purposes of demonstration, we'll use the following Nix file,
 `deterministic.nix` for testing:
 
-    let
-      inherit (import <nixpkgs> {}) runCommand;
-    in {
-      stable = runCommand "stable" {} ''
-        touch $out
-      '';
-    
-      unstable = runCommand "unstable" {} ''
-        echo $RANDOM > $out
-      '';
-    }
+```nix
+let
+  inherit (import <nixpkgs> {}) runCommand;
+in {
+  stable = runCommand "stable" {} ''
+    touch $out
+  '';
+
+  unstable = runCommand "unstable" {} ''
+    echo $RANDOM > $out
+  '';
+}
+```
 
 Additionally, `nix.conf` contains:
 
@@ -26,10 +28,12 @@ Additionally, `nix.conf` contains:
 
 where `/etc/nix/my-diff-hook` is an executable file containing:
 
-    #!/bin/sh
-    exec >&2
-    echo "For derivation $3:"
-    /run/current-system/sw/bin/diff -r "$1" "$2"
+```bash
+#!/bin/sh
+exec >&2
+echo "For derivation $3:"
+/run/current-system/sw/bin/diff -r "$1" "$2"
+```
 
 The diff hook is executed by the same user and group who ran the build.
 However, the diff hook does not have write access to the store path just
@@ -43,44 +47,55 @@ to the build command.
 If the build passes and is deterministic, Nix will exit with a status
 code of 0:
 
-    $ nix-build ./deterministic.nix -A stable
-    this derivation will be built:
-      /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv
-    building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
-    /nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
-    
-    $ nix-build ./deterministic.nix -A stable --check
-    checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
-    /nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
+```console
+$ nix-build ./deterministic.nix -A stable
+this derivation will be built:
+  /nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv
+building '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
+/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
+
+$ nix-build ./deterministic.nix -A stable --check
+checking outputs of '/nix/store/z98fasz2jqy9gs0xbvdj939p27jwda38-stable.drv'...
+/nix/store/yyxlzw3vqaas7wfp04g0b1xg51f2czgq-stable
+```
 
 If the build is not deterministic, Nix will exit with a status code of
 1:
 
-    $ nix-build ./deterministic.nix -A unstable
-    this derivation will be built:
-      /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv
-    building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-    /nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable
-    
-    $ nix-build ./deterministic.nix -A unstable --check
-    checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-    error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
+```console
+$ nix-build ./deterministic.nix -A unstable
+this derivation will be built:
+  /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv
+building '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable
+
+$ nix-build ./deterministic.nix -A unstable --check
+checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may
+not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
+```
 
 In the Nix daemon's log, we will now see:
 
-    For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
-    1c1
-    < 8108
-    ---
-    > 30204
+```
+For derivation /nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv:
+1c1
+< 8108
+---
+> 30204
+```
 
 Using `--check` with `--keep-failed` will cause Nix to keep the second
 build's output in a special, `.check` path:
 
-    $ nix-build ./deterministic.nix -A unstable --check --keep-failed
-    checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
-    note: keeping build directory '/tmp/nix-build-unstable.drv-0'
-    error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check'
+```console
+$ nix-build ./deterministic.nix -A unstable --check --keep-failed
+checking outputs of '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv'...
+note: keeping build directory '/tmp/nix-build-unstable.drv-0'
+error: derivation '/nix/store/cgl13lbj1w368r5z8gywipl1ifli7dhk-unstable.drv' may
+not be deterministic: output '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable' differs
+from '/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check'
+```
 
 In particular, notice the
 `/nix/store/krpqk0l9ib0ibi1d2w52z293zw455cap-unstable.check` output. Nix
@@ -102,7 +117,8 @@ has copied the build results to that directory where you can examine it.
 already. If the derivation has not been built Nix will fail with the
 error:
 
-    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' are not valid, so checking is not possible
+    error: some outputs of '/nix/store/hzi1h60z2qf0nb85iwnpvrai3j2w7rr6-unstable.drv' 
+    are not valid, so checking is not possible
 
 Run the build without `--check`, and then try with `--check` again.
 
@@ -130,10 +146,12 @@ reproducibly:
 
 An example output of this configuration:
 
-    $ nix-build ./test.nix -A unstable
-    this derivation will be built:
-      /nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv
-    building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 1/2)...
-    building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 2/2)...
-    output '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable' of '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' differs from '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable.check' from previous round
-    /nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable
+```console
+$ nix-build ./test.nix -A unstable
+this derivation will be built:
+  /nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv
+building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 1/2)...
+building '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' (round 2/2)...
+output '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable' of '/nix/store/ch6llwpr2h8c3jmnf3f2ghkhx59aa97f-unstable.drv' differs from '/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable.check' from previous round
+/nix/store/6xg356v9gl03hpbbg8gws77n19qanh02-unstable
+```
diff --git a/doc/manual/src/advanced-topics/distributed-builds.md b/doc/manual/src/advanced-topics/distributed-builds.md
index 76a5380bf..c6966a50b 100644
--- a/doc/manual/src/advanced-topics/distributed-builds.md
+++ b/doc/manual/src/advanced-topics/distributed-builds.md
@@ -11,12 +11,16 @@ To forward a build to a remote machine, it’s required that the remote
 machine is accessible via SSH and that it has Nix installed. You can
 test whether connecting to the remote Nix instance works, e.g.
 
-    $ nix ping-store --store ssh://mac
+```console
+$ nix ping-store --store ssh://mac
+```
 
 will try to connect to the machine named `mac`. It is possible to
 specify an SSH identity file as part of the remote store URI, e.g.
 
-    $ nix ping-store --store ssh://mac?ssh-key=/home/alice/my-key
+```console
+$ nix ping-store --store ssh://mac?ssh-key=/home/alice/my-key
+```
 
 Since builds should be non-interactive, the key should not have a
 passphrase. Alternatively, you can load identities ahead of time into
@@ -24,8 +28,10 @@ passphrase. Alternatively, you can load identities ahead of time into
 
 If you get the error
 
-    bash: nix-store: command not found
-    error: cannot connect to 'mac'
+```console
+bash: nix-store: command not found
+error: cannot connect to 'mac'
+```
 
 then you need to ensure that the `PATH` of non-interactive login shells
 contains Nix.
@@ -43,21 +49,23 @@ the Nix configuration file. The former is convenient for testing. For
 example, the following command allows you to build a derivation for
 `x86_64-darwin` on a Linux machine:
 
-    $ uname
-    Linux
+```console
+$ uname
+Linux
     
-    $ nix build \
-      '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
-      --builders 'ssh://mac x86_64-darwin'
-    [1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
-    
-    $ cat ./result
-    Darwin
+$ nix build \
+  '(with import <nixpkgs> { system = "x86_64-darwin"; }; runCommand "foo" {} "uname > $out")' \
+  --builders 'ssh://mac x86_64-darwin'
+[1/0/1 built, 0.0 MiB DL] building foo on ssh://mac
+
+$ cat ./result
+Darwin
+```
 
 It is possible to specify multiple builders separated by a semicolon or
 a newline, e.g.
 
-``` 
+```console
   --builders 'ssh://mac x86_64-darwin ; ssh://beastie x86_64-freebsd'
 ```
 
@@ -91,8 +99,10 @@ default, set it to `-`.
     the `requiredSystemFeatures` attribute, then Nix will only perform
     the derivation on a machine that has the specified features. For
     instance, the attribute
-    
-        requiredSystemFeatures = [ "kvm" ];
+
+    ```nix
+    requiredSystemFeatures = [ "kvm" ];
+    ```
     
     will cause the build to be performed on a machine that has the `kvm`
     feature.
@@ -111,11 +121,15 @@ For example, the machine specification
 specifies several machines that can perform `i686-linux` builds.
 However, `poochie` will only do builds that have the attribute
 
-    requiredSystemFeatures = [ "benchmark" ];
+```nix
+requiredSystemFeatures = [ "benchmark" ];
+```
 
 or
 
-    requiredSystemFeatures = [ "benchmark" "kvm" ];
+```nix
+requiredSystemFeatures = [ "benchmark" "kvm" ];
+```
 
 `itchy` cannot do builds that require `kvm`, but `scratchy` does support
 such builds. For regular builds, `itchy` will be preferred over
diff --git a/doc/manual/src/advanced-topics/post-build-hook.md b/doc/manual/src/advanced-topics/post-build-hook.md
index 7b3ae58fb..bbdabed41 100644
--- a/doc/manual/src/advanced-topics/post-build-hook.md
+++ b/doc/manual/src/advanced-topics/post-build-hook.md
@@ -27,9 +27,11 @@ Use `nix-store --generate-binary-cache-key` to create our public and
 private signing keys. We will sign paths with the private key, and
 distribute the public key for verifying the authenticity of the paths.
 
-    # nix-store --generate-binary-cache-key example-nix-cache-1 /etc/nix/key.private /etc/nix/key.public
-    # cat /etc/nix/key.public
-    example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
+```console
+# nix-store --generate-binary-cache-key example-nix-cache-1 /etc/nix/key.private /etc/nix/key.public
+# cat /etc/nix/key.public
+example-nix-cache-1:1/cKDz3QCCOmwcztD2eV6Coggp6rqc9DGjWv7C0G+rM=
+```
 
 Then, add the public key and the cache URL to your `nix.conf`'s
 `trusted-public-keys` and `substituters` options:
@@ -43,16 +45,18 @@ We will restart the Nix daemon in a later step.
 
 Write the following script to `/etc/nix/upload-to-cache.sh`:
 
-    #!/bin/sh
-    
-    set -eu
-    set -f # disable globbing
-    export IFS=' '
-    
-    echo "Signing paths" $OUT_PATHS
-    nix sign-paths --key-file /etc/nix/key.private $OUT_PATHS
-    echo "Uploading paths" $OUT_PATHS
-    exec nix copy --to 's3://example-nix-cache' $OUT_PATHS
+```bash
+#!/bin/sh
+
+set -eu
+set -f # disable globbing
+export IFS=' '
+
+echo "Signing paths" $OUT_PATHS
+nix sign-paths --key-file /etc/nix/key.private $OUT_PATHS
+echo "Uploading paths" $OUT_PATHS
+exec nix copy --to 's3://example-nix-cache' $OUT_PATHS
+```
 
 > **Note**
 > 
@@ -65,7 +69,9 @@ Write the following script to `/etc/nix/upload-to-cache.sh`:
 
 Then make sure the hook program is executable by the `root` user:
 
-    # chmod +x /etc/nix/upload-to-cache.sh
+```console
+# chmod +x /etc/nix/upload-to-cache.sh
+```
 
 # Updating Nix Configuration
 
@@ -80,27 +86,33 @@ Then, restart the `nix-daemon`.
 
 Build any derivation, for example:
 
-    $ nix-build -E '(import <nixpkgs> {}).writeText "example" (builtins.toString builtins.currentTime)'
-    this derivation will be built:
-      /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv
-    building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv'...
-    running post-build-hook '/home/grahamc/projects/github.com/NixOS/nix/post-hook.sh'...
-    post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-    post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-    /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+```console
+$ nix-build -E '(import <nixpkgs> {}).writeText "example" (builtins.toString builtins.currentTime)'
+this derivation will be built:
+  /nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv
+building '/nix/store/s4pnfbkalzy5qz57qs6yybna8wylkig6-example.drv'...
+running post-build-hook '/home/grahamc/projects/github.com/NixOS/nix/post-hook.sh'...
+post-build-hook: Signing paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+post-build-hook: Uploading paths /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+/nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+```
 
 Then delete the path from the store, and try substituting it from the
 binary cache:
 
-    $ rm ./result
-    $ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+```console
+$ rm ./result
+$ nix-store --delete /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+```
 
 Now, copy the path back from the cache:
 
-    $ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
-    copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example from 's3://example-nix-cache'...
-    warning: you did not specify '--add-root'; the result might be removed by the garbage collector
-    /nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example
+```console
+$ nix-store --realise /nix/store/ibcyipq5gf91838ldx40mjsp0b8w9n18-example
+copying path '/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example from 's3://example-nix-cache'...
+warning: you did not specify '--add-root'; the result might be removed by the garbage collector
+/nix/store/m8bmqwrch6l3h8s0k3d673xpmipcdpsa-example
+```
 
 # Conclusion
 
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
index 306ad23f5..028b15c9f 100644
--- a/doc/manual/src/command-ref/conf-file.md
+++ b/doc/manual/src/command-ref/conf-file.md
@@ -70,11 +70,11 @@ The following settings are currently available:
     Note that trusted users are always allowed to connect.
 
   - `auto-optimise-store`  
-    If set to `true`, Nix automatically detects files in the store that
-    have identical contents, and replaces them with hard links to a
-    single copy. This saves disk space. If set to `false` (the default),
-    you can still run `nix-store
-                    --optimise` to get rid of duplicate files.
+    If set to `true`, Nix automatically detects files in the store
+    that have identical contents, and replaces them with hard links to
+    a single copy. This saves disk space. If set to `false` (the
+    default), you can still run `nix-store --optimise` to get rid of
+    duplicate files.
 
   - `builders`  
     A list of machines on which to perform builds.
@@ -214,11 +214,13 @@ The following settings are currently available:
     they have disappeared from their original URI. For example, given
     the default mirror `http://tarballs.nixos.org/`, when building the
     derivation
-    
-        builtins.fetchurl {
-          url = "https://example.org/foo-1.2.3.tar.xz";
-          sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
-        }
+
+    ```nix
+    builtins.fetchurl {
+      url = "https://example.org/foo-1.2.3.tar.xz";
+      sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
+    }
+    ```
     
     Nix will attempt to download this file from
     `http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae`
@@ -233,8 +235,7 @@ The following settings are currently available:
     If set to `true` (the default), Nix will write the build log of a
     derivation (i.e. the standard output and error of its builder) to
     the directory `/nix/var/log/nix/drvs`. The build log can be
-    retrieved using the command `nix-store -l
-                    path`.
+    retrieved using the command `nix-store -l path`.
 
   - `keep-derivations`  
     If `true` (default), the garbage collector will keep the derivations
@@ -504,10 +505,9 @@ The following settings are currently available:
   - `secret-key-files`  
     A whitespace-separated list of files containing secret (private)
     keys. These are used to sign locally-built paths. They can be
-    generated using `nix-store
-                    --generate-binary-cache-key`. The corresponding public key can be
-    distributed to other users, who can add it to `trusted-public-keys`
-    in their `nix.conf`.
+    generated using `nix-store --generate-binary-cache-key`. The
+    corresponding public key can be distributed to other users, who
+    can add it to `trusted-public-keys` in their `nix.conf`.
 
   - `show-trace`  
     Causes Nix to print out a stack trace in case of Nix expression
@@ -601,18 +601,17 @@ The following settings are currently available:
 
   - `trusted-public-keys`  
     A whitespace-separated list of public keys. When paths are copied
-    from another Nix store (such as a binary cache), they must be signed
-    with one of these keys. For example:
+    from another Nix store (such as a binary cache), they must be
+    signed with one of these keys. For example:
     `cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-                    hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=`.
+    hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=`.
 
   - `trusted-substituters`  
     A list of URLs of substituters, separated by whitespace. These are
     not used by default, but can be enabled by users of the Nix daemon
-    by specifying `--option
-                    substituters urls` on the command line. Unprivileged users are only
-    allowed to pass a subset of the URLs listed in `substituters` and
-    `trusted-substituters`.
+    by specifying `--option substituters urls` on the command
+    line. Unprivileged users are only allowed to pass a subset of the
+    URLs listed in `substituters` and `trusted-substituters`.
 
   - `trusted-users`  
     A list of names of users (separated by whitespace) that have
diff --git a/doc/manual/src/command-ref/env-common.md b/doc/manual/src/command-ref/env-common.md
index e5fd45a7f..03016dba7 100644
--- a/doc/manual/src/command-ref/env-common.md
+++ b/doc/manual/src/command-ref/env-common.md
@@ -54,9 +54,11 @@ Most Nix commands interpret the following environment variables:
     Note that if you’re symlinking the Nix store so that you can put it
     on another file system than the root file system, on Linux you’re
     better off using `bind` mount points, e.g.,
-    
-        $ mkdir /nix
-        $ mount -o bind /mnt/otherdisk/nix /nix
+
+    ```console
+    $ mkdir /nix
+    $ mount -o bind /mnt/otherdisk/nix /nix
+    ```
     
     Consult the mount 8 manual page for details.
 
diff --git a/doc/manual/src/command-ref/nix-build.md b/doc/manual/src/command-ref/nix-build.md
index 026495c8d..4bcb8db40 100644
--- a/doc/manual/src/command-ref/nix-build.md
+++ b/doc/manual/src/command-ref/nix-build.md
@@ -66,20 +66,24 @@ The following common options are supported:
 
 # Examples
 
-    $ nix-build '<nixpkgs>' -A firefox
-    store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
-    /nix/store/d18hyl92g30l...-firefox-1.5.0.7
+```console
+$ nix-build '<nixpkgs>' -A firefox
+store derivation is /nix/store/qybprl8sz2lc...-firefox-1.5.0.7.drv
+/nix/store/d18hyl92g30l...-firefox-1.5.0.7
 
-    $ ls -l result
-    lrwxrwxrwx  ...  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
+$ ls -l result
+lrwxrwxrwx  ...  result -> /nix/store/d18hyl92g30l...-firefox-1.5.0.7
 
-    $ ls ./result/bin/
-    firefox  firefox-config
+$ ls ./result/bin/
+firefox  firefox-config
+```
 
 If a derivation has multiple outputs, `nix-build` will build the default
 (first) output. You can also build all outputs:
 
-    $ nix-build '<nixpkgs>' -A openssl.all
+```console
+$ nix-build '<nixpkgs>' -A openssl.all
+```
 
 This will create a symlink for each output named `result-outputname`.
 The suffix is omitted if the output name is `out`. So if `openssl` has
@@ -87,19 +91,23 @@ outputs `out`, `bin` and `man`, `nix-build` will create symlinks
 `result`, `result-bin` and `result-man`. It’s also possible to build a
 specific output:
 
-    $ nix-build '<nixpkgs>' -A openssl.man
+```console
+$ nix-build '<nixpkgs>' -A openssl.man
+```
 
 This will create a symlink `result-man`.
 
 Build a Nix expression given on the command line:
 
-    $ nix-build -E 'with import <nixpkgs> { }; runCommand "foo" { } "echo bar > $out"'
-    $ cat ./result
-    bar
+```console
+$ nix-build -E 'with import <nixpkgs> { }; runCommand "foo" { } "echo bar > $out"'
+$ cat ./result
+bar
+```
 
 Build the GNU Hello package from the latest revision of the master
 branch of Nixpkgs:
 
-    $ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
-
-# Environment variables
+```console
+$ nix-build https://github.com/NixOS/nixpkgs/archive/master.tar.gz -A hello
+```
diff --git a/doc/manual/src/command-ref/nix-channel.md b/doc/manual/src/command-ref/nix-channel.md
index ea3a57e69..f0e205967 100644
--- a/doc/manual/src/command-ref/nix-channel.md
+++ b/doc/manual/src/command-ref/nix-channel.md
@@ -51,20 +51,24 @@ The list of subscribed channels is stored in `~/.nix-channels`.
 
 To subscribe to the Nixpkgs channel and install the GNU Hello package:
 
-    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-    $ nix-channel --update
-    $ nix-env -iA nixpkgs.hello
+```console
+$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+$ nix-channel --update
+$ nix-env -iA nixpkgs.hello
+```
 
 You can revert channel updates using `--rollback`:
 
-    $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
-    "14.04.527.0e935f1"
+```console
+$ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
+"14.04.527.0e935f1"
 
-    $ nix-channel --rollback
-    switching from generation 483 to 482
+$ nix-channel --rollback
+switching from generation 483 to 482
 
-    $ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
-    "14.04.526.dbadfad"
+$ nix-instantiate --eval -E '(import <nixpkgs> {}).lib.version'
+"14.04.526.dbadfad"
+```
 
 # Files
 
diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md
index 37587c7e1..62a6b7ca0 100644
--- a/doc/manual/src/command-ref/nix-collect-garbage.md
+++ b/doc/manual/src/command-ref/nix-collect-garbage.md
@@ -27,4 +27,6 @@ generations that were active at that point in time).
 To delete from the Nix store everything that is not used by the current
 generations of each profile, do
 
-    $ nix-collect-garbage -d
+```console
+$ nix-collect-garbage -d
+```
diff --git a/doc/manual/src/command-ref/nix-copy-closure.md b/doc/manual/src/command-ref/nix-copy-closure.md
index 2a4558324..5ce320af7 100644
--- a/doc/manual/src/command-ref/nix-copy-closure.md
+++ b/doc/manual/src/command-ref/nix-copy-closure.md
@@ -73,11 +73,15 @@ and second to send the dump of those paths.  If this bothers you, use
 
 Copy Firefox with all its dependencies to a remote machine:
 
-    $ nix-copy-closure --to alice@itchy.labs $(type -tP firefox)
+```console
+$ nix-copy-closure --to alice@itchy.labs $(type -tP firefox)
+```
 
 Copy Subversion from a remote machine and then install it into a user
 environment:
 
-    $ nix-copy-closure --from alice@itchy.labs \
-        /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
-    $ nix-env -i /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
+```console
+$ nix-copy-closure --from alice@itchy.labs \
+    /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
+$ nix-env -i /nix/store/0dj0503hjxy5mbwlafv1rsbdiyx1gkdy-subversion-1.4.4
+```
diff --git a/doc/manual/src/command-ref/nix-env.md b/doc/manual/src/command-ref/nix-env.md
index c5fcce316..ee838581b 100644
--- a/doc/manual/src/command-ref/nix-env.md
+++ b/doc/manual/src/command-ref/nix-env.md
@@ -127,10 +127,12 @@ have an effect.
     For example, if `~/.nix-defexpr` contains two files, `foo.nix` and
     `bar.nix`, then the default Nix expression will essentially be
 
-        {
-          foo = import ~/.nix-defexpr/foo.nix;
-          bar = import ~/.nix-defexpr/bar.nix;
-        }
+    ```nix
+    {
+      foo = import ~/.nix-defexpr/foo.nix;
+      bar = import ~/.nix-defexpr/bar.nix;
+    }
+    ```
 
     The file `manifest.nix` is always ignored. Subdirectories without a
     `default.nix` file are traversed recursively in search of more Nix
@@ -240,44 +242,60 @@ a number of possible ways:
 
 To install a specific version of `gcc` from the active Nix expression:
 
-    $ nix-env --install gcc-3.3.2
-    installing `gcc-3.3.2'
-    uninstalling `gcc-3.1'
+```console
+$ nix-env --install gcc-3.3.2
+installing `gcc-3.3.2'
+uninstalling `gcc-3.1'
+```
 
 Note the previously installed version is removed, since
 `--preserve-installed` was not specified.
 
 To install an arbitrary version:
 
-    $ nix-env --install gcc
-    installing `gcc-3.3.2'
+```console
+$ nix-env --install gcc
+installing `gcc-3.3.2'
+```
 
 To install using a specific attribute:
 
-    $ nix-env -i -A gcc40mips
-    $ nix-env -i -A xorg.xorgserver
+```console
+$ nix-env -i -A gcc40mips
+$ nix-env -i -A xorg.xorgserver
+```
 
 To install all derivations in the Nix expression `foo.nix`:
 
-    $ nix-env -f ~/foo.nix -i '.*'
+```console
+$ nix-env -f ~/foo.nix -i '.*'
+```
 
 To copy the store path with symbolic name `gcc` from another profile:
 
-    $ nix-env -i --from-profile /nix/var/nix/profiles/foo gcc
+```console
+$ nix-env -i --from-profile /nix/var/nix/profiles/foo gcc
+```
 
 To install a specific store derivation (typically created by
 `nix-instantiate`):
 
-    $ nix-env -i /nix/store/fibjb1bfbpm5mrsxc4mh2d8n37sxh91i-gcc-3.4.3.drv
+```console
+$ nix-env -i /nix/store/fibjb1bfbpm5mrsxc4mh2d8n37sxh91i-gcc-3.4.3.drv
+```
 
 To install a specific output path:
 
-    $ nix-env -i /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vk-gcc-3.4.3
+```console
+$ nix-env -i /nix/store/y3cgx0xj1p4iv9x0pnnmdhr8iyg741vk-gcc-3.4.3
+```
 
 To install from a Nix expression specified on the command-line:
 
-    $ nix-env -f ./foo.nix -i -E \
-        'f: (f {system = "i686-linux";}).subversionWithJava'
+```console
+$ nix-env -f ./foo.nix -i -E \
+    'f: (f {system = "i686-linux";}).subversionWithJava'
+```
 
 I.e., this evaluates to `(f: (f {system =
 "i686-linux";}).subversionWithJava) (import ./foo.nix)`, thus selecting
@@ -286,17 +304,21 @@ function defined in `./foo.nix`.
 
 A dry-run tells you which paths will be downloaded or built from source:
 
-    $ nix-env -f '<nixpkgs>' -iA hello --dry-run
-    (dry run; not doing anything)
-    installing ‘hello-2.10’
-    this path will be fetched (0.04 MiB download, 0.19 MiB unpacked):
-      /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10
-      ...
+```console
+$ nix-env -f '<nixpkgs>' -iA hello --dry-run
+(dry run; not doing anything)
+installing ‘hello-2.10’
+this path will be fetched (0.04 MiB download, 0.19 MiB unpacked):
+  /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10
+  ...
+```
 
 To install Firefox from the latest revision in the Nixpkgs/NixOS 14.12
 channel:
 
-    $ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA firefox
+```console
+$ nix-env -f https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz -iA firefox
+```
 
 # Operation `--upgrade`
 
@@ -353,18 +375,26 @@ For the other flags, see `--install`.
 
 ## Examples
 
-    $ nix-env --upgrade gcc
-    upgrading `gcc-3.3.1' to `gcc-3.4'
+```console
+$ nix-env --upgrade gcc
+upgrading `gcc-3.3.1' to `gcc-3.4'
+```
 
-    $ nix-env -u gcc-3.3.2 --always (switch to a specific version)
-    upgrading `gcc-3.4' to `gcc-3.3.2'
+```console
+$ nix-env -u gcc-3.3.2 --always (switch to a specific version)
+upgrading `gcc-3.4' to `gcc-3.3.2'
+```
 
-    $ nix-env --upgrade pan
-    (no upgrades available, so nothing happens)
+```console
+$ nix-env --upgrade pan
+(no upgrades available, so nothing happens)
+```
 
-    $ nix-env -u (try to upgrade everything)
-    upgrading `hello-2.1.2' to `hello-2.1.3'
-    upgrading `mozilla-1.2' to `mozilla-1.4'
+```console
+$ nix-env -u (try to upgrade everything)
+upgrading `hello-2.1.2' to `hello-2.1.3'
+upgrading `mozilla-1.2' to `mozilla-1.4'
+```
 
 ## Versions
 
@@ -416,8 +446,10 @@ designated by the symbolic names *drvnames* are removed.
 
 ## Examples
 
-    $ nix-env --uninstall gcc
-    $ nix-env -e '.*' (remove everything)
+```console
+$ nix-env --uninstall gcc
+$ nix-env -e '.*' (remove everything)
+```
 
 # Operation `--set`
 
@@ -435,7 +467,9 @@ that it contains exactly the specified derivation, and nothing else.
 The following updates a profile such that its current generation will
 contain just Firefox:
 
-    $ nix-env -p /nix/var/nix/profiles/browser --set firefox
+```console
+$ nix-env -p /nix/var/nix/profiles/browser --set firefox
+```
 
 # Operation `--set-flag`
 
@@ -473,37 +507,43 @@ environment build script:
 
 To prevent the currently installed Firefox from being upgraded:
 
-    $ nix-env --set-flag keep true firefox
+```console
+$ nix-env --set-flag keep true firefox
+```
 
 After this, `nix-env -u` will ignore Firefox.
 
 To disable the currently installed Firefox, then install a new Firefox
 while the old remains part of the profile:
 
-    $ nix-env -q
-    firefox-2.0.0.9 (the current one)
+```console
+$ nix-env -q
+firefox-2.0.0.9 (the current one)
 
-    $ nix-env --preserve-installed -i firefox-2.0.0.11
-    installing `firefox-2.0.0.11'
-    building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
-    collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox'
-      and `/nix/store/...-firefox-2.0.0.9/bin/firefox'.
-    (i.e., can’t have two active at the same time)
+$ nix-env --preserve-installed -i firefox-2.0.0.11
+installing `firefox-2.0.0.11'
+building path(s) `/nix/store/myy0y59q3ig70dgq37jqwg1j0rsapzsl-user-environment'
+collision between `/nix/store/...-firefox-2.0.0.11/bin/firefox'
+  and `/nix/store/...-firefox-2.0.0.9/bin/firefox'.
+(i.e., can’t have two active at the same time)
 
-    $ nix-env --set-flag active false firefox
-    setting flag on `firefox-2.0.0.9'
+$ nix-env --set-flag active false firefox
+setting flag on `firefox-2.0.0.9'
 
-    $ nix-env --preserve-installed -i firefox-2.0.0.11
-    installing `firefox-2.0.0.11'
+$ nix-env --preserve-installed -i firefox-2.0.0.11
+installing `firefox-2.0.0.11'
 
-    $ nix-env -q
-    firefox-2.0.0.11 (the enabled one)
-    firefox-2.0.0.9 (the disabled one)
+$ nix-env -q
+firefox-2.0.0.11 (the enabled one)
+firefox-2.0.0.9 (the disabled one)
+```
 
 To make files from `binutils` take precedence over files from `gcc`:
 
-    $ nix-env --set-flag priority 5 binutils
-    $ nix-env --set-flag priority 10 gcc
+```console
+$ nix-env --set-flag priority 5 binutils
+$ nix-env --set-flag priority 10 gcc
+```
 
 # Operation `--query`
 
@@ -633,66 +673,82 @@ derivation is shown unless `--no-name` is specified.
 
 To show installed packages:
 
-    $ nix-env -q
-    bison-1.875c
-    docbook-xml-4.2
-    firefox-1.0.4
-    MPlayer-1.0pre7
-    ORBit2-2.8.3
-    …
+```console
+$ nix-env -q
+bison-1.875c
+docbook-xml-4.2
+firefox-1.0.4
+MPlayer-1.0pre7
+ORBit2-2.8.3
+…
+```
 
 To show available packages:
 
-    $ nix-env -qa
-    firefox-1.0.7
-    GConf-2.4.0.1
-    MPlayer-1.0pre7
-    ORBit2-2.8.3
-    …
+```console
+$ nix-env -qa
+firefox-1.0.7
+GConf-2.4.0.1
+MPlayer-1.0pre7
+ORBit2-2.8.3
+…
+```
 
 To show the status of available packages:
 
-    $ nix-env -qas
-    -P- firefox-1.0.7   (not installed but present)
-    --S GConf-2.4.0.1   (not present, but there is a substitute for fast installation)
-    --S MPlayer-1.0pre3 (i.e., this is not the installed MPlayer, even though the version is the same!)
-    IP- ORBit2-2.8.3    (installed and by definition present)
-    …
+```console
+$ nix-env -qas
+-P- firefox-1.0.7   (not installed but present)
+--S GConf-2.4.0.1   (not present, but there is a substitute for fast installation)
+--S MPlayer-1.0pre3 (i.e., this is not the installed MPlayer, even though the version is the same!)
+IP- ORBit2-2.8.3    (installed and by definition present)
+…
+```
 
 To show available packages in the Nix expression `foo.nix`:
 
-    $ nix-env -f ./foo.nix -qa
-    foo-1.2.3
+```console
+$ nix-env -f ./foo.nix -qa
+foo-1.2.3
+```
 
 To compare installed versions to what’s available:
 
-    $ nix-env -qc
-    ...
-    acrobat-reader-7.0 - ?      (package is not available at all)
-    autoconf-2.59      = 2.59   (same version)
-    firefox-1.0.4      < 1.0.7  (a more recent version is available)
-    ...
+```console
+$ nix-env -qc
+...
+acrobat-reader-7.0 - ?      (package is not available at all)
+autoconf-2.59      = 2.59   (same version)
+firefox-1.0.4      < 1.0.7  (a more recent version is available)
+...
+```
 
 To show all packages with “`zip`” in the name:
 
-    $ nix-env -qa '.*zip.*'
-    bzip2-1.0.6
-    gzip-1.6
-    zip-3.0
-    …
+```console
+$ nix-env -qa '.*zip.*'
+bzip2-1.0.6
+gzip-1.6
+zip-3.0
+…
+```
 
 To show all packages with “`firefox`” or “`chromium`” in the name:
 
-    $ nix-env -qa '.*(firefox|chromium).*'
-    chromium-37.0.2062.94
-    chromium-beta-38.0.2125.24
-    firefox-32.0.3
-    firefox-with-plugins-13.0.1
-    …
+```console
+$ nix-env -qa '.*(firefox|chromium).*'
+chromium-37.0.2062.94
+chromium-beta-38.0.2125.24
+firefox-32.0.3
+firefox-with-plugins-13.0.1
+…
+```
 
 To show all packages in the latest revision of the Nixpkgs repository:
 
-    $ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
+```console
+$ nix-env -f https://github.com/NixOS/nixpkgs/archive/master.tar.gz -qa
+```
 
 # Operation `--switch-profile`
 
@@ -707,7 +763,9 @@ the symlink `~/.nix-profile` is made to point to *path*.
 
 ## Examples
 
-    $ nix-env -S ~/my-profile
+```console
+$ nix-env -S ~/my-profile
+```
 
 # Operation `--list-generations`
 
@@ -724,11 +782,13 @@ generation, and indicates the current generation.
 
 ## Examples
 
-    $ nix-env --list-generations
-      95   2004-02-06 11:48:24
-      96   2004-02-06 11:49:01
-      97   2004-02-06 16:22:45
-      98   2004-02-06 16:24:33   (current)
+```console
+$ nix-env --list-generations
+  95   2004-02-06 11:48:24
+  96   2004-02-06 11:49:01
+  97   2004-02-06 16:22:45
+  98   2004-02-06 16:24:33   (current)
+```
 
 # Operation `--delete-generations`
 
@@ -750,13 +810,21 @@ generations is important to make garbage collection effective.
 
 ## Examples
 
-    $ nix-env --delete-generations 3 4 8
+```console
+$ nix-env --delete-generations 3 4 8
+```
 
-    $ nix-env --delete-generations +5
+```console
+$ nix-env --delete-generations +5
+```
 
-    $ nix-env --delete-generations 30d
+```console
+$ nix-env --delete-generations 30d
+```
 
-    $ nix-env -p other_profile --delete-generations old
+```console
+$ nix-env -p other_profile --delete-generations old
+```
 
 # Operation `--switch-generation`
 
@@ -776,8 +844,10 @@ Switching will fail if the specified generation does not exist.
 
 ## Examples
 
-    $ nix-env -G 42
-    switching from generation 50 to 42
+```console
+$ nix-env -G 42
+switching from generation 50 to 42
+```
 
 # Operation `--rollback`
 
@@ -794,11 +864,15 @@ generation, if it exists. It is just a convenience wrapper around
 
 ## Examples
 
-    $ nix-env --rollback
-    switching from generation 92 to 91
+```console
+$ nix-env --rollback
+switching from generation 92 to 91
+```
 
-    $ nix-env --rollback
-    error: no generation older than the current (91) exists
+```console
+$ nix-env --rollback
+error: no generation older than the current (91) exists
+```
 
 # Environment variables
 
diff --git a/doc/manual/src/command-ref/nix-hash.md b/doc/manual/src/command-ref/nix-hash.md
index edb331e1c..d3f91f8e9 100644
--- a/doc/manual/src/command-ref/nix-hash.md
+++ b/doc/manual/src/command-ref/nix-hash.md
@@ -61,38 +61,44 @@ md5sum`.
 
 Computing the same hash as `nix-prefetch-url`:
 
-    $ nix-prefetch-url file://<(echo test)
-    1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
-    $ nix-hash --type sha256 --flat --base32 <(echo test)
-    1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
+```console
+$ nix-prefetch-url file://<(echo test)
+1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
+$ nix-hash --type sha256 --flat --base32 <(echo test)
+1lkgqb6fclns49861dwk9rzb6xnfkxbpws74mxnx01z9qyv1pjpj
+```
 
 Computing hashes:
 
-    $ mkdir test
-    $ echo "hello" > test/world
+```console
+$ mkdir test
+$ echo "hello" > test/world
 
-    $ nix-hash test/ (MD5 hash; default)
-    8179d3caeff1869b5ba1744e5a245c04
+$ nix-hash test/ (MD5 hash; default)
+8179d3caeff1869b5ba1744e5a245c04
 
-    $ nix-store --dump test/ | md5sum (for comparison)
-    8179d3caeff1869b5ba1744e5a245c04  -
+$ nix-store --dump test/ | md5sum (for comparison)
+8179d3caeff1869b5ba1744e5a245c04  -
 
-    $ nix-hash --type sha1 test/
-    e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+$ nix-hash --type sha1 test/
+e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
 
-    $ nix-hash --type sha1 --base32 test/
-    nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+$ nix-hash --type sha1 --base32 test/
+nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
 
-    $ nix-hash --type sha256 --flat test/
-    error: reading file `test/': Is a directory
+$ nix-hash --type sha256 --flat test/
+error: reading file `test/': Is a directory
 
-    $ nix-hash --type sha256 --flat test/world
-    5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
+$ nix-hash --type sha256 --flat test/world
+5891b5b522d5df086d0ff0b110fbd9d21bb4fc7163af34d08286a2e846f6be03
+```
 
 Converting between hexadecimal and base-32:
 
-    $ nix-hash --type sha1 --to-base32 e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
-    nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+```console
+$ nix-hash --type sha1 --to-base32 e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
 
-    $ nix-hash --type sha1 --to-base16 nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
-    e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+$ nix-hash --type sha1 --to-base16 nvd61k9nalji1zl9rrdfmsmvyyjqpzg4
+e4fd8ba5f7bbeaea5ace89fe10255536cd60dab6
+```
diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index 2d6525e77..5b5ee0439 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -85,61 +85,77 @@ standard input.
 Instantiating store derivations from a Nix expression, and building them
 using `nix-store`:
 
-    $ nix-instantiate test.nix (instantiate)
-    /nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
+```console
+$ nix-instantiate test.nix (instantiate)
+/nix/store/cigxbmvy6dzix98dxxh9b6shg7ar5bvs-perl-BerkeleyDB-0.26.drv
 
-    $ nix-store -r $(nix-instantiate test.nix) (build)
-    ...
-    /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 (output path)
+$ nix-store -r $(nix-instantiate test.nix) (build)
+...
+/nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26 (output path)
 
-    $ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
-    dr-xr-xr-x    2 eelco    users        4096 1970-01-01 01:00 lib
-    ...
+$ ls -l /nix/store/qhqk4n8ci095g3sdp93x7rgwyh9rdvgk-perl-BerkeleyDB-0.26
+dr-xr-xr-x    2 eelco    users        4096 1970-01-01 01:00 lib
+...
+```
 
 You can also give a Nix expression on the command line:
 
-    $ nix-instantiate -E 'with import <nixpkgs> { }; hello'
-    /nix/store/j8s4zyv75a724q38cb0r87rlczaiag4y-hello-2.8.drv
+```console
+$ nix-instantiate -E 'with import <nixpkgs> { }; hello'
+/nix/store/j8s4zyv75a724q38cb0r87rlczaiag4y-hello-2.8.drv
+```
 
 This is equivalent to:
 
-    $ nix-instantiate '<nixpkgs>' -A hello
+```console
+$ nix-instantiate '<nixpkgs>' -A hello
+```
 
 Parsing and evaluating Nix expressions:
 
-    $ nix-instantiate --parse -E '1 + 2'
-    1 + 2
+```console
+$ nix-instantiate --parse -E '1 + 2'
+1 + 2
+```
 
-    $ nix-instantiate --eval -E '1 + 2'
-    3
+```console
+$ nix-instantiate --eval -E '1 + 2'
+3
+```
 
-    $ nix-instantiate --eval --xml -E '1 + 2'
-    <?xml version='1.0' encoding='utf-8'?>
-    <expr>
-      <int value="3" />
-    </expr>
+```console
+$ nix-instantiate --eval --xml -E '1 + 2'
+<?xml version='1.0' encoding='utf-8'?>
+<expr>
+  <int value="3" />
+</expr>
+```
 
 The difference between non-strict and strict evaluation:
 
-    $ nix-instantiate --eval --xml -E 'rec { x = "foo"; y = x; }'
-    ...
-      <attr name="x">
-        <string value="foo" />
-      </attr>
-      <attr name="y">
-        <unevaluated />
-      </attr>
-    ...
+```console
+$ nix-instantiate --eval --xml -E 'rec { x = "foo"; y = x; }'
+...
+  <attr name="x">
+    <string value="foo" />
+  </attr>
+  <attr name="y">
+    <unevaluated />
+  </attr>
+...
+```
 
 Note that `y` is left unevaluated (the XML representation doesn’t
 attempt to show non-normal forms).
 
-    $ nix-instantiate --eval --xml --strict -E 'rec { x = "foo"; y = x; }'
-    ...
-      <attr name="x">
-        <string value="foo" />
-      </attr>
-      <attr name="y">
-        <string value="foo" />
-      </attr>
-    ...
+```console
+$ nix-instantiate --eval --xml --strict -E 'rec { x = "foo"; y = x; }'
+...
+  <attr name="x">
+    <string value="foo" />
+  </attr>
+  <attr name="y">
+    <string value="foo" />
+  </attr>
+...
+```
diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/src/command-ref/nix-prefetch-url.md
index 688496969..1cd1063cd 100644
--- a/doc/manual/src/command-ref/nix-prefetch-url.md
+++ b/doc/manual/src/command-ref/nix-prefetch-url.md
@@ -59,13 +59,19 @@ Nix store is also printed.
 
 # Examples
 
-    $ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz
-    0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+```console
+$ nix-prefetch-url ftp://ftp.gnu.org/pub/gnu/hello/hello-2.10.tar.gz
+0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+```
 
-    $ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz
-    0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
-    /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+```console
+$ nix-prefetch-url --print-path mirror://gnu/hello/hello-2.10.tar.gz
+0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i
+/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+```
 
-    $ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz
-    079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7
-    /nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz
+```console
+$ nix-prefetch-url --unpack --print-path https://github.com/NixOS/patchelf/archive/0.8.tar.gz
+079agjlv0hrv7fxnx9ngipx14gyncbkllxrp9cccnh3a50fxcmy7
+/nix/store/19zrmhm3m40xxaw81c8cqm6aljgrnwj2-0.8.tar.gz
+```
diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
index 492351867..27826717b 100644
--- a/doc/manual/src/command-ref/nix-shell.md
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -39,10 +39,12 @@ after `$stdenv/setup` has been sourced. Since this hook is not executed
 by regular Nix builds, it allows you to perform initialisation specific
 to `nix-shell`. For example, the derivation attribute
 
-    shellHook =
-      ''
-        echo "Hello shell"
-      '';
+```nix
+shellHook =
+  ''
+    echo "Hello shell"
+  '';
+```
 
 will cause `nix-shell` to print `Hello shell`.
 
@@ -108,46 +110,58 @@ The following common options are supported:
 To build the dependencies of the package Pan, and start an interactive
 shell in which to build it:
 
-    $ nix-shell '<nixpkgs>' -A pan
-    [nix-shell]$ unpackPhase
-    [nix-shell]$ cd pan-*
-    [nix-shell]$ configurePhase
-    [nix-shell]$ buildPhase
-    [nix-shell]$ ./pan/gui/pan
+```shell
+$ nix-shell '<nixpkgs>' -A pan
+[nix-shell]$ unpackPhase
+[nix-shell]$ cd pan-*
+[nix-shell]$ configurePhase
+[nix-shell]$ buildPhase
+[nix-shell]$ ./pan/gui/pan
+```
 
 To clear the environment first, and do some additional automatic
 initialisation of the interactive shell:
 
-    $ nix-shell '<nixpkgs>' -A pan --pure \
-        --command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
+```shell
+$ nix-shell '<nixpkgs>' -A pan --pure \
+    --command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
+```
 
 Nix expressions can also be given on the command line using the `-E` and
 `-p` flags. For instance, the following starts a shell containing the
 packages `sqlite` and `libX11`:
 
-    $ nix-shell -E 'with import <nixpkgs> { }; runCommand "dummy" { buildInputs = [ sqlite xorg.libX11 ]; } ""'
+```shell
+$ nix-shell -E 'with import <nixpkgs> { }; runCommand "dummy" { buildInputs = [ sqlite xorg.libX11 ]; } ""'
+```
 
 A shorter way to do the same is:
 
-    $ nix-shell -p sqlite xorg.libX11
-    [nix-shell]$ echo $NIX_LDFLAGS
-    … -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
+```shell
+$ nix-shell -p sqlite xorg.libX11
+[nix-shell]$ echo $NIX_LDFLAGS
+… -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
+```
 
 Note that `-p` accepts multiple full nix expressions that are valid in
 the `buildInputs = [ ... ]` shown above, not only package names. So the
 following is also legal:
 
-    $ nix-shell -p sqlite 'git.override { withManual = false; }'
+```shell
+$ nix-shell -p sqlite 'git.override { withManual = false; }'
+```
 
 The `-p` flag looks up Nixpkgs in the Nix search path. You can override
 it by passing `-I` or setting `NIX_PATH`. For example, the following
 gives you a shell containing the Pan package from a specific revision of
 Nixpkgs:
 
-    $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
+```shell
+$ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
 
-    [nix-shell:~]$ pan --version
-    Pan 0.139
+[nix-shell:~]$ pan --version
+Pan 0.139
+```
 
 # Use as a `#!`-interpreter
 
@@ -155,8 +169,10 @@ You can use `nix-shell` as a script interpreter to allow scripts written
 in arbitrary languages to obtain their own dependencies via Nix. This is
 done by starting the script with the following lines:
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell -i real-interpreter -p packages
+```bash
+#! /usr/bin/env nix-shell
+#! nix-shell -i real-interpreter -p packages
+```
 
 where *real-interpreter* is the “real” script interpreter that will be
 invoked by `nix-shell` after it has obtained the dependencies and
@@ -170,39 +186,45 @@ because many operating systems only allow one argument in `#!` lines.
 For example, here is a Python script that depends on Python and the
 `prettytable` package:
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell -i python -p python pythonPackages.prettytable
+```python
+#! /usr/bin/env nix-shell
+#! nix-shell -i python -p python pythonPackages.prettytable
 
-    import prettytable
+import prettytable
 
-    # Print a simple table.
-    t = prettytable.PrettyTable(["N", "N^2"])
-    for n in range(1, 10): t.add_row([n, n * n])
-    print t
+# Print a simple table.
+t = prettytable.PrettyTable(["N", "N^2"])
+for n in range(1, 10): t.add_row([n, n * n])
+print t
+```
 
 Similarly, the following is a Perl script that specifies that it
 requires Perl and the `HTML::TokeParser::Simple` and `LWP` packages:
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell -i perl -p perl perlPackages.HTMLTokeParserSimple perlPackages.LWP
+```perl
+#! /usr/bin/env nix-shell
+#! nix-shell -i perl -p perl perlPackages.HTMLTokeParserSimple perlPackages.LWP
 
-    use HTML::TokeParser::Simple;
+use HTML::TokeParser::Simple;
 
-    # Fetch nixos.org and print all hrefs.
-    my $p = HTML::TokeParser::Simple->new(url => 'http://nixos.org/');
+# Fetch nixos.org and print all hrefs.
+my $p = HTML::TokeParser::Simple->new(url => 'http://nixos.org/');
 
-    while (my $token = $p->get_tag("a")) {
-        my $href = $token->get_attr("href");
-        print "$href\n" if $href;
-    }
+while (my $token = $p->get_tag("a")) {
+    my $href = $token->get_attr("href");
+    print "$href\n" if $href;
+}
+```
 
 Sometimes you need to pass a simple Nix expression to customize a
 package like Terraform:
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell -i bash -p "terraform.withPlugins (plugins: [ plugins.openstack ])"
+```bash
+#! /usr/bin/env nix-shell
+#! nix-shell -i bash -p "terraform.withPlugins (plugins: [ plugins.openstack ])"
 
-    terraform apply
+terraform apply
+```
 
 > **Note**
 >
@@ -213,20 +235,22 @@ Finally, using the merging of multiple nix-shell shebangs the following
 Haskell script uses a specific branch of Nixpkgs/NixOS (the 18.03 stable
 branch):
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell -i runghc -p "haskellPackages.ghcWithPackages (ps: [ps.HTTP ps.tagsoup])"
-    #! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-18.03.tar.gz
+```haskell
+#! /usr/bin/env nix-shell
+#! nix-shell -i runghc -p "haskellPackages.ghcWithPackages (ps: [ps.HTTP ps.tagsoup])"
+#! nix-shell -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/nixos-18.03.tar.gz
 
-    import Network.HTTP
-    import Text.HTML.TagSoup
+import Network.HTTP
+import Text.HTML.TagSoup
 
-    -- Fetch nixos.org and print all hrefs.
-    main = do
-      resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
-      body <- getResponseBody resp
-      let tags = filter (isTagOpenName "a") $ parseTags body
-      let tags' = map (fromAttrib "href") tags
-      mapM_ putStrLn $ filter (/= "") tags'
+-- Fetch nixos.org and print all hrefs.
+main = do
+  resp <- Network.HTTP.simpleHTTP (getRequest "http://nixos.org/")
+  body <- getResponseBody resp
+  let tags = filter (isTagOpenName "a") $ parseTags body
+  let tags' = map (fromAttrib "href") tags
+  mapM_ putStrLn $ filter (/= "") tags'
+```
 
 If you want to be even more precise, you can specify a specific revision
 of Nixpkgs:
@@ -237,12 +261,16 @@ The examples above all used `-p` to get dependencies from Nixpkgs. You
 can also use a Nix expression to build your own dependencies. For
 example, the Python example could have been written as:
 
-    #! /usr/bin/env nix-shell
-    #! nix-shell deps.nix -i python
+```python
+#! /usr/bin/env nix-shell
+#! nix-shell deps.nix -i python
+```
 
 where the file `deps.nix` in the same directory as the `#!`-script
 contains:
 
-    with import <nixpkgs> {};
+```nix
+with import <nixpkgs> {};
 
-    runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
+runCommand "dummy" { buildInputs = [ python pythonPackages.prettytable ]; } ""
+```
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index 1842f8858..193d670c2 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -47,13 +47,15 @@ have an effect.
     The `--indirect` flag causes a uniquely named symlink to *path* to
     be stored in `/nix/var/nix/gcroots/auto/`. For instance,
 
-        $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
+    ```console
+    $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
 
-        $ ls -l /nix/var/nix/gcroots/auto
-        lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
+    $ ls -l /nix/var/nix/gcroots/auto
+    lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
 
-        $ ls -l /home/eelco/bla/result
-        lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r11343n6qd4...-f-spot-0.0.10
+    $ ls -l /home/eelco/bla/result
+    lrwxrwxrwx    1 ... 2005-03-13 21:10 /home/eelco/bla/result -> /nix/store/1r11343n6qd4...-f-spot-0.0.10
+    ```
 
     Thus, when `/home/eelco/bla/result` is removed, the GC root in the
     `auto` directory becomes a dangling symlink and will be ignored by
@@ -157,14 +159,18 @@ or.
 This operation is typically used to build store derivations produced by
 [`nix-instantiate`](nix-instantiate.md):
 
-    $ nix-store -r $(nix-instantiate ./test.nix)
-    /nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1
+```console
+$ nix-store -r $(nix-instantiate ./test.nix)
+/nix/store/31axcgrlbfsxzmfff1gyj1bf62hvkby2-aterm-2.3.1
+```
 
 This is essentially what [`nix-build`](nix-build.md) does.
 
 To test whether a previously-built derivation is deterministic:
 
-    $ nix-build '<nixpkgs>' -A hello --check -K
+```console
+$ nix-build '<nixpkgs>' -A hello --check -K
+```
 
 # Operation `--serve`
 
@@ -190,9 +196,11 @@ The following flags are available:
 To turn a host into a build server, the `authorized_keys` file can be
 used to provide build access to a given SSH public key:
 
-    $ cat <<EOF >>/root/.ssh/authorized_keys
-    command="nice -n20 nix-store --serve --write" ssh-rsa AAAAB3NzaC1yc2EAAAA...
-    EOF
+```console
+$ cat <<EOF >>/root/.ssh/authorized_keys
+command="nice -n20 nix-store --serve --write" ssh-rsa AAAAB3NzaC1yc2EAAAA...
+EOF
+```
 
 # Operation `--gc`
 
@@ -245,14 +253,18 @@ number of bytes that would be freed.
 
 To delete all unreachable paths, just do:
 
-    $ nix-store --gc
-    deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv'
-    ...
-    8825586 bytes freed (8.42 MiB)
+```console
+$ nix-store --gc
+deleting `/nix/store/kq82idx6g0nyzsp2s14gfsc38npai7lf-cairo-1.0.4.tar.gz.drv'
+...
+8825586 bytes freed (8.42 MiB)
+```
 
 To delete at least 100 MiBs of unreachable paths:
 
-    $ nix-store --gc --max-freed $((100 * 1024 * 1024))
+```console
+$ nix-store --gc --max-freed $((100 * 1024 * 1024))
+```
 
 # Operation `--delete`
 
@@ -274,9 +286,11 @@ paths in the store that refer to it (i.e., depend on it).
 
 ## Example
 
-    $ nix-store --delete /nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4
-    0 bytes freed (0.00 MiB)
-    error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4' since it is still alive
+```console
+$ nix-store --delete /nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4
+0 bytes freed (0.00 MiB)
+error: cannot delete path `/nix/store/zq0h41l75vlb4z45kzgjjmsjxvcv1qk7-mesa-6.4' since it is still alive
+```
 
 # Operation `--query`
 
@@ -407,18 +421,22 @@ symlink.
 Print the closure (runtime dependencies) of the `svn` program in the
 current user environment:
 
-    $ nix-store -qR $(which svn)
-    /nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
-    /nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
-    ...
+```console
+$ nix-store -qR $(which svn)
+/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
+/nix/store/9lz9yc6zgmc0vlqmn2ipcpkjlmbi51vv-glibc-2.3.4
+...
+```
 
 Print the build-time dependencies of `svn`:
 
-    $ nix-store -qR $(nix-store -qd $(which svn))
-    /nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv
-    /nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh
-    /nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv
-    ... lots of other paths ...
+```console
+$ nix-store -qR $(nix-store -qd $(which svn))
+/nix/store/02iizgn86m42q905rddvg4ja975bk2i4-grep-2.5.1.tar.bz2.drv
+/nix/store/07a2bzxmzwz5hp58nf03pahrv2ygwgs3-gcc-wrapper.sh
+/nix/store/0ma7c9wsbaxahwwl04gbw3fcd806ski4-glibc-2.3.4.drv
+... lots of other paths ...
+```
 
 The difference with the previous example is that we ask the closure of
 the derivation (`-qd`), not the closure of the output path that contains
@@ -426,29 +444,35 @@ the derivation (`-qd`), not the closure of the output path that contains
 
 Show the build-time dependencies as a tree:
 
-    $ nix-store -q --tree $(nix-store -qd $(which svn))
-    /nix/store/7i5082kfb6yjbqdbiwdhhza0am2xvh6c-subversion-1.1.4.drv
-    +---/nix/store/d8afh10z72n8l1cr5w42366abiblgn54-builder.sh
-    +---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv
-    |   +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash
-    |   +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh
-    ...
+```console
+$ nix-store -q --tree $(nix-store -qd $(which svn))
+/nix/store/7i5082kfb6yjbqdbiwdhhza0am2xvh6c-subversion-1.1.4.drv
++---/nix/store/d8afh10z72n8l1cr5w42366abiblgn54-builder.sh
++---/nix/store/fmzxmpjx2lh849ph0l36snfj9zdibw67-bash-3.0.drv
+|   +---/nix/store/570hmhmx3v57605cqg9yfvvyh0nnb8k8-bash
+|   +---/nix/store/p3srsbd8dx44v2pg6nbnszab5mcwx03v-builder.sh
+...
+```
 
 Show all paths that depend on the same OpenSSL library as `svn`:
 
-    $ nix-store -q --referrers $(nix-store -q --binding openssl $(nix-store -qd $(which svn)))
-    /nix/store/23ny9l9wixx21632y2wi4p585qhva1q8-sylpheed-1.0.0
-    /nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
-    /nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3
-    /nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fx-lynx-2.8.5
+```console
+$ nix-store -q --referrers $(nix-store -q --binding openssl $(nix-store -qd $(which svn)))
+/nix/store/23ny9l9wixx21632y2wi4p585qhva1q8-sylpheed-1.0.0
+/nix/store/5mbglq5ldqld8sj57273aljwkfvj22mc-subversion-1.1.4
+/nix/store/dpmvp969yhdqs7lm2r1a3gng7pyq6vy4-subversion-1.1.3
+/nix/store/l51240xqsgg8a7yrbqdx1rfzyv6l26fx-lynx-2.8.5
+```
 
 Show all paths that directly or indirectly depend on the Glibc (C
 library) used by `svn`:
 
-    $ nix-store -q --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}')
-    /nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2
-    /nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4
-    ...
+```console
+$ nix-store -q --referrers-closure $(ldd $(which svn) | grep /libc.so | awk '{print $3}')
+/nix/store/034a6h4vpz9kds5r6kzb9lhh81mscw43-libgnomeprintui-2.8.2
+/nix/store/15l3yi0d45prm7a82pcrknxdh6nzmxza-gawk-3.1.4
+...
+```
 
 Note that `ldd` is a command that prints out the dynamic libraries used
 by an ELF executable.
@@ -456,16 +480,20 @@ by an ELF executable.
 Make a picture of the runtime dependency graph of the current user
 environment:
 
-    $ nix-store -q --graph ~/.nix-profile | dot -Tps > graph.ps
-    $ gv graph.ps
+```console
+$ nix-store -q --graph ~/.nix-profile | dot -Tps > graph.ps
+$ gv graph.ps
+```
 
 Show every garbage collector root that points to a store path that
 depends on `svn`:
 
-    $ nix-store -q --roots $(which svn)
-    /nix/var/nix/profiles/default-81-link
-    /nix/var/nix/profiles/default-82-link
-    /nix/var/nix/profiles/per-user/eelco/profile-97-link
+```console
+$ nix-store -q --roots $(which svn)
+/nix/var/nix/profiles/default-81-link
+/nix/var/nix/profiles/default-82-link
+/nix/var/nix/profiles/per-user/eelco/profile-97-link
+```
 
 # Operation `--add`
 
@@ -480,8 +508,10 @@ prints the resulting paths in the Nix store on standard output.
 
 ## Example
 
-    $ nix-store --add ./foo.c
-    /nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zf-foo.c
+```console
+$ nix-store --add ./foo.c
+/nix/store/m7lrha58ph6rcnv109yzx1nk1cj7k7zf-foo.c
+```
 
 # Operation `--add-fixed`
 
@@ -505,8 +535,10 @@ This operation has the following options:
 
 ## Example
 
-    $ nix-store --add-fixed sha256 ./hello-2.10.tar.gz
-    /nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+```console
+$ nix-store --add-fixed sha256 ./hello-2.10.tar.gz
+/nix/store/3x7dwzq014bblazs7kq20p9hyzz0qh8g-hello-2.10.tar.gz
+```
 
 # Operation `--verify`
 
@@ -554,7 +586,9 @@ path has changed, and 1 otherwise.
 
 To verify the integrity of the `svn` command and all its dependencies:
 
-    $ nix-store --verify-path $(nix-store -qR $(which svn))
+```console
+$ nix-store --verify-path $(nix-store -qR $(which svn))
+```
 
 # Operation `--repair-path`
 
@@ -578,14 +612,16 @@ substitutes are available, then repair is not possible.
 
 ## Example
 
-    $ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
-    path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified!
-      expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588',
-      got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4'
+```console
+$ nix-store --verify-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
+path `/nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13' was modified!
+  expected hash `2db57715ae90b7e31ff1f2ecb8c12ec1cc43da920efcbe3b22763f36a1861588',
+  got `481c5aa5483ebc97c20457bb8bca24deea56550d3985cda0027f67fe54b808e4'
 
-    $ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
-    fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
-    …
+$ nix-store --repair-path /nix/store/dj7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13
+fetching path `/nix/store/d7a81wsm1ijwwpkks3725661h3263p5-glibc-2.13'...
+…
+```
 
 # Operation `--dump`
 
@@ -651,11 +687,15 @@ a store path references other store paths that are missing in the target
 Nix store, the import will fail. To copy a whole closure, do something
 like:
 
-    $ nix-store --export $(nix-store -qR paths) > out
+```console
+$ nix-store --export $(nix-store -qR paths) > out
+```
 
 To import the whole closure again, run:
 
-    $ nix-store --import < out
+```console
+$ nix-store --import < out
+```
 
 # Operation `--import`
 
@@ -695,11 +735,13 @@ Use `-vv` or `-vvv` to get some progress indication.
 
 ## Example
 
-    $ nix-store --optimise
-    hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
-    ...
-    541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
-    there are 114486 files with equal contents out of 215894 files in total
+```console
+$ nix-store --optimise
+hashing files in `/nix/store/qhqx7l2f1kmwihc9bnxs7rc159hsxnf3-gcc-4.1.1'
+...
+541838819 bytes (516.74 MiB) freed by hard-linking 54143 files;
+there are 114486 files with equal contents out of 215894 files in total
+```
 
 # Operation `--read-log`
 
@@ -721,13 +763,15 @@ substitute, then the log is unavailable.
 
 ## Example
 
-    $ nix-store -l $(which ktorrent)
-    building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66ph1-ktorrent-2.2.1
-    unpacking sources
-    unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz
-    ktorrent-2.2.1/
-    ktorrent-2.2.1/NEWS
-    ...
+```console
+$ nix-store -l $(which ktorrent)
+building /nix/store/dhc73pvzpnzxhdgpimsd9sw39di66ph1-ktorrent-2.2.1
+unpacking sources
+unpacking source archive /nix/store/p8n1jpqs27mgkjw07pb5269717nzf5f8-ktorrent-2.2.1.tar.gz
+ktorrent-2.2.1/
+ktorrent-2.2.1/NEWS
+...
+```
 
 # Operation `--dump-db`
 
@@ -773,12 +817,14 @@ of the builder are placed in the variable `_args`.
 
 ## Example
 
-    $ nix-store --print-env $(nix-instantiate '<nixpkgs>' -A firefox)
-    …
-    export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2'
-    export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
-    export system; system='x86_64-linux'
-    export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh'
+```console
+$ nix-store --print-env $(nix-instantiate '<nixpkgs>' -A firefox)
+…
+export src; src='/nix/store/plpj7qrwcz94z2psh6fchsi7s8yihc7k-firefox-12.0.source.tar.bz2'
+export stdenv; stdenv='/nix/store/7c8asx3yfrg5dg1gzhzyq2236zfgibnn-stdenv'
+export system; system='x86_64-linux'
+export _args; _args='-e /nix/store/9krlzvny65gdc8s7kpb6lkx8cd02c25c-default-builder.sh'
+```
 
 # Operation `--generate-binary-cache-key`
 
diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md
index ee8419fd2..65e72d000 100644
--- a/doc/manual/src/command-ref/opt-common.md
+++ b/doc/manual/src/command-ref/opt-common.md
@@ -158,11 +158,13 @@ Most Nix commands accept the following command-line options:
     
     For instance, the top-level `default.nix` in Nixpkgs is actually a
     function:
-    
-        { # The system (e.g., `i686-linux') for which to build the packages.
-          system ? builtins.currentSystem
-          ...
-        }: ...
+
+    ```nix
+    { # The system (e.g., `i686-linux') for which to build the packages.
+      system ? builtins.currentSystem
+      ...
+    }: ...
+    ```
     
     So if you call this Nix expression (e.g., when you do `nix-env -i
     pkgname`), the function will be called automatically using the
diff --git a/doc/manual/src/expressions/advanced-attributes.md b/doc/manual/src/expressions/advanced-attributes.md
index bfee28acf..31ebadda1 100644
--- a/doc/manual/src/expressions/advanced-attributes.md
+++ b/doc/manual/src/expressions/advanced-attributes.md
@@ -6,7 +6,9 @@ Derivations can declare some infrequently used optional attributes.
     The optional attribute `allowedReferences` specifies a list of legal
     references (dependencies) of the output of the builder. For example,
     
-        allowedReferences = [];
+    ```nix
+    allowedReferences = [];
+    ```
     
     enforces that the output of a derivation cannot have any runtime
     dependencies on its inputs. To allow an output to have a runtime
@@ -20,7 +22,9 @@ Derivations can declare some infrequently used optional attributes.
     the legal requisites of the whole closure, so all the dependencies
     recursively. For example,
     
-        allowedRequisites = [ foobar ];
+    ```nix
+    allowedRequisites = [ foobar ];
+    ```
     
     enforces that the output of a derivation cannot have any other
     runtime dependency than `foobar`, and in addition it enforces that
@@ -31,7 +35,9 @@ Derivations can declare some infrequently used optional attributes.
     illegal references (dependencies) of the output of the builder. For
     example,
     
-        disallowedReferences = [ foo ];
+    ```nix
+    disallowedReferences = [ foo ];
+    ```
     
     enforces that the output of a derivation cannot have a direct
     runtime dependencies on the derivation `foo`.
@@ -41,7 +47,9 @@ Derivations can declare some infrequently used optional attributes.
     specifies illegal requisites for the whole closure, so all the
     dependencies recursively. For example,
     
-        disallowedRequisites = [ foobar ];
+    ```nix
+    disallowedRequisites = [ foobar ];
+    ```
     
     enforces that the output of a derivation cannot have any runtime
     dependency on `foobar` or any other derivation depending recursively
@@ -50,20 +58,20 @@ Derivations can declare some infrequently used optional attributes.
   - `exportReferencesGraph`  
     This attribute allows builders access to the references graph of
     their inputs. The attribute is a list of inputs in the Nix store
-    whose references graph the builder needs to know. The value of this
-    attribute should be a list of pairs `[ name1
-                    path1 name2
-                    path2 ...
-                    ]`. The references graph of each *pathN* will be stored in a text
-    file *nameN* in the temporary build directory. The text files have
-    the format used by `nix-store
-                    --register-validity` (with the deriver fields left empty). For
-    example, when the following derivation is built:
+    whose references graph the builder needs to know. The value of
+    this attribute should be a list of pairs `[ name1 path1 name2
+    path2 ...  ]`. The references graph of each *pathN* will be stored
+    in a text file *nameN* in the temporary build directory. The text
+    files have the format used by `nix-store --register-validity`
+    (with the deriver fields left empty). For example, when the
+    following derivation is built:
     
-        derivation {
-          ...
-          exportReferencesGraph = [ "libfoo-graph" libfoo ];
-        };
+    ```nix
+    derivation {
+      ...
+      exportReferencesGraph = [ "libfoo-graph" libfoo ];
+    };
+    ```
     
     the references graph of `libfoo` is placed in the file
     `libfoo-graph` in the temporary build directory.
@@ -84,7 +92,9 @@ Derivations can declare some infrequently used optional attributes.
     environment variables to be passed unmodified. For example,
     `fetchurl` in Nixpkgs has the line
     
-        impureEnvVars = [ "http_proxy" "https_proxy" ... ];
+    ```nix
+    impureEnvVars = [ "http_proxy" "https_proxy" ... ];
+    ```
     
     to make it use the proxy server configuration specified by the user
     in the environment variables `http_proxy` and friends.
@@ -116,19 +126,23 @@ Derivations can declare some infrequently used optional attributes.
     been modified, the caller must also specify a cryptographic hash of
     the file. For example,
     
-        fetchurl {
-          url = "http://ftp.gnu.org/pub/gnu/hello/hello-2.1.1.tar.gz";
-          sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-        }
+    ```nix
+    fetchurl {
+      url = "http://ftp.gnu.org/pub/gnu/hello/hello-2.1.1.tar.gz";
+      sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+    }
+    ```
     
     It sometimes happens that the URL of the file changes, e.g., because
     servers are reorganised or no longer available. We then must update
     the call to `fetchurl`, e.g.,
     
-        fetchurl {
-          url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-          sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-        }
+    ```nix
+    fetchurl {
+      url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+      sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+    }
+    ```
     
     If a `fetchurl` derivation was treated like a normal derivation, the
     output paths of the derivation and *all derivations depending on it*
@@ -147,23 +161,25 @@ Derivations can declare some infrequently used optional attributes.
     As an example, here is the (simplified) Nix expression for
     `fetchurl`:
     
-        { stdenv, curl }: # The curl program is used for downloading.
-        
-        { url, sha256 }:
-        
-        stdenv.mkDerivation {
-          name = baseNameOf (toString url);
-          builder = ./builder.sh;
-          buildInputs = [ curl ];
-        
-          # This is a fixed-output derivation; the output must be a regular
-          # file with SHA256 hash sha256.
-          outputHashMode = "flat";
-          outputHashAlgo = "sha256";
-          outputHash = sha256;
-        
-          inherit url;
-        }
+    ```nix
+    { stdenv, curl }: # The curl program is used for downloading.
+
+    { url, sha256 }:
+
+    stdenv.mkDerivation {
+      name = baseNameOf (toString url);
+      builder = ./builder.sh;
+      buildInputs = [ curl ];
+
+      # This is a fixed-output derivation; the output must be a regular
+      # file with SHA256 hash sha256.
+      outputHashMode = "flat";
+      outputHashAlgo = "sha256";
+      outputHash = sha256;
+
+      inherit url;
+    }
+    ```
     
     The `outputHashAlgo` attribute specifies the hash algorithm used to
     compute the hash. It can currently be `"sha1"`, `"sha256"` or
@@ -196,21 +212,19 @@ Derivations can declare some infrequently used optional attributes.
     A list of names of attributes that should be passed via files rather
     than environment variables. For example, if you have
     
-    ``` 
+    ```nix
     passAsFile = ["big"];
     big = "a very long string";
-        
     ```
     
-    then when the builder runs, the environment variable `bigPath` will
-    contain the absolute path to a temporary file containing `a very
-    long
-                    string`. That is, for any attribute *x* listed in `passAsFile`, Nix
-    will pass an environment variable `xPath` holding the path of the
-    file containing the value of attribute *x*. This is useful when you
-    need to pass large strings to a builder, since most operating
-    systems impose a limit on the size of the environment (typically, a
-    few hundred kilobyte).
+    then when the builder runs, the environment variable `bigPath`
+    will contain the absolute path to a temporary file containing `a
+    very long string`. That is, for any attribute *x* listed in
+    `passAsFile`, Nix will pass an environment variable `xPath`
+    holding the path of the file containing the value of attribute
+    *x*. This is useful when you need to pass large strings to a
+    builder, since most operating systems impose a limit on the size
+    of the environment (typically, a few hundred kilobyte).
 
   - `preferLocalBuild`  
     If this attribute is set to `true` and [distributed building is
diff --git a/doc/manual/src/expressions/arguments-variables.md b/doc/manual/src/expressions/arguments-variables.md
index 2956f98f1..12198c879 100644
--- a/doc/manual/src/expressions/arguments-variables.md
+++ b/doc/manual/src/expressions/arguments-variables.md
@@ -8,25 +8,27 @@ packages are imported and called with the appropriate arguments. Here
 are some fragments of `all-packages.nix`, with annotations of what
 they mean:
 
-    ...
-    
-    rec { ①
-    
-      hello = import ../applications/misc/hello/ex-1 ② { ③
-        inherit fetchurl stdenv perl;
-      };
-    
-      perl = import ../development/interpreters/perl { ④
-        inherit fetchurl stdenv;
-      };
-    
-      fetchurl = import ../build-support/fetchurl {
-        inherit stdenv; ...
-      };
-    
-      stdenv = ...;
-    
-    }
+```nix
+...
+
+rec { ①
+
+  hello = import ../applications/misc/hello/ex-1 ② { ③
+    inherit fetchurl stdenv perl;
+  };
+
+  perl = import ../development/interpreters/perl { ④
+    inherit fetchurl stdenv;
+  };
+
+  fetchurl = import ../build-support/fetchurl {
+    inherit stdenv; ...
+  };
+
+  stdenv = ...;
+
+}
+```
 
 1.  This file defines a set of attributes, all of which are concrete
     derivations (i.e., not functions). In fact, we define a *mutually
@@ -64,11 +66,15 @@ they mean:
     > calls a function, filling in any missing arguments by passing the
     > corresponding attribute from the Nixpkgs set, like this:
     > 
-    >     hello = callPackage ../applications/misc/hello/ex-1 { };
+    > ```nix
+    > hello = callPackage ../applications/misc/hello/ex-1 { };
+    > ```
     > 
     > If necessary, you can set or override arguments:
     > 
-    >     hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
+    > ```nix
+    > hello = callPackage ../applications/misc/hello/ex-1 { stdenv = myStdenv; };
+    > ```
 
 4.  Likewise, we have to instantiate Perl, `fetchurl`, and the standard
     environment.
diff --git a/doc/manual/src/expressions/build-script.md b/doc/manual/src/expressions/build-script.md
index e0dda56f8..b1eacae88 100644
--- a/doc/manual/src/expressions/build-script.md
+++ b/doc/manual/src/expressions/build-script.md
@@ -3,15 +3,17 @@
 Here is the builder referenced from Hello's Nix expression (stored in
 `pkgs/applications/misc/hello/ex-1/builder.sh`):
 
-    source $stdenv/setup ①
-    
-    PATH=$perl/bin:$PATH ②
-    
-    tar xvfz $src ③
-    cd hello-*
-    ./configure --prefix=$out ④
-    make ⑤
-    make install
+```bash
+source $stdenv/setup ①
+
+PATH=$perl/bin:$PATH ②
+
+tar xvfz $src ③
+cd hello-*
+./configure --prefix=$out ④
+make ⑤
+make install
+```
 
 The builder can actually be made a lot shorter by using the *generic
 builder* functions provided by `stdenv`, but here we write out the build
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index 22f133c33..7c4a62f54 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -51,7 +51,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
     You can use `builtins` to test for the availability of features in
     the Nix installation, e.g.,
     
-        if builtins ? getEnv then builtins.getEnv "PATH" else ""
+    ```nix
+    if builtins ? getEnv then builtins.getEnv "PATH" else ""
+    ```
     
     This allows a Nix expression to fall back gracefully on older Nix
     installations that don’t have the desired built-in function.
@@ -114,9 +116,11 @@ For instance, `derivation` is also available as `builtins.derivation`.
     function is to obtain external Nix expression dependencies, such as
     a particular version of Nixpkgs, e.g.
     
-        with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
-        
-        stdenv.mkDerivation { … }
+    ```nix
+    with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
+
+    stdenv.mkDerivation { … }
+    ```
     
     The fetched tarball is cached for a certain amount of time (1 hour
     by default) in `~/.cache/nix/tarballs/`. You can change the cache
@@ -124,19 +128,21 @@ For instance, `derivation` is also available as `builtins.derivation`.
     of seconds` or in the Nix configuration file with this option: ` 
     number of seconds to cache `.
     
-    Note that when obtaining the hash with ` nix-prefetch-url
-                     ` the option `--unpack` is required.
+    Note that when obtaining the hash with ` nix-prefetch-url ` the
+    option `--unpack` is required.
     
     This function can also verify the contents against a hash. In that
     case, the function takes a set instead of a URL. The set requires
     the attribute `url` and the attribute `sha256`, e.g.
     
-        with import (fetchTarball {
-          url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
-          sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
-        }) {};
-        
-        stdenv.mkDerivation { … }
+    ```nix
+    with import (fetchTarball {
+      url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
+      sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
+    }) {};
+
+    stdenv.mkDerivation { … }
+    ```
     
     This function is not available if [restricted evaluation
     mode](../command-ref/conf-file.md) is enabled.
@@ -172,18 +178,22 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
       - To fetch a private repository over SSH:
         
-            builtins.fetchGit {
-              url = "git@github.com:my-secret/repository.git";
-              ref = "master";
-              rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "git@github.com:my-secret/repository.git";
+          ref = "master";
+          rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
+        }
+        ```
     
       - To fetch an arbitrary reference:
         
-            builtins.fetchGit {
-              url = "https://github.com/NixOS/nix.git";
-              ref = "refs/heads/0.5-release";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "https://github.com/NixOS/nix.git";
+          ref = "refs/heads/0.5-release";
+        }
+        ```
     
       - If the revision you're looking for is in the default branch of
         the git repository you don't strictly need to specify the branch
@@ -193,11 +203,13 @@ For instance, `derivation` is also available as `builtins.derivation`.
         branch for the non-default branch you will need to specify the
         the `ref` attribute as well.
         
-            builtins.fetchGit {
-              url = "https://github.com/nixos/nix.git";
-              rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-              ref = "1.11-maintenance";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+          ref = "1.11-maintenance";
+        }
+        ```
         
         > **Note**
         > 
@@ -211,24 +223,30 @@ For instance, `derivation` is also available as `builtins.derivation`.
       - If the revision you're looking for is in the default branch of
         the git repository you may omit the `ref` attribute.
         
-            builtins.fetchGit {
-              url = "https://github.com/nixos/nix.git";
-              rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+        }
+        ```
     
       - To fetch a specific tag:
         
-            builtins.fetchGit {
-              url = "https://github.com/nixos/nix.git";
-              ref = "refs/tags/1.9";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "https://github.com/nixos/nix.git";
+          ref = "refs/tags/1.9";
+        }
+        ```
     
       - To fetch the latest version of a remote branch:
         
-            builtins.fetchGit {
-              url = "ssh://git@github.com/nixos/nix.git";
-              ref = "master";
-            }
+        ```nix
+        builtins.fetchGit {
+          url = "ssh://git@github.com/nixos/nix.git";
+          ref = "master";
+        }
+        ```
         
         > **Note**
         > 
@@ -248,10 +266,12 @@ For instance, `derivation` is also available as `builtins.derivation`.
     filtering certain files. For instance, suppose that you want to use
     the directory `source-dir` as an input to a Nix expression, e.g.
     
-        stdenv.mkDerivation {
-          ...
-          src = ./source-dir;
-        }
+    ```nix
+    stdenv.mkDerivation {
+      ...
+      src = ./source-dir;
+    }
+    ```
     
     However, if `source-dir` is a Subversion working copy, then all
     those annoying `.svn` subdirectories will also be copied to the
@@ -259,10 +279,10 @@ For instance, `derivation` is also available as `builtins.derivation`.
     causing lots of spurious rebuilds. With `filterSource` you can
     filter out the `.svn` directories:
     
-    ``` 
-      src = builtins.filterSource
-        (path: type: type != "directory" || baseNameOf path != ".svn")
-        ./source-dir;
+    ```nix
+    src = builtins.filterSource
+      (path: type: type != "directory" || baseNameOf path != ".svn")
+      ./source-dir;
     ```
     
     Thus, the first argument *e1* must be a predicate function that is
@@ -279,10 +299,10 @@ For instance, `derivation` is also available as `builtins.derivation`.
 
   - `builtins.foldl’` *op* *nul* *list*  
     Reduce a list by applying a binary operator, from left to right,
-    e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op
-                    (op nul x0) x1) x2) ...`. The operator is applied strictly, i.e.,
-    its arguments are evaluated first. For example, `foldl’ (x: y: x +
-    y) 0 [1 2 3]` evaluates to 6.
+    e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op (op nul x0) x1) x2)
+    ...`. The operator is applied strictly, i.e., its arguments are
+    evaluated first. For example, `foldl’ (x: y: x + y) 0 [1 2 3]`
+    evaluates to 6.
 
   - `builtins.functionArgs` *f*  
     Return a set containing the names of the formal arguments expected
@@ -298,16 +318,19 @@ For instance, `derivation` is also available as `builtins.derivation`.
   - `builtins.fromJSON` *e*  
     Convert a JSON string to a Nix value. For example,
     
-        builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
+    ```nix
+    builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
+    ```
     
-    returns the value `{ x = [ 1 2 3 ]; y = null;
-                    }`.
+    returns the value `{ x = [ 1 2 3 ]; y = null; }`.
 
   - `builtins.genList` *generator* *length*  
     Generate list of size *length*, with each element *i* equal to the
     value returned by *generator* `i`. For example,
     
-        builtins.genList (x: x * x) 5
+    ```nix
+    builtins.genList (x: x * x) 5
+    ```
     
     returns the list `[ 0 1 4 9 16 ]`.
 
@@ -369,26 +392,34 @@ For instance, `derivation` is also available as `builtins.derivation`.
     variables that are in scope at the call site. For instance, if you
     have a calling expression
     
-        rec {
-          x = 123;
-          y = import ./foo.nix;
-        }
+    ```nix
+    rec {
+      x = 123;
+      y = import ./foo.nix;
+    }
+    ```
     
     then the following `foo.nix` will give an error:
     
-        x + 456
+    ```nix
+    x + 456
+    ```
     
     since `x` is not in scope in `foo.nix`. If you want `x` to be
     available in `foo.nix`, you should pass it as a function argument:
     
-        rec {
-          x = 123;
-          y = import ./foo.nix x;
-        }
+    ```nix
+    rec {
+      x = 123;
+      y = import ./foo.nix x;
+    }
+    ```
     
     and
     
-        x: x + 456
+    ```nix
+    x: x + 456
+    ```
     
     (The function argument doesn’t have to be called `x` in `foo.nix`;
     any name would work.)
@@ -442,23 +473,28 @@ For instance, `derivation` is also available as `builtins.derivation`.
     string-valued attribute `name` specifying the name of the attribute,
     and an attribute `value` specifying its value. Example:
     
-        builtins.listToAttrs
-          [ { name = "foo"; value = 123; }
-            { name = "bar"; value = 456; }
-          ]
+    ```nix
+    builtins.listToAttrs
+      [ { name = "foo"; value = 123; }
+        { name = "bar"; value = 456; }
+      ]
+    ```
     
     evaluates to
     
-        { foo = 123; bar = 456; }
+    ```nix
+    { foo = 123; bar = 456; }
+    ```
 
   - `map` *f* *list*; `builtins.map` *f* *list*  
     Apply the function *f* to each element in the list *list*. For
     example,
     
-        map (x: "foo" + x) [ "bar" "bla" "abc" ]
+    ```nix
+    map (x: "foo" + x) [ "bar" "bla" "abc" ]
+    ```
     
-    evaluates to `[ "foobar" "foobla" "fooabc"
-                    ]`.
+    evaluates to `[ "foobar" "foobla" "fooabc" ]`.
 
   - `builtins.match` *regex* *str*  
     Returns a list if the [extended POSIX regular
@@ -466,19 +502,27 @@ For instance, `derivation` is also available as `builtins.derivation`.
     *regex* matches *str* precisely, otherwise returns `null`. Each item
     in the list is a regex group.
     
-        builtins.match "ab" "abc"
+    ```nix
+    builtins.match "ab" "abc"
+    ```
     
     Evaluates to `null`.
     
-        builtins.match "abc" "abc"
+    ```nix
+    builtins.match "abc" "abc"
+    ```
     
     Evaluates to `[ ]`.
     
-        builtins.match "a(b)(c)" "abc"
+    ```nix
+    builtins.match "a(b)(c)" "abc"
+    ```
     
     Evaluates to `[ "b" "c" ]`.
     
-        builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
+    ```nix
+    builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
+    ```
     
     Evaluates to `[ "foo" ]`.
 
@@ -534,11 +578,12 @@ For instance, `derivation` is also available as `builtins.derivation`.
   - `builtins.readDir` *path*  
     Return the contents of the directory *path* as a set mapping
     directory entries to the corresponding file type. For instance, if
-    directory `A` contains a regular file `B` and another directory `C`,
-    then `builtins.readDir
-                    ./A` will return the set
+    directory `A` contains a regular file `B` and another directory
+    `C`, then `builtins.readDir ./A` will return the set
     
-        { B = "regular"; C = "directory"; }
+    ```nix
+    { B = "regular"; C = "directory"; }
+    ```
     
     The possible values for the file type are `"regular"`,
     `"directory"`, `"symlink"` and `"unknown"`.
@@ -550,7 +595,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
     Remove the attributes listed in *list* from *set*. The attributes
     don’t have to exist in *set*. For instance,
     
-        removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
+    ```nix
+    removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
+    ```
     
     evaluates to `{ y = 2; }`.
 
@@ -558,7 +605,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
     Given string *s*, replace every occurrence of the strings in *from*
     with the corresponding string in *to*. For example,
     
-        builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
+    ```nix
+    builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
+    ```
     
     evaluates to `"fabir"`.
 
@@ -572,10 +621,11 @@ For instance, `derivation` is also available as `builtins.derivation`.
     if the first element is less than the second, and `false` otherwise.
     For example,
     
-        builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
+    ```nix
+    builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
+    ```
     
-    produces the list `[ 42 77 147 249 483 526
-                    ]`.
+    produces the list `[ 42 77 147 249 483 526 ]`.
     
     This is a stable sort: it preserves the relative order of elements
     deemed equal by the comparator.
@@ -587,19 +637,27 @@ For instance, `derivation` is also available as `builtins.derivation`.
     *regex* matches of *str*. Each item in the lists of matched
     sequences is a regex group.
     
-        builtins.split "(a)b" "abc"
+    ```nix
+    builtins.split "(a)b" "abc"
+    ```
     
     Evaluates to `[ "" [ "a" ] "c" ]`.
     
-        builtins.split "([ac])" "abc"
+    ```nix
+    builtins.split "([ac])" "abc"
+    ```
     
     Evaluates to `[ "" [ "a" ] "b" [ "c" ] "" ]`.
     
-        builtins.split "(a)|(c)" "abc"
+    ```nix
+    builtins.split "(a)|(c)" "abc"
+    ```
     
     Evaluates to `[ "" [ "a" null ] "b" [ null "c" ] "" ]`.
     
-        builtins.split "([[:upper:]]+)" "  FOO   "
+    ```nix
+    builtins.split "([[:upper:]]+)" "  FOO   "
+    ```
     
     Evaluates to `[ " " [ "FOO" ] " " ]`.
 
@@ -623,7 +681,9 @@ For instance, `derivation` is also available as `builtins.derivation`.
     substring up to the end of the string is returned. *start* must be
     non-negative. For example,
     
-        builtins.substring 0 3 "nixos"
+    ```nix
+    builtins.substring 0 3 "nixos"
+    ```
     
     evaluates to `"nix"`.
 
@@ -645,45 +705,47 @@ For instance, `derivation` is also available as `builtins.derivation`.
     “inline”. For instance, the following Nix expression combines the
     [Nix expression for GNU Hello](expression-syntax.md) and its
     [build script](build-script.md) into one file:
-    
-        { stdenv, fetchurl, perl }:
-        
-        stdenv.mkDerivation {
-          name = "hello-2.1.1";
-        
-          builder = builtins.toFile "builder.sh" "
-            source $stdenv/setup
-        
-            PATH=$perl/bin:$PATH
-        
-            tar xvfz $src
-            cd hello-*
-            ./configure --prefix=$out
-            make
-            make install
-          ";
-        
-          src = fetchurl {
-            url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-            sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-          };
-          inherit perl;
-        }
+
+    ```nix
+    { stdenv, fetchurl, perl }:
+
+    stdenv.mkDerivation {
+      name = "hello-2.1.1";
+
+      builder = builtins.toFile "builder.sh" "
+        source $stdenv/setup
+
+        PATH=$perl/bin:$PATH
+
+        tar xvfz $src
+        cd hello-*
+        ./configure --prefix=$out
+        make
+        make install
+      ";
+
+      src = fetchurl {
+        url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+        sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+      };
+      inherit perl;
+    }
+    ```
     
     It is even possible for one file to refer to another, e.g.,
     
-    ``` 
-      builder = let
-        configFile = builtins.toFile "foo.conf" "
-          # This is some dummy configuration file.
-          ...
-        ";
-      in builtins.toFile "builder.sh" "
-        source $stdenv/setup
+    ```nix
+    builder = let
+      configFile = builtins.toFile "foo.conf" "
+        # This is some dummy configuration file.
         ...
-        cp ${configFile} $out/etc/foo.conf
       ";
-    ```
+    in builtins.toFile "builder.sh" "
+      source $stdenv/setup
+      ...
+      cp ${configFile} $out/etc/foo.conf
+    ";
+  ```
     
     Note that `${configFile}` is an
     [antiquotation](language-values.md), so the result of the
@@ -694,10 +756,12 @@ For instance, `derivation` is also available as `builtins.derivation`.
     It is however *not* allowed to have files mutually referring to each
     other, like so:
     
-        let
-          foo = builtins.toFile "foo" "...${bar}...";
-          bar = builtins.toFile "bar" "...${foo}...";
-        in foo
+    ```nix
+    let
+      foo = builtins.toFile "foo" "...${bar}...";
+      bar = builtins.toFile "bar" "...${foo}...";
+    in foo
+    ```
     
     This is not allowed because it would cause a cyclic dependency in
     the computation of the cryptographic hashes for `foo` and `bar`.
@@ -744,40 +808,42 @@ For instance, `derivation` is also available as `builtins.derivation`.
     
     Here is an example where this is the case:
     
-        { stdenv, fetchurl, libxslt, jira, uberwiki }:
-        
-        stdenv.mkDerivation (rec {
-          name = "web-server";
-        
-          buildInputs = [ libxslt ];
-        
-          builder = builtins.toFile "builder.sh" "
-            source $stdenv/setup
-            mkdir $out
-            echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml ① 
-          ";
-        
-          stylesheet = builtins.toFile "stylesheet.xsl" ② 
-           "<?xml version='1.0' encoding='UTF-8'?>
-            <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-              <xsl:template match='/'>
-                <Configure>
-                  <xsl:for-each select='/expr/list/attrs'>
-                    <Call name='addWebApplication'>
-                      <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
-                      <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
-                    </Call>
-                  </xsl:for-each>
-                </Configure>
-              </xsl:template>
-            </xsl:stylesheet>
-          ";
-        
-          servlets = builtins.toXML [ ③ 
-            { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
-            { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
-          ];
-        })
+    ```nix
+    { stdenv, fetchurl, libxslt, jira, uberwiki }:
+
+    stdenv.mkDerivation (rec {
+      name = "web-server";
+
+      buildInputs = [ libxslt ];
+
+      builder = builtins.toFile "builder.sh" "
+        source $stdenv/setup
+        mkdir $out
+        echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml ① 
+      ";
+
+      stylesheet = builtins.toFile "stylesheet.xsl" ② 
+       "<?xml version='1.0' encoding='UTF-8'?>
+        <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+          <xsl:template match='/'>
+            <Configure>
+              <xsl:for-each select='/expr/list/attrs'>
+                <Call name='addWebApplication'>
+                  <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
+                  <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
+                </Call>
+              </xsl:for-each>
+            </Configure>
+          </xsl:template>
+        </xsl:stylesheet>
+      ";
+
+      servlets = builtins.toXML [ ③ 
+        { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
+        { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
+      ];
+    })
+    ```
     
     The builder is supposed to generate the configuration file for a
     [Jetty servlet container](http://jetty.mortbay.org/). A servlet
@@ -796,27 +862,29 @@ For instance, `derivation` is also available as `builtins.derivation`.
     configuration file for the Jetty server. The XML representation
     produced at point ③ by `toXML` is as follows:
     
-        <?xml version='1.0' encoding='utf-8'?>
-        <expr>
-          <list>
-            <attrs>
-              <attr name="path">
-                <string value="/bugtracker" />
-              </attr>
-              <attr name="war">
-                <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
-              </attr>
-            </attrs>
-            <attrs>
-              <attr name="path">
-                <string value="/wiki" />
-              </attr>
-              <attr name="war">
-                <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
-              </attr>
-            </attrs>
-          </list>
-        </expr>
+    ```xml
+    <?xml version='1.0' encoding='utf-8'?>
+    <expr>
+      <list>
+        <attrs>
+          <attr name="path">
+            <string value="/bugtracker" />
+          </attr>
+          <attr name="war">
+            <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
+          </attr>
+        </attrs>
+        <attrs>
+          <attr name="path">
+            <string value="/wiki" />
+          </attr>
+          <attr name="war">
+            <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
+          </attr>
+        </attrs>
+      </list>
+    </expr>
+    ```
     
     Note that we used the `toFile` built-in to write the builder and
     the stylesheet “inline” in the Nix expression. The path of the
@@ -830,13 +898,13 @@ For instance, `derivation` is also available as `builtins.derivation`.
 
   - `builtins.tryEval` *e*  
     Try to shallowly evaluate *e*. Return a set containing the
-    attributes `success` (`true` if *e* evaluated successfully, `false`
-    if an error was thrown) and `value`, equalling *e* if successful and
-    `false` otherwise. Note that this doesn't evaluate *e* deeply, so
-    ` let e = { x = throw ""; }; in (builtins.tryEval e).success
-                     ` will be `true`. Using ` builtins.deepSeq
-                     ` one can get the expected result: `let e = { x = throw "";
-                    }; in (builtins.tryEval (builtins.deepSeq e e)).success` will be
+    attributes `success` (`true` if *e* evaluated successfully,
+    `false` if an error was thrown) and `value`, equalling *e* if
+    successful and `false` otherwise. Note that this doesn't evaluate
+    *e* deeply, so ` let e = { x = throw ""; }; in (builtins.tryEval
+    e).success ` will be `true`. Using ` builtins.deepSeq ` one can
+    get the expected result: `let e = { x = throw ""; }; in
+    (builtins.tryEval (builtins.deepSeq e e)).success` will be
     `false`.
 
   - `builtins.typeOf` *e*  
diff --git a/doc/manual/src/expressions/derivations.md b/doc/manual/src/expressions/derivations.md
index 0e5656b5b..d26a33b7f 100644
--- a/doc/manual/src/expressions/derivations.md
+++ b/doc/manual/src/expressions/derivations.md
@@ -57,23 +57,34 @@ the attributes of which specify the inputs of the build.
     and it doesn’t need the documentation at build time. Thus, the
     library package could specify:
     
-        outputs = [ "lib" "headers" "doc" ];
+    ```nix
+    outputs = [ "lib" "headers" "doc" ];
+    ```
     
     This will cause Nix to pass environment variables `lib`, `headers`
     and `doc` to the builder containing the intended store paths of each
     output. The builder would typically do something like
     
-        ./configure --libdir=$lib/lib --includedir=$headers/include --docdir=$doc/share/doc
+    ```bash
+    ./configure \
+      --libdir=$lib/lib \
+      --includedir=$headers/include \
+      --docdir=$doc/share/doc
+    ```
     
     for an Autoconf-style package. You can refer to each output of a
     derivation by selecting it as an attribute, e.g.
     
-        buildInputs = [ pkg.lib pkg.headers ];
+    ```nix
+    buildInputs = [ pkg.lib pkg.headers ];
+    ```
     
     The first element of `outputs` determines the *default output*.
     Thus, you could also write
     
-        buildInputs = [ pkg pkg.headers ];
+    ```nix
+    buildInputs = [ pkg pkg.headers ];
+    ```
     
     since `pkg` is equivalent to `pkg.lib`.
 
diff --git a/doc/manual/src/expressions/expression-syntax.md b/doc/manual/src/expressions/expression-syntax.md
index e3432b577..2a1306e32 100644
--- a/doc/manual/src/expressions/expression-syntax.md
+++ b/doc/manual/src/expressions/expression-syntax.md
@@ -2,17 +2,19 @@
 
 Here is a Nix expression for GNU Hello:
 
-    { stdenv, fetchurl, perl }: ①
-    
-    stdenv.mkDerivation { ②
-      name = "hello-2.1.1"; ③
-      builder = ./builder.sh; ④
-      src = fetchurl { ⑤
-        url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-        sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-      };
-      inherit perl; ⑥
-    }
+```nix
+{ stdenv, fetchurl, perl }: ①
+
+stdenv.mkDerivation { ②
+  name = "hello-2.1.1"; ③
+  builder = ./builder.sh; ④
+  src = fetchurl { ⑤
+    url = "ftp://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+    sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+  };
+  inherit perl; ⑥
+}
+```
 
 This file is actually already in the Nix Packages collection in
 `pkgs/applications/misc/hello/ex-1/default.nix`. It is customary to
@@ -31,31 +33,27 @@ elements (referenced from the figure by number):
     etc. `fetchurl` is a function that downloads files. `perl` is the
     Perl interpreter.
     
-    Nix functions generally have the form `{ x, y, ...,
-                    z }: e` where `x`, `y`, etc. are the names of the expected
-    arguments, and where *e* is the body of the function. So here, the
-    entire remainder of the file is the body of the function; when given
-    the required arguments, the body should describe how to build an
-    instance of the Hello package.
+    Nix functions generally have the form `{ x, y, ..., z }: e` where
+    `x`, `y`, etc. are the names of the expected arguments, and where
+    *e* is the body of the function. So here, the entire remainder of
+    the file is the body of the function; when given the required
+    arguments, the body should describe how to build an instance of
+    the Hello package.
 
 2.  So we have to build a package. Building something from other stuff
     is called a *derivation* in Nix (as opposed to sources, which are
     built by humans instead of computers). We perform a derivation by
-    calling `stdenv.mkDerivation`. `mkDerivation` is a function provided
-    by `stdenv` that builds a package from a set of *attributes*. A set
-    is just a list of key/value pairs where each key is a string and
-    each value is an arbitrary Nix expression. They take the general
-    form `{
-                    name1 =
-                    expr1; ...
-                    nameN =
-                    exprN; }`.
+    calling `stdenv.mkDerivation`. `mkDerivation` is a function
+    provided by `stdenv` that builds a package from a set of
+    *attributes*. A set is just a list of key/value pairs where each
+    key is a string and each value is an arbitrary Nix
+    expression. They take the general form `{ name1 = expr1; ...
+    nameN = exprN; }`.
 
-3.  The attribute `name` specifies the symbolic name and version of the
-    package. Nix doesn't really care about these things, but they are
-    used by for instance `nix-env
-                    -q` to show a “human-readable” name for packages. This attribute is
-    required by `mkDerivation`.
+3.  The attribute `name` specifies the symbolic name and version of
+    the package. Nix doesn't really care about these things, but they
+    are used by for instance `nix-env -q` to show a “human-readable”
+    name for packages. This attribute is required by `mkDerivation`.
 
 4.  The attribute `builder` specifies the builder. This attribute can
     sometimes be omitted, in which case `mkDerivation` will fill in a
@@ -83,8 +81,10 @@ elements (referenced from the figure by number):
     `perl` function argument to the builder. All attributes in the set
     are actually passed as environment variables to the builder, so
     declaring an attribute
-    
-        perl = perl;
+
+    ```nix
+    perl = perl;
+    ```
     
     will do the trick: it binds an attribute `perl` to the function
     argument which also happens to be called `perl`. However, it looks a
diff --git a/doc/manual/src/expressions/generic-builder.md b/doc/manual/src/expressions/generic-builder.md
index 43275dbf7..cf26b5f82 100644
--- a/doc/manual/src/expressions/generic-builder.md
+++ b/doc/manual/src/expressions/generic-builder.md
@@ -3,12 +3,14 @@
 Recall that the [build script for GNU Hello](build-script.md) looked
 something like this:
 
-    PATH=$perl/bin:$PATH
-    tar xvfz $src
-    cd hello-*
-    ./configure --prefix=$out
-    make
-    make install
+```bash
+PATH=$perl/bin:$PATH
+tar xvfz $src
+cd hello-*
+./configure --prefix=$out
+make
+make install
+```
 
 The builders for almost all Unix packages look like this — set up some
 environment variables, unpack the sources, configure, build, and
@@ -16,11 +18,13 @@ install. For this reason the standard environment provides some Bash
 functions that automate the build process. Here is what a builder using
 the generic build facilities looks like:
 
-    buildInputs="$perl" ①
-    
-    source $stdenv/setup ②
-    
-    genericBuild ③
+```bash
+buildInputs="$perl" ①
+
+source $stdenv/setup ②
+
+genericBuild ③
+```
 
 Here is what each line means:
 
@@ -45,15 +49,17 @@ Here is what each line means:
 Discerning readers will note that the `buildInputs` could just as well
 have been set in the Nix expression, like this:
 
-``` 
+```nix
   buildInputs = [ perl ];
 ```
 
 The `perl` attribute can then be removed, and the builder becomes even
 shorter:
 
-    source $stdenv/setup
-    genericBuild
+```bash
+source $stdenv/setup
+genericBuild
+```
 
 In fact, `mkDerivation` provides a default builder that looks exactly
 like that, so it is actually possible to omit the builder for Hello
diff --git a/doc/manual/src/expressions/language-constructs.md b/doc/manual/src/expressions/language-constructs.md
index 8e267a799..cb0169239 100644
--- a/doc/manual/src/expressions/language-constructs.md
+++ b/doc/manual/src/expressions/language-constructs.md
@@ -5,10 +5,12 @@
 Recursive sets are just normal sets, but the attributes can refer to
 each other. For example,
 
-    rec {
-      x = y;
-      y = 123;
-    }.x
+```nix
+rec {
+  x = y;
+  y = 123;
+}.x
+```
 
 evaluates to `123`. Note that without `rec` the binding `x = y;` would
 refer to the variable `y` in the surrounding scope, if one exists, and
@@ -19,10 +21,12 @@ recursive set, they are.
 Recursive sets of course introduce the danger of infinite recursion. For
 example, the expression
 
-    rec {
-      x = y;
-      y = x;
-    }.x
+```nix
+rec {
+  x = y;
+  y = x;
+}.x
+```
 
 will crash with an `infinite recursion encountered` error message.
 
@@ -31,10 +35,12 @@ will crash with an `infinite recursion encountered` error message.
 A let-expression allows you to define local variables for an expression.
 For instance,
 
-    let
-      x = "foo";
-      y = "bar";
-    in x + y
+```nix
+let
+  x = "foo";
+  y = "bar";
+in x + y
+```
 
 evaluates to `"foobar"`.
 
@@ -45,38 +51,42 @@ copy variables from the surrounding lexical scope (e.g., when you want
 to propagate attributes). This can be shortened using the `inherit`
 keyword. For instance,
 
-    let x = 123; in
-    { inherit x;
-      y = 456;
-    }
+```nix
+let x = 123; in
+{ inherit x;
+  y = 456;
+}
+```
 
 is equivalent to
 
-    let x = 123; in
-    { x = x;
-      y = 456;
-    }
+```nix
+let x = 123; in
+{ x = x;
+  y = 456;
+}
+```
 
 and both evaluate to `{ x = 123; y = 456; }`. (Note that this works
 because `x` is added to the lexical scope by the `let` construct.) It is
 also possible to inherit attributes from another set. For instance, in
 this fragment from `all-packages.nix`,
 
-``` 
-  graphviz = (import ../tools/graphics/graphviz) {
-    inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
-    inherit (xlibs) libXaw;
-  };
+```nix
+graphviz = (import ../tools/graphics/graphviz) {
+  inherit fetchurl stdenv libpng libjpeg expat x11 yacc;
+  inherit (xlibs) libXaw;
+};
 
-  xlibs = {
-    libX11 = ...;
-    libXaw = ...;
-    ...
-  }
-
-  libpng = ...;
-  libjpg = ...;
+xlibs = {
+  libX11 = ...;
+  libXaw = ...;
   ...
+}
+
+libpng = ...;
+libjpg = ...;
+...
 ```
 
 the set used in the function call to the function defined in
@@ -86,17 +96,21 @@ surrounding scope (`fetchurl` ... `yacc`), but also inherits `libXaw`
 
 Summarizing the fragment
 
-    ...
-    inherit x y z;
-    inherit (src-set) a b c;
-    ...
+```nix
+...
+inherit x y z;
+inherit (src-set) a b c;
+...
+```
 
 is equivalent to
 
-    ...
-    x = x; y = y; z = z;
-    a = src-set.a; b = src-set.b; c = src-set.c;
-    ...
+```nix
+...
+x = x; y = y; z = z;
+a = src-set.a; b = src-set.b; c = src-set.c;
+...
+```
 
 when used while defining local variables in a let-expression or while
 defining a set.
@@ -105,7 +119,9 @@ defining a set.
 
 Functions have the following form:
 
-    pattern: body
+```nix
+pattern: body
+```
 
 The pattern specifies what the argument of the function must look like,
 and binds variables in the body to (parts of) the argument. There are
@@ -114,42 +130,51 @@ three kinds of patterns:
   - If a pattern is a single identifier, then the function matches any
     argument. Example:
     
-        let negate = x: !x;
-            concat = x: y: x + y;
-        in if negate true then concat "foo" "bar" else ""
+    ```nix
+    let negate = x: !x;
+        concat = x: y: x + y;
+    in if negate true then concat "foo" "bar" else ""
+    ```
     
     Note that `concat` is a function that takes one argument and returns
     a function that takes another argument. This allows partial
     parameterisation (i.e., only filling some of the arguments of a
     function); e.g.,
     
-        map (concat "foo") [ "bar" "bla" "abc" ]
+    ```nix
+    map (concat "foo") [ "bar" "bla" "abc" ]
+    ```
     
-    evaluates to `[ "foobar" "foobla"
-            "fooabc" ]`.
+    evaluates to `[ "foobar" "foobla" "fooabc" ]`.
 
   - A *set pattern* of the form `{ name1, name2, …, nameN }` matches a
     set containing the listed attributes, and binds the values of those
     attributes to variables in the function body. For example, the
     function
     
-        { x, y, z }: z + y + x
+    ```nix
+    { x, y, z }: z + y + x
+    ```
     
     can only be called with a set containing exactly the attributes `x`,
     `y` and `z`. No other attributes are allowed. If you want to allow
     additional arguments, you can use an ellipsis (`...`):
     
-        { x, y, z, ... }: z + y + x
+    ```nix
+    { x, y, z, ... }: z + y + x
+    ```
     
     This works on any set that contains at least the three named
     attributes.
     
-    It is possible to provide *default values* for attributes, in which
-    case they are allowed to be missing. A default value is specified by
-    writing `name ?
-            e`, where *e* is an arbitrary expression. For example,
+    It is possible to provide *default values* for attributes, in
+    which case they are allowed to be missing. A default value is
+    specified by writing `name ?  e`, where *e* is an arbitrary
+    expression. For example,
     
-        { x, y ? "foo", z ? "bar" }: z + y + x
+    ```nix
+    { x, y ? "foo", z ? "bar" }: z + y + x
+    ```
     
     specifies a function that only requires an attribute named `x`, but
     optionally accepts `y` and `z`.
@@ -157,14 +182,14 @@ three kinds of patterns:
   - An `@`-pattern provides a means of referring to the whole value
     being matched:
     
-    ``` 
-     args@{ x, y, z, ... }: z + y + x + args.a
+    ```nix
+    args@{ x, y, z, ... }: z + y + x + args.a
     ```
     
     but can also be written as:
     
-    ``` 
-     { x, y, z, ... } @ args: z + y + x + args.a
+    ```nix
+    { x, y, z, ... } @ args: z + y + x + args.a
     ```
     
     Here `args` is bound to the entire argument, which is further
@@ -182,24 +207,30 @@ three kinds of patterns:
     > 
     > For instance
     > 
-    >     let
-    >       function = args@{ a ? 23, ... }: args;
-    >     in
-    >      function {}
+    > ```nix
+    > let
+    >   function = args@{ a ? 23, ... }: args;
+    > in
+    >   function {}
+    > ````
     > 
     > will evaluate to an empty attribute set.
 
 Note that functions do not have names. If you want to give them a name,
 you can bind them to an attribute, e.g.,
 
-    let concat = { x, y }: x + y;
-    in concat { x = "foo"; y = "bar"; }
+```nix
+let concat = { x, y }: x + y;
+in concat { x = "foo"; y = "bar"; }
+```
 
 ## Conditionals
 
 Conditionals look like this:
 
-    if e1 then e2 else e3
+```nix
+if e1 then e2 else e3
+```
 
 where *e1* is an expression that should evaluate to a Boolean value
 (`true` or `false`).
@@ -209,7 +240,9 @@ where *e1* is an expression that should evaluate to a Boolean value
 Assertions are generally used to check that certain requirements on or
 between features and dependencies hold. They look like this:
 
-    assert e1; e2
+```nix
+assert e1; e2
+```
 
 where *e1* is an expression that should evaluate to a Boolean value. If
 it evaluates to `true`, *e2* is returned; otherwise expression
@@ -218,29 +251,31 @@ evaluation is aborted and a backtrace is printed.
 Here is a Nix expression for the Subversion package that shows how
 assertions can be used:.
 
-    { localServer ? false
-    , httpServer ? false
-    , sslSupport ? false
-    , pythonBindings ? false
-    , javaSwigBindings ? false
-    , javahlBindings ? false
-    , stdenv, fetchurl
-    , openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
-    }:
-    
-    assert localServer -> db4 != null; ①
-    assert httpServer -> httpd != null && httpd.expat == expat; ②
-    assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); ③
-    assert pythonBindings -> swig != null && swig.pythonSupport;
-    assert javaSwigBindings -> swig != null && swig.javaSupport;
-    assert javahlBindings -> j2sdk != null;
-    
-    stdenv.mkDerivation {
-      name = "subversion-1.1.1";
-      ...
-      openssl = if sslSupport then openssl else null; ④
-      ...
-    }
+```nix
+{ localServer ? false
+, httpServer ? false
+, sslSupport ? false
+, pythonBindings ? false
+, javaSwigBindings ? false
+, javahlBindings ? false
+, stdenv, fetchurl
+, openssl ? null, httpd ? null, db4 ? null, expat, swig ? null, j2sdk ? null
+}:
+
+assert localServer -> db4 != null; ①
+assert httpServer -> httpd != null && httpd.expat == expat; ②
+assert sslSupport -> openssl != null && (httpServer -> httpd.openssl == openssl); ③
+assert pythonBindings -> swig != null && swig.pythonSupport;
+assert javaSwigBindings -> swig != null && swig.javaSupport;
+assert javahlBindings -> j2sdk != null;
+
+stdenv.mkDerivation {
+  name = "subversion-1.1.1";
+  ...
+  openssl = if sslSupport then openssl else null; ④
+  ...
+}
+```
 
 The points of interest are:
 
@@ -273,19 +308,25 @@ The points of interest are:
 
 A *with-expression*,
 
-    with e1; e2
+```nix
+with e1; e2
+```
 
 introduces the set *e1* into the lexical scope of the expression *e2*.
 For instance,
 
-    let as = { x = "foo"; y = "bar"; };
-    in with as; x + y
+```nix
+let as = { x = "foo"; y = "bar"; };
+in with as; x + y
+```
 
 evaluates to `"foobar"` since the `with` adds the `x` and `y` attributes
 of `as` to the lexical scope in the expression `x + y`. The most common
 use of `with` is in conjunction with the `import` function. E.g.,
 
-    with (import ./definitions.nix); ...
+```nix
+with (import ./definitions.nix); ...
+```
 
 makes all attributes defined in the file `definitions.nix` available as
 if they were defined locally in a `let`-expression.
@@ -293,14 +334,17 @@ if they were defined locally in a `let`-expression.
 The bindings introduced by `with` do not shadow bindings introduced by
 other means, e.g.
 
-    let a = 3; in with { a = 1; }; let a = 4; in with { a = 2; }; ...
+```nix
+let a = 3; in with { a = 1; }; let a = 4; in with { a = 2; }; ...
+```
 
 establishes the same scope as
 
-    let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...
+```nix
+let a = 1; in let a = 2; in let a = 3; in let a = 4; in ...
+```
 
 ## Comments
 
 Comments can be single-line, started with a `#` character, or
-inline/multi-line, enclosed within `/*
-... */`.
+inline/multi-line, enclosed within `/* ... */`.
diff --git a/doc/manual/src/expressions/language-values.md b/doc/manual/src/expressions/language-values.md
index eca2cab51..ce31029cc 100644
--- a/doc/manual/src/expressions/language-values.md
+++ b/doc/manual/src/expressions/language-values.md
@@ -19,24 +19,30 @@ Nix has the following basic data types:
     into a string (meaning that it must be a string, a path, or a
     derivation). For instance, rather than writing
     
-        "--with-freetype2-library=" + freetype + "/lib"
+    ```nix
+    "--with-freetype2-library=" + freetype + "/lib"
+    ```
     
     (where `freetype` is a derivation), you can instead write the more
     natural
     
-        "--with-freetype2-library=${freetype}/lib"
+    ```nix
+    "--with-freetype2-library=${freetype}/lib"
+    ```
     
     The latter is automatically translated to the former. A more
     complicated example (from the Nix expression for
     [Qt](http://www.trolltech.com/products/qt)):
     
-        configureFlags = "
-          -system-zlib -system-libpng -system-libjpeg
-          ${if openglSupport then "-dlopen-opengl
-            -L${mesa}/lib -I${mesa}/include
-            -L${libXmu}/lib -I${libXmu}/include" else ""}
-          ${if threadSupport then "-thread" else "-no-thread"}
-        ";
+    ```nix
+    configureFlags = "
+      -system-zlib -system-libpng -system-libjpeg
+      ${if openglSupport then "-dlopen-opengl
+        -L${mesa}/lib -I${mesa}/include
+        -L${libXmu}/lib -I${libXmu}/include" else ""}
+      ${if threadSupport then "-thread" else "-no-thread"}
+    ";
+    ```
     
     Note that Nix expressions and strings can be arbitrarily nested; in
     this case the outer string contains various antiquotations that
@@ -46,11 +52,13 @@ Nix has the following basic data types:
     The second way to write string literals is as an *indented string*,
     which is enclosed between pairs of *double single-quotes*, like so:
     
-        ''
-          This is the first line.
-          This is the second line.
-            This is the third line.
-        ''
+    ```nix
+    ''
+      This is the first line.
+      This is the second line.
+        This is the third line.
+    ''
+    ```
     
     This kind of string literal intelligently strips indentation from
     the start of each line. To be precise, it strips from each line a
@@ -60,7 +68,9 @@ Nix has the following basic data types:
     line is indented four spaces. Thus, two spaces are stripped from
     each line, so the resulting string is
     
-        "This is the first line.\nThis is the second line.\n  This is the third line.\n"
+    ```nix
+    "This is the first line.\nThis is the second line.\n  This is the third line.\n"
+    ```
     
     Note that the whitespace and newline following the opening `''` is
     ignored if there is no non-whitespace text on the initial line.
@@ -82,17 +92,19 @@ Nix has the following basic data types:
     configuration files because `''` is much less common than `"`.
     Example:
     
-        stdenv.mkDerivation {
-          ...
-          postInstall =
-            ''
-              mkdir $out/bin $out/etc
-              cp foo $out/bin
-              echo "Hello World" > $out/etc/foo.conf
-              ${if enableBar then "cp bar $out/bin" else ""}
-            '';
-          ...
-        }
+    ```nix
+    stdenv.mkDerivation {
+      ...
+      postInstall =
+        ''
+          mkdir $out/bin $out/etc
+          cp foo $out/bin
+          echo "Hello World" > $out/etc/foo.conf
+          ${if enableBar then "cp bar $out/bin" else ""}
+        '';
+      ...
+    }
+    ```
     
     Finally, as a convenience, *URIs* as defined in appendix B of
     [RFC 2396](http://www.ietf.org/rfc/rfc2396.txt) can be written *as
@@ -136,13 +148,17 @@ Nix has the following basic data types:
 Lists are formed by enclosing a whitespace-separated list of values
 between square brackets. For example,
 
-    [ 123 ./foo.nix "abc" (f { x = y; }) ]
+```nix
+[ 123 ./foo.nix "abc" (f { x = y; }) ]
+```
 
 defines a list of four elements, the last being the result of a call to
 the function `f`. Note that function calls have to be enclosed in
 parentheses. If they had been omitted, e.g.,
 
-    [ 123 ./foo.nix "abc" f { x = y; } ]
+```nix
+[ 123 ./foo.nix "abc" f { x = y; } ]
+```
 
 the result would be a list of five elements, the fourth one being a
 function and the fifth being a set.
@@ -159,10 +175,12 @@ Sets are just a list of name/value pairs (called *attributes*) enclosed
 in curly brackets, where each value is an arbitrary expression
 terminated by a semicolon. For example:
 
-    { x = 123;
-      text = "Hello";
-      y = f { bla = 456; };
-    }
+```nix
+{ x = 123;
+  text = "Hello";
+  y = f { bla = 456; };
+}
+```
 
 This defines a set with attributes named `x`, `text`, `y`. The order of
 the attributes is irrelevant. An attribute name may only occur once.
@@ -170,24 +188,32 @@ the attributes is irrelevant. An attribute name may only occur once.
 Attributes can be selected from a set using the `.` operator. For
 instance,
 
-    { a = "Foo"; b = "Bar"; }.a
+```nix
+{ a = "Foo"; b = "Bar"; }.a
+```
 
 evaluates to `"Foo"`. It is possible to provide a default value in an
 attribute selection using the `or` keyword. For example,
 
-    { a = "Foo"; b = "Bar"; }.c or "Xyzzy"
+```nix
+{ a = "Foo"; b = "Bar"; }.c or "Xyzzy"
+```
 
 will evaluate to `"Xyzzy"` because there is no `c` attribute in the set.
 
 You can use arbitrary double-quoted strings as attribute names:
 
-    { "foo ${bar}" = 123; "nix-1.0" = 456; }."foo ${bar}"
+```nix
+{ "foo ${bar}" = 123; "nix-1.0" = 456; }."foo ${bar}"
+```
 
 This will evaluate to `123` (Assuming `bar` is antiquotable). In the
 case where an attribute name is just a single antiquotation, the quotes
 can be dropped:
 
-    { foo = 123; }.${bar} or 456 
+```nix
+{ foo = 123; }.${bar} or 456
+```
 
 This will evaluate to `123` if `bar` evaluates to `"foo"` when coerced
 to a string and `456` otherwise (again assuming `bar` is antiquotable).
@@ -196,7 +222,9 @@ In the special case where an attribute name inside of a set declaration
 evaluates to `null` (which is normally an error, as `null` is not
 antiquotable), that attribute is simply not added to the set:
 
-    { ${if foo then "bar" else null} = true; }
+```nix
+{ ${if foo then "bar" else null} = true; }
+```
 
 This will evaluate to `{}` if `foo` evaluates to `false`.
 
@@ -205,9 +233,11 @@ itself a function or a set with a `__functor` attribute whose value is
 callable) can be applied as if it were a function, with the set itself
 passed in first , e.g.,
 
-    let add = { __functor = self: x: x + self.x; };
-        inc = add // { x = 1; };
-    in inc 1
+```nix
+let add = { __functor = self: x: x + self.x; };
+    inc = add // { x = 1; };
+in inc 1
+```
 
 evaluates to `2`. This can be used to attach metadata to a function
 without the caller needing to treat it specially, or to implement a form
diff --git a/doc/manual/src/expressions/simple-building-testing.md b/doc/manual/src/expressions/simple-building-testing.md
index ca422acea..6f730a936 100644
--- a/doc/manual/src/expressions/simple-building-testing.md
+++ b/doc/manual/src/expressions/simple-building-testing.md
@@ -6,18 +6,20 @@ yet. The best way to test the package is by using the command
 `nix-build`, which builds a Nix expression and creates a symlink named
 `result` in the current directory:
 
-    $ nix-build -A hello
-    building path `/nix/store/632d2b22514d...-hello-2.1.1'
-    hello-2.1.1/
-    hello-2.1.1/intl/
-    hello-2.1.1/intl/ChangeLog
-    ...
-    
-    $ ls -l result
-    lrwxrwxrwx ... 2006-09-29 10:43 result -> /nix/store/632d2b22514d...-hello-2.1.1
-    
-    $ ./result/bin/hello
-    Hello, world!
+```console
+$ nix-build -A hello
+building path `/nix/store/632d2b22514d...-hello-2.1.1'
+hello-2.1.1/
+hello-2.1.1/intl/
+hello-2.1.1/intl/ChangeLog
+...
+
+$ ls -l result
+lrwxrwxrwx ... 2006-09-29 10:43 result -> /nix/store/632d2b22514d...-hello-2.1.1
+
+$ ./result/bin/hello
+Hello, world!
+```
 
 The `-A` option selects the `hello` attribute. This is faster than
 using the symbolic package name specified by the `name` attribute
@@ -50,8 +52,10 @@ simultaneously, and they try to build the same derivation, the first Nix
 instance that gets there will perform the build, while the others block
 (or perform other derivations if available) until the build finishes:
 
-    $ nix-build -A hello
-    waiting for lock on `/nix/store/0h5b7hp8d4hqfrw8igvx97x1xawrjnac-hello-2.1.1x'
+```console
+$ nix-build -A hello
+waiting for lock on `/nix/store/0h5b7hp8d4hqfrw8igvx97x1xawrjnac-hello-2.1.1x'
+```
 
 So it is always safe to run multiple instances of Nix in parallel (which
 isn’t the case with, say, `make`).
diff --git a/doc/manual/src/hacking.md b/doc/manual/src/hacking.md
index f8375822d..1aa4e6b5f 100644
--- a/doc/manual/src/hacking.md
+++ b/doc/manual/src/hacking.md
@@ -3,45 +3,63 @@
 This section provides some notes on how to hack on Nix. To get the
 latest version of Nix from GitHub:
 
-    $ git clone https://github.com/NixOS/nix.git
-    $ cd nix
+```console
+$ git clone https://github.com/NixOS/nix.git
+$ cd nix
+```
 
 To build Nix for the current operating system/architecture use
 
-    $ nix-build
+```console
+$ nix-build
+```
 
 or if you have a flakes-enabled nix:
 
-    $ nix build
+```console
+$ nix build
+```
 
 This will build `defaultPackage` attribute defined in the `flake.nix`
 file. To build for other platforms add one of the following suffixes to
 it: aarch64-linux, i686-linux, x86\_64-darwin, x86\_64-linux. i.e.
 
-    $ nix-build -A defaultPackage.x86_64-linux
+```console
+$ nix-build -A defaultPackage.x86_64-linux
+```
 
 To build all dependencies and start a shell in which all environment
 variables are set up so that those dependencies can be found:
 
-    $ nix-shell
+```console
+$ nix-shell
+```
 
 To build Nix itself in this shell:
 
-    [nix-shell]$ ./bootstrap.sh
-    [nix-shell]$ ./configure $configureFlags
-    [nix-shell]$ make -j $NIX_BUILD_CORES
+```console
+[nix-shell]$ ./bootstrap.sh
+[nix-shell]$ ./configure $configureFlags
+[nix-shell]$ make -j $NIX_BUILD_CORES
+```
 
 To install it in `$(pwd)/inst` and test it:
 
-    [nix-shell]$ make install
-    [nix-shell]$ make installcheck
-    [nix-shell]$ ./inst/bin/nix --version
-    nix (Nix) 2.4
+```console
+[nix-shell]$ make install
+[nix-shell]$ make installcheck
+[nix-shell]$ ./inst/bin/nix --version
+nix (Nix) 2.4
+```
 
-If you have a flakes-enabled nix you can replace:
+If you have a flakes-enabled Nix you can replace:
 
-    $ nix-shell
+```console
+$ nix-shell
+```
 
 by:
 
-    $ nix develop
+```console
+$ nix develop
+```
diff --git a/doc/manual/src/installation/building-source.md b/doc/manual/src/installation/building-source.md
index 35dbd5541..d21a51a82 100644
--- a/doc/manual/src/installation/building-source.md
+++ b/doc/manual/src/installation/building-source.md
@@ -3,16 +3,20 @@
 After unpacking or checking out the Nix sources, issue the following
 commands:
 
-    $ ./configure options...
-    $ make
-    $ make install
+```console
+$ ./configure options...
+$ make
+$ make install
+```
 
 Nix requires GNU Make so you may need to invoke `gmake` instead.
 
 When building from the Git repository, these should be preceded by the
 command:
 
-    $ ./bootstrap.sh
+```console
+$ ./bootstrap.sh
+```
 
 The installation path can be specified by passing the `--prefix=prefix`
 to `configure`. The default installation directory is `/usr/local`. You
diff --git a/doc/manual/src/installation/env-variables.md b/doc/manual/src/installation/env-variables.md
index 6e78245c9..4a49897e4 100644
--- a/doc/manual/src/installation/env-variables.md
+++ b/doc/manual/src/installation/env-variables.md
@@ -10,7 +10,9 @@ environment variables is to include the file
 `prefix/etc/profile.d/nix.sh` in your `~/.profile` (or similar), like
 this:
 
-    source prefix/etc/profile.d/nix.sh
+```bash
+source prefix/etc/profile.d/nix.sh
+```
 
 # `NIX_SSL_CERT_FILE`
 
@@ -23,13 +25,17 @@ and use its own certificate bundle.
 
 Set the environment variable and install Nix
 
-    $ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
-    $ sh <(curl -L https://nixos.org/nix/install)
+```console
+$ export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
+$ sh <(curl -L https://nixos.org/nix/install)
+```
 
 In the shell profile and rc files (for example, `/etc/bashrc`,
 `/etc/zshrc`), add the following line:
 
-    export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
+```bash
+export NIX_SSL_CERT_FILE=/etc/ssl/my-certificate-bundle.crt
+```
 
 > **Note**
 > 
@@ -41,8 +47,10 @@ In the shell profile and rc files (for example, `/etc/bashrc`,
 On macOS you must specify the environment variable for the Nix daemon
 service, then restart it:
 
-    $ sudo launchctl setenv NIX_SSL_CERT_FILE /etc/ssl/my-certificate-bundle.crt
-    $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
+```console
+$ sudo launchctl setenv NIX_SSL_CERT_FILE /etc/ssl/my-certificate-bundle.crt
+$ sudo launchctl kickstart -k system/org.nixos.nix-daemon
+```
 
 ## Proxy Environment Variables
 
diff --git a/doc/manual/src/installation/installing-binary.md b/doc/manual/src/installation/installing-binary.md
index a1dd993c4..8b8d1d738 100644
--- a/doc/manual/src/installation/installing-binary.md
+++ b/doc/manual/src/installation/installing-binary.md
@@ -3,8 +3,8 @@
 If you are using Linux or macOS versions up to 10.14 (Mojave), the
 easiest way to install Nix is to run the following command:
 
-``` 
-  $ sh <(curl -L https://nixos.org/nix/install)
+```console
+$ sh <(curl -L https://nixos.org/nix/install)
 ```
 
 If you're using macOS 10.15 (Catalina) or newer, consult [the macOS
@@ -18,8 +18,8 @@ installation is highly recommended.
 
 To explicitly select a single-user installation on your system:
 
-``` 
-  sh <(curl -L https://nixos.org/nix/install) --no-daemon
+```console
+$ sh <(curl -L https://nixos.org/nix/install) --no-daemon
 ```
 
 This will perform a single-user installation of Nix, meaning that `/nix`
@@ -28,8 +28,10 @@ account, *not* as root. The script will invoke `sudo` to create `/nix`
 if it doesn’t already exist. If you don’t have `sudo`, you should
 manually create `/nix` first as root, e.g.:
 
-    $ mkdir /nix
-    $ chown alice /nix
+```console
+$ mkdir /nix
+$ chown alice /nix
+```
 
 The install script will modify the first writable file from amongst
 `.bash_profile`, `.bash_login` and `.profile` to source
@@ -39,7 +41,9 @@ the install script to disable this behaviour.
 
 You can uninstall Nix simply by running:
 
-    $ rm -rf /nix
+```console
+$ rm -rf /nix
+```
 
 # Multi User Installation
 
@@ -53,7 +57,9 @@ service for the Nix daemon.
 You can instruct the installer to perform a multi-user installation on
 your system:
 
-    sh <(curl -L https://nixos.org/nix/install) --daemon
+```console
+$ sh <(curl -L https://nixos.org/nix/install) --daemon
+```
 
 The multi-user installation of Nix will create build users between the
 user IDs 30001 and 30032, and a group with the group ID 30000. You
@@ -72,18 +78,20 @@ extension. The installer will also create `/etc/profile.d/nix.sh`.
 
 You can uninstall Nix with the following commands:
 
-    sudo rm -rf /etc/profile/nix.sh /etc/nix /nix ~root/.nix-profile ~root/.nix-defexpr ~root/.nix-channels ~/.nix-profile ~/.nix-defexpr ~/.nix-channels
-    
-    # If you are on Linux with systemd, you will need to run:
-    sudo systemctl stop nix-daemon.socket
-    sudo systemctl stop nix-daemon.service
-    sudo systemctl disable nix-daemon.socket
-    sudo systemctl disable nix-daemon.service
-    sudo systemctl daemon-reload
-    
-    # If you are on macOS, you will need to run:
-    sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
-    sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
+```console
+sudo rm -rf /etc/profile/nix.sh /etc/nix /nix ~root/.nix-profile ~root/.nix-defexpr ~root/.nix-channels ~/.nix-profile ~/.nix-defexpr ~/.nix-channels
+
+# If you are on Linux with systemd, you will need to run:
+sudo systemctl stop nix-daemon.socket
+sudo systemctl stop nix-daemon.service
+sudo systemctl disable nix-daemon.socket
+sudo systemctl disable nix-daemon.service
+sudo systemctl daemon-reload
+
+# If you are on macOS, you will need to run:
+sudo launchctl unload /Library/LaunchDaemons/org.nixos.nix-daemon.plist
+sudo rm /Library/LaunchDaemons/org.nixos.nix-daemon.plist
+```
 
 There may also be references to Nix in `/etc/profile`, `/etc/bashrc`,
 and `/etc/zshrc` which you may remove.
@@ -110,7 +118,9 @@ chip](https://www.apple.com/euro/mac/shared/docs/Apple_T2_Security_Chip_Overview
 your drive will still be encrypted at rest (in which case "unencrypted"
 is a bit of a misnomer). To use this approach, just install Nix with:
 
-    $ sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume
+```console
+$ sh <(curl -L https://nixos.org/nix/install) --darwin-use-unencrypted-nix-store-volume
+```
 
 If you don't like the sound of this, you'll want to weigh the other
 approaches and tradeoffs detailed in this section.
@@ -184,7 +194,9 @@ there are a few things to weigh:
 If you are comfortable navigating these tradeoffs, you can encrypt the
 volume with something along the lines of:
 
-    alice$ diskutil apfs enableFileVault /nix -user disk
+```console
+alice$ diskutil apfs enableFileVault /nix -user disk
+```
 
 ## Symlink the Nix store to a custom location
 
@@ -221,11 +233,15 @@ as a helpful reference if you run into trouble.
     `apfs.util` to trigger creation (not deletion) of new entries
     without a reboot:
     
-        alice$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B
+    ```console
+    alice$ /System/Library/Filesystems/apfs.fs/Contents/Resources/apfs.util -B
+    ```
 
 3.  Create the new APFS volume with diskutil:
     
-        alice$ sudo diskutil apfs addVolume diskX APFS 'Nix Store' -mountpoint /nix
+    ```console
+    alice$ sudo diskutil apfs addVolume diskX APFS 'Nix Store' -mountpoint /nix
+    ```
 
 4.  Using `vifs`, add the new mount to `/etc/fstab`. If it doesn't
     already have other entries, it should look something like:
@@ -248,8 +264,8 @@ since 1.11.16, at `https://releases.nixos.org/nix/nix-version/install`.
 These install scripts can be used the same as the main NixOS.org
 installation script:
 
-``` 
-  sh <(curl -L https://nixos.org/nix/install)
+```console
+$ sh <(curl -L https://nixos.org/nix/install)
 ```
 
 In the same directory of the install script are sha256 sums, and gpg
@@ -263,10 +279,12 @@ dependencies. (This is what the install script at
 it somewhere (e.g. in `/tmp`), and then run the script named `install`
 inside the binary tarball:
 
-    alice$ cd /tmp
-    alice$ tar xfj nix-1.8-x86_64-darwin.tar.bz2
-    alice$ cd nix-1.8-x86_64-darwin
-    alice$ ./install
+```console
+alice$ cd /tmp
+alice$ tar xfj nix-1.8-x86_64-darwin.tar.bz2
+alice$ cd nix-1.8-x86_64-darwin
+alice$ ./install
+```
 
 If you need to edit the multi-user installation script to use different
 group ID or a different user ID range, modify the variables set in the
diff --git a/doc/manual/src/installation/multi-user.md b/doc/manual/src/installation/multi-user.md
index de159b603..6920591c4 100644
--- a/doc/manual/src/installation/multi-user.md
+++ b/doc/manual/src/installation/multi-user.md
@@ -28,10 +28,12 @@ group should have no other members. The build users should not be
 members of any other group. On Linux, you can create the group and users
 as follows:
 
-    $ groupadd -r nixbld
-    $ for n in $(seq 1 10); do useradd -c "Nix build user $n" \
-        -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
-        nixbld$n; done
+```console
+$ groupadd -r nixbld
+$ for n in $(seq 1 10); do useradd -c "Nix build user $n" \
+    -d /var/empty -g nixbld -G nixbld -M -N -r -s "$(which nologin)" \
+    nixbld$n; done
+```
 
 This creates 10 build users. There can never be more concurrent builds
 than the number of build users, so you may want to increase this if you
@@ -42,7 +44,9 @@ expect to do many builds at the same time.
 The [Nix daemon](../command-ref/nix-daemon.md) should be started as
 follows (as `root`):
 
-    $ nix-daemon
+```console
+$ nix-daemon
+```
 
 You’ll want to put that line somewhere in your system’s boot scripts.
 
@@ -50,7 +54,9 @@ To let unprivileged users use the daemon, they should set the
 [`NIX_REMOTE` environment variable](../command-ref/env-common.md) to
 `daemon`. So you should put a line like
 
-    export NIX_REMOTE=daemon
+```console
+export NIX_REMOTE=daemon
+```
 
 into the users’ login scripts.
 
@@ -61,8 +67,10 @@ permissions on the directory `/nix/var/nix/daemon-socket`. For instance,
 if you want to restrict the use of Nix to the members of a group called
 `nix-users`, do
 
-    $ chgrp nix-users /nix/var/nix/daemon-socket
-    $ chmod ug=rwx,o= /nix/var/nix/daemon-socket
+```console
+$ chgrp nix-users /nix/var/nix/daemon-socket
+$ chmod ug=rwx,o= /nix/var/nix/daemon-socket
+```
 
 This way, users who are not in the `nix-users` group cannot connect to
 the Unix domain socket `/nix/var/nix/daemon-socket/socket`, so they
diff --git a/doc/manual/src/installation/obtaining-source.md b/doc/manual/src/installation/obtaining-source.md
index 2937130cf..0a906e390 100644
--- a/doc/manual/src/installation/obtaining-source.md
+++ b/doc/manual/src/installation/obtaining-source.md
@@ -10,7 +10,9 @@ Alternatively, the most recent sources of Nix can be obtained from its
 following command will check out the latest revision into a directory
 called `nix`:
 
-    $ git clone https://github.com/NixOS/nix
+```console
+$ git clone https://github.com/NixOS/nix
+```
 
 Likewise, specific releases can be obtained from the
 [tags](https://github.com/NixOS/nix/tags) of the repository.
diff --git a/doc/manual/src/introduction.md b/doc/manual/src/introduction.md
index b54b0d02d..f01fe7b38 100644
--- a/doc/manual/src/introduction.md
+++ b/doc/manual/src/introduction.md
@@ -75,21 +75,27 @@ And since packages aren’t overwritten, the old versions are still
 there after an upgrade.  This means that you can _roll back_ to the
 old version:
 
-    $ nix-env --upgrade some-packages
-    $ nix-env --rollback
+```console
+$ nix-env --upgrade some-packages
+$ nix-env --rollback
+```
 
 ## Garbage collection
 
 When you uninstall a package like this…
 
-    $ nix-env --uninstall firefox
+```console
+$ nix-env --uninstall firefox
+```
 
 the package isn’t deleted from the system right away (after all, you
 might want to do a rollback, or it might be in the profiles of other
 users).  Instead, unused packages can be deleted safely by running the
 _garbage collector_:
 
-    $ nix-collect-garbage
+```console
+$ nix-collect-garbage
+```
 
 This deletes all packages that aren’t in use by any user profile or by
 a currently running program.
@@ -115,7 +121,9 @@ each other in the Nix store.
 Nix expressions generally describe how to build a package from
 source, so an installation action like
 
-    $ nix-env --install firefox
+```console
+$ nix-env --install firefox
+```
 
 _could_ cause quite a bit of build activity, as not only Firefox but
 also all its dependencies (all the way up to the C library and the
@@ -149,16 +157,20 @@ For example, the following command gets all dependencies of the
 Pan newsreader, as described by [its
 Nix expression](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/networking/newsreaders/pan/default.nix):
 
-    $ nix-shell '<nixpkgs>' -A pan
+```console
+$ nix-shell '<nixpkgs>' -A pan
+```
 
 You’re then dropped into a shell where you can edit, build and test
 the package:
 
-    [nix-shell]$ tar xf $src
-    [nix-shell]$ cd pan-*
-    [nix-shell]$ ./configure
-    [nix-shell]$ make
-    [nix-shell]$ ./pan/gui/pan
+```console
+[nix-shell]$ tar xf $src
+[nix-shell]$ cd pan-*
+[nix-shell]$ ./configure
+[nix-shell]$ make
+[nix-shell]$ ./pan/gui/pan
+```
 
 ## Portability
 
diff --git a/doc/manual/src/package-management/basic-package-mgmt.md b/doc/manual/src/package-management/basic-package-mgmt.md
index 17b5cc9c2..9702a29eb 100644
--- a/doc/manual/src/package-management/basic-package-mgmt.md
+++ b/doc/manual/src/package-management/basic-package-mgmt.md
@@ -31,8 +31,10 @@ automatically added to your list of “subscribed” channels when you
 install Nix. If this is not the case for some reason, you can add it
 as follows:
 
-    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
-    $ nix-channel --update
+```console
+$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+$ nix-channel --update
+```
 
 > **Note**
 > 
@@ -44,14 +46,16 @@ as follows:
 
 You can view the set of available packages in Nixpkgs:
 
-    $ nix-env -qa
-    aterm-2.2
-    bash-3.0
-    binutils-2.15
-    bison-1.875d
-    blackdown-1.4.2
-    bzip2-1.0.2
-    …
+```console
+$ nix-env -qa
+aterm-2.2
+bash-3.0
+binutils-2.15
+bison-1.875d
+blackdown-1.4.2
+bzip2-1.0.2
+…
+```
 
 The flag `-q` specifies a query operation, and `-a` means that you want
 to show the “available” (i.e., installable) packages, as opposed to the
@@ -59,31 +63,39 @@ installed packages. If you downloaded Nixpkgs yourself, or if you
 checked it out from GitHub, then you need to pass the path to your
 Nixpkgs tree using the `-f` flag:
 
-    $ nix-env -qaf /path/to/nixpkgs
+```console
+$ nix-env -qaf /path/to/nixpkgs
+```
 
 where */path/to/nixpkgs* is where you’ve unpacked or checked out
 Nixpkgs.
 
 You can select specific packages by name:
 
-    $ nix-env -qa firefox
-    firefox-34.0.5
-    firefox-with-plugins-34.0.5
+```console
+$ nix-env -qa firefox
+firefox-34.0.5
+firefox-with-plugins-34.0.5
+```
 
 and using regular expressions:
 
-    $ nix-env -qa 'firefox.*'
+```console
+$ nix-env -qa 'firefox.*'
+```
 
 It is also possible to see the *status* of available packages, i.e.,
 whether they are installed into the user environment and/or present in
 the system:
 
-    $ nix-env -qas
-    …
-    -PS bash-3.0
-    --S binutils-2.15
-    IPS bison-1.875d
-    …
+```console
+$ nix-env -qas
+…
+-PS bash-3.0
+--S binutils-2.15
+IPS bison-1.875d
+…
+```
 
 The first character (`I`) indicates whether the package is installed in
 your current user environment. The second (`P`) indicates whether it is
@@ -96,7 +108,9 @@ Nix knows that it can fetch a pre-built package from somewhere
 
 You can install a package using `nix-env -i`. For instance,
 
-    $ nix-env -i subversion
+```console
+$ nix-env -i subversion
+```
 
 will install the package called `subversion` (which is, of course, the
 [Subversion version management system](http://subversion.tigris.org/)).
@@ -121,12 +135,16 @@ will install the package called `subversion` (which is, of course, the
 
 Naturally, packages can also be uninstalled:
 
-    $ nix-env -e subversion
+```console
+$ nix-env -e subversion
+```
 
 Upgrading to a new version is just as easy. If you have a new release of
 Nix Packages, you can do:
 
-    $ nix-env -u subversion
+```console
+$ nix-env -u subversion
+```
 
 This will *only* upgrade Subversion if there is a “newer” version in the
 new set of Nix expressions, as defined by some pretty arbitrary rules
@@ -137,14 +155,18 @@ whatever version is in the Nix expressions, use `-i` instead of `-u`;
 
 You can also upgrade all packages for which there are newer versions:
 
-    $ nix-env -u
+```console
+$ nix-env -u
+```
 
 Sometimes it’s useful to be able to ask what `nix-env` would do, without
 actually doing it. For instance, to find out what packages would be
 upgraded by `nix-env -u`, you can do
 
-    $ nix-env -u --dry-run
-    (dry run; not doing anything)
-    upgrading `libxslt-1.1.0' to `libxslt-1.1.10'
-    upgrading `graphviz-1.10' to `graphviz-1.12'
-    upgrading `coreutils-5.0' to `coreutils-5.2.1'
+```console
+$ nix-env -u --dry-run
+(dry run; not doing anything)
+upgrading `libxslt-1.1.0' to `libxslt-1.1.10'
+upgrading `graphviz-1.10' to `graphviz-1.12'
+upgrading `coreutils-5.0' to `coreutils-5.2.1'
+```
diff --git a/doc/manual/src/package-management/binary-cache-substituter.md b/doc/manual/src/package-management/binary-cache-substituter.md
index 44f0da238..bdc5038fc 100644
--- a/doc/manual/src/package-management/binary-cache-substituter.md
+++ b/doc/manual/src/package-management/binary-cache-substituter.md
@@ -8,16 +8,22 @@ usually uses to fetch pre-built binaries from <https://cache.nixos.org>.
 The daemon that handles binary cache requests via HTTP, `nix-serve`, is
 not part of the Nix distribution, but you can install it from Nixpkgs:
 
-    $ nix-env -i nix-serve
+```console
+$ nix-env -i nix-serve
+```
 
 You can then start the server, listening for HTTP connections on
 whatever port you like:
 
-    $ nix-serve -p 8080
+```console
+$ nix-serve -p 8080
+```
 
 To check whether it works, try the following on the client:
 
-    $ curl http://avalon:8080/nix-cache-info
+```console
+$ curl http://avalon:8080/nix-cache-info
+```
 
 which should print something like:
 
@@ -28,7 +34,9 @@ which should print something like:
 On the client side, you can tell Nix to use your binary cache using
 `--option extra-binary-caches`, e.g.:
 
-    $ nix-env -i firefox --option extra-binary-caches http://avalon:8080/
+```console
+$ nix-env -i firefox --option extra-binary-caches http://avalon:8080/
+```
 
 The option `extra-binary-caches` tells Nix to use this binary cache in
 addition to your default caches, such as <https://cache.nixos.org>.
diff --git a/doc/manual/src/package-management/channels.md b/doc/manual/src/package-management/channels.md
index c239998d9..93c8b41a6 100644
--- a/doc/manual/src/package-management/channels.md
+++ b/doc/manual/src/package-management/channels.md
@@ -15,7 +15,9 @@ To see the list of official NixOS channels, visit
 
 You can “subscribe” to a channel using `nix-channel --add`, e.g.,
 
-    $ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+```console
+$ nix-channel --add https://nixos.org/channels/nixpkgs-unstable
+```
 
 subscribes you to a channel that always contains that latest version of
 the Nix Packages collection. (Subscribing really just means that the URL
@@ -24,11 +26,15 @@ calls to `nix-channel
 --update`.) You can “unsubscribe” using `nix-channel
 --remove`:
 
-    $ nix-channel --remove nixpkgs
+```console
+$ nix-channel --remove nixpkgs
+```
 
 To obtain the latest Nix expressions available in a channel, do
 
-    $ nix-channel --update
+```console
+$ nix-channel --update
+```
 
 This downloads and unpacks the Nix expressions in every channel
 (downloaded from `url/nixexprs.tar.bz2`). It also makes the union of
@@ -36,7 +42,9 @@ each channel’s Nix expressions available by default to `nix-env`
 operations (via the symlink `~/.nix-defexpr/channels`). Consequently,
 you can then say
 
-    $ nix-env -u
+```console
+$ nix-env -u
+```
 
 to upgrade all packages in your profile to the latest versions available
 in the subscribed channels.
diff --git a/doc/manual/src/package-management/garbage-collection.md b/doc/manual/src/package-management/garbage-collection.md
index 4c8799dfe..fecb30fd6 100644
--- a/doc/manual/src/package-management/garbage-collection.md
+++ b/doc/manual/src/package-management/garbage-collection.md
@@ -18,23 +18,31 @@ be done if you are certain that you will not need to roll back.
 
 To delete all old (non-current) generations of your current profile:
 
-    $ nix-env --delete-generations old
+```console
+$ nix-env --delete-generations old
+```
 
 Instead of `old` you can also specify a list of generations, e.g.,
 
-    $ nix-env --delete-generations 10 11 14
+```console
+$ nix-env --delete-generations 10 11 14
+```
 
 To delete all generations older than a specified number of days (except
 the current generation), use the `d` suffix. For example,
 
-    $ nix-env --delete-generations 14d
+```console
+$ nix-env --delete-generations 14d
+```
 
 deletes all generations older than two weeks.
 
 After removing appropriate old generations you can run the garbage
 collector as follows:
 
-    $ nix-store --gc
+```console
+$ nix-store --gc
+```
 
 The behaviour of the gargage collector is affected by the
 `keep-derivations` (default: true) and `keep-outputs` (default: false)
@@ -47,7 +55,9 @@ sense to keep outputs to ensure that rebuild times are quick.) If you
 are feeling uncertain, you can also first view what files would be
 deleted:
 
-    $ nix-store --gc --print-dead
+```console
+$ nix-store --gc --print-dead
+```
 
 Likewise, the option `--print-live` will show the paths that *won’t* be
 deleted.
@@ -56,6 +66,8 @@ There is also a convenient little utility `nix-collect-garbage`, which
 when invoked with the `-d` (`--delete-old`) switch deletes all old
 generations of all profiles in `/nix/var/nix/profiles`. So
 
-    $ nix-collect-garbage -d
+```console
+$ nix-collect-garbage -d
+```
 
 is a quick and easy way to clean up your system.
diff --git a/doc/manual/src/package-management/garbage-collector-roots.md b/doc/manual/src/package-management/garbage-collector-roots.md
index 6f4d48e80..30c5b7f8d 100644
--- a/doc/manual/src/package-management/garbage-collector-roots.md
+++ b/doc/manual/src/package-management/garbage-collector-roots.md
@@ -5,7 +5,9 @@ are symlinks in the directory `prefix/nix/var/nix/gcroots`. For
 instance, the following command makes the path
 `/nix/store/d718ef...-foo` a root of the collector:
 
-    $ ln -s /nix/store/d718ef...-foo /nix/var/nix/gcroots/bar
+```console
+$ ln -s /nix/store/d718ef...-foo /nix/var/nix/gcroots/bar
+```
 
 That is, after this command, the garbage collector will not remove
 `/nix/store/d718ef...-foo` or any of its dependencies.
diff --git a/doc/manual/src/package-management/profiles.md b/doc/manual/src/package-management/profiles.md
index f3786072d..fbbfb7320 100644
--- a/doc/manual/src/package-management/profiles.md
+++ b/doc/manual/src/package-management/profiles.md
@@ -22,7 +22,9 @@ store looks like:
 
 Of course, you wouldn’t want to type
 
-    $ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn
+```console
+$ /nix/store/dpmvp969yhdq...-subversion-1.1.3/bin/svn
+```
 
 every time you want to run Subversion. Of course we could set up the
 `PATH` environment variable to include the `bin` directory of every
@@ -36,7 +38,9 @@ environment `/nix/store/0c1p5z4kda11...-user-env` contains a symlink to
 just Subversion 1.1.2 (arrows in the figure indicate symlinks). This
 would be what we would obtain if we had done
 
-    $ nix-env -i subversion
+```console
+$ nix-env -i subversion
+```
 
 on a set of Nix expressions that contained Subversion 1.1.2.
 
@@ -49,7 +53,9 @@ since every time you perform a `nix-env` operation, a new user
 environment is generated based on the current one. For instance,
 generation 43 was created from generation 42 when we did
 
-    $ nix-env -i subversion firefox
+```console
+$ nix-env -i subversion firefox
+```
 
 on a set of Nix expressions that contained Firefox and a new version of
 Subversion.
@@ -57,11 +63,13 @@ Subversion.
 Generations are grouped together into *profiles* so that different users
 don’t interfere with each other if they don’t want to. For example:
 
-    $ ls -l /nix/var/nix/profiles/
-    ...
-    lrwxrwxrwx  1 eelco ... default-42-link -> /nix/store/0c1p5z4kda11...-user-env
-    lrwxrwxrwx  1 eelco ... default-43-link -> /nix/store/3aw2pdyx2jfc...-user-env
-    lrwxrwxrwx  1 eelco ... default -> default-43-link
+```console
+$ ls -l /nix/var/nix/profiles/
+...
+lrwxrwxrwx  1 eelco ... default-42-link -> /nix/store/0c1p5z4kda11...-user-env
+lrwxrwxrwx  1 eelco ... default-43-link -> /nix/store/3aw2pdyx2jfc...-user-env
+lrwxrwxrwx  1 eelco ... default -> default-43-link
+```
 
 This shows a profile called `default`. The file `default` itself is
 actually a symlink that points to the current generation. When we do a
@@ -75,18 +83,24 @@ store.)
 
 If you find that you want to undo a `nix-env` operation, you can just do
 
-    $ nix-env --rollback
+```console
+$ nix-env --rollback
+```
 
 which will just make the current generation link point at the previous
 link. E.g., `default` would be made to point at `default-42-link`. You
 can also switch to a specific generation:
 
-    $ nix-env --switch-generation 43
+```console
+$ nix-env --switch-generation 43
+```
 
 which in this example would roll forward to generation 43 again. You can
 also see all available generations:
 
-    $ nix-env --list-generations
+```console
+$ nix-env --list-generations
+```
 
 You generally wouldn’t have `/nix/var/nix/profiles/some-profile/bin` in
 your `PATH`. Rather, there is a symlink `~/.nix-profile` that points to
@@ -96,9 +110,11 @@ initialisation script `/nix/etc/profile.d/nix.sh` does). This makes it
 easier to switch to a different profile. You can do that using the
 command `nix-env --switch-profile`:
 
-    $ nix-env --switch-profile /nix/var/nix/profiles/my-profile
-    
-    $ nix-env --switch-profile /nix/var/nix/profiles/default
+```console
+$ nix-env --switch-profile /nix/var/nix/profiles/my-profile
+
+$ nix-env --switch-profile /nix/var/nix/profiles/default
+```
 
 These commands switch to the `my-profile` and default profile,
 respectively. If the profile doesn’t exist, it will be created
@@ -110,6 +126,8 @@ All `nix-env` operations work on the profile pointed to by
 `~/.nix-profile`, but you can override this using the `--profile` option
 (abbreviation `-p`):
 
-    $ nix-env -p /nix/var/nix/profiles/other-profile -i subversion
+```console
+$ nix-env -p /nix/var/nix/profiles/other-profile -i subversion
+```
 
 This will *not* change the `~/.nix-profile` symlink.
diff --git a/doc/manual/src/package-management/s3-substituter.md b/doc/manual/src/package-management/s3-substituter.md
index 2824c1a9b..a4f4d561f 100644
--- a/doc/manual/src/package-management/s3-substituter.md
+++ b/doc/manual/src/package-management/s3-substituter.md
@@ -51,25 +51,27 @@ cache's documentation.
 
 Your bucket will need the following bucket policy:
 
-    {
-        "Id": "DirectReads",
-        "Version": "2012-10-17",
-        "Statement": [
-            {
-                "Sid": "AllowDirectReads",
-                "Action": [
-                    "s3:GetObject",
-                    "s3:GetBucketLocation"
-                ],
-                "Effect": "Allow",
-                "Resource": [
-                    "arn:aws:s3:::example-nix-cache",
-                    "arn:aws:s3:::example-nix-cache/*"
-                ],
-                "Principal": "*"
-            }
-        ]
-    }
+```json
+{
+    "Id": "DirectReads",
+    "Version": "2012-10-17",
+    "Statement": [
+        {
+            "Sid": "AllowDirectReads",
+            "Action": [
+                "s3:GetObject",
+                "s3:GetBucketLocation"
+            ],
+            "Effect": "Allow",
+            "Resource": [
+                "arn:aws:s3:::example-nix-cache",
+                "arn:aws:s3:::example-nix-cache/*"
+            ],
+            "Principal": "*"
+        }
+    ]
+}
+```
 
 ## Authenticated Reads to your S3 binary cache
 
@@ -101,35 +103,43 @@ for authenticating requests to Amazon S3.
 
 Your account will need the following IAM policy to upload to the cache:
 
+```json
+{
+  "Version": "2012-10-17",
+  "Statement": [
     {
-      "Version": "2012-10-17",
-      "Statement": [
-        {
-          "Sid": "UploadToCache",
-          "Effect": "Allow",
-          "Action": [
-            "s3:AbortMultipartUpload",
-            "s3:GetBucketLocation",
-            "s3:GetObject",
-            "s3:ListBucket",
-            "s3:ListBucketMultipartUploads",
-            "s3:ListMultipartUploadParts",
-            "s3:PutObject"
-          ],
-          "Resource": [
-            "arn:aws:s3:::example-nix-cache",
-            "arn:aws:s3:::example-nix-cache/*"
-          ]
-        }
+      "Sid": "UploadToCache",
+      "Effect": "Allow",
+      "Action": [
+        "s3:AbortMultipartUpload",
+        "s3:GetBucketLocation",
+        "s3:GetObject",
+        "s3:ListBucket",
+        "s3:ListBucketMultipartUploads",
+        "s3:ListMultipartUploadParts",
+        "s3:PutObject"
+      ],
+      "Resource": [
+        "arn:aws:s3:::example-nix-cache",
+        "arn:aws:s3:::example-nix-cache/*"
       ]
     }
+  ]
+}
+```
 
 ## Examples
 
 To upload with a specific credential profile for Amazon S3:
 
-    nix copy --to 's3://example-nix-cache?profile=cache-upload&region=eu-west-2' nixpkgs.hello
+```console
+$ nix copy nixpkgs.hello \
+  --to 's3://example-nix-cache?profile=cache-upload&region=eu-west-2'
+```
 
 To upload to an S3-compatible binary cache:
 
-    nix copy --to 's3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com' nixpkgs.hello
+```console
+$ nix copy nixpkgs.hello --to \
+  's3://example-nix-cache?profile=cache-upload&scheme=https&endpoint=minio.example.com'
+```
diff --git a/doc/manual/src/package-management/ssh-substituter.md b/doc/manual/src/package-management/ssh-substituter.md
index 482844c7c..6e5e258bc 100644
--- a/doc/manual/src/package-management/ssh-substituter.md
+++ b/doc/manual/src/package-management/ssh-substituter.md
@@ -5,7 +5,9 @@ Nix store via SSH. For example, the following installs Firefox,
 automatically fetching any store paths in Firefox’s closure if they are
 available on the server `avalon`:
 
-    $ nix-env -i firefox --substituters ssh://alice@avalon
+```console
+$ nix-env -i firefox --substituters ssh://alice@avalon
+```
 
 This works similar to the binary cache substituter that Nix usually
 uses, only using SSH instead of HTTP: if a store path `P` is needed, Nix
@@ -22,11 +24,17 @@ building from source.
 You can also copy the closure of some store path, without installing it
 into your profile, e.g.
 
-    $ nix-store -r /nix/store/m85bxg…-firefox-34.0.5 --substituters ssh://alice@avalon
+```console
+$ nix-store -r /nix/store/m85bxg…-firefox-34.0.5 --substituters
+ssh://alice@avalon
+```
 
 This is essentially equivalent to doing
 
-    $ nix-copy-closure --from alice@avalon /nix/store/m85bxg…-firefox-34.0.5
+```console
+$ nix-copy-closure --from alice@avalon
+/nix/store/m85bxg…-firefox-34.0.5
+```
 
 You can use SSH’s *forced command* feature to set up a restricted user
 account for SSH substituter access, allowing read-only access to the
@@ -45,8 +53,10 @@ to `sshd_config` to restrict the user `nix-ssh`:
 On NixOS, you can accomplish the same by adding the following to your
 `configuration.nix`:
 
-    nix.sshServe.enable = true;
-    nix.sshServe.keys = [ "ssh-dss AAAAB3NzaC1k... bob@example.org" ];
+```nix
+nix.sshServe.enable = true;
+nix.sshServe.keys = [ "ssh-dss AAAAB3NzaC1k... bob@example.org" ];
+```
 
 where the latter line lists the public keys of users that are allowed to
 connect.
diff --git a/doc/manual/src/quick-start.md b/doc/manual/src/quick-start.md
index 3c519217b..71205923b 100644
--- a/doc/manual/src/quick-start.md
+++ b/doc/manual/src/quick-start.md
@@ -6,7 +6,9 @@ to subsequent chapters.
 
 1. Install single-user Nix by running the following:
 
-        $ bash <(curl -L https://nixos.org/nix/install)
+   ```console
+   $ bash <(curl -L https://nixos.org/nix/install)
+   ```
 
    This will install Nix in `/nix`. The install script will create
    `/nix` using `sudo`, so make sure you have sufficient rights.  (For
@@ -16,52 +18,66 @@ to subsequent chapters.
 1. See what installable packages are currently available in the
    channel:
 
-        $ nix-env -qa
-        docbook-xml-4.3
-        docbook-xml-4.5
-        firefox-33.0.2
-        hello-2.9
-        libxslt-1.1.28
-        …
+   ```console
+   $ nix-env -qa
+   docbook-xml-4.3
+   docbook-xml-4.5
+   firefox-33.0.2
+   hello-2.9
+   libxslt-1.1.28
+   …
+   ```
 
 1. Install some packages from the channel:
 
-        $ nix-env -i hello
+   ```console
+   $ nix-env -i hello
+   ```
 
    This should download pre-built packages; it should not build them
    locally (if it does, something went wrong).
 
 1. Test that they work:
 
-        $ which hello
-        /home/eelco/.nix-profile/bin/hello
-        $ hello
-        Hello, world!
+   ```console
+   $ which hello
+   /home/eelco/.nix-profile/bin/hello
+   $ hello
+   Hello, world!
+   ```
 
 1. Uninstall a package:
 
-        $ nix-env -e hello
+   ```console
+   $ nix-env -e hello
+   ```
 
 1. You can also test a package without installing it:
 
-        $ nix-shell -p hello
+   ```console
+   $ nix-shell -p hello
+   ```
 
    This builds or downloads GNU Hello and its dependencies, then drops
    you into a Bash shell where the `hello` command is present, all
    without affecting your normal environment:
 
-        [nix-shell:~]$ hello
-        Hello, world!
+   ```console
+   [nix-shell:~]$ hello
+   Hello, world!
 
-        [nix-shell:~]$ exit
+   [nix-shell:~]$ exit
 
-        $ hello
-        hello: command not found
+   $ hello
+   hello: command not found
+   ```
 
 1. To keep up-to-date with the channel, do:
 
-        $ nix-channel --update nixpkgs
-        $ nix-env -u '*'
+   ```console
+   $ nix-channel --update nixpkgs
+   $ nix-env -u '*'
+   ```
 
    The latter command will upgrade each installed package for which
    there is a “newer” version (as determined by comparing the version
@@ -70,10 +86,14 @@ to subsequent chapters.
 1. If you're unhappy with the result of a `nix-env` action (e.g., an
    upgraded package turned out not to work properly), you can go back:
 
-        $ nix-env --rollback
+   ```console
+   $ nix-env --rollback
+   ```
 
 1. You should periodically run the Nix garbage collector to get rid of
    unused packages, since uninstalls or upgrades don't actually delete
    them:
 
-        $ nix-collect-garbage -d
+   ```console
+   $ nix-collect-garbage -d
+   ```
diff --git a/flake.nix b/flake.nix
index f31dc4039..8f5a3055c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -467,6 +467,7 @@
               configureFlags+=" --prefix=$prefix"
               PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$PKG_CONFIG_PATH
               PATH=$prefix/bin:$PATH
+              export MANPATH=/home/eelco/Dev/nix/inst/share/man:$MANPATH
               unset PYTHONPATH
             '';
         });
diff --git a/src/libstore/nar-accessor.cc b/src/libstore/nar-accessor.cc
index d884a131e..ed5791b14 100644
--- a/src/libstore/nar-accessor.cc
+++ b/src/libstore/nar-accessor.cc
@@ -49,7 +49,8 @@ struct NarAccessor : public FSAccessor
             : acc(acc), source(source)
         { }
 
-        void createMember(const Path & path, NarMember member) {
+        void createMember(const Path & path, NarMember member)
+        {
             size_t level = std::count(path.begin(), path.end(), '/');
             while (parents.size() > level) parents.pop();
 

From 2ae9ac23698276c3e045d9b21f5c6ffb40f38324 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 31 Jul 2020 16:02:37 +0200
Subject: [PATCH 037/176] console -> shell

---
 doc/manual/src/command-ref/nix-shell.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/manual/src/command-ref/nix-shell.md b/doc/manual/src/command-ref/nix-shell.md
index 27826717b..fc42a202a 100644
--- a/doc/manual/src/command-ref/nix-shell.md
+++ b/doc/manual/src/command-ref/nix-shell.md
@@ -110,7 +110,7 @@ The following common options are supported:
 To build the dependencies of the package Pan, and start an interactive
 shell in which to build it:
 
-```shell
+```console
 $ nix-shell '<nixpkgs>' -A pan
 [nix-shell]$ unpackPhase
 [nix-shell]$ cd pan-*
@@ -122,7 +122,7 @@ $ nix-shell '<nixpkgs>' -A pan
 To clear the environment first, and do some additional automatic
 initialisation of the interactive shell:
 
-```shell
+```console
 $ nix-shell '<nixpkgs>' -A pan --pure \
     --command 'export NIX_DEBUG=1; export NIX_CORES=8; return'
 ```
@@ -131,13 +131,13 @@ Nix expressions can also be given on the command line using the `-E` and
 `-p` flags. For instance, the following starts a shell containing the
 packages `sqlite` and `libX11`:
 
-```shell
+```console
 $ nix-shell -E 'with import <nixpkgs> { }; runCommand "dummy" { buildInputs = [ sqlite xorg.libX11 ]; } ""'
 ```
 
 A shorter way to do the same is:
 
-```shell
+```console
 $ nix-shell -p sqlite xorg.libX11
 [nix-shell]$ echo $NIX_LDFLAGS
 … -L/nix/store/j1zg5v…-sqlite-3.8.0.2/lib -L/nix/store/0gmcz9…-libX11-1.6.1/lib …
@@ -147,7 +147,7 @@ Note that `-p` accepts multiple full nix expressions that are valid in
 the `buildInputs = [ ... ]` shown above, not only package names. So the
 following is also legal:
 
-```shell
+```console
 $ nix-shell -p sqlite 'git.override { withManual = false; }'
 ```
 
@@ -156,7 +156,7 @@ it by passing `-I` or setting `NIX_PATH`. For example, the following
 gives you a shell containing the Pan package from a specific revision of
 Nixpkgs:
 
-```shell
+```console
 $ nix-shell -p pan -I nixpkgs=https://github.com/NixOS/nixpkgs/archive/8a3eea054838b55aca962c3fbde9c83c102b8bf2.tar.gz
 
 [nix-shell:~]$ pan --version

From 45b6fdb22b05352108b6470ae16d611431c06666 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 4 Aug 2020 22:10:13 +0000
Subject: [PATCH 038/176] Remove unused functions

---
 src/libstore/remote-store.cc    | 16 ----------------
 src/libstore/worker-protocol.hh |  2 --
 2 files changed, 18 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 1200ab200..dc2efefeb 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -63,22 +63,6 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
     }
 }
 
-std::map<string, StorePath> readOutputPathMap(const Store & store, Source & from)
-{
-    std::map<string, StorePath> pathMap;
-    auto rawInput = readStrings<Strings>(from);
-    if (rawInput.size() % 2)
-        throw Error("got an odd number of elements from the daemon when trying to read a output path map");
-    auto curInput = rawInput.begin();
-    while (curInput != rawInput.end()) {
-        auto thisKey = *curInput++;
-        auto thisValue = *curInput++;
-        pathMap.emplace(thisKey, store.parseStorePath(thisValue));
-    }
-    return pathMap;
-}
-
-
 void write(const Store & store, Sink & out, const StorePath & storePath)
 {
 	auto path = store.printStorePath(storePath);
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index ad5854c85..117d3e1a4 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -126,6 +126,4 @@ StorePathCAMap readStorePathCAMap(const Store & store, Source & from);
 
 void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap & paths);
 
-void writeOutputPathMap(const Store & store, Sink & out, const OutputPathMap & paths);
-
 }

From 1dfcbebc95f1c74763770bb2bd7afdebe8804845 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 4 Aug 2020 22:28:10 +0000
Subject: [PATCH 039/176] Organize and format code a bit

---
 src/libstore/remote-store.cc | 17 +++++++++--------
 src/libstore/store-api.cc    | 16 ++++++++--------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index dc2efefeb..772979066 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -31,7 +31,6 @@ template<> StorePathSet readStorePaths(const Store & store, Source & from)
     return paths;
 }
 
-
 void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths)
 {
     out << paths.size();
@@ -39,11 +38,6 @@ void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths
         out << store.printStorePath(i);
 }
 
-StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
-{
-	auto path = readString(from);
-	return store.parseStorePath(path);
-}
 
 StorePathCAMap readStorePathCAMap(const Store & store, Source & from)
 {
@@ -63,10 +57,17 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
     }
 }
 
+
+StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
+{
+    auto path = readString(from);
+    return store.parseStorePath(path);
+}
+
 void write(const Store & store, Sink & out, const StorePath & storePath)
 {
-	auto path = store.printStorePath(storePath);
-	out << path;
+    auto path = store.printStorePath(storePath);
+    out << path;
 }
 
 
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 4c68709ef..e894d2b85 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -362,14 +362,14 @@ bool Store::PathInfoCacheValue::isKnownNow()
 }
 
 OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path) {
-	auto resp = queryDerivationOutputMap(path);
-	OutputPathMap result;
-	for (auto & [outName, optOutPath] : resp) {
-		if (!optOutPath)
-			throw Error("output '%s' has no store path mapped to it", outName);
-		result.insert_or_assign(outName, *optOutPath);
-	}
-	return result;
+    auto resp = queryDerivationOutputMap(path);
+    OutputPathMap result;
+    for (auto & [outName, optOutPath] : resp) {
+        if (!optOutPath)
+            throw Error("output '%s' has no store path mapped to it", outName);
+        result.insert_or_assign(outName, *optOutPath);
+    }
+    return result;
 }
 
 StorePathSet Store::queryDerivationOutputs(const StorePath & path)

From 16c98bf57c52dee59c06e0e8911800943a468962 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 4 Aug 2020 22:36:31 +0000
Subject: [PATCH 040/176] Get rid of some unneeded temporaries

---
 src/libstore/remote-store.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 772979066..63c19a450 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -60,14 +60,12 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
 
 StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
 {
-    auto path = readString(from);
-    return store.parseStorePath(path);
+    return store.parseStorePath(readString(from));
 }
 
 void write(const Store & store, Sink & out, const StorePath & storePath)
 {
-    auto path = store.printStorePath(storePath);
-    out << path;
+    out << store.printStorePath(storePath);
 }
 
 

From ed96e603e116123c1e44f5108b67b472b2c96538 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Aug 2020 19:44:08 +0000
Subject: [PATCH 041/176] Proxy -> Phantom to match Rust

Sorry, Haskell.
---
 src/libstore/remote-store.cc    |  4 ++--
 src/libstore/worker-protocol.hh | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 377c81ff4..2c0857466 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -58,7 +58,7 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
 }
 
 
-StorePath read(const Store & store, Source & from, Proxy<StorePath> _)
+StorePath read(const Store & store, Source & from, Phantom<StorePath> _)
 {
     return store.parseStorePath(readString(from));
 }
@@ -461,7 +461,7 @@ std::map<std::string, std::optional<StorePath>> RemoteStore::queryDerivationOutp
     auto conn(getConnection());
     conn->to << wopQueryDerivationOutputMap << printStorePath(path);
     conn.processStderr();
-    return read(*this, conn->from, Proxy<std::map<std::string, std::optional<StorePath>>> {});
+    return read(*this, conn->from, Phantom<std::map<std::string, std::optional<StorePath>>> {});
 
 }
 
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index 117d3e1a4..384b81f08 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -72,16 +72,16 @@ void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths
 
 /* To guide overloading */
 template<typename T>
-struct Proxy {};
+struct Phantom {};
 
 template<typename T>
-std::map<std::string, T> read(const Store & store, Source & from, Proxy<std::map<std::string, T>> _)
+std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::map<std::string, T>> _)
 {
     std::map<string, T> resMap;
     auto size = (size_t)readInt(from);
     while (size--) {
         auto thisKey = readString(from);
-        resMap.insert_or_assign(std::move(thisKey), read(store, from, Proxy<T> {}));
+        resMap.insert_or_assign(std::move(thisKey), read(store, from, Phantom<T> {}));
     }
     return resMap;
 }
@@ -97,14 +97,14 @@ void write(const Store & store, Sink & out, const std::map<string, T> & resMap)
 }
 
 template<typename T>
-std::optional<T> read(const Store & store, Source & from, Proxy<std::optional<T>> _)
+std::optional<T> read(const Store & store, Source & from, Phantom<std::optional<T>> _)
 {
     auto tag = readNum<uint8_t>(from);
     switch (tag) {
     case 0:
         return std::nullopt;
     case 1:
-        return read(store, from, Proxy<T> {});
+        return read(store, from, Phantom<T> {});
     default:
         throw Error("got an invalid tag bit for std::optional: %#04x", tag);
     }
@@ -118,7 +118,7 @@ void write(const Store & store, Sink & out, const std::optional<T> & optVal)
         write(store, out, *optVal);
 }
 
-StorePath read(const Store & store, Source & from, Proxy<StorePath> _);
+StorePath read(const Store & store, Source & from, Phantom<StorePath> _);
 
 void write(const Store & store, Sink & out, const StorePath & storePath);
 

From 6c66331d5c34d97092a9b5e2832fed73e0da3c87 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 5 Aug 2020 20:37:48 +0000
Subject: [PATCH 042/176] WIP: Put the worker protocol `read` and `write` in a
 namespace to disambig

---
 src/libstore/remote-store.cc    |  6 +++++-
 src/libstore/worker-protocol.hh | 15 +++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 2c0857466..96e0aabba 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -58,6 +58,8 @@ void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap &
 }
 
 
+namespace worker_proto {
+
 StorePath read(const Store & store, Source & from, Phantom<StorePath> _)
 {
     return store.parseStorePath(readString(from));
@@ -68,6 +70,8 @@ void write(const Store & store, Sink & out, const StorePath & storePath)
     out << store.printStorePath(storePath);
 }
 
+}
+
 
 /* TODO: Separate these store impls into different files, give them better names */
 RemoteStore::RemoteStore(const Params & params)
@@ -461,7 +465,7 @@ std::map<std::string, std::optional<StorePath>> RemoteStore::queryDerivationOutp
     auto conn(getConnection());
     conn->to << wopQueryDerivationOutputMap << printStorePath(path);
     conn.processStderr();
-    return read(*this, conn->from, Phantom<std::map<std::string, std::optional<StorePath>>> {});
+    return worker_proto::read(*this, conn->from, Phantom<std::map<std::string, std::optional<StorePath>>> {});
 
 }
 
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index 384b81f08..fdd700668 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -74,6 +74,10 @@ void writeStorePaths(const Store & store, Sink & out, const StorePathSet & paths
 template<typename T>
 struct Phantom {};
 
+
+namespace worker_proto {
+/* FIXME maybe move more stuff inside here */
+
 template<typename T>
 std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::map<std::string, T>> _)
 {
@@ -81,7 +85,7 @@ std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::m
     auto size = (size_t)readInt(from);
     while (size--) {
         auto thisKey = readString(from);
-        resMap.insert_or_assign(std::move(thisKey), read(store, from, Phantom<T> {}));
+        resMap.insert_or_assign(std::move(thisKey), nix::worker_proto::read(store, from, Phantom<T> {}));
     }
     return resMap;
 }
@@ -92,7 +96,7 @@ void write(const Store & store, Sink & out, const std::map<string, T> & resMap)
     out << resMap.size();
     for (auto & i : resMap) {
         out << i.first;
-        write(store, out, i.second);
+        nix::worker_proto::write(store, out, i.second);
     }
 }
 
@@ -104,7 +108,7 @@ std::optional<T> read(const Store & store, Source & from, Phantom<std::optional<
     case 0:
         return std::nullopt;
     case 1:
-        return read(store, from, Phantom<T> {});
+        return nix::worker_proto::read(store, from, Phantom<T> {});
     default:
         throw Error("got an invalid tag bit for std::optional: %#04x", tag);
     }
@@ -115,13 +119,16 @@ void write(const Store & store, Sink & out, const std::optional<T> & optVal)
 {
     out << (optVal ? 1 : 0);
     if (optVal)
-        write(store, out, *optVal);
+        nix::worker_proto::write(store, out, *optVal);
 }
 
 StorePath read(const Store & store, Source & from, Phantom<StorePath> _);
 
 void write(const Store & store, Sink & out, const StorePath & storePath);
 
+}
+
+
 StorePathCAMap readStorePathCAMap(const Store & store, Source & from);
 
 void writeStorePathCAMap(const Store & store, Sink & out, const StorePathCAMap & paths);

From 0739d428e07b59b7d44bdbf7354dafaae09dba7c Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Wed, 5 Aug 2020 17:49:45 -0400
Subject: [PATCH 043/176] Solve template deduction problem

We had to predeclare our template functions
---
 src/libstore/daemon.cc          |  2 +-
 src/libstore/worker-protocol.hh | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index e18f793c8..a420dcab0 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -327,7 +327,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         logger->startWork();
         auto outputs = store->queryDerivationOutputMap(path);
         logger->stopWork();
-        write(*store, to, outputs);
+        nix::worker_proto::write(*store, to, outputs);
         break;
     }
 
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index fdd700668..c50995d7c 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -78,6 +78,19 @@ struct Phantom {};
 namespace worker_proto {
 /* FIXME maybe move more stuff inside here */
 
+StorePath read(const Store & store, Source & from, Phantom<StorePath> _);
+void write(const Store & store, Sink & out, const StorePath & storePath);
+
+template<typename T>
+std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::map<std::string, T>> _);
+template<typename T>
+void write(const Store & store, Sink & out, const std::map<string, T> & resMap);
+template<typename T>
+std::optional<T> read(const Store & store, Source & from, Phantom<std::optional<T>> _);
+template<typename T>
+void write(const Store & store, Sink & out, const std::optional<T> & optVal);
+
+
 template<typename T>
 std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::map<std::string, T>> _)
 {
@@ -122,9 +135,6 @@ void write(const Store & store, Sink & out, const std::optional<T> & optVal)
         nix::worker_proto::write(store, out, *optVal);
 }
 
-StorePath read(const Store & store, Source & from, Phantom<StorePath> _);
-
-void write(const Store & store, Sink & out, const StorePath & storePath);
 
 }
 

From 8b175f58d1a25dd904fb0ffdf5b2b9501983dba0 Mon Sep 17 00:00:00 2001
From: Carlo Nucera <carlo.nucera@protonmail.com>
Date: Wed, 5 Aug 2020 17:57:07 -0400
Subject: [PATCH 044/176] Simplify the namespace

---
 src/libstore/daemon.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index a420dcab0..9503915eb 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -327,7 +327,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
         logger->startWork();
         auto outputs = store->queryDerivationOutputMap(path);
         logger->stopWork();
-        nix::worker_proto::write(*store, to, outputs);
+        worker_proto::write(*store, to, outputs);
         break;
     }
 

From 47644e49ca252441fcc3ae57f5a01e7fc579ba8c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 7 Aug 2020 17:05:14 +0000
Subject: [PATCH 045/176] Specialize `std::optional<StorePath>` so this is
 backwards compatible

While I am cautious to break parametricity, I think it's OK in this
cases---we're not about to try to do some crazy polymorphic protocol
anytime soon.
---
 src/libstore/remote-store.cc    | 14 ++++++++++++++
 src/libstore/worker-protocol.hh |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 96e0aabba..005415666 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -70,6 +70,20 @@ void write(const Store & store, Sink & out, const StorePath & storePath)
     out << store.printStorePath(storePath);
 }
 
+
+template<>
+std::optional<StorePath> read(const Store & store, Source & from, Phantom<std::optional<StorePath>> _)
+{
+	auto s = readString(from);
+    return s == "" ? std::optional<StorePath> {} : store.parseStorePath(s);
+}
+
+template<>
+void write(const Store & store, Sink & out, const std::optional<StorePath> & storePathOpt)
+{
+    out << (storePathOpt ? store.printStorePath(*storePathOpt) : "");
+}
+
 }
 
 
diff --git a/src/libstore/worker-protocol.hh b/src/libstore/worker-protocol.hh
index c50995d7c..b3576fbeb 100644
--- a/src/libstore/worker-protocol.hh
+++ b/src/libstore/worker-protocol.hh
@@ -90,6 +90,13 @@ std::optional<T> read(const Store & store, Source & from, Phantom<std::optional<
 template<typename T>
 void write(const Store & store, Sink & out, const std::optional<T> & optVal);
 
+/* Specialization which uses and empty string for the empty case, taking
+   advantage of the fact StorePaths always serialize to a non-empty string.
+   This is done primarily for backwards compatability, so that StorePath <=
+   std::optional<StorePath>, where <= is the compatability partial order.
+ */
+template<>
+void write(const Store & store, Sink & out, const std::optional<StorePath> & optVal);
 
 template<typename T>
 std::map<std::string, T> read(const Store & store, Source & from, Phantom<std::map<std::string, T>> _)

From e913a2989fd7dfabfd93c89fd4295386eda4277f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 7 Aug 2020 19:09:26 +0000
Subject: [PATCH 046/176] Squashed get CA derivations building

---
 src/libexpr/get-drvs.cc      |  13 +-
 src/libexpr/get-drvs.hh      |   2 +-
 src/libexpr/primops.cc       |  59 ++-
 src/libstore/build.cc        | 964 ++++++++++++++++++++++++-----------
 src/libstore/derivations.cc  | 158 +++---
 src/libstore/derivations.hh  |  14 +-
 src/libstore/local-store.cc  |  31 +-
 src/libstore/local-store.hh  |   6 +
 src/libstore/misc.cc         |  23 +-
 src/libstore/references.cc   |  16 +-
 src/libstore/references.hh   |   2 +
 src/libstore/remote-store.cc |   2 +-
 src/libstore/store-api.cc    |  19 +-
 src/libstore/store-api.hh    |   6 +-
 src/libutil/serialise.hh     |   6 +
 src/nix-build/nix-build.cc   |  56 +-
 src/nix-store/nix-store.cc   |  26 +-
 src/nix/build.cc             |   3 +-
 src/nix/command.cc           |   4 +-
 src/nix/installables.cc      |  13 +-
 src/nix/installables.hh      |   4 +-
 src/nix/profile.cc           |  10 +-
 src/nix/repl.cc              |   6 +-
 src/nix/show-derivation.cc   |   4 +-
 tests/content-addressed.nix  |  19 +
 tests/content-addressed.sh   |  16 +
 tests/local.mk               |   3 +-
 tests/multiple-outputs.nix   |  15 +
 tests/multiple-outputs.sh    |   6 +
 29 files changed, 1021 insertions(+), 485 deletions(-)
 create mode 100644 tests/content-addressed.nix
 create mode 100644 tests/content-addressed.sh

diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc
index 5d6e39aa0..d41cac132 100644
--- a/src/libexpr/get-drvs.cc
+++ b/src/libexpr/get-drvs.cc
@@ -39,7 +39,9 @@ DrvInfo::DrvInfo(EvalState & state, ref<Store> store, const std::string & drvPat
     if (i == drv.outputs.end())
         throw Error("derivation '%s' does not have output '%s'", store->printStorePath(drvPath), outputName);
 
-    outPath = store->printStorePath(i->second.path(*store, drv.name));
+    auto optStorePath = i->second.pathOpt(*store, drv.name);
+    if (optStorePath)
+        outPath = store->printStorePath(*optStorePath);
 }
 
 
@@ -77,12 +79,15 @@ string DrvInfo::queryDrvPath() const
 
 string DrvInfo::queryOutPath() const
 {
-    if (outPath == "" && attrs) {
+    if (!outPath && attrs) {
         Bindings::iterator i = attrs->find(state->sOutPath);
         PathSet context;
-        outPath = i != attrs->end() ? state->coerceToPath(*i->pos, *i->value, context) : "";
+        if (i != attrs->end())
+            outPath = state->coerceToPath(*i->pos, *i->value, context);
     }
-    return outPath;
+    if (!outPath)
+        throw UnimplementedError("CA derivations are not yet supported");
+    return *outPath;
 }
 
 
diff --git a/src/libexpr/get-drvs.hh b/src/libexpr/get-drvs.hh
index d7860fc6a..29bb6a660 100644
--- a/src/libexpr/get-drvs.hh
+++ b/src/libexpr/get-drvs.hh
@@ -20,7 +20,7 @@ private:
     mutable string name;
     mutable string system;
     mutable string drvPath;
-    mutable string outPath;
+    mutable std::optional<string> outPath;
     mutable string outputName;
     Outputs outputs;
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 65d36ca0e..11f44fb97 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -44,16 +44,6 @@ void EvalState::realiseContext(const PathSet & context)
             throw InvalidPathError(store->printStorePath(ctx));
         if (!outputName.empty() && ctx.isDerivation()) {
             drvs.push_back(StorePathWithOutputs{ctx, {outputName}});
-
-            /* Add the output of this derivation to the allowed
-               paths. */
-            if (allowedPaths) {
-                auto drv = store->derivationFromPath(ctx);
-                DerivationOutputs::iterator i = drv.outputs.find(outputName);
-                if (i == drv.outputs.end())
-                    throw Error("derivation '%s' does not have an output named '%s'", ctxS, outputName);
-                allowedPaths->insert(store->printStorePath(i->second.path(*store, drv.name)));
-            }
         }
     }
 
@@ -69,8 +59,38 @@ void EvalState::realiseContext(const PathSet & context)
     store->queryMissing(drvs, willBuild, willSubstitute, unknown, downloadSize, narSize);
 
     store->buildPaths(drvs);
+
+    /* Add the output of this derivations to the allowed
+       paths. */
+    if (allowedPaths) {
+        for (auto & [drvPath, outputs] : drvs) {
+            auto outputPaths = store->queryDerivationOutputMapAssumeTotal(drvPath);
+            for (auto & outputName : outputs) {
+                if (outputPaths.count(outputName) == 0)
+                    throw Error("derivation '%s' does not have an output named '%s'",
+                            store->printStorePath(drvPath), outputName);
+                allowedPaths->insert(store->printStorePath(outputPaths.at(outputName)));
+            }
+        }
+    }
 }
 
+static void mkOutputString(EvalState & state, Value & v,
+    const StorePath & drvPath, const BasicDerivation & drv,
+    std::pair<string, DerivationOutput> o)
+{
+    auto optOutputPath = o.second.pathOpt(*state.store, drv.name);
+    mkString(
+        *state.allocAttr(v, state.symbols.create(o.first)),
+        state.store->printStorePath(optOutputPath
+            ? *optOutputPath
+            /* Downstream we would substitute this for an actual path once
+               we build the floating CA derivation */
+            /* FIXME: we need to depend on the basic derivation, not
+               derivation */
+            : downstreamPlaceholder(*state.store, drvPath, o.first)),
+        {"!" + o.first + "!" + state.store->printStorePath(drvPath)});
+}
 
 /* Load and evaluate an expression from path specified by the
    argument. */
@@ -114,8 +134,7 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
         unsigned int outputs_index = 0;
 
         for (const auto & o : drv.outputs) {
-            v2 = state.allocAttr(w, state.symbols.create(o.first));
-            mkString(*v2, state.store->printStorePath(o.second.path(*state.store, drv.name)), {"!" + o.first + "!" + path});
+            mkOutputString(state, w, storePath, drv, o);
             outputsVal->listElems()[outputs_index] = state.allocValue();
             mkString(*(outputsVal->listElems()[outputs_index++]), o.first);
         }
@@ -846,16 +865,18 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
 
     /* Optimisation, but required in read-only mode! because in that
        case we don't actually write store derivations, so we can't
-       read them later. */
-    drvHashes.insert_or_assign(drvPath,
-        hashDerivationModulo(*state.store, Derivation(drv), false));
+       read them later.
+
+       However, we don't bother doing this for floating CA derivations because
+       their "hash modulo" is indeterminate until built. */
+    if (drv.type() != DerivationType::CAFloating)
+        drvHashes.insert_or_assign(drvPath,
+            hashDerivationModulo(*state.store, Derivation(drv), false));
 
     state.mkAttrs(v, 1 + drv.outputs.size());
     mkString(*state.allocAttr(v, state.sDrvPath), drvPathS, {"=" + drvPathS});
-    for (auto & i : drv.outputs) {
-        mkString(*state.allocAttr(v, state.symbols.create(i.first)),
-            state.store->printStorePath(i.second.path(*state.store, drv.name)), {"!" + i.first + "!" + drvPathS});
-    }
+    for (auto & i : drv.outputs)
+        mkOutputString(state, v, drvPath, drv, i);
     v.attrs->sort();
 }
 
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index b47aeff3b..7c2225805 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -16,6 +16,7 @@
 #include "machines.hh"
 #include "daemon.hh"
 #include "worker-protocol.hh"
+#include "topo-sort.hh"
 
 #include <algorithm>
 #include <iostream>
@@ -717,6 +718,24 @@ typedef enum {rpAccept, rpDecline, rpPostpone} HookReply;
 
 class SubstitutionGoal;
 
+struct KnownInitialOutputStatus {
+    StorePath path;
+    /* The output optional indicates whether it's already valid; i.e. exists
+       and is registered. If we're repairing, inner bool indicates whether the
+       valid path is in fact not corrupt. Otherwise, the inner bool is always
+       true (assumed no corruption). */
+    std::optional<bool> valid;
+    /* Valid in the store, and additionally non-corrupt if we are repairing */
+    bool isValid() const {
+        return valid && *valid;
+    }
+};
+
+struct InitialOutputStatus {
+    bool wanted;
+    std::optional<KnownInitialOutputStatus> known;
+};
+
 class DerivationGoal : public Goal
 {
 private:
@@ -744,19 +763,14 @@ private:
 
     /* The remainder is state held during the build. */
 
-    /* Locks on the output paths. */
+    /* Locks on (fixed) output paths. */
     PathLocks outputLocks;
 
     /* All input paths (that is, the union of FS closures of the
        immediate input paths). */
     StorePathSet inputPaths;
 
-    /* Outputs that are already valid.  If we're repairing, these are
-       the outputs that are valid *and* not corrupt. */
-    StorePathSet validPaths;
-
-    /* Outputs that are corrupt or not valid. */
-    StorePathSet missingPaths;
+    std::map<std::string, InitialOutputStatus> initialOutputs;
 
     /* User selected for running the builder. */
     std::unique_ptr<UserLock> buildUser;
@@ -839,6 +853,31 @@ private:
     typedef map<StorePath, StorePath> RedirectedOutputs;
     RedirectedOutputs redirectedOutputs;
 
+    /* The outputs paths used during the build.
+
+       - Input-addressed derivations or fixed content-addressed outputs are
+         sometimes built when some of their outputs already exist, and can not
+         be hidden via sandboxing. We use temporary locations instead and
+         rewrite after the build. Otherwise the regular predetermined paths are
+         put here.
+
+       - Floating content-addressed derivations do not know their final build
+         output paths until the outputs are hashed, so random locations are
+         used, and then renamed. The randomness helps guard against hidden
+         self-references.
+     */
+    OutputPathMap scratchOutputs;
+
+    /* The final output paths of the build.
+
+       - For input-addressed derivations, always the precomputed paths
+
+       - For content-addressed derivations, calcuated from whatever the hash
+         ends up being. (Note that fixed outputs derivations that produce the
+         "wrong" output still install that data under its true content-address.)
+     */
+    std::map<std::string, StorePath> finalOutputs;
+
     BuildMode buildMode;
 
     /* If we're repairing without a chroot, there may be outputs that
@@ -937,7 +976,8 @@ private:
     void getDerivation();
     void loadDerivation();
     void haveDerivation();
-    void outputsSubstituted();
+    void outputsSubstitutionTried();
+    void gaveUpOnSubstitution();
     void closureRepaired();
     void inputsRealised();
     void tryToBuild();
@@ -998,13 +1038,24 @@ private:
     void handleEOF(int fd) override;
     void flushLine();
 
+    /* Wrappers around the corresponding Store methods that first consult the
+       derivation.  This is currently needed because when there is no drv file
+       there also is no DB entry. */
+    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap();
+    OutputPathMap queryDerivationOutputMapAssumeTotal();
+
     /* Return the set of (in)valid paths. */
-    StorePathSet checkPathValidity(bool returnValid, bool checkHash);
+    void checkPathValidity();
 
     /* Forcibly kill the child process, if any. */
     void killChild();
 
-    void addHashRewrite(const StorePath & path);
+    /* Map a path to another (reproducably) so we can avoid overwriting outputs
+       that already exist. */
+    StorePath makeFallbackPath(const StorePath & path);
+    /* Make a path to another based on the output name alone, if one doesn't
+       want to use a random path for CA builds. */
+    StorePath makeFallbackPath(std::string_view path);
 
     void repairClosure();
 
@@ -1047,7 +1098,7 @@ DerivationGoal::DerivationGoal(const StorePath & drvPath, const BasicDerivation
 {
     this->drv = std::make_unique<BasicDerivation>(BasicDerivation(drv));
     state = &DerivationGoal::haveDerivation;
-    name = fmt("building of %s", worker.store.showPaths(drv.outputPaths(worker.store)));
+    name = fmt("building of %s", StorePathWithOutputs { drvPath, drv.outputNames() }.to_string(worker.store));
     trace("created");
 
     mcExpectedBuilds = std::make_unique<MaintainCount<uint64_t>>(worker.expectedBuilds);
@@ -1179,43 +1230,63 @@ void DerivationGoal::haveDerivation()
 {
     trace("have derivation");
 
+    if (drv->type() == DerivationType::CAFloating)
+        settings.requireExperimentalFeature("ca-derivations");
+
     retrySubstitution = false;
 
-    for (auto & i : drv->outputs)
-        worker.store.addTempRoot(i.second.path(worker.store, drv->name));
+    /* Temporarily root output paths that are known a priori building */
+    for (auto & i : drv->outputs) {
+        auto optOutputPath = i.second.pathOpt(worker.store, drv->name);
+        if (optOutputPath)
+            worker.store.addTempRoot(*optOutputPath);
+    }
 
     /* Check what outputs paths are not already valid. */
-    auto invalidOutputs = checkPathValidity(false, buildMode == bmRepair);
+    checkPathValidity();
+    bool allValid = true;
+    for (auto & [_, status] : initialOutputs) {
+        if (!status.wanted) continue;
+        if (!status.known || !status.known->isValid()) {
+            allValid = false;
+            break;
+        }
+    }
 
     /* If they are all valid, then we're done. */
-    if (invalidOutputs.size() == 0 && buildMode == bmNormal) {
+    if (allValid && buildMode == bmNormal) {
         done(BuildResult::AlreadyValid);
         return;
     }
 
     parsedDrv = std::make_unique<ParsedDerivation>(drvPath, *drv);
 
-    if (drv->type() == DerivationType::CAFloating) {
-        settings.requireExperimentalFeature("ca-derivations");
-        throw UnimplementedError("ca-derivations isn't implemented yet");
-    }
-
 
     /* We are first going to try to create the invalid output paths
        through substitutes.  If that doesn't work, we'll build
        them. */
     if (settings.useSubstitutes && parsedDrv->substitutesAllowed())
-        for (auto & i : invalidOutputs)
-            addWaitee(worker.makeSubstitutionGoal(i, buildMode == bmRepair ? Repair : NoRepair, getDerivationCA(*drv)));
+        for (auto & [_, status] : initialOutputs) {
+            if (!status.wanted) continue;
+            if (!status.known) {
+                warn("Do not know how to query for unknown floating CA drv output yet");
+                /* Nothing to wait for; tail call */
+                return DerivationGoal::gaveUpOnSubstitution();
+            }
+            addWaitee(worker.makeSubstitutionGoal(
+                status.known->path,
+                buildMode == bmRepair ? Repair : NoRepair,
+                getDerivationCA(*drv)));
+        }
 
     if (waitees.empty()) /* to prevent hang (no wake-up event) */
-        outputsSubstituted();
+        outputsSubstitutionTried();
     else
-        state = &DerivationGoal::outputsSubstituted;
+        state = &DerivationGoal::outputsSubstitutionTried;
 }
 
 
-void DerivationGoal::outputsSubstituted()
+void DerivationGoal::outputsSubstitutionTried()
 {
     trace("all outputs substituted (maybe)");
 
@@ -1239,7 +1310,14 @@ void DerivationGoal::outputsSubstituted()
         return;
     }
 
-    auto nrInvalid = checkPathValidity(false, buildMode == bmRepair).size();
+    checkPathValidity();
+    size_t nrInvalid = 0;
+    for (auto & [_, status] : initialOutputs) {
+        if (!status.wanted) continue;
+        if (!status.known || !status.known->isValid())
+            nrInvalid++;
+    }
+
     if (buildMode == bmNormal && nrInvalid == 0) {
         done(BuildResult::Substituted);
         return;
@@ -1252,6 +1330,12 @@ void DerivationGoal::outputsSubstituted()
         throw Error("some outputs of '%s' are not valid, so checking is not possible",
             worker.store.printStorePath(drvPath));
 
+    /* Nothing to wait for; tail call */
+    gaveUpOnSubstitution();
+}
+
+void DerivationGoal::gaveUpOnSubstitution()
+{
     /* Otherwise, at least one of the output paths could not be
        produced using a substitute.  So we have to build instead. */
 
@@ -1287,15 +1371,16 @@ void DerivationGoal::repairClosure()
        that produced those outputs. */
 
     /* Get the output closure. */
+    auto outputs = queryDerivationOutputMapAssumeTotal();
     StorePathSet outputClosure;
-    for (auto & i : drv->outputs) {
+    for (auto & i : outputs) {
         if (!wantOutput(i.first, wantedOutputs)) continue;
-        worker.store.computeFSClosure(i.second.path(worker.store, drv->name), outputClosure);
+        worker.store.computeFSClosure(i.second, outputClosure);
     }
 
     /* Filter out our own outputs (which we have already checked). */
-    for (auto & i : drv->outputs)
-        outputClosure.erase(i.second.path(worker.store, drv->name));
+    for (auto & i : outputs)
+        outputClosure.erase(i.second);
 
     /* Get all dependencies of this derivation so that we know which
        derivation is responsible for which path in the output
@@ -1305,9 +1390,9 @@ void DerivationGoal::repairClosure()
     std::map<StorePath, StorePath> outputsToDrv;
     for (auto & i : inputClosure)
         if (i.isDerivation()) {
-            Derivation drv = worker.store.derivationFromPath(i);
-            for (auto & j : drv.outputs)
-                outputsToDrv.insert_or_assign(j.second.path(worker.store, drv.name), i);
+            auto depOutputs = worker.store.queryDerivationOutputMapAssumeTotal(i);
+            for (auto & j : depOutputs)
+                outputsToDrv.insert_or_assign(j.second, i);
         }
 
     /* Check each path (slow!). */
@@ -1370,20 +1455,19 @@ void DerivationGoal::inputsRealised()
 
     /* First, the input derivations. */
     if (useDerivation)
-        for (auto & i : dynamic_cast<Derivation *>(drv.get())->inputDrvs) {
+        for (auto & [depDrvPath, wantedDepOutputs] : dynamic_cast<Derivation *>(drv.get())->inputDrvs) {
             /* Add the relevant output closures of the input derivation
                `i' as input paths.  Only add the closures of output paths
                that are specified as inputs. */
-            assert(worker.store.isValidPath(i.first));
-            Derivation inDrv = worker.store.derivationFromPath(i.first);
-            for (auto & j : i.second) {
-                auto k = inDrv.outputs.find(j);
-                if (k != inDrv.outputs.end())
-                    worker.store.computeFSClosure(k->second.path(worker.store, inDrv.name), inputPaths);
+            assert(worker.store.isValidPath(drvPath));
+            auto outputs = worker.store.queryDerivationOutputMapAssumeTotal(depDrvPath);
+            for (auto & j : wantedDepOutputs) {
+                if (outputs.count(j) > 0)
+                    worker.store.computeFSClosure(outputs.at(j), inputPaths);
                 else
                     throw Error(
                         "derivation '%s' requires non-existent output '%s' from input derivation '%s'",
-                        worker.store.printStorePath(drvPath), j, worker.store.printStorePath(i.first));
+                        worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath));
             }
         }
 
@@ -1426,14 +1510,20 @@ void DerivationGoal::tryToBuild()
 {
     trace("trying to build");
 
-    /* Obtain locks on all output paths.  The locks are automatically
-       released when we exit this function or Nix crashes.  If we
-       can't acquire the lock, then continue; hopefully some other
-       goal can start a build, and if not, the main loop will sleep a
-       few seconds and then retry this goal. */
+    /* Obtain locks on all output paths, if the paths are known a priori.
+
+       The locks are automatically released when we exit this function or Nix
+       crashes.  If we can't acquire the lock, then continue; hopefully some
+       other goal can start a build, and if not, the main loop will sleep a few
+       seconds and then retry this goal. */
     PathSet lockFiles;
-    for (auto & outPath : drv->outputPaths(worker.store))
-        lockFiles.insert(worker.store.Store::toRealPath(outPath));
+    /* FIXME: Should lock something like the drv itself so we don't build same
+       CA drv concurrently */
+    for (auto & i : drv->outputs) {
+        auto optPath = i.second.pathOpt(worker.store, drv->name);
+        if (optPath)
+            lockFiles.insert(worker.store.Store::toRealPath(*optPath));
+    }
 
     if (!outputLocks.lockPaths(lockFiles, "", false)) {
         if (!actLock)
@@ -1452,24 +1542,28 @@ void DerivationGoal::tryToBuild()
        omitted, but that would be less efficient.)  Note that since we
        now hold the locks on the output paths, no other process can
        build this derivation, so no further checks are necessary. */
-    validPaths = checkPathValidity(true, buildMode == bmRepair);
-    if (buildMode != bmCheck && validPaths.size() == drv->outputs.size()) {
+    bool allValid = true;
+    for (auto & [_, status] : initialOutputs) {
+        if (!status.wanted) continue;
+        if (!status.known || !status.known->isValid()) {
+            allValid = false;
+            break;
+        }
+    }
+    if (buildMode != bmCheck && allValid) {
         debug("skipping build of derivation '%s', someone beat us to it", worker.store.printStorePath(drvPath));
         outputLocks.setDeletion(true);
         done(BuildResult::AlreadyValid);
         return;
     }
 
-    missingPaths = drv->outputPaths(worker.store);
-    if (buildMode != bmCheck)
-        for (auto & i : validPaths) missingPaths.erase(i);
-
     /* If any of the outputs already exist but are not valid, delete
        them. */
-    for (auto & i : drv->outputs) {
-        if (worker.store.isValidPath(i.second.path(worker.store, drv->name))) continue;
-        debug("removing invalid path '%s'", worker.store.printStorePath(i.second.path(worker.store, drv->name)));
-        deletePath(worker.store.Store::toRealPath(i.second.path(worker.store, drv->name)));
+    for (auto & [_, status] : initialOutputs) {
+        if (!status.known || status.known->isValid()) continue;
+        auto storePath = status.known->path;
+        debug("removing invalid path '%s'", worker.store.printStorePath(status.known->path));
+        deletePath(worker.store.Store::toRealPath(storePath));
     }
 
     /* Don't do a remote build if the derivation has the attribute
@@ -1477,7 +1571,6 @@ void DerivationGoal::tryToBuild()
        supported for local builds. */
     bool buildLocally = buildMode != bmNormal || parsedDrv->willBuildLocally();
 
-    /* Is the build hook willing to accept this job? */
     if (!buildLocally) {
         switch (tryBuildHook()) {
             case rpAccept:
@@ -1661,8 +1754,10 @@ void DerivationGoal::buildDone()
             /* Move paths out of the chroot for easier debugging of
                build failures. */
             if (useChroot && buildMode == bmNormal)
-                for (auto & i : missingPaths) {
-                    auto p = worker.store.printStorePath(i);
+                for (auto & [_, status] : initialOutputs) {
+                    if (!status.known) continue;
+                    if (buildMode != bmCheck && status.known->isValid()) continue;
+                    auto p = worker.store.printStorePath(status.known->path);
                     if (pathExists(chrootRootDir + p))
                         rename((chrootRootDir + p).c_str(), p.c_str());
                 }
@@ -1692,7 +1787,10 @@ void DerivationGoal::buildDone()
                 fmt("running post-build-hook '%s'", settings.postBuildHook),
                 Logger::Fields{worker.store.printStorePath(drvPath)});
             PushActivity pact(act.id);
-            auto outputPaths = drv->outputPaths(worker.store);
+            StorePathSet outputPaths;
+            for (auto i : drv->outputs) {
+                outputPaths.insert(finalOutputs.at(i.first));
+            }
             std::map<std::string, std::string> hookEnvironment = getEnv();
 
             hookEnvironment.emplace("DRV_PATH", worker.store.printStorePath(drvPath));
@@ -1868,7 +1966,15 @@ HookReply DerivationGoal::tryBuildHook()
 
     /* Tell the hooks the missing outputs that have to be copied back
        from the remote system. */
-    writeStorePaths(worker.store, hook->sink, missingPaths);
+    {
+        StorePathSet missingPaths;
+        for (auto & [_, status] : initialOutputs) {
+            if (!status.known) continue;
+            if (buildMode != bmCheck && status.known->isValid()) continue;
+            missingPaths.insert(status.known->path);
+        }
+        writeStorePaths(worker.store, hook->sink, missingPaths);
+    }
 
     hook->sink = FdSink();
     hook->toHook.writeSide = -1;
@@ -1919,8 +2025,16 @@ StorePathSet DerivationGoal::exportReferences(const StorePathSet & storePaths)
     for (auto & j : paths2) {
         if (j.isDerivation()) {
             Derivation drv = worker.store.derivationFromPath(j);
-            for (auto & k : drv.outputs)
-                worker.store.computeFSClosure(k.second.path(worker.store, drv.name), paths);
+            for (auto & k : drv.outputs) {
+                auto optPath = k.second.pathOpt(worker.store, drv.name);
+                if (!optPath)
+                    /* FIXME: I am confused why we are calling
+                       `computeFSClosure` on the output path, rather than
+                       derivation itself. That doesn't seem right to me, so I
+                       won't try to implemented this for CA derivations. */
+                    throw UnimplementedError("export references including CA derivations (themselves) is not yet implemented");
+                worker.store.computeFSClosure(*optPath, paths);
+            }
         }
     }
 
@@ -2013,9 +2127,66 @@ void DerivationGoal::startBuilder()
 
     chownToBuilder(tmpDir);
 
-    /* Substitute output placeholders with the actual output paths. */
-    for (auto & output : drv->outputs)
-        inputRewrites[hashPlaceholder(output.first)] = worker.store.printStorePath(output.second.path(worker.store, drv->name));
+    for (auto & [outputName, status] : initialOutputs) {
+        /* Set scratch path we'll actually use during the build.
+
+           If we're not doing a chroot build, but we have some valid
+           output paths.  Since we can't just overwrite or delete
+           them, we have to do hash rewriting: i.e. in the
+           environment/arguments passed to the build, we replace the
+           hashes of the valid outputs with unique dummy strings;
+           after the build, we discard the redirected outputs
+           corresponding to the valid outputs, and rewrite the
+           contents of the new outputs to replace the dummy strings
+           with the actual hashes. */
+        auto scratchPath =
+            !status.known
+                /* FIXME add option to randomize, so we can audit whether our
+                 * rewrites caught everything */
+                ? makeFallbackPath(outputName)
+            : !needsHashRewrite()
+                /* Can always use original path in sandbox */
+                ? status.known->path
+            : !status.known->valid
+                /* If path doesn't yet exist can just use it */
+                ? status.known->path
+            : buildMode != bmRepair && !*status.known->valid
+                /* If we aren't repairing we'll delete a corrupted path, so we
+                   can use original path */
+                ? status.known->path
+            :   /* If we are repairing or the path is totally valid, we'll need
+                   to use a temporary path */
+                makeFallbackPath(status.known->path);
+        scratchOutputs.insert_or_assign(outputName, scratchPath);
+
+        /* A non-removed corrupted path needs to be stored here, too */
+        if (buildMode == bmRepair && !*status.known->valid)
+            redirectedBadOutputs.insert(status.known->path);
+
+        /* Substitute output placeholders with the scratch output paths.
+           We'll use during the build. */
+        inputRewrites[hashPlaceholder(outputName)] = worker.store.printStorePath(scratchPath);
+
+        /* Additional tasks if we know the final path a priori. */
+        if (!status.known) continue;
+        auto fixedFinalPath = status.known->path;
+
+        /* Additional tasks if the final and scratch are both known and
+           differ. */
+        if (fixedFinalPath == scratchPath) continue;
+
+        /* Ensure scratch scratch path is ours to use */
+        deletePath(worker.store.printStorePath(scratchPath));
+
+        /* Rewrite and unrewrite paths */
+        {
+            std::string h1 { fixedFinalPath.hashPart() };
+            std::string h2 { scratchPath.hashPart() };
+            inputRewrites[h1] = h2;
+        }
+
+        redirectedOutputs.insert_or_assign(std::move(fixedFinalPath), std::move(scratchPath));
+    }
 
     /* Construct the environment passed to the builder. */
     initEnv();
@@ -2199,8 +2370,14 @@ void DerivationGoal::startBuilder()
            rebuilding a path that is in settings.dirsInChroot
            (typically the dependencies of /bin/sh).  Throw them
            out. */
-        for (auto & i : drv->outputs)
-            dirsInChroot.erase(worker.store.printStorePath(i.second.path(worker.store, drv->name)));
+        for (auto & i : drv->outputs) {
+            /* If the name isn't known a prior (i.e. floating content-addressed
+               derivation), the temporary location we use should be fresh and
+               never in the sandbox in the first place. */
+            auto optPath = i.second.pathOpt(worker.store, drv->name);
+            if (optPath)
+                dirsInChroot.erase(worker.store.printStorePath(*optPath));
+        }
 
 #elif __APPLE__
         /* We don't really have any parent prep work to do (yet?)
@@ -2210,33 +2387,8 @@ void DerivationGoal::startBuilder()
 #endif
     }
 
-    if (needsHashRewrite()) {
-
-        if (pathExists(homeDir))
-            throw Error("home directory '%1%' exists; please remove it to assure purity of builds without sandboxing", homeDir);
-
-        /* We're not doing a chroot build, but we have some valid
-           output paths.  Since we can't just overwrite or delete
-           them, we have to do hash rewriting: i.e. in the
-           environment/arguments passed to the build, we replace the
-           hashes of the valid outputs with unique dummy strings;
-           after the build, we discard the redirected outputs
-           corresponding to the valid outputs, and rewrite the
-           contents of the new outputs to replace the dummy strings
-           with the actual hashes. */
-        if (validPaths.size() > 0)
-            for (auto & i : validPaths)
-                addHashRewrite(i);
-
-        /* If we're repairing, then we don't want to delete the
-           corrupt outputs in advance.  So rewrite them as well. */
-        if (buildMode == bmRepair)
-            for (auto & i : missingPaths)
-                if (worker.store.isValidPath(i) && pathExists(worker.store.printStorePath(i))) {
-                    addHashRewrite(i);
-                    redirectedBadOutputs.insert(i);
-                }
-    }
+    if (needsHashRewrite() && pathExists(homeDir))
+        throw Error("home directory '%1%' exists; please remove it to assure purity of builds without sandboxing", homeDir);
 
     if (useChroot && settings.preBuildHook != "" && dynamic_cast<Derivation *>(drv.get())) {
         printMsg(lvlChatty, format("executing pre-build hook '%1%'")
@@ -2612,8 +2764,11 @@ void DerivationGoal::writeStructuredAttrs()
 
     /* Add an "outputs" object containing the output paths. */
     nlohmann::json outputs;
-    for (auto & i : drv->outputs)
-        outputs[i.first] = rewriteStrings(worker.store.printStorePath(i.second.path(worker.store, drv->name)), inputRewrites);
+    for (auto & i : drv->outputs) {
+        /* The placeholder must have a rewrite, so we use it to cover both the
+           cases where we know or don't know the output path ahead of time. */
+        outputs[i.first] = rewriteStrings(hashPlaceholder(i.first), inputRewrites);
+    }
     json["outputs"] = outputs;
 
     /* Handle exportReferencesGraph. */
@@ -2815,19 +2970,20 @@ struct RestrictedStore : public LocalFSStore
         StorePathSet newPaths;
 
         for (auto & path : paths) {
-            if (path.path.isDerivation()) {
-                if (!goal.isAllowed(path.path))
-                    throw InvalidPath("cannot build unknown path '%s' in recursive Nix", printStorePath(path.path));
-                auto drv = derivationFromPath(path.path);
-                for (auto & output : drv.outputs)
-                    if (wantOutput(output.first, path.outputs))
-                        newPaths.insert(output.second.path(*this, drv.name));
-            } else if (!goal.isAllowed(path.path))
+            if (!goal.isAllowed(path.path))
                 throw InvalidPath("cannot build unknown path '%s' in recursive Nix", printStorePath(path.path));
         }
 
         next->buildPaths(paths, buildMode);
 
+        for (auto & path : paths) {
+            if (!path.path.isDerivation()) continue;
+            auto outputs = next->queryDerivationOutputMapAssumeTotal(path.path);
+            for (auto & output : outputs)
+                if (wantOutput(output.first, path.outputs))
+                    newPaths.insert(output.second);
+        }
+
         StorePathSet closure;
         next->computeFSClosure(newPaths, closure);
         for (auto & path : closure)
@@ -3443,14 +3599,10 @@ void DerivationGoal::runChild()
                 if (derivationIsImpure(derivationType))
                     sandboxProfile += "(import \"sandbox-network.sb\")\n";
 
-                /* Our rwx outputs */
+                /* Add the output paths we'll use at build-time to the chroot */
                 sandboxProfile += "(allow file-read* file-write* process-exec\n";
-                for (auto & i : missingPaths)
-                    sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(i));
-
-                /* Also add redirected outputs to the chroot */
-                for (auto & i : redirectedOutputs)
-                    sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(i.second));
+                for (auto & [_, path] : scratchOutputs)
+                    sandboxProfile += fmt("\t(subpath \"%s\")\n", worker.store.printStorePath(path));
 
                 sandboxProfile += ")\n";
 
@@ -3573,23 +3725,6 @@ void DerivationGoal::runChild()
 }
 
 
-/* Parse a list of reference specifiers.  Each element must either be
-   a store path, or the symbolic name of the output of the derivation
-   (such as `out'). */
-StorePathSet parseReferenceSpecifiers(Store & store, const BasicDerivation & drv, const Strings & paths)
-{
-    StorePathSet result;
-    for (auto & i : paths) {
-        if (store.isStorePath(i))
-            result.insert(store.parseStorePath(i));
-        else if (drv.outputs.count(i))
-            result.insert(drv.outputs.find(i)->second.path(store, drv.name));
-        else throw BuildError("derivation contains an illegal reference specifier '%s'", i);
-    }
-    return result;
-}
-
-
 static void moveCheckToStore(const Path & src, const Path & dst)
 {
     /* For the rename of directory to succeed, we must be running as root or
@@ -3617,11 +3752,18 @@ void DerivationGoal::registerOutputs()
 {
     /* When using a build hook, the build hook can register the output
        as valid (by doing `nix-store --import').  If so we don't have
-       to do anything here. */
+       to do anything here.
+
+       We can only early return when the outputs are known a priori. For
+       floating content-addressed derivations this isn't the case.
+     */
     if (hook) {
         bool allValid = true;
-        for (auto & i : drv->outputs)
-            if (!worker.store.isValidPath(i.second.path(worker.store, drv->name))) allValid = false;
+        for (auto & i : drv->outputs) {
+            auto optStorePath = i.second.pathOpt(worker.store, drv->name);
+            if (!optStorePath || !worker.store.isValidPath(*optStorePath))
+                allValid = false;
+        }
         if (allValid) return;
     }
 
@@ -3642,47 +3784,47 @@ void DerivationGoal::registerOutputs()
        Nix calls. */
     StorePathSet referenceablePaths;
     for (auto & p : inputPaths) referenceablePaths.insert(p);
-    for (auto & i : drv->outputs) referenceablePaths.insert(i.second.path(worker.store, drv->name));
+    for (auto & i : scratchOutputs) referenceablePaths.insert(i.second);
     for (auto & p : addedPaths) referenceablePaths.insert(p);
 
-    /* Check whether the output paths were created, and grep each
-       output path to determine what other paths it references.  Also make all
-       output paths read-only. */
-    for (auto & i : drv->outputs) {
-        auto path = worker.store.printStorePath(i.second.path(worker.store, drv->name));
-        if (!missingPaths.count(i.second.path(worker.store, drv->name))) continue;
+    /* FIXME `needsHashRewrite` should probably be removed and we get to the
+       real reason why we aren't using the chroot dir */
+    auto toRealPathChroot = [&](const Path & p) -> Path {
+        return useChroot && !needsHashRewrite()
+            ? chrootRootDir + p
+            : worker.store.toRealPath(p);
+    };
 
-        Path actualPath = path;
-        if (needsHashRewrite()) {
-            auto r = redirectedOutputs.find(i.second.path(worker.store, drv->name));
-            if (r != redirectedOutputs.end()) {
-                auto redirected = worker.store.Store::toRealPath(r->second);
-                if (buildMode == bmRepair
-                    && redirectedBadOutputs.count(i.second.path(worker.store, drv->name))
-                    && pathExists(redirected))
-                    replaceValidPath(path, redirected);
-                if (buildMode == bmCheck)
-                    actualPath = redirected;
-            }
-        } else if (useChroot) {
-            actualPath = chrootRootDir + path;
-            if (pathExists(actualPath)) {
-                /* Move output paths from the chroot to the Nix store. */
-                if (buildMode == bmRepair)
-                    replaceValidPath(path, actualPath);
-                else
-                    if (buildMode != bmCheck && rename(actualPath.c_str(), worker.store.toRealPath(path).c_str()) == -1)
-                        throw SysError("moving build output '%1%' from the sandbox to the Nix store", path);
-            }
-            if (buildMode != bmCheck) actualPath = worker.store.toRealPath(path);
+    /* Check whether the output paths were created, and make all
+       output paths read-only.  Then get the references of each output (that we
+       might need to register), so we can topologically sort them. For the ones
+       that are most definitely already installed, we just store their final
+       name so we can also use it in rewrites. */
+    StringSet outputsToSort;
+    std::map<std::string, std::variant<StorePath, StorePathSet>> outputReferences;
+    std::map<std::string, struct stat> outputStats;
+    for (auto & [outputName, _] : drv->outputs) {
+        auto actualPath = toRealPathChroot(worker.store.printStorePath(scratchOutputs.at(outputName)));
+
+        outputsToSort.insert(outputName);
+
+        /* Updated wanted info to remove the outputs we definitely don't need to register */
+        auto & initialInfo = initialOutputs.at(outputName);
+
+        /* Don't register if already valid, and not checking */
+        initialInfo.wanted = buildMode == bmCheck
+            || !(initialInfo.known && initialInfo.known->isValid());
+        if (!initialInfo.wanted) {
+            outputReferences.insert_or_assign(outputName, initialInfo.known->path);
+            continue;
         }
 
         struct stat st;
         if (lstat(actualPath.c_str(), &st) == -1) {
             if (errno == ENOENT)
                 throw BuildError(
-                    "builder for '%s' failed to produce output path '%s'",
-                    worker.store.printStorePath(drvPath), path);
+                    "builder for '%s' failed to produce output path for output '%s' at '%s'",
+                    worker.store.printStorePath(drvPath), outputName, actualPath);
             throw SysError("getting attributes of path '%s'", actualPath);
         }
 
@@ -3693,116 +3835,280 @@ void DerivationGoal::registerOutputs()
            user. */
         if ((!S_ISLNK(st.st_mode) && (st.st_mode & (S_IWGRP | S_IWOTH))) ||
             (buildUser && st.st_uid != buildUser->getUID()))
-            throw BuildError("suspicious ownership or permission on '%1%'; rejecting this build output", path);
+            throw BuildError(
+                    "suspicious ownership or permission on '%s' for output '%s'; rejecting this build output",
+                    actualPath, outputName);
 #endif
 
-        /* Apply hash rewriting if necessary. */
+        /* Canonicalise first.  This ensures that the path we're
+           rewriting doesn't contain a hard link to /etc/shadow or
+           something like that. */
+        canonicalisePathMetaData(actualPath, buildUser ? buildUser->getUID() : -1, inodesSeen);
+
+        debug("scanning for references for output %1 in temp location '%1%'", outputName, actualPath);
+
+        /* Pass blank Sink as we are not ready to hash data at this stage. */
+        NullSink blank;
+        auto references = worker.store.parseStorePathSet(
+            scanForReferences(blank, actualPath, worker.store.printStorePathSet(referenceablePaths)));
+
+        outputReferences.insert_or_assign(outputName, references);
+        outputStats.insert_or_assign(outputName, std::move(st));
+    }
+
+    auto sortedOutputNames = topoSort(outputsToSort,
+        {[&](const std::string & name) {
+            auto x = outputReferences.at(name);
+            return std::visit(overloaded {
+                /* Since we'll use the already installed versions of these, we
+                   can treat them as leaves and ignore any references they
+                   have. */
+                [&](StorePath _) { return StringSet {}; },
+                [&](StorePathSet refs) {
+                    StringSet referencedOutputs;
+                    /* FIXME build inverted map up front so no quadratic waste here */
+                    for (auto & r : refs)
+                        for (auto & [o, p] : scratchOutputs)
+                            if (r == p)
+                                referencedOutputs.insert(o);
+                    return referencedOutputs;
+                },
+            }, x);
+        }},
+        {[&](const std::string & path, const std::string & parent) {
+            // TODO with more -vvvv also show the temporary paths for manual inspection.
+            return BuildError(
+                "cycle detected in build of '%s' in the references of output '%s' from output '%s'",
+                worker.store.printStorePath(drvPath), path, parent);
+        }});
+
+    std::reverse(sortedOutputNames.begin(), sortedOutputNames.end());
+
+    for (auto & outputName : sortedOutputNames) {
+        auto output = drv->outputs.at(outputName);
+        auto & scratchPath = scratchOutputs.at(outputName);
+        auto actualPath = toRealPathChroot(worker.store.printStorePath(scratchOutputs.at(outputName)));
+
+        auto finish = [&](StorePath finalStorePath) {
+            /* Store the final path */
+            finalOutputs.insert_or_assign(outputName, finalStorePath);
+            /* The rewrite rule will be used in downstream outputs that refer to
+               use. This is why the topological sort is essential to do first
+               before this for loop. */
+            if (scratchPath != finalStorePath)
+                outputRewrites[std::string { scratchPath.hashPart() }] = std::string { finalStorePath.hashPart() };
+        };
+
         bool rewritten = false;
-        if (!outputRewrites.empty()) {
-            logWarning({
-                .name = "Rewriting hashes",
-                .hint = hintfmt("rewriting hashes in '%1%'; cross fingers", path)
-            });
+        std::optional<StorePathSet> referencesOpt = std::visit(overloaded {
+            [&](StorePath skippedFinalPath) -> std::optional<StorePathSet> {
+                finish(skippedFinalPath);
+                return std::nullopt;
+            },
+            [&](StorePathSet references) -> std::optional<StorePathSet> {
+                return references;
+            },
+        }, outputReferences.at(outputName));
 
-            /* Canonicalise first.  This ensures that the path we're
-               rewriting doesn't contain a hard link to /etc/shadow or
-               something like that. */
-            canonicalisePathMetaData(actualPath, buildUser ? buildUser->getUID() : -1, inodesSeen);
+        if (!referencesOpt)
+            continue;
+        auto references = *referencesOpt;
 
-            /* FIXME: this is in-memory. */
-            StringSink sink;
-            dumpPath(actualPath, sink);
-            deletePath(actualPath);
-            sink.s = make_ref<std::string>(rewriteStrings(*sink.s, outputRewrites));
-            StringSource source(*sink.s);
-            restorePath(actualPath, source);
+        auto rewriteOutput = [&]() {
+            /* Apply hash rewriting if necessary. */
+            if (!outputRewrites.empty()) {
+                logWarning({
+                    .name = "Rewriting hashes",
+                    .hint = hintfmt("rewriting hashes in '%1%'; cross fingers", actualPath),
+                });
 
-            rewritten = true;
-        }
+                /* FIXME: this is in-memory. */
+                StringSink sink;
+                dumpPath(actualPath, sink);
+                deletePath(actualPath);
+                sink.s = make_ref<std::string>(rewriteStrings(*sink.s, outputRewrites));
+                StringSource source(*sink.s);
+                restorePath(actualPath, source);
 
-        /* Check that fixed-output derivations produced the right
-           outputs (i.e., the content hash should match the specified
-           hash). */
-        std::optional<ContentAddress> ca;
+                rewritten = true;
+            }
+        };
 
-        if (! std::holds_alternative<DerivationOutputInputAddressed>(i.second.output)) {
-            DerivationOutputCAFloating outputHash;
-            std::visit(overloaded {
-                [&](DerivationOutputInputAddressed doi) {
-                    assert(false); // Enclosing `if` handles this case in other branch
+        auto rewriteRefs = [&]() -> std::pair<bool, StorePathSet> {
+            /* In the CA case, we need the rewritten refs to calculate the
+               final path, therefore we look for a *non-rewritten
+               self-reference, and use a bool rather try to solve the
+               computationally intractable fixed point. */
+            std::pair<bool, StorePathSet> res {
+                false,
+                {},
+            };
+            for (auto & r : references) {
+                auto name = r.name();
+                auto origHash = std::string { r.hashPart() };
+                if (r == scratchPath)
+                    res.first = true;
+                else if (outputRewrites.count(origHash) == 0)
+                    res.second.insert(r);
+                else {
+                    std::string newRef = outputRewrites.at(origHash);
+                    newRef += '-';
+                    newRef += name;
+                    res.second.insert(StorePath { newRef });
+                }
+            }
+            return res;
+        };
+
+        ValidPathInfo newInfo = [&]() {if (auto outputP = std::get_if<DerivationOutputInputAddressed>(&output.output)) {
+            /* input-addressed case */
+            auto requiredFinalPath = outputP->path;
+            /* Preemtively add rewrite rule for final hash, as that is
+               what the NAR hash will use rather than normalized-self references */
+            if (scratchPath != requiredFinalPath)
+                outputRewrites.insert_or_assign(
+                    std::string { scratchPath.hashPart() },
+                    std::string { requiredFinalPath.hashPart() });
+            rewriteOutput();
+            auto narHashAndSize = hashPath(htSHA256, actualPath);
+            ValidPathInfo newInfo0 { requiredFinalPath };
+            newInfo0.narHash = narHashAndSize.first;
+            newInfo0.narSize = narHashAndSize.second;
+            auto refs = rewriteRefs();
+            newInfo0.references = refs.second;
+            if (refs.first)
+                newInfo0.references.insert(newInfo0.path);
+            return newInfo0;
+        } else {
+            /* content-addressed case */
+            DerivationOutputCAFloating outputHash = std::visit(overloaded {
+                [&](DerivationOutputInputAddressed doi) -> DerivationOutputCAFloating {
+                    // Enclosing `if` handles this case in other branch
+                    throw Error("ought to unreachable, handled in other branch");
                 },
                 [&](DerivationOutputCAFixed dof) {
-                    outputHash = DerivationOutputCAFloating {
+                    return DerivationOutputCAFloating {
                         .method = dof.hash.method,
                         .hashType = dof.hash.hash.type,
                     };
                 },
                 [&](DerivationOutputCAFloating dof) {
-                    outputHash = dof;
+                   return dof;
                 },
-            }, i.second.output);
-
+            }, output.output);
+            auto & st = outputStats.at(outputName);
             if (outputHash.method == FileIngestionMethod::Flat) {
                 /* The output path should be a regular file without execute permission. */
                 if (!S_ISREG(st.st_mode) || (st.st_mode & S_IXUSR) != 0)
                     throw BuildError(
                         "output path '%1%' should be a non-executable regular file "
                         "since recursive hashing is not enabled (outputHashMode=flat)",
-                        path);
+                        actualPath);
             }
-
-            /* Check the hash. In hash mode, move the path produced by
-               the derivation to its content-addressed location. */
-            Hash h2 = outputHash.method == FileIngestionMethod::Recursive
-                ? hashPath(outputHash.hashType, actualPath).first
-                : hashFile(outputHash.hashType, actualPath);
-
-            auto dest = worker.store.makeFixedOutputPath(outputHash.method, h2, i.second.path(worker.store, drv->name).name());
-
-            // true if either floating CA, or incorrect fixed hash.
-            bool needsMove = true;
-
-            if (auto p = std::get_if<DerivationOutputCAFixed>(& i.second.output)) {
-              Hash & h = p->hash.hash;
-              if (h != h2) {
-
-                /* Throw an error after registering the path as
-                   valid. */
-                worker.hashMismatch = true;
-                delayedException = std::make_exception_ptr(
-                    BuildError("hash mismatch in fixed-output derivation '%s':\n  wanted: %s\n  got:    %s",
-                        worker.store.printStorePath(dest),
-                        h.to_string(SRI, true),
-                        h2.to_string(SRI, true)));
-              } else {
-                  // matched the fixed hash, so no move needed.
-                  needsMove = false;
-              }
+            rewriteOutput();
+            /* FIXME optimize and deduplicate with addToStore */
+            std::string oldHashPart { scratchPath.hashPart() };
+            HashModuloSink caSink { outputHash.hashType, oldHashPart };
+            switch (outputHash.method) {
+            case FileIngestionMethod::Recursive:
+                dumpPath(actualPath, caSink);
+                break;
+            case FileIngestionMethod::Flat:
+                readFile(actualPath, caSink);
+                break;
             }
-
-            if (needsMove) {
-                Path actualDest = worker.store.Store::toRealPath(dest);
-
-                if (worker.store.isValidPath(dest))
-                    std::rethrow_exception(delayedException);
-
-                if (actualPath != actualDest) {
-                    PathLocks outputLocks({actualDest});
-                    deletePath(actualDest);
-                    if (rename(actualPath.c_str(), actualDest.c_str()) == -1)
-                        throw SysError("moving '%s' to '%s'", actualPath, worker.store.printStorePath(dest));
-                }
-
-                path = worker.store.printStorePath(dest);
-                actualPath = actualDest;
-            }
-            else
-                assert(worker.store.parseStorePath(path) == dest);
-
-            ca = FixedOutputHash {
-                .method = outputHash.method,
-                .hash = h2,
+            auto got = caSink.finish().first;
+            auto refs = rewriteRefs();
+            ValidPathInfo newInfo0 {
+                worker.store.makeFixedOutputPath(
+                    outputHash.method,
+                    got,
+                    outputPathName(drv->name, outputName),
+                    refs.second,
+                    refs.first),
             };
+            newInfo0.ca = FixedOutputHash {
+                .method = outputHash.method,
+                .hash = got,
+            };
+            newInfo0.references = refs.second;
+            if (refs.first)
+                newInfo0.references.insert(newInfo0.path);
+            {
+                HashModuloSink narSink { htSHA256, oldHashPart };
+                dumpPath(actualPath, narSink);
+                auto narHashAndSize = narSink.finish();
+                newInfo0.narHash = narHashAndSize.first;
+                newInfo0.narSize = narHashAndSize.second;
+            }
+
+            /* Check wanted hash if output is fixed */
+            if (auto p = std::get_if<DerivationOutputCAFixed>(&output.output)) {
+                Hash & wanted = p->hash.hash;
+                if (wanted != got) {
+                    /* Throw an error after registering the path as
+                       valid. */
+                    worker.hashMismatch = true;
+                    delayedException = std::make_exception_ptr(
+                        BuildError("hash mismatch in fixed-output derivation '%s':\n  wanted: %s\n  got:    %s",
+                            worker.store.printStorePath(drvPath),
+                            wanted.to_string(SRI, true),
+                            got.to_string(SRI, true)));
+                }
+            }
+
+            assert(newInfo0.ca);
+            return newInfo0;
+        }}();
+
+        /* Calculate where we'll move the output files. In the checking case we
+           will leave leave them where they are, for now, rather than move to
+           their usual "final destination" */
+        auto finalDestPath = worker.store.printStorePath(newInfo.path);
+
+        /* Lock final output path, if not already locked. This happens with
+           floating CA derivations and hash-mismatching fixed-output
+           derivations. */
+        PathLocks dynamicOutputLock;
+        auto optFixedPath = output.pathOpt(worker.store, drv->name);
+        if (!optFixedPath ||
+            worker.store.printStorePath(*optFixedPath) != finalDestPath)
+        {
+            assert(newInfo.ca);
+            dynamicOutputLock.lockPaths({worker.store.toRealPath(finalDestPath)});
+        }
+
+        /* Move files, if needed */
+        if (worker.store.toRealPath(finalDestPath) != actualPath) {
+            if (buildMode == bmRepair) {
+                /* Path already exists, need to replace it */
+                replaceValidPath(worker.store.toRealPath(finalDestPath), actualPath);
+                actualPath = worker.store.toRealPath(finalDestPath);
+            } else if (buildMode == bmCheck) {
+                /* Path already exists, and we want to compare, so we leave out
+                   new path in place. */
+            } else if (finalDestPath == finalDestPath && worker.store.isValidPath(newInfo.path)) {
+                /* Path already exists because CA path produced by something
+                   else. No moving needed. */
+                assert(newInfo.ca);
+            } else {
+                /* Temporarily add write perm so we can move, will be fixed
+                   later. */
+                {
+                    struct stat st;
+                    auto & mode = st.st_mode;
+                    if (lstat(actualPath.c_str(), &st))
+                        throw SysError("getting attributes of path '%1%'", actualPath);
+                    mode |= 0200;
+                    if (chmod(actualPath.c_str(), mode) == -1)
+                        throw SysError("changing mode of '%1%' to %2$o", actualPath, mode);
+                }
+                if (rename(
+                        actualPath.c_str(),
+                        worker.store.toRealPath(finalDestPath).c_str()) == -1)
+                    throw SysError("moving build output '%1%' from it's temporary location to the Nix store", finalDestPath);
+                actualPath = worker.store.toRealPath(finalDestPath);
+            }
         }
 
         /* Get rid of all weird permissions.  This also checks that
@@ -3810,45 +4116,33 @@ void DerivationGoal::registerOutputs()
         canonicalisePathMetaData(actualPath,
             buildUser && !rewritten ? buildUser->getUID() : -1, inodesSeen);
 
-        /* For this output path, find the references to other paths
-           contained in it.  Compute the SHA-256 NAR hash at the same
-           time.  The hash is stored in the database so that we can
-           verify later on whether nobody has messed with the store. */
-        debug("scanning for references inside '%1%'", path);
-        // HashResult hash;
-        auto pathSetAndHash = scanForReferences(actualPath, worker.store.printStorePathSet(referenceablePaths));
-        auto references = worker.store.parseStorePathSet(pathSetAndHash.first);
-        HashResult hash = pathSetAndHash.second;
-
         if (buildMode == bmCheck) {
-            if (!worker.store.isValidPath(worker.store.parseStorePath(path))) continue;
-            ValidPathInfo info(*worker.store.queryPathInfo(worker.store.parseStorePath(path)));
-            if (hash.first != info.narHash) {
+            if (!worker.store.isValidPath(newInfo.path)) continue;
+            ValidPathInfo oldInfo(*worker.store.queryPathInfo(newInfo.path));
+            if (newInfo.narHash != oldInfo.narHash) {
                 worker.checkMismatch = true;
                 if (settings.runDiffHook || settings.keepFailed) {
-                    Path dst = worker.store.toRealPath(path + checkSuffix);
+                    Path dst = worker.store.toRealPath(finalDestPath + checkSuffix);
                     deletePath(dst);
                     moveCheckToStore(actualPath, dst);
 
                     handleDiffHook(
                         buildUser ? buildUser->getUID() : getuid(),
                         buildUser ? buildUser->getGID() : getgid(),
-                        path, dst, worker.store.printStorePath(drvPath), tmpDir);
+                        finalDestPath, dst, worker.store.printStorePath(drvPath), tmpDir);
 
                     throw NotDeterministic("derivation '%s' may not be deterministic: output '%s' differs from '%s'",
-                        worker.store.printStorePath(drvPath), worker.store.toRealPath(path), dst);
+                        worker.store.printStorePath(drvPath), worker.store.toRealPath(finalDestPath), dst);
                 } else
                     throw NotDeterministic("derivation '%s' may not be deterministic: output '%s' differs",
-                        worker.store.printStorePath(drvPath), worker.store.toRealPath(path));
+                        worker.store.printStorePath(drvPath), worker.store.toRealPath(finalDestPath));
             }
 
             /* Since we verified the build, it's now ultimately trusted. */
-            if (!info.ultimate) {
-                info.ultimate = true;
-                worker.store.signPathInfo(info);
-                ValidPathInfos infos;
-                infos.push_back(std::move(info));
-                worker.store.registerValidPaths(infos);
+            if (!oldInfo.ultimate) {
+                oldInfo.ultimate = true;
+                worker.store.signPathInfo(oldInfo);
+                worker.store.registerValidPaths({ std::move(oldInfo) });
             }
 
             continue;
@@ -3865,24 +4159,22 @@ void DerivationGoal::registerOutputs()
 
         if (curRound == nrRounds) {
             worker.store.optimisePath(actualPath); // FIXME: combine with scanForReferences()
-            worker.markContentsGood(worker.store.parseStorePath(path));
+            worker.markContentsGood(newInfo.path);
         }
 
-        ValidPathInfo info(worker.store.parseStorePath(path));
-        info.narHash = hash.first;
-        info.narSize = hash.second;
-        info.references = std::move(references);
-        info.deriver = drvPath;
-        info.ultimate = true;
-        info.ca = ca;
-        worker.store.signPathInfo(info);
+        newInfo.deriver = drvPath;
+        newInfo.ultimate = true;
+        worker.store.signPathInfo(newInfo);
 
-        if (!info.references.empty()) {
-            // FIXME don't we have an experimental feature for fixed output with references?
-            info.ca = {};
-        }
+        finish(newInfo.path);
 
-        infos.emplace(i.first, std::move(info));
+        /* If it's a CA path, register it right away. This is necessary if it
+           isn't statically known so that we can safely unlock the path before
+           the next iteration */
+        if (newInfo.ca)
+            worker.store.registerValidPaths({newInfo});
+
+        infos.emplace(outputName, std::move(newInfo));
     }
 
     if (buildMode == bmCheck) return;
@@ -3925,8 +4217,8 @@ void DerivationGoal::registerOutputs()
 
     /* If this is the first round of several, then move the output out of the way. */
     if (nrRounds > 1 && curRound == 1 && curRound < nrRounds && keepPreviousRound) {
-        for (auto & i : drv->outputs) {
-            auto path = worker.store.printStorePath(i.second.path(worker.store, drv->name));
+        for (auto & [_, outputStorePath] : finalOutputs) {
+            auto path = worker.store.printStorePath(outputStorePath);
             Path prev = path + checkSuffix;
             deletePath(prev);
             Path dst = path + checkSuffix;
@@ -3943,8 +4235,8 @@ void DerivationGoal::registerOutputs()
     /* Remove the .check directories if we're done. FIXME: keep them
        if the result was not determistic? */
     if (curRound == nrRounds) {
-        for (auto & i : drv->outputs) {
-            Path prev = worker.store.printStorePath(i.second.path(worker.store, drv->name)) + checkSuffix;
+        for (auto & [_, outputStorePath] : finalOutputs) {
+            Path prev = worker.store.printStorePath(outputStorePath) + checkSuffix;
             deletePath(prev);
         }
     }
@@ -3954,7 +4246,13 @@ void DerivationGoal::registerOutputs()
        outputs, this will fail. */
     {
         ValidPathInfos infos2;
-        for (auto & i : infos) infos2.push_back(i.second);
+        for (auto & [outputName, newInfo] : infos) {
+            /* FIXME: we will want to track this mapping in the DB whether or
+               not we have a drv file. */
+            if (useDerivation)
+                worker.store.linkDeriverToPath(drvPath, outputName, newInfo.path);
+            infos2.push_back(newInfo);
+        }
         worker.store.registerValidPaths(infos2);
     }
 
@@ -4030,7 +4328,17 @@ void DerivationGoal::checkOutputs(const std::map<Path, ValidPathInfo> & outputs)
             {
                 if (!value) return;
 
-                auto spec = parseReferenceSpecifiers(worker.store, *drv, *value);
+                /* Parse a list of reference specifiers.  Each element must
+                   either be a store path, or the symbolic name of the output
+                   of the derivation (such as `out'). */
+                StorePathSet spec;
+                for (auto & i : *value) {
+                    if (worker.store.isStorePath(i))
+                        spec.insert(worker.store.parseStorePath(i));
+                    else if (finalOutputs.count(i))
+                        spec.insert(finalOutputs.at(i));
+                    else throw BuildError("derivation contains an illegal reference specifier '%s'", i);
+                }
 
                 auto used = recursive
                     ? getClosure(info.path).first
@@ -4239,31 +4547,65 @@ void DerivationGoal::flushLine()
 }
 
 
-StorePathSet DerivationGoal::checkPathValidity(bool returnValid, bool checkHash)
+std::map<std::string, std::optional<StorePath>> DerivationGoal::queryDerivationOutputMap()
 {
-    StorePathSet result;
-    for (auto & i : drv->outputs) {
-        if (!wantOutput(i.first, wantedOutputs)) continue;
-        bool good =
-            worker.store.isValidPath(i.second.path(worker.store, drv->name)) &&
-            (!checkHash || worker.pathContentsGood(i.second.path(worker.store, drv->name)));
-        if (good == returnValid) result.insert(i.second.path(worker.store, drv->name));
+    if (drv->type() != DerivationType::CAFloating) {
+        std::map<std::string, std::optional<StorePath>> res;
+        for (auto & [name, output] : drv->outputs)
+            res.insert_or_assign(name, output.pathOpt(worker.store, drv->name));
+        return res;
+    } else {
+        return worker.store.queryDerivationOutputMap(drvPath);
+    }
+}
+
+OutputPathMap DerivationGoal::queryDerivationOutputMapAssumeTotal()
+{
+    if (drv->type() != DerivationType::CAFloating) {
+        OutputPathMap res;
+        for (auto & [name, output] : drv->outputs)
+            res.insert_or_assign(name, *output.pathOpt(worker.store, drv->name));
+        return res;
+    } else {
+        return worker.store.queryDerivationOutputMapAssumeTotal(drvPath);
     }
-    return result;
 }
 
 
-void DerivationGoal::addHashRewrite(const StorePath & path)
+void DerivationGoal::checkPathValidity()
 {
-    auto h1 = std::string(((std::string_view) path.to_string()).substr(0, 32));
-    auto p = worker.store.makeStorePath(
+    bool checkHash = buildMode == bmRepair;
+    for (auto & i : queryDerivationOutputMap()) {
+        InitialOutputStatus status {
+            .wanted = wantOutput(i.first, wantedOutputs),
+        };
+        if (i.second) {
+            auto outputPath = *i.second;
+            status.known = {
+                .path = outputPath,
+                .valid = !worker.store.isValidPath(outputPath)
+                    ? std::optional<bool> {}
+                    : !checkHash || worker.pathContentsGood(outputPath),
+            };
+        }
+        initialOutputs.insert_or_assign(i.first, status);
+    }
+}
+
+
+StorePath DerivationGoal::makeFallbackPath(std::string_view outputName)
+{
+    return worker.store.makeStorePath(
+        "rewrite:" + std::string(drvPath.to_string()) + ":name:" + std::string(outputName),
+        Hash(htSHA256), outputPathName(drv->name, outputName));
+}
+
+
+StorePath DerivationGoal::makeFallbackPath(const StorePath & path)
+{
+    return worker.store.makeStorePath(
         "rewrite:" + std::string(drvPath.to_string()) + ":" + std::string(path.to_string()),
         Hash(htSHA256), path.name());
-    auto h2 = std::string(((std::string_view) p.to_string()).substr(0, 32));
-    deletePath(worker.store.printStorePath(p));
-    inputRewrites[h1] = h2;
-    outputRewrites[h2] = h1;
-    redirectedOutputs.insert_or_assign(path, std::move(p));
 }
 
 
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 68b081058..58c67e40c 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -15,7 +15,8 @@ std::optional<StorePath> DerivationOutput::pathOpt(const Store & store, std::str
         },
         [&](DerivationOutputCAFixed dof) -> std::optional<StorePath> {
             return {
-                store.makeFixedOutputPath(dof.hash.method, dof.hash.hash, drvName)
+                // FIXME if we intend to support multiple CA outputs.
+                dof.path(store, drvName, "out")
             };
         },
         [](DerivationOutputCAFloating dof) -> std::optional<StorePath> {
@@ -25,6 +26,13 @@ std::optional<StorePath> DerivationOutput::pathOpt(const Store & store, std::str
 }
 
 
+StorePath DerivationOutputCAFixed::path(const Store & store, std::string_view drvName, std::string_view outputName) const {
+    return store.makeFixedOutputPath(
+        hash.method, hash.hash,
+        outputPathName(drvName, outputName));
+}
+
+
 bool derivationIsCA(DerivationType dt) {
     switch (dt) {
     case DerivationType::InputAddressed: return false;
@@ -106,12 +114,15 @@ static string parseString(std::istream & str)
     return res;
 }
 
+static void validatePath(std::string_view s) {
+    if (s.size() == 0 || s[0] != '/')
+        throw FormatError("bad path '%1%' in derivation", s);
+}
 
 static Path parsePath(std::istream & str)
 {
-    string s = parseString(str);
-    if (s.size() == 0 || s[0] != '/')
-        throw FormatError("bad path '%1%' in derivation", s);
+    auto s = parseString(str);
+    validatePath(s);
     return s;
 }
 
@@ -141,7 +152,7 @@ static StringSet parseStrings(std::istream & str, bool arePaths)
 
 static DerivationOutput parseDerivationOutput(const Store & store, std::istringstream & str)
 {
-    expect(str, ","); auto path = store.parseStorePath(parsePath(str));
+    expect(str, ","); auto pathS = parseString(str);
     expect(str, ","); auto hashAlgo = parseString(str);
     expect(str, ","); const auto hash = parseString(str);
     expect(str, ")");
@@ -152,30 +163,35 @@ static DerivationOutput parseDerivationOutput(const Store & store, std::istrings
             method = FileIngestionMethod::Recursive;
             hashAlgo = string(hashAlgo, 2);
         }
-        const HashType hashType = parseHashType(hashAlgo);
-
-        return hash != ""
-            ? DerivationOutput {
-                  .output = DerivationOutputCAFixed {
-                      .hash = FixedOutputHash {
-                          .method = std::move(method),
-                          .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
-                      },
-                  }
-               }
-            : (settings.requireExperimentalFeature("ca-derivations"),
-              DerivationOutput {
-                  .output =  DerivationOutputCAFloating {
-                      .method = std::move(method),
-                      .hashType = std::move(hashType),
-                  },
-              });
-    } else
+        const auto hashType = parseHashType(hashAlgo);
+        if (hash != "") {
+            validatePath(pathS);
+            return DerivationOutput {
+                .output = DerivationOutputCAFixed {
+                    .hash = FixedOutputHash {
+                        .method = std::move(method),
+                        .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
+                    },
+                },
+            };
+        } else {
+            settings.requireExperimentalFeature("ca-derivations");
+            assert(pathS == "");
+            return DerivationOutput {
+                .output = DerivationOutputCAFloating {
+                    .method = std::move(method),
+                    .hashType = std::move(hashType),
+                },
+            };
+        }
+    } else {
+        validatePath(pathS);
         return DerivationOutput {
             .output = DerivationOutputInputAddressed {
-                .path = std::move(path),
+                .path = store.parseStorePath(pathS),
             }
         };
+    }
 }
 
 
@@ -316,17 +332,19 @@ string Derivation::unparse(const Store & store, bool maskOutputs,
     for (auto & i : outputs) {
         if (first) first = false; else s += ',';
         s += '('; printUnquotedString(s, i.first);
-        s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(i.second.path(store, name)));
         std::visit(overloaded {
             [&](DerivationOutputInputAddressed doi) {
+                s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(doi.path));
                 s += ','; printUnquotedString(s, "");
                 s += ','; printUnquotedString(s, "");
             },
             [&](DerivationOutputCAFixed dof) {
+                s += ','; printUnquotedString(s, maskOutputs ? "" : store.printStorePath(dof.path(store, name, i.first)));
                 s += ','; printUnquotedString(s, dof.hash.printMethodAlgo());
                 s += ','; printUnquotedString(s, dof.hash.hash.to_string(Base16, false));
             },
             [&](DerivationOutputCAFloating dof) {
+                s += ','; printUnquotedString(s, "");
                 s += ','; printUnquotedString(s, makeFileIngestionPrefix(dof.method) + printHashType(dof.hashType));
                 s += ','; printUnquotedString(s, "");
             },
@@ -382,6 +400,16 @@ bool isDerivation(const string & fileName)
 }
 
 
+std::string outputPathName(std::string_view drvName, std::string_view outputName) {
+    std::string res { drvName };
+    if (outputName != "out") {
+        res += "-";
+        res += outputName;
+    }
+    return res;
+}
+
+
 DerivationType BasicDerivation::type() const
 {
     std::set<std::string_view> inputAddressedOutputs, fixedCAOutputs, floatingCAOutputs;
@@ -479,7 +507,7 @@ DrvHashModulo hashDerivationModulo(Store & store, const Derivation & drv, bool m
             auto hash = hashString(htSHA256, "fixed:out:"
                 + dof.hash.printMethodAlgo() + ":"
                 + dof.hash.hash.to_string(Base16, false) + ":"
-                + store.printStorePath(i.second.path(store, drv.name)));
+                + store.printStorePath(dof.path(store, drv.name, i.first)));
             outputHashes.insert_or_assign(i.first, std::move(hash));
         }
         return outputHashes;
@@ -530,17 +558,9 @@ bool wantOutput(const string & output, const std::set<string> & wanted)
 }
 
 
-StorePathSet BasicDerivation::outputPaths(const Store & store) const
-{
-    StorePathSet paths;
-    for (auto & i : outputs)
-        paths.insert(i.second.path(store, name));
-    return paths;
-}
-
 static DerivationOutput readDerivationOutput(Source & in, const Store & store)
 {
-    auto path = store.parseStorePath(readString(in));
+    auto pathS = readString(in);
     auto hashAlgo = readString(in);
     auto hash = readString(in);
 
@@ -550,29 +570,35 @@ static DerivationOutput readDerivationOutput(Source & in, const Store & store)
             method = FileIngestionMethod::Recursive;
             hashAlgo = string(hashAlgo, 2);
         }
-        auto hashType = parseHashType(hashAlgo);
-        return hash != ""
-            ? DerivationOutput {
-                  .output = DerivationOutputCAFixed {
-                      .hash = FixedOutputHash {
-                          .method = std::move(method),
-                          .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
-                      },
-                  }
-               }
-            : (settings.requireExperimentalFeature("ca-derivations"),
-              DerivationOutput {
-                  .output = DerivationOutputCAFloating {
-                      .method = std::move(method),
-                      .hashType = std::move(hashType),
-                  },
-              });
-    } else
+        const auto hashType = parseHashType(hashAlgo);
+        if (hash != "") {
+            validatePath(pathS);
+            return DerivationOutput {
+                .output = DerivationOutputCAFixed {
+                    .hash = FixedOutputHash {
+                        .method = std::move(method),
+                        .hash = Hash::parseNonSRIUnprefixed(hash, hashType),
+                    },
+                },
+            };
+        } else {
+            settings.requireExperimentalFeature("ca-derivations");
+            assert(pathS == "");
+            return DerivationOutput {
+                .output = DerivationOutputCAFloating {
+                    .method = std::move(method),
+                    .hashType = std::move(hashType),
+                },
+            };
+        }
+    } else {
+        validatePath(pathS);
         return DerivationOutput {
             .output = DerivationOutputInputAddressed {
-                .path = std::move(path),
+                .path = store.parseStorePath(pathS),
             }
         };
+    }
 }
 
 StringSet BasicDerivation::outputNames() const
@@ -624,18 +650,21 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
 {
     out << drv.outputs.size();
     for (auto & i : drv.outputs) {
-        out << i.first
-            << store.printStorePath(i.second.path(store, drv.name));
+        out << i.first;
         std::visit(overloaded {
             [&](DerivationOutputInputAddressed doi) {
-                out << "" << "";
+                out << store.printStorePath(doi.path)
+                    << ""
+                    << "";
             },
             [&](DerivationOutputCAFixed dof) {
-                out << dof.hash.printMethodAlgo()
+                out << store.printStorePath(dof.path(store, drv.name, i.first))
+                    << dof.hash.printMethodAlgo()
                     << dof.hash.hash.to_string(Base16, false);
             },
             [&](DerivationOutputCAFloating dof) {
-                out << (makeFileIngestionPrefix(dof.method) + printHashType(dof.hashType))
+                out << ""
+                    << (makeFileIngestionPrefix(dof.method) + printHashType(dof.hashType))
                     << "";
             },
         }, i.second.output);
@@ -654,5 +683,14 @@ std::string hashPlaceholder(const std::string & outputName)
     return "/" + hashString(htSHA256, "nix-output:" + outputName).to_string(Base32, false);
 }
 
+StorePath downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName)
+{
+    auto drvNameWithExtension = drvPath.name();
+    auto drvName = drvNameWithExtension.substr(0, drvNameWithExtension.size() - 4);
+    return store.makeStorePath(
+        "downstream-placeholder:" + std::string { drvPath.name() } + ":" + std::string { outputName },
+        "compressed:" + std::string { drvPath.hashPart() },
+        outputPathName(drvName, outputName));
+}
 
 }
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 14e0e947a..963b44b8c 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -27,6 +27,7 @@ struct DerivationOutputInputAddressed
 struct DerivationOutputCAFixed
 {
     FixedOutputHash hash; /* hash used for expected hash computation */
+    StorePath path(const Store & store, std::string_view drvName, std::string_view outputName) const;
 };
 
 /* Floating-output derivations, whose output paths are content addressed, but
@@ -48,12 +49,6 @@ struct DerivationOutput
     > output;
     std::optional<HashType> hashAlgoOpt(const Store & store) const;
     std::optional<StorePath> pathOpt(const Store & store, std::string_view drvName) const;
-    /* DEPRECATED: Remove after CA drvs are fully implemented */
-    StorePath path(const Store & store, std::string_view drvName) const {
-        auto p = pathOpt(store, drvName);
-        if (!p) throw UnimplementedError("floating content-addressed derivations are not yet implemented");
-        return *p;
-    }
 };
 
 typedef std::map<string, DerivationOutput> DerivationOutputs;
@@ -101,9 +96,6 @@ struct BasicDerivation
     /* Return true iff this is a fixed-output derivation. */
     DerivationType type() const;
 
-    /* Return the output paths of a derivation. */
-    StorePathSet outputPaths(const Store & store) const;
-
     /* Return the output names of a derivation. */
     StringSet outputNames() const;
 
@@ -136,6 +128,8 @@ Derivation readDerivation(const Store & store, const Path & drvPath, std::string
 // FIXME: remove
 bool isDerivation(const string & fileName);
 
+std::string outputPathName(std::string_view drvName, std::string_view outputName);
+
 // known CA drv's output hashes, current just for fixed-output derivations
 // whose output hashes are always known since they are fixed up-front.
 typedef std::map<std::string, Hash> CaOutputHashes;
@@ -185,4 +179,6 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
 
 std::string hashPlaceholder(const std::string & outputName);
 
+StorePath downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName);
+
 }
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e96091aae..027efc7c9 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -578,13 +578,32 @@ void LocalStore::checkDerivationOutputs(const StorePath & drvPath, const Derivat
                 envHasRightPath(path, i.first);
             },
             [&](DerivationOutputCAFloating _) {
-                throw UnimplementedError("floating CA output derivations are not yet implemented");
+                /* Nothing to check */
             },
         }, i.second.output);
     }
 }
 
 
+void LocalStore::linkDeriverToPath(const StorePath & deriver, const string & outputName, const StorePath & output)
+{
+    auto state(_state.lock());
+    return linkDeriverToPath(*state, queryValidPathId(*state, deriver), outputName, output);
+}
+
+void LocalStore::linkDeriverToPath(State & state, uint64_t deriver, const string & outputName, const StorePath & output)
+{
+    retrySQLite<void>([&]() {
+        state.stmtAddDerivationOutput.use()
+            (deriver)
+            (outputName)
+            (printStorePath(output))
+            .exec();
+    });
+
+}
+
+
 uint64_t LocalStore::addValidPath(State & state,
     const ValidPathInfo & info, bool checkOutputs)
 {
@@ -619,11 +638,11 @@ uint64_t LocalStore::addValidPath(State & state,
         if (checkOutputs) checkDerivationOutputs(info.path, drv);
 
         for (auto & i : drv.outputs) {
-            state.stmtAddDerivationOutput.use()
-                (id)
-                (i.first)
-                (printStorePath(i.second.path(*this, drv.name)))
-                .exec();
+            /* Floating CA derivations have indeterminate output paths until
+               they are built, so don't register anything in that case */
+            auto optPath = i.second.pathOpt(*this, drv.name);
+            if (optPath)
+                linkDeriverToPath(state, id, i.first, *optPath);
         }
     }
 
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 627b1f557..bf4016b13 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -282,6 +282,12 @@ private:
        specified by the ‘secret-key-files’ option. */
     void signPathInfo(ValidPathInfo & info);
 
+    /* Add a mapping from the deriver of the path info (if specified) to its
+     * out path
+     */
+    void linkDeriverToPath(const StorePath & deriver, const string & outputName, const StorePath & output);
+    void linkDeriverToPath(State & state, uint64_t deriver, const string & outputName, const StorePath & output);
+
     Path getRealStoreDir() override { return realStoreDir; }
 
     void createUser(const std::string & userName, uid_t userId) override;
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 0ae1ceaad..9024fb2bd 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -203,17 +203,24 @@ void Store::queryMissing(const std::vector<StorePathWithOutputs> & targets,
                 return;
             }
 
+            PathSet invalid;
+            /* true for regular derivations, and CA derivations for which we
+               have a trust mapping for all wanted outputs. */
+            auto knownOutputPaths = true;
+            for (auto & [outputName, pathOpt] : queryDerivationOutputMap(path.path)) {
+                if (!pathOpt) {
+                    knownOutputPaths = false;
+                    break;
+                }
+                if (wantOutput(outputName, path.outputs) && !isValidPath(*pathOpt))
+                    invalid.insert(printStorePath(*pathOpt));
+            }
+            if (knownOutputPaths && invalid.empty()) return;
+
             auto drv = make_ref<Derivation>(derivationFromPath(path.path));
             ParsedDerivation parsedDrv(StorePath(path.path), *drv);
 
-            PathSet invalid;
-            for (auto & j : drv->outputs)
-                if (wantOutput(j.first, path.outputs)
-                    && !isValidPath(j.second.path(*this, drv->name)))
-                    invalid.insert(printStorePath(j.second.path(*this, drv->name)));
-            if (invalid.empty()) return;
-
-            if (settings.useSubstitutes && parsedDrv.substitutesAllowed()) {
+            if (knownOutputPaths && settings.useSubstitutes && parsedDrv.substitutesAllowed()) {
                 auto drvState = make_ref<Sync<DrvState>>(DrvState(invalid.size()));
                 for (auto & output : invalid)
                     pool.enqueue(std::bind(checkOutput, printStorePath(path.path), drv, output, drvState));
diff --git a/src/libstore/references.cc b/src/libstore/references.cc
index 62a3cda61..d2096cb49 100644
--- a/src/libstore/references.cc
+++ b/src/libstore/references.cc
@@ -79,9 +79,17 @@ void RefScanSink::operator () (const unsigned char * data, size_t len)
 std::pair<PathSet, HashResult> scanForReferences(const string & path,
     const PathSet & refs)
 {
-    RefScanSink refsSink;
     HashSink hashSink { htSHA256 };
-    TeeSink sink { refsSink, hashSink };
+    auto found = scanForReferences(hashSink, path, refs);
+    auto hash = hashSink.finish();
+    return std::pair<PathSet, HashResult>(found, hash);
+}
+
+PathSet scanForReferences(Sink & toTee,
+    const string & path, const PathSet & refs)
+{
+    RefScanSink refsSink;
+    TeeSink sink { refsSink, toTee };
     std::map<string, Path> backMap;
 
     /* For efficiency (and a higher hit rate), just search for the
@@ -111,9 +119,7 @@ std::pair<PathSet, HashResult> scanForReferences(const string & path,
         found.insert(j->second);
     }
 
-    auto hash = hashSink.finish();
-
-    return std::pair<PathSet, HashResult>(found, hash);
+    return found;
 }
 
 
diff --git a/src/libstore/references.hh b/src/libstore/references.hh
index 598a3203a..c2efd095c 100644
--- a/src/libstore/references.hh
+++ b/src/libstore/references.hh
@@ -7,6 +7,8 @@ namespace nix {
 
 std::pair<PathSet, HashResult> scanForReferences(const Path & path, const PathSet & refs);
 
+PathSet scanForReferences(Sink & toTee, const Path & path, const PathSet & refs);
+
 struct RewritingSink : Sink
 {
     std::string from, to, prev;
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 005415666..e69d15c53 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -74,7 +74,7 @@ void write(const Store & store, Sink & out, const StorePath & storePath)
 template<>
 std::optional<StorePath> read(const Store & store, Source & from, Phantom<std::optional<StorePath>> _)
 {
-	auto s = readString(from);
+    auto s = readString(from);
     return s == "" ? std::optional<StorePath> {} : store.parseStorePath(s);
 }
 
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index e66c04df4..63accd514 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -140,21 +140,28 @@ StorePathWithOutputs Store::followLinksToStorePathWithOutputs(std::string_view p
 */
 
 
-StorePath Store::makeStorePath(const string & type,
-    const Hash & hash, std::string_view name) const
+StorePath Store::makeStorePath(std::string_view type,
+    std::string_view hash, std::string_view name) const
 {
     /* e.g., "source:sha256:1abc...:/nix/store:foo.tar.gz" */
-    string s = type + ":" + hash.to_string(Base16, true) + ":" + storeDir + ":" + std::string(name);
+    string s = std::string { type } + ":" + std::string { hash }
+        + ":" + storeDir + ":" + std::string { name };
     auto h = compressHash(hashString(htSHA256, s), 20);
     return StorePath(h, name);
 }
 
 
-StorePath Store::makeOutputPath(const string & id,
+StorePath Store::makeStorePath(std::string_view type,
     const Hash & hash, std::string_view name) const
 {
-    return makeStorePath("output:" + id, hash,
-        std::string(name) + (id == "out" ? "" : "-" + id));
+    return makeStorePath(type, hash.to_string(Base16, true), name);
+}
+
+
+StorePath Store::makeOutputPath(std::string_view id,
+    const Hash & hash, std::string_view name) const
+{
+    return makeStorePath("output:" + std::string { id }, hash, outputPathName(name, id));
 }
 
 
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 9003ab541..943f08211 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -244,10 +244,12 @@ public:
     StorePathWithOutputs followLinksToStorePathWithOutputs(std::string_view path) const;
 
     /* Constructs a unique store path name. */
-    StorePath makeStorePath(const string & type,
+    StorePath makeStorePath(std::string_view type,
+        std::string_view hash, std::string_view name) const;
+    StorePath makeStorePath(std::string_view type,
         const Hash & hash, std::string_view name) const;
 
-    StorePath makeOutputPath(const string & id,
+    StorePath makeOutputPath(std::string_view id,
         const Hash & hash, std::string_view name) const;
 
     StorePath makeFixedOutputPath(FileIngestionMethod method,
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index c29c6b29b..3650857aa 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -22,6 +22,12 @@ struct Sink
     }
 };
 
+/* Just throws away data. */
+struct NullSink : Sink
+{
+    void operator () (const unsigned char * data, size_t len) override
+    { }
+};
 
 /* A buffered abstract sink. */
 struct BufferedSink : virtual Sink
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 94412042f..be73ea724 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -487,50 +487,56 @@ static void _main(int argc, char * * argv)
 
         std::vector<StorePathWithOutputs> pathsToBuild;
 
-        std::map<Path, Path> drvPrefixes;
-        std::map<Path, Path> resultSymlinks;
-        std::vector<Path> outPaths;
+        std::map<StorePath, std::pair<size_t, StringSet>> drvMap;
 
         for (auto & drvInfo : drvs) {
-            auto drvPath = drvInfo.queryDrvPath();
-            auto outPath = drvInfo.queryOutPath();
+            auto drvPath = store->parseStorePath(drvInfo.queryDrvPath());
 
             auto outputName = drvInfo.queryOutputName();
             if (outputName == "")
-                throw Error("derivation '%s' lacks an 'outputName' attribute", drvPath);
+                throw Error("derivation '%s' lacks an 'outputName' attribute", store->printStorePath(drvPath));
 
-            pathsToBuild.push_back({store->parseStorePath(drvPath), {outputName}});
+            pathsToBuild.push_back({drvPath, {outputName}});
 
-            std::string drvPrefix;
-            auto i = drvPrefixes.find(drvPath);
-            if (i != drvPrefixes.end())
-                drvPrefix = i->second;
+            auto i = drvMap.find(drvPath);
+            if (i != drvMap.end())
+                i->second.second.insert(outputName);
             else {
-                drvPrefix = outLink;
-                if (drvPrefixes.size())
-                    drvPrefix += fmt("-%d", drvPrefixes.size() + 1);
-                drvPrefixes[drvPath] = drvPrefix;
+                drvMap[drvPath] = {drvMap.size(), {outputName}};
             }
-
-            std::string symlink = drvPrefix;
-            if (outputName != "out") symlink += "-" + outputName;
-
-            resultSymlinks[symlink] = outPath;
-            outPaths.push_back(outPath);
         }
 
         buildPaths(pathsToBuild);
 
         if (dryRun) return;
 
-        for (auto & symlink : resultSymlinks)
-            if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>())
-                store2->addPermRoot(store->parseStorePath(symlink.second), absPath(symlink.first), true);
+        std::vector<StorePath> outPaths;
+
+        for (auto & [drvPath, info] : drvMap) {
+            auto & [counter, wantedOutputs] = info;
+            std::string drvPrefix = outLink;
+            if (counter)
+                drvPrefix += fmt("-%d", counter + 1);
+
+            auto builtOutputs = store->queryDerivationOutputMapAssumeTotal(drvPath);
+
+            for (auto & outputName : wantedOutputs) {
+                auto outputPath = builtOutputs.at(outputName);
+
+                if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>()) {
+                    std::string symlink = drvPrefix;
+                    if (outputName != "out") symlink += "-" + outputName;
+                    store2->addPermRoot(outputPath, absPath(symlink), true);
+                }
+
+                outPaths.push_back(outputPath);
+            }
+        }
 
         logger->stop();
 
         for (auto & path : outPaths)
-            std::cout << path << '\n';
+            std::cout << store->printStorePath(path) << '\n';
     }
 }
 
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 2996e36c4..9eadf62e4 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -65,6 +65,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
 
     if (path.path.isDerivation()) {
         if (build) store->buildPaths({path});
+        auto outputPaths = store->queryDerivationOutputMapAssumeTotal(path.path);
         Derivation drv = store->derivationFromPath(path.path);
         rootNr++;
 
@@ -77,7 +78,8 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
             if (i == drv.outputs.end())
                 throw Error("derivation '%s' does not have an output named '%s'",
                     store2->printStorePath(path.path), j);
-            auto outPath = store2->printStorePath(i->second.path(*store, drv.name));
+            auto outPath = outputPaths.at(i->first);
+            auto retPath = store->printStorePath(outPath);
             if (store2) {
                 if (gcRoot == "")
                     printGCWarning();
@@ -85,10 +87,10 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
                     Path rootName = gcRoot;
                     if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
                     if (i->first != "out") rootName += "-" + i->first;
-                    outPath = store2->addPermRoot(store->parseStorePath(outPath), rootName, indirectRoot);
+                    retPath = store2->addPermRoot(outPath, rootName, indirectRoot);
                 }
             }
-            outputs.insert(outPath);
+            outputs.insert(retPath);
         }
         return outputs;
     }
@@ -218,8 +220,14 @@ static StorePathSet maybeUseOutputs(const StorePath & storePath, bool useOutput,
     if (useOutput && storePath.isDerivation()) {
         auto drv = store->derivationFromPath(storePath);
         StorePathSet outputs;
-        for (auto & i : drv.outputs)
-            outputs.insert(i.second.path(*store, drv.name));
+        if (forceRealise)
+            return store->queryDerivationOutputs(storePath);
+        for (auto & i : drv.outputs) {
+            auto optPath = i.second.pathOpt(*store, drv.name);
+            if (!optPath)
+                throw UsageError("Cannot use output path of floating content-addressed derivation until we know what it is (e.g. by building it)");
+            outputs.insert(*optPath);
+        }
         return outputs;
     }
     else return {storePath};
@@ -309,11 +317,9 @@ static void opQuery(Strings opFlags, Strings opArgs)
 
         case qOutputs: {
             for (auto & i : opArgs) {
-                auto i2 = store->followLinksToStorePath(i);
-                if (forceRealise) realisePath({i2});
-                Derivation drv = store->derivationFromPath(i2);
-                for (auto & j : drv.outputs)
-                    cout << fmt("%1%\n", store->printStorePath(j.second.path(*store, drv.name)));
+                auto outputs = maybeUseOutputs(store->followLinksToStorePath(i), true, forceRealise);
+                for (auto & outputPath : outputs)
+                    cout << fmt("%1%\n", store->printStorePath(outputPath));
             }
             break;
         }
diff --git a/src/nix/build.cc b/src/nix/build.cc
index 13d14a7fb..a66e8dac4 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -74,7 +74,8 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile
                             store2->addPermRoot(bo.path, absPath(symlink), true);
                         },
                         [&](BuildableFromDrv bfd) {
-                            for (auto & output : bfd.outputs) {
+                            auto builtOutputs = store->queryDerivationOutputMapAssumeTotal(bfd.drvPath);
+                            for (auto & output : builtOutputs) {
                                 std::string symlink = outLink;
                                 if (i) symlink += fmt("-%d", i);
                                 if (output.first != "out") symlink += fmt("-%s", output.first);
diff --git a/src/nix/command.cc b/src/nix/command.cc
index da32819da..4a93d8e73 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -137,7 +137,9 @@ void MixProfile::updateProfile(const Buildables & buildables)
             },
             [&](BuildableFromDrv bfd) {
                 for (auto & output : bfd.outputs) {
-                    result.push_back(output.second);
+                    if (!output.second)
+                        throw Error("output path should be known because we just tried to build it");
+                    result.push_back(*output.second);
                 }
             },
         }, buildable);
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index ea152709f..2ff94cd38 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -302,10 +302,10 @@ struct InstallableStorePath : Installable
     Buildables toBuildables() override
     {
         if (storePath.isDerivation()) {
-            std::map<std::string, StorePath> outputs;
+            std::map<std::string, std::optional<StorePath>> outputs;
             auto drv = store->readDerivation(storePath);
             for (auto & [name, output] : drv.outputs)
-                outputs.emplace(name, output.path(*store, drv.name));
+                outputs.emplace(name, output.pathOpt(*store, drv.name));
             return {
                 BuildableFromDrv {
                     .drvPath = storePath,
@@ -331,7 +331,7 @@ Buildables InstallableValue::toBuildables()
 {
     Buildables res;
 
-    std::map<StorePath, OutputPathMap> drvsToOutputs;
+    std::map<StorePath, std::map<std::string, std::optional<StorePath>>> drvsToOutputs;
 
     // Group by derivation, helps with .all in particular
     for (auto & drv : toDerivations()) {
@@ -674,8 +674,11 @@ StorePathSet toStorePaths(ref<Store> store,
                     outPaths.insert(bo.path);
                 },
                 [&](BuildableFromDrv bfd) {
-                    for (auto & output : bfd.outputs)
-                        outPaths.insert(output.second);
+                    for (auto & output : bfd.outputs) {
+                        if (!output.second)
+                            throw Error("Cannot operate on output of unbuilt CA drv");
+                        outPaths.insert(*output.second);
+                    }
                 },
             }, b);
     } else {
diff --git a/src/nix/installables.hh b/src/nix/installables.hh
index 26e87ee3a..41c75a4ed 100644
--- a/src/nix/installables.hh
+++ b/src/nix/installables.hh
@@ -20,7 +20,7 @@ struct BuildableOpaque {
 
 struct BuildableFromDrv {
     StorePath drvPath;
-    std::map<std::string, StorePath> outputs;
+    std::map<std::string, std::optional<StorePath>> outputs;
 };
 
 typedef std::variant<
@@ -82,7 +82,7 @@ struct InstallableValue : Installable
     struct DerivationInfo
     {
         StorePath drvPath;
-        StorePath outPath;
+        std::optional<StorePath> outPath;
         std::string outputName;
     };
 
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index 7dcc0b6d4..be002519a 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -178,7 +178,9 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
                 auto [attrPath, resolvedRef, drv] = installable2->toDerivation();
 
                 ProfileElement element;
-                element.storePaths = {drv.outPath}; // FIXME
+                if (!drv.outPath)
+                    throw UnimplementedError("CA derivations are not yet supported by 'nix profile'");
+                element.storePaths = {*drv.outPath}; // FIXME
                 element.source = ProfileElementSource{
                     installable2->flakeRef,
                     resolvedRef,
@@ -189,7 +191,7 @@ struct CmdProfileInstall : InstallablesCommand, MixDefaultProfile
 
                 manifest.elements.emplace_back(std::move(element));
             } else
-                throw Error("'nix profile install' does not support argument '%s'", installable->what());
+                throw UnimplementedError("'nix profile install' does not support argument '%s'", installable->what());
         }
 
         store->buildPaths(pathsToBuild);
@@ -347,7 +349,9 @@ struct CmdProfileUpgrade : virtual SourceExprCommand, MixDefaultProfile, MixProf
                 printInfo("upgrading '%s' from flake '%s' to '%s'",
                     element.source->attrPath, element.source->resolvedRef, resolvedRef);
 
-                element.storePaths = {drv.outPath}; // FIXME
+                if (!drv.outPath)
+                    throw UnimplementedError("CA derivations are not yet supported by 'nix profile'");
+                element.storePaths = {*drv.outPath}; // FIXME
                 element.source = ProfileElementSource{
                     installable.flakeRef,
                     resolvedRef,
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index c3c9e54a8..0224f891d 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -488,10 +488,10 @@ bool NixRepl::processLine(string line)
                but doing it in a child makes it easier to recover from
                problems / SIGINT. */
             if (runProgram(settings.nixBinDir + "/nix", Strings{"build", "--no-link", drvPath}) == 0) {
-                auto drv = readDerivation(*state->store, drvPath, Derivation::nameFromPath(state->store->parseStorePath(drvPath)));
+                auto outputs = state->store->queryDerivationOutputMapAssumeTotal(state->store->parseStorePath(drvPath));
                 std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
-                for (auto & i : drv.outputs)
-                    std::cout << fmt("  %s -> %s\n", i.first, state->store->printStorePath(i.second.path(*state->store, drv.name)));
+                for (auto & i : outputs)
+                    std::cout << fmt("  %s -> %s\n", i.first, state->store->printStorePath(i.second));
             }
         } else if (command == ":i") {
             runProgram(settings.nixBinDir + "/nix-env", Strings{"-i", drvPath});
diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc
index 1b51d114f..b204b2d4c 100644
--- a/src/nix/show-derivation.cc
+++ b/src/nix/show-derivation.cc
@@ -69,12 +69,12 @@ struct CmdShowDerivation : InstallablesCommand
                 auto outputsObj(drvObj.object("outputs"));
                 for (auto & output : drv.outputs) {
                     auto outputObj(outputsObj.object(output.first));
-                    outputObj.attr("path", store->printStorePath(output.second.path(*store, drv.name)));
-
                     std::visit(overloaded {
                         [&](DerivationOutputInputAddressed doi) {
+                            outputObj.attr("path", store->printStorePath(doi.path));
                         },
                         [&](DerivationOutputCAFixed dof) {
+                            outputObj.attr("path", store->printStorePath(dof.path(*store, drv.name, output.first)));
                             outputObj.attr("hashAlgo", dof.hash.printMethodAlgo());
                             outputObj.attr("hash", dof.hash.hash.to_string(Base16, false));
                         },
diff --git a/tests/content-addressed.nix b/tests/content-addressed.nix
new file mode 100644
index 000000000..586e4cba6
--- /dev/null
+++ b/tests/content-addressed.nix
@@ -0,0 +1,19 @@
+with import ./config.nix;
+
+{ seed ? 0 }:
+# A simple content-addressed derivation.
+# The derivation can be arbitrarily modified by passing a different `seed`,
+# but the output will always be the same
+mkDerivation {
+  name = "simple-content-addressed";
+  buildCommand = ''
+    set -x
+    echo "Building a CA derivation"
+    echo "The seed is ${toString seed}"
+    mkdir -p $out
+    echo "Hello World" > $out/hello
+  '';
+  __contentAddressed = true;
+  outputHashMode = "recursive";
+  outputHashAlgo = "sha256";
+}
diff --git a/tests/content-addressed.sh b/tests/content-addressed.sh
new file mode 100644
index 000000000..2968f3a8c
--- /dev/null
+++ b/tests/content-addressed.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+source common.sh
+
+clearStore
+clearCache
+
+export REMOTE_STORE=file://$cacheDir
+
+drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix --arg seed 1)
+nix --experimental-features 'nix-command ca-derivations' show-derivation --derivation "$drv" --arg seed 1
+
+out1=$(nix-build --experimental-features ca-derivations ./content-addressed.nix --arg seed 1 --no-out-link)
+out2=$(nix-build --experimental-features ca-derivations ./content-addressed.nix --arg seed 2 --no-out-link)
+
+test $out1 == $out2
diff --git a/tests/local.mk b/tests/local.mk
index 0f3bfe606..4f4e63a5a 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -32,7 +32,8 @@ nix_tests = \
   post-hook.sh \
   function-trace.sh \
   recursive.sh \
-  flakes.sh
+  flakes.sh \
+  content-addressed.sh
   # parallel.sh
 
 install-tests += $(foreach x, $(nix_tests), tests/$(x))
diff --git a/tests/multiple-outputs.nix b/tests/multiple-outputs.nix
index 4a9010d18..b915493f7 100644
--- a/tests/multiple-outputs.nix
+++ b/tests/multiple-outputs.nix
@@ -2,6 +2,21 @@ with import ./config.nix;
 
 rec {
 
+  # Want to ensure that "out" doesn't get a suffix on it's path.
+  nameCheck = mkDerivation {
+    name = "multiple-outputs-a";
+    outputs = [ "out" "dev" ];
+    builder = builtins.toFile "builder.sh"
+      ''
+        mkdir $first $second
+        test -z $all
+        echo "first" > $first/file
+        echo "second" > $second/file
+        ln -s $first $second/link
+      '';
+    helloString = "Hello, world!";
+  };
+
   a = mkDerivation {
     name = "multiple-outputs-a";
     outputs = [ "first" "second" ];
diff --git a/tests/multiple-outputs.sh b/tests/multiple-outputs.sh
index bedbc39a4..7a6ec181d 100644
--- a/tests/multiple-outputs.sh
+++ b/tests/multiple-outputs.sh
@@ -4,6 +4,12 @@ clearStore
 
 rm -f $TEST_ROOT/result*
 
+# Test whether the output names match our expectations
+outPath=$(nix-instantiate multiple-outputs.nix --eval -A nameCheck.out.outPath)
+[ "$(echo "$outPath" | sed -E 's_^".*/[^-/]*-([^/]*)"$_\1_')" = "multiple-outputs-a" ]
+outPath=$(nix-instantiate multiple-outputs.nix --eval -A nameCheck.dev.outPath)
+[ "$(echo "$outPath" | sed -E 's_^".*/[^-/]*-([^/]*)"$_\1_')" = "multiple-outputs-a-dev" ]
+
 # Test whether read-only evaluation works when referring to the
 # ‘drvPath’ attribute.
 echo "evaluating c..."

From f7696c66e85008e2b60a579bcdf5ff13c141d0af Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sat, 8 Aug 2020 15:48:51 +0000
Subject: [PATCH 047/176] Fix perl FFI for floating ca derivations

Path is null when not known statically.
---
 perl/lib/Nix/Store.xs | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
index de60fb939..6fe01fff0 100644
--- a/perl/lib/Nix/Store.xs
+++ b/perl/lib/Nix/Store.xs
@@ -303,11 +303,15 @@ SV * derivationFromPath(char * drvPath)
             hash = newHV();
 
             HV * outputs = newHV();
-            for (auto & i : drv.outputs)
+            for (auto & i : drv.outputs) {
+                auto pathOpt = i.second.pathOpt(*store(), drv.name);
                 hv_store(
                     outputs, i.first.c_str(), i.first.size(),
-                    newSVpv(store()->printStorePath(i.second.path(*store(), drv.name)).c_str(), 0),
+                    !pathOpt
+                        ? newSV(0) /* null value */
+                        : newSVpv(store()->printStorePath(*pathOpt).c_str(), 0),
                     0);
+            }
             hv_stores(hash, "outputs", newRV((SV *) outputs));
 
             AV * inputDrvs = newAV();

From 2a0902634eddded44a1775b275a257c98ca1dec8 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 00:12:54 +0000
Subject: [PATCH 048/176] Fix error in merge breaking floating CA drvs

Forgot to add this hunk!
---
 src/libstore/derivations.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index 732401dc5..e9f35a6f1 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -192,7 +192,7 @@ static DerivationOutput parseDerivationOutput(const Store & store,
 
 static DerivationOutput parseDerivationOutput(const Store & store, std::istringstream & str)
 {
-    expect(str, ","); const auto pathS = parsePath(str);
+    expect(str, ","); const auto pathS = parseString(str);
     expect(str, ","); const auto hashAlgo = parseString(str);
     expect(str, ","); const auto hash = parseString(str);
     expect(str, ")");

From d0f6e338ddbd4b7e37c2d944c368ca3094619e9f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 16:49:10 -0400
Subject: [PATCH 049/176] Apply suggestions from code review
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Thanks!!

Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
---
 src/libstore/build.cc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7c2225805..b9f79e5b7 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -876,7 +876,7 @@ private:
          ends up being. (Note that fixed outputs derivations that produce the
          "wrong" output still install that data under its true content-address.)
      */
-    std::map<std::string, StorePath> finalOutputs;
+    OutputPathMap finalOutputs;
 
     BuildMode buildMode;
 
@@ -1055,7 +1055,7 @@ private:
     StorePath makeFallbackPath(const StorePath & path);
     /* Make a path to another based on the output name alone, if one doesn't
        want to use a random path for CA builds. */
-    StorePath makeFallbackPath(std::string_view path);
+    StorePath makeFallbackPath(std::string_view outputName);
 
     void repairClosure();
 
@@ -1336,7 +1336,7 @@ void DerivationGoal::outputsSubstitutionTried()
 
 void DerivationGoal::gaveUpOnSubstitution()
 {
-    /* Otherwise, at least one of the output paths could not be
+    /* At least one of the output paths could not be
        produced using a substitute.  So we have to build instead. */
 
     /* Make sure checkPathValidity() from now on checks all
@@ -2371,7 +2371,7 @@ void DerivationGoal::startBuilder()
            (typically the dependencies of /bin/sh).  Throw them
            out. */
         for (auto & i : drv->outputs) {
-            /* If the name isn't known a prior (i.e. floating content-addressed
+            /* If the name isn't known a priori (i.e. floating content-addressed
                derivation), the temporary location we use should be fresh and
                never in the sandbox in the first place. */
             auto optPath = i.second.pathOpt(worker.store, drv->name);
@@ -3887,7 +3887,7 @@ void DerivationGoal::registerOutputs()
     for (auto & outputName : sortedOutputNames) {
         auto output = drv->outputs.at(outputName);
         auto & scratchPath = scratchOutputs.at(outputName);
-        auto actualPath = toRealPathChroot(worker.store.printStorePath(scratchOutputs.at(outputName)));
+        auto actualPath = toRealPathChroot(worker.store.printStorePath(scratchPath));
 
         auto finish = [&](StorePath finalStorePath) {
             /* Store the final path */

From 07e3466eb4e6d259dc328a5aec834d42f8aacb60 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 21:16:14 +0000
Subject: [PATCH 050/176] Float comment to out describe `gaveUpOnSubstitution`
 in general

---
 src/libstore/build.cc | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index b9f79e5b7..1b55b9826 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1334,11 +1334,10 @@ void DerivationGoal::outputsSubstitutionTried()
     gaveUpOnSubstitution();
 }
 
+/* At least one of the output paths could not be
+   produced using a substitute.  So we have to build instead. */
 void DerivationGoal::gaveUpOnSubstitution()
 {
-    /* At least one of the output paths could not be
-       produced using a substitute.  So we have to build instead. */
-
     /* Make sure checkPathValidity() from now on checks all
        outputs. */
     wantedOutputs.clear();

From 8a068bd0252573750be6ea754f0e3ff502fb6019 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 21:25:40 +0000
Subject: [PATCH 051/176] Remove redundant equality check

---
 src/libstore/build.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 1b55b9826..cc596b063 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4086,7 +4086,7 @@ void DerivationGoal::registerOutputs()
             } else if (buildMode == bmCheck) {
                 /* Path already exists, and we want to compare, so we leave out
                    new path in place. */
-            } else if (finalDestPath == finalDestPath && worker.store.isValidPath(newInfo.path)) {
+            } else if (worker.store.isValidPath(newInfo.path)) {
                 /* Path already exists because CA path produced by something
                    else. No moving needed. */
                 assert(newInfo.ca);

From 6d571390500431904d1ca1621fb6791fc25522f1 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 22:34:09 +0000
Subject: [PATCH 052/176] Clarify `outputReferences` variable with
 self-describing type

Thanks for the idea, @Regnat!
---
 src/libstore/build.cc | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index cc596b063..142149ae3 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3800,7 +3800,9 @@ void DerivationGoal::registerOutputs()
        that are most definitely already installed, we just store their final
        name so we can also use it in rewrites. */
     StringSet outputsToSort;
-    std::map<std::string, std::variant<StorePath, StorePathSet>> outputReferences;
+    struct AlreadyRegistered { StorePath path; };
+    struct PerhapsNeedToRegister { StorePathSet refs; };
+    std::map<std::string, std::variant<AlreadyRegistered, PerhapsNeedToRegister>> outputReferencesIfUnregistered;
     std::map<std::string, struct stat> outputStats;
     for (auto & [outputName, _] : drv->outputs) {
         auto actualPath = toRealPathChroot(worker.store.printStorePath(scratchOutputs.at(outputName)));
@@ -3814,7 +3816,9 @@ void DerivationGoal::registerOutputs()
         initialInfo.wanted = buildMode == bmCheck
             || !(initialInfo.known && initialInfo.known->isValid());
         if (!initialInfo.wanted) {
-            outputReferences.insert_or_assign(outputName, initialInfo.known->path);
+            outputReferencesIfUnregistered.insert_or_assign(
+                outputName,
+                AlreadyRegistered { .path = initialInfo.known->path });
             continue;
         }
 
@@ -3851,28 +3855,29 @@ void DerivationGoal::registerOutputs()
         auto references = worker.store.parseStorePathSet(
             scanForReferences(blank, actualPath, worker.store.printStorePathSet(referenceablePaths)));
 
-        outputReferences.insert_or_assign(outputName, references);
+        outputReferencesIfUnregistered.insert_or_assign(
+            outputName,
+            PerhapsNeedToRegister { .refs = references });
         outputStats.insert_or_assign(outputName, std::move(st));
     }
 
     auto sortedOutputNames = topoSort(outputsToSort,
         {[&](const std::string & name) {
-            auto x = outputReferences.at(name);
             return std::visit(overloaded {
                 /* Since we'll use the already installed versions of these, we
                    can treat them as leaves and ignore any references they
                    have. */
-                [&](StorePath _) { return StringSet {}; },
-                [&](StorePathSet refs) {
+                [&](AlreadyRegistered _) { return StringSet {}; },
+                [&](PerhapsNeedToRegister refs) {
                     StringSet referencedOutputs;
                     /* FIXME build inverted map up front so no quadratic waste here */
-                    for (auto & r : refs)
+                    for (auto & r : refs.refs)
                         for (auto & [o, p] : scratchOutputs)
                             if (r == p)
                                 referencedOutputs.insert(o);
                     return referencedOutputs;
                 },
-            }, x);
+            }, outputReferencesIfUnregistered.at(name));
         }},
         {[&](const std::string & path, const std::string & parent) {
             // TODO with more -vvvv also show the temporary paths for manual inspection.
@@ -3900,14 +3905,14 @@ void DerivationGoal::registerOutputs()
 
         bool rewritten = false;
         std::optional<StorePathSet> referencesOpt = std::visit(overloaded {
-            [&](StorePath skippedFinalPath) -> std::optional<StorePathSet> {
-                finish(skippedFinalPath);
+            [&](AlreadyRegistered skippedFinalPath) -> std::optional<StorePathSet> {
+                finish(skippedFinalPath.path);
                 return std::nullopt;
             },
-            [&](StorePathSet references) -> std::optional<StorePathSet> {
-                return references;
+            [&](PerhapsNeedToRegister r) -> std::optional<StorePathSet> {
+                return r.refs;
             },
-        }, outputReferences.at(outputName));
+        }, outputReferencesIfUnregistered.at(outputName));
 
         if (!referencesOpt)
             continue;

From 4c6aac8fdf2cbc85280115da53acebb910d2e60c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 22:46:05 +0000
Subject: [PATCH 053/176] Clarify comment on sandbox and temp fresh paths

---
 src/libstore/build.cc | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 142149ae3..d2bfc73c9 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2370,9 +2370,11 @@ void DerivationGoal::startBuilder()
            (typically the dependencies of /bin/sh).  Throw them
            out. */
         for (auto & i : drv->outputs) {
-            /* If the name isn't known a priori (i.e. floating content-addressed
-               derivation), the temporary location we use should be fresh and
-               never in the sandbox in the first place. */
+            /* If the name isn't known a priori (i.e. floating
+               content-addressed derivation), the temporary location we use
+               should be fresh.  Freshness means it is impossible that the path
+               is already in the sandbox, so we don't need to worry about
+               removing it.  */
             auto optPath = i.second.pathOpt(worker.store, drv->name);
             if (optPath)
                 dirsInChroot.erase(worker.store.printStorePath(*optPath));

From 2de201254e8669a6768bb739ff27fd94a87a71b9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 23:07:50 +0000
Subject: [PATCH 054/176] Don't assume a total output map in two places in
 build.cc

Thanks @regnat for catching one of them. The other follows for many of
the same reasons. I'm find fixing others on a need-to-fix basis,
provided their are no regressions.
---
 src/libstore/build.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d2bfc73c9..c8107c7e8 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1389,9 +1389,10 @@ void DerivationGoal::repairClosure()
     std::map<StorePath, StorePath> outputsToDrv;
     for (auto & i : inputClosure)
         if (i.isDerivation()) {
-            auto depOutputs = worker.store.queryDerivationOutputMapAssumeTotal(i);
+            auto depOutputs = worker.store.queryDerivationOutputMap(i);
             for (auto & j : depOutputs)
-                outputsToDrv.insert_or_assign(j.second, i);
+                if (j.second)
+                    outputsToDrv.insert_or_assign(*j.second, i);
         }
 
     /* Check each path (slow!). */
@@ -1459,11 +1460,16 @@ void DerivationGoal::inputsRealised()
                `i' as input paths.  Only add the closures of output paths
                that are specified as inputs. */
             assert(worker.store.isValidPath(drvPath));
-            auto outputs = worker.store.queryDerivationOutputMapAssumeTotal(depDrvPath);
+            auto outputs = worker.store.queryDerivationOutputMap(depDrvPath);
             for (auto & j : wantedDepOutputs) {
-                if (outputs.count(j) > 0)
-                    worker.store.computeFSClosure(outputs.at(j), inputPaths);
-                else
+                if (outputs.count(j) > 0) {
+                    auto optRealizedInput = outputs.at(j);
+                    if (!optRealizedInput)
+                        throw Error(
+                            "derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output.",
+                            worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath));
+                    worker.store.computeFSClosure(*optRealizedInput, inputPaths);
+                } else
                     throw Error(
                         "derivation '%s' requires non-existent output '%s' from input derivation '%s'",
                         worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath));

From 18834f77643f5bd1071e1735f23f925d87cce6e5 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 11 Aug 2020 23:44:02 +0000
Subject: [PATCH 055/176] Recheck path validity after acquiring lock

It might have changed, and in any event this is how the cod used to work
so let's just keep it.
---
 src/libstore/build.cc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index c8107c7e8..49042649e 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1547,6 +1547,7 @@ void DerivationGoal::tryToBuild()
        omitted, but that would be less efficient.)  Note that since we
        now hold the locks on the output paths, no other process can
        build this derivation, so no further checks are necessary. */
+    checkPathValidity();
     bool allValid = true;
     for (auto & [_, status] : initialOutputs) {
         if (!status.wanted) continue;

From 5f80aea795d3f6f78d682c7b99453b6fb7c9b6ba Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 12 Aug 2020 02:23:31 +0000
Subject: [PATCH 056/176] Break out lambda so output can be matched just once

This is much better.
---
 src/libstore/build.cc | 86 +++++++++++++++++++++----------------------
 1 file changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 49042649e..0ea8f9c97 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -3973,42 +3973,7 @@ void DerivationGoal::registerOutputs()
             return res;
         };
 
-        ValidPathInfo newInfo = [&]() {if (auto outputP = std::get_if<DerivationOutputInputAddressed>(&output.output)) {
-            /* input-addressed case */
-            auto requiredFinalPath = outputP->path;
-            /* Preemtively add rewrite rule for final hash, as that is
-               what the NAR hash will use rather than normalized-self references */
-            if (scratchPath != requiredFinalPath)
-                outputRewrites.insert_or_assign(
-                    std::string { scratchPath.hashPart() },
-                    std::string { requiredFinalPath.hashPart() });
-            rewriteOutput();
-            auto narHashAndSize = hashPath(htSHA256, actualPath);
-            ValidPathInfo newInfo0 { requiredFinalPath };
-            newInfo0.narHash = narHashAndSize.first;
-            newInfo0.narSize = narHashAndSize.second;
-            auto refs = rewriteRefs();
-            newInfo0.references = refs.second;
-            if (refs.first)
-                newInfo0.references.insert(newInfo0.path);
-            return newInfo0;
-        } else {
-            /* content-addressed case */
-            DerivationOutputCAFloating outputHash = std::visit(overloaded {
-                [&](DerivationOutputInputAddressed doi) -> DerivationOutputCAFloating {
-                    // Enclosing `if` handles this case in other branch
-                    throw Error("ought to unreachable, handled in other branch");
-                },
-                [&](DerivationOutputCAFixed dof) {
-                    return DerivationOutputCAFloating {
-                        .method = dof.hash.method,
-                        .hashType = dof.hash.hash.type,
-                    };
-                },
-                [&](DerivationOutputCAFloating dof) {
-                   return dof;
-                },
-            }, output.output);
+        auto newInfoFromCA = [&](const DerivationOutputCAFloating outputHash) -> ValidPathInfo {
             auto & st = outputStats.at(outputName);
             if (outputHash.method == FileIngestionMethod::Flat) {
                 /* The output path should be a regular file without execute permission. */
@@ -4055,9 +4020,41 @@ void DerivationGoal::registerOutputs()
                 newInfo0.narSize = narHashAndSize.second;
             }
 
-            /* Check wanted hash if output is fixed */
-            if (auto p = std::get_if<DerivationOutputCAFixed>(&output.output)) {
-                Hash & wanted = p->hash.hash;
+            assert(newInfo0.ca);
+            return newInfo0;
+        };
+
+        ValidPathInfo newInfo = std::visit(overloaded {
+            [&](DerivationOutputInputAddressed output) {
+                /* input-addressed case */
+                auto requiredFinalPath = output.path;
+                /* Preemtively add rewrite rule for final hash, as that is
+                   what the NAR hash will use rather than normalized-self references */
+                if (scratchPath != requiredFinalPath)
+                    outputRewrites.insert_or_assign(
+                        std::string { scratchPath.hashPart() },
+                        std::string { requiredFinalPath.hashPart() });
+                rewriteOutput();
+                auto narHashAndSize = hashPath(htSHA256, actualPath);
+                ValidPathInfo newInfo0 { requiredFinalPath };
+                newInfo0.narHash = narHashAndSize.first;
+                newInfo0.narSize = narHashAndSize.second;
+                auto refs = rewriteRefs();
+                newInfo0.references = refs.second;
+                if (refs.first)
+                    newInfo0.references.insert(newInfo0.path);
+                return newInfo0;
+            },
+            [&](DerivationOutputCAFixed dof) {
+                auto newInfo0 = newInfoFromCA(DerivationOutputCAFloating {
+                    .method = dof.hash.method,
+                    .hashType = dof.hash.hash.type,
+                });
+
+                /* Check wanted hash */
+                Hash & wanted = dof.hash.hash;
+                assert(newInfo0.ca);
+                auto got = getContentAddressHash(*newInfo0.ca);
                 if (wanted != got) {
                     /* Throw an error after registering the path as
                        valid. */
@@ -4068,11 +4065,12 @@ void DerivationGoal::registerOutputs()
                             wanted.to_string(SRI, true),
                             got.to_string(SRI, true)));
                 }
-            }
-
-            assert(newInfo0.ca);
-            return newInfo0;
-        }}();
+                return newInfo0;
+            },
+            [&](DerivationOutputCAFloating dof) {
+                return newInfoFromCA(dof);
+            },
+        }, output.output);
 
         /* Calculate where we'll move the output files. In the checking case we
            will leave leave them where they are, for now, rather than move to

From f899a7c6d726dbf75e78fce5b5a9aa478387fcbe Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 14 Aug 2020 18:51:31 +0000
Subject: [PATCH 057/176] Work around clang bug

---
 src/nix/show-derivation.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nix/show-derivation.cc b/src/nix/show-derivation.cc
index cc52e53fb..b9f33499b 100644
--- a/src/nix/show-derivation.cc
+++ b/src/nix/show-derivation.cc
@@ -67,7 +67,8 @@ struct CmdShowDerivation : InstallablesCommand
 
             {
                 auto outputsObj(drvObj.object("outputs"));
-                for (auto & [outputName, output] : drv.outputs) {
+                for (auto & [_outputName, output] : drv.outputs) {
+                    auto & outputName = _outputName; // work around clang bug
                     auto outputObj { outputsObj.object(outputName) };
                     std::visit(overloaded {
                         [&](DerivationOutputInputAddressed doi) {

From a72a20d68fe6ae75f05f69e7de0bc3326d779144 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 17 Aug 2020 17:44:52 +0200
Subject: [PATCH 058/176] Add 'nix dump-args' to dump all commands/flags for
 manpage generation

---
 src/libutil/args.cc | 70 +++++++++++++++++++++++++++++++++++++++++++++
 src/libutil/args.hh |  8 ++++++
 src/nix/command.cc  | 13 +++++++++
 src/nix/command.hh  |  7 +++++
 src/nix/flake.cc    |  7 +----
 src/nix/main.cc     |  7 +++++
 src/nix/profile.cc  |  7 +----
 src/nix/registry.cc |  7 +----
 8 files changed, 108 insertions(+), 18 deletions(-)

diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index 986c5d1cd..bf5e7ce95 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -3,6 +3,8 @@
 
 #include <glob.h>
 
+#include <nlohmann/json.hpp>
+
 namespace nix {
 
 void Args::addFlag(Flag && flag_)
@@ -205,6 +207,42 @@ bool Args::processArgs(const Strings & args, bool finish)
     return res;
 }
 
+nlohmann::json Args::toJSON()
+{
+    auto flags = nlohmann::json::object();
+
+    for (auto & [name, flag] : longFlags) {
+        auto j = nlohmann::json::object();
+        if (flag->shortName)
+            j["shortName"] = std::string(1, flag->shortName);
+        if (flag->description != "")
+            j["description"] = flag->description;
+        if (flag->category != "")
+            j["category"] = flag->category;
+        if (flag->handler.arity != ArityAny)
+            j["arity"] = flag->handler.arity;
+        if (!flag->labels.empty())
+            j["labels"] = flag->labels;
+        flags[name] = std::move(j);
+    }
+
+    auto args = nlohmann::json::array();
+
+    for (auto & arg : expectedArgs) {
+        auto j = nlohmann::json::object();
+        j["label"] = arg.label;
+        j["optional"] = arg.optional;
+        if (arg.handler.arity != ArityAny)
+            j["arity"] = arg.handler.arity;
+        args.push_back(std::move(j));
+    }
+
+    auto res = nlohmann::json::object();
+    res["flags"] = std::move(flags);
+    res["args"] = std::move(args);
+    return res;
+}
+
 static void hashTypeCompleter(size_t index, std::string_view prefix) 
 {
     for (auto & type : hashTypes)
@@ -313,6 +351,22 @@ void Command::printHelp(const string & programName, std::ostream & out)
     }
 }
 
+nlohmann::json Command::toJSON()
+{
+    auto exs = nlohmann::json::array();
+
+    for (auto & example : examples()) {
+        auto ex = nlohmann::json::object();
+        ex["description"] = example.description;
+        ex["command"] = example.command;
+        exs.push_back(std::move(ex));
+    }
+
+    auto res = Args::toJSON();
+    res["examples"] = std::move(exs);
+    return res;
+}
+
 MultiCommand::MultiCommand(const Commands & commands)
     : commands(commands)
 {
@@ -387,4 +441,20 @@ bool MultiCommand::processArgs(const Strings & args, bool finish)
         return Args::processArgs(args, finish);
 }
 
+nlohmann::json MultiCommand::toJSON()
+{
+    auto cmds = nlohmann::json::object();
+
+    for (auto & [name, commandFun] : commands) {
+        auto command = commandFun();
+        auto j = command->toJSON();
+        j["category"] = categories[command->category()];
+        cmds[name] = std::move(j);
+    }
+
+    auto res = Args::toJSON();
+    res["commands"] = std::move(cmds);
+    return res;
+}
+
 }
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index 97a517344..c56044f1d 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -4,6 +4,8 @@
 #include <map>
 #include <memory>
 
+#include <nlohmann/json_fwd.hpp>
+
 #include "util.hh"
 
 namespace nix {
@@ -203,6 +205,8 @@ public:
         });
     }
 
+    virtual nlohmann::json toJSON();
+
     friend class MultiCommand;
 };
 
@@ -234,6 +238,8 @@ struct Command : virtual Args
     virtual Category category() { return catDefault; }
 
     void printHelp(const string & programName, std::ostream & out) override;
+
+    nlohmann::json toJSON() override;
 };
 
 typedef std::map<std::string, std::function<ref<Command>()>> Commands;
@@ -259,6 +265,8 @@ public:
     bool processFlag(Strings::iterator & pos, Strings::iterator end) override;
 
     bool processArgs(const Strings & args, bool finish) override;
+
+    nlohmann::json toJSON() override;
 };
 
 Strings argvToStrings(int argc, char * * argv);
diff --git a/src/nix/command.cc b/src/nix/command.cc
index da32819da..2f1fbded1 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -4,12 +4,25 @@
 #include "nixexpr.hh"
 #include "profiles.hh"
 
+#include <nlohmann/json.hpp>
+
 extern char * * environ __attribute__((weak));
 
 namespace nix {
 
 Commands * RegisterCommand::commands = nullptr;
 
+void NixMultiCommand::printHelp(const string & programName, std::ostream & out)
+{
+    MultiCommand::printHelp(programName, out);
+}
+
+nlohmann::json NixMultiCommand::toJSON()
+{
+    // FIXME: use Command::toJSON() as well.
+    return MultiCommand::toJSON();
+}
+
 StoreCommand::StoreCommand()
 {
 }
diff --git a/src/nix/command.hh b/src/nix/command.hh
index bc46a2028..d60c8aeb6 100644
--- a/src/nix/command.hh
+++ b/src/nix/command.hh
@@ -21,6 +21,13 @@ static constexpr Command::Category catSecondary = 100;
 static constexpr Command::Category catUtility = 101;
 static constexpr Command::Category catNixInstallation = 102;
 
+struct NixMultiCommand : virtual MultiCommand, virtual Command
+{
+    void printHelp(const string & programName, std::ostream & out) override;
+
+    nlohmann::json toJSON() override;
+};
+
 /* A command that requires a Nix store. */
 struct StoreCommand : virtual Command
 {
diff --git a/src/nix/flake.cc b/src/nix/flake.cc
index 653f8db1b..ae6f4c5f9 100644
--- a/src/nix/flake.cc
+++ b/src/nix/flake.cc
@@ -933,7 +933,7 @@ struct CmdFlakeShow : FlakeCommand
     }
 };
 
-struct CmdFlake : virtual MultiCommand, virtual Command
+struct CmdFlake : NixMultiCommand
 {
     CmdFlake()
         : MultiCommand({
@@ -963,11 +963,6 @@ struct CmdFlake : virtual MultiCommand, virtual Command
         command->second->prepare();
         command->second->run();
     }
-
-    void printHelp(const string & programName, std::ostream & out) override
-    {
-        MultiCommand::printHelp(programName, out);
-    }
 };
 
 static auto r1 = registerCommand<CmdFlake>("flake");
diff --git a/src/nix/main.cc b/src/nix/main.cc
index e62657e95..fa04bebea 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -17,6 +17,8 @@
 #include <netdb.h>
 #include <netinet/in.h>
 
+#include <nlohmann/json.hpp>
+
 extern std::string chrootHelperName;
 
 void chrootHelper(int argc, char * * argv);
@@ -172,6 +174,11 @@ void mainWrapped(int argc, char * * argv)
 
     NixArgs args;
 
+    if (argc == 2 && std::string(argv[1]) == "dump-args") {
+        std::cout << args.toJSON().dump() << "\n";
+        return;
+    }
+
     Finally printCompletions([&]()
     {
         if (completions) {
diff --git a/src/nix/profile.cc b/src/nix/profile.cc
index cffc9ee44..9241931e9 100644
--- a/src/nix/profile.cc
+++ b/src/nix/profile.cc
@@ -437,7 +437,7 @@ struct CmdProfileDiffClosures : virtual StoreCommand, MixDefaultProfile
     }
 };
 
-struct CmdProfile : virtual MultiCommand, virtual Command
+struct CmdProfile : NixMultiCommand
 {
     CmdProfile()
         : MultiCommand({
@@ -461,11 +461,6 @@ struct CmdProfile : virtual MultiCommand, virtual Command
         command->second->prepare();
         command->second->run();
     }
-
-    void printHelp(const string & programName, std::ostream & out) override
-    {
-        MultiCommand::printHelp(programName, out);
-    }
 };
 
 static auto r1 = registerCommand<CmdProfile>("profile");
diff --git a/src/nix/registry.cc b/src/nix/registry.cc
index ebee4545c..367268683 100644
--- a/src/nix/registry.cc
+++ b/src/nix/registry.cc
@@ -115,7 +115,7 @@ struct CmdRegistryPin : virtual Args, EvalCommand
     }
 };
 
-struct CmdRegistry : virtual MultiCommand, virtual Command
+struct CmdRegistry : virtual NixMultiCommand
 {
     CmdRegistry()
         : MultiCommand({
@@ -141,11 +141,6 @@ struct CmdRegistry : virtual MultiCommand, virtual Command
         command->second->prepare();
         command->second->run();
     }
-
-    void printHelp(const string & programName, std::ostream & out) override
-    {
-        MultiCommand::printHelp(programName, out);
-    }
 };
 
 static auto r1 = registerCommand<CmdRegistry>("registry");

From 6f19c776db280a46e84d6e84d83814445869ef37 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 17 Aug 2020 19:33:18 +0200
Subject: [PATCH 059/176] Start generation of the nix.1 manpage

---
 .gitignore                                    |  2 +
 doc/manual/generate-manpage.jq                | 42 +++++++++++++++++++
 doc/manual/local.mk                           |  8 +++-
 doc/manual/src/SUMMARY.md                     |  2 +
 .../src/command-ref/experimental-commands.md  |  8 ++++
 src/libutil/args.cc                           |  3 +-
 6 files changed, 63 insertions(+), 2 deletions(-)
 create mode 100644 doc/manual/generate-manpage.jq
 create mode 100644 doc/manual/src/command-ref/experimental-commands.md

diff --git a/.gitignore b/.gitignore
index d456d7da3..b8028e665 100644
--- a/.gitignore
+++ b/.gitignore
@@ -25,6 +25,8 @@ perl/Makefile.config
 /doc/manual/*.1
 /doc/manual/*.5
 /doc/manual/*.8
+/doc/manual/nix.json
+/doc/manual/src/command-ref/nix.md
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/doc/manual/generate-manpage.jq b/doc/manual/generate-manpage.jq
new file mode 100644
index 000000000..cf06da0c8
--- /dev/null
+++ b/doc/manual/generate-manpage.jq
@@ -0,0 +1,42 @@
+def show_flags:
+
+.flags
+| map_values(select(.category != "config"))
+| to_entries
+| map(
+    "  - `--" + .key + "`"
+    + (if .value.shortName then " / `" + .value.shortName + "`" else "" end)
+    + (if .value.labels then " " + (.value.labels | map("*" + . + "*") | join(" ")) else "" end)
+    + "  \n"
+    + "    " + .value.description + "\n\n")
+| join("")
+;
+
+def show_synopsis:
+
+"`" + .command + "` " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n"
+
+;
+
+"# Synopsis\n\n"
++ ({"command": "nix", "args": .args} | show_synopsis)
++ "\n"
++ "# Common flags\n\n"
++ show_flags
++ (.commands | to_entries | map(
+    "# Operation `" + .key + "`\n\n"
+    + "## Synopsis\n\n"
+    + ({"command": ("nix " + .key), "args": .value.args} | show_synopsis)
+    + "\n"
+    + "## Description\n\n"
+    + .value.description + "\n\n"
+    + (if (.value.flags | length) > 0 then
+        "## Flags\n\n"
+        + (.value | show_flags)
+      else "" end)
+    + (if (.value.examples | length) > 0 then
+        "## Examples\n\n"
+        + (.value.examples | map("- " + .description + "\n\n  ```console\n  " + .command + "\n  ```\n" ) | join("\n"))
+        + "\n"
+       else "" end)
+  ) | join(""))
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index c9104ad7e..8f917316d 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -4,7 +4,7 @@ MANUAL_SRCS := $(call rwildcard, $(d)/src, *.md)
 
 # Generate man pages.
 man-pages := $(foreach n, \
-  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 \
+  nix-env.1 nix-build.1 nix-shell.1 nix-store.1 nix-instantiate.1 nix.1 \
   nix-collect-garbage.1 \
   nix-prefetch-url.1 nix-channel.1 \
   nix-hash.1 nix-copy-closure.1 \
@@ -24,6 +24,12 @@ $(d)/%.8: $(d)/src/command-ref/%.md
 $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
+$(d)/src/command-ref/nix.md: $(d)/nix.json $(d)/generate-manpage.jq
+	jq -r -f doc/manual/generate-manpage.jq $< > $@
+
+$(d)/nix.json: $(bindir)/nix
+	$(trace-gen) $(bindir)/nix dump-args > $@
+
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
 
diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 5f6817674..4089caf8a 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -60,6 +60,8 @@
     - [nix-hash](command-ref/nix-hash.md)
     - [nix-instantiate](command-ref/nix-instantiate.md)
     - [nix-prefetch-url](command-ref/nix-prefetch-url.md)
+  - [Experimental Commands](command-ref/experimental-commands.md)
+    - [nix](command-ref/nix.md)
   - [Files](command-ref/files.md)
     - [nix.conf](command-ref/conf-file.md)
 - [Glossary](glossary.md)
diff --git a/doc/manual/src/command-ref/experimental-commands.md b/doc/manual/src/command-ref/experimental-commands.md
new file mode 100644
index 000000000..cfa6f8b73
--- /dev/null
+++ b/doc/manual/src/command-ref/experimental-commands.md
@@ -0,0 +1,8 @@
+# Experimental Commands
+
+This section lists experimental commands.
+
+> **Warning**
+>
+> These commands may be removed in the future, or their syntax may
+> change in incompatible ways.
diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index bf5e7ce95..ad83a2414 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -238,6 +238,7 @@ nlohmann::json Args::toJSON()
     }
 
     auto res = nlohmann::json::object();
+    res["description"] = description();
     res["flags"] = std::move(flags);
     res["args"] = std::move(args);
     return res;
@@ -371,7 +372,7 @@ MultiCommand::MultiCommand(const Commands & commands)
     : commands(commands)
 {
     expectArgs({
-        .label = "command",
+        .label = "subcommand",
         .optional = true,
         .handler = {[=](std::string s) {
             assert(!command);

From 069340179e91202b2d3adc5ea1e3023ba2a51691 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 18 Aug 2020 15:15:35 +0200
Subject: [PATCH 060/176] Improve nix.1 manpage generator

---
 doc/manual/generate-manpage.jq | 72 +++++++++++++++++-----------------
 src/nix/main.cc                |  5 +++
 2 files changed, 40 insertions(+), 37 deletions(-)

diff --git a/doc/manual/generate-manpage.jq b/doc/manual/generate-manpage.jq
index cf06da0c8..d3cf1c601 100644
--- a/doc/manual/generate-manpage.jq
+++ b/doc/manual/generate-manpage.jq
@@ -1,42 +1,40 @@
 def show_flags:
-
-.flags
-| map_values(select(.category != "config"))
-| to_entries
-| map(
-    "  - `--" + .key + "`"
-    + (if .value.shortName then " / `" + .value.shortName + "`" else "" end)
-    + (if .value.labels then " " + (.value.labels | map("*" + . + "*") | join(" ")) else "" end)
-    + "  \n"
-    + "    " + .value.description + "\n\n")
-| join("")
-;
+  .flags
+  | map_values(select(.category != "config"))
+  | to_entries
+  | map(
+      "  - `--" + .key + "`"
+      + (if .value.shortName then " / `" + .value.shortName + "`" else "" end)
+      + (if .value.labels then " " + (.value.labels | map("*" + . + "*") | join(" ")) else "" end)
+      + "  \n"
+      + "    " + .value.description + "\n\n")
+  | join("")
+  ;
 
 def show_synopsis:
+  "`" + .command + "` " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n\n"
+  ;
 
-"`" + .command + "` " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n"
+def show_command:
+  . as $top |
+  .section + " Name\n\n"
+  + "`" + .command + "` - " + .def.description + "\n\n"
+  + .section + " Synopsis\n\n"
+  + ({"command": .command, "args": .def.args} | show_synopsis)
+  + (if (.def.flags | length) > 0 then
+      .section + " Flags\n\n"
+      + (.def | show_flags)
+    else "" end)
+  + (if (.def.examples | length) > 0 then
+      .section + " Examples\n\n"
+      + (.def.examples | map(.description + "\n\n```console\n" + .command + "\n```\n" ) | join("\n"))
+      + "\n"
+     else "" end)
+  + (if .def.commands then .def.commands | to_entries | map(
+      "# Subcommand `" + ($top.command + " " + .key) + "`\n\n"
+      + ({"command": ($top.command + " " + .key), "section": "##", "def": .value} | show_command)
+    ) | join("") else "" end)
+  ;
 
-;
-
-"# Synopsis\n\n"
-+ ({"command": "nix", "args": .args} | show_synopsis)
-+ "\n"
-+ "# Common flags\n\n"
-+ show_flags
-+ (.commands | to_entries | map(
-    "# Operation `" + .key + "`\n\n"
-    + "## Synopsis\n\n"
-    + ({"command": ("nix " + .key), "args": .value.args} | show_synopsis)
-    + "\n"
-    + "## Description\n\n"
-    + .value.description + "\n\n"
-    + (if (.value.flags | length) > 0 then
-        "## Flags\n\n"
-        + (.value | show_flags)
-      else "" end)
-    + (if (.value.examples | length) > 0 then
-        "## Examples\n\n"
-        + (.value.examples | map("- " + .description + "\n\n  ```console\n  " + .command + "\n  ```\n" ) | join("\n"))
-        + "\n"
-       else "" end)
-  ) | join(""))
+"Title: nix\n\n"
++ ({"command": "nix", "section": "#", "def": .} | show_command)
diff --git a/src/nix/main.cc b/src/nix/main.cc
index fa04bebea..0c4fd46fd 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -142,6 +142,11 @@ struct NixArgs : virtual MultiCommand, virtual MixCommonArgs
         printHelp(programName, std::cout);
         throw Exit();
     }
+
+    std::string description() override
+    {
+        return "a tool for reproducible and declarative configuration management";
+    }
 };
 
 void mainWrapped(int argc, char * * argv)

From 8a97b11374c5165d3602648c5c0327f103072105 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Aug 2020 12:31:18 +0200
Subject: [PATCH 061/176] Improve margins between sections

The default CSS puts almost no space between sections, but a lot of
space between subsections. This flips that around.
---
 doc/manual/book.toml  | 2 ++
 doc/manual/custom.css | 7 +++++++
 doc/manual/local.mk   | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)
 create mode 100644 doc/manual/book.toml
 create mode 100644 doc/manual/custom.css

diff --git a/doc/manual/book.toml b/doc/manual/book.toml
new file mode 100644
index 000000000..fee41dfb3
--- /dev/null
+++ b/doc/manual/book.toml
@@ -0,0 +1,2 @@
+[output.html]
+additional-css = ["custom.css"]
diff --git a/doc/manual/custom.css b/doc/manual/custom.css
new file mode 100644
index 000000000..69d48d4a7
--- /dev/null
+++ b/doc/manual/custom.css
@@ -0,0 +1,7 @@
+h1:not(:first-of-type) {
+    margin-top: 1.3em;
+}
+
+h2 {
+    margin-top: 1em;
+}
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 8f917316d..04c57b23b 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -33,7 +33,7 @@ $(d)/nix.json: $(bindir)/nix
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
 
-$(docdir)/manual/index.html: $(MANUAL_SRCS)
+$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css
 	$(trace-gen) mdbook build doc/manual -d $(docdir)/manual
 	@cp doc/manual/highlight.pack.js $(docdir)/manual/highlight.js
 

From 34b22e012350186925e513f34b1292858a81c932 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Aug 2020 14:21:27 +0200
Subject: [PATCH 062/176] Change option descriptions to Markdown

---
 src/libexpr/common-eval-args.cc | 2 +-
 src/libmain/common-args.cc      | 6 +++---
 src/nix/installables.cc         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libexpr/common-eval-args.cc b/src/libexpr/common-eval-args.cc
index 6b48ead1f..10c1a6975 100644
--- a/src/libexpr/common-eval-args.cc
+++ b/src/libexpr/common-eval-args.cc
@@ -29,7 +29,7 @@ MixEvalArgs::MixEvalArgs()
     addFlag({
         .longName = "include",
         .shortName = 'I',
-        .description = "add a path to the list of locations used to look up <...> file names",
+        .description = "add a path to the list of locations used to look up `<...>` file names",
         .labels = {"path"},
         .handler = {[&](std::string s) { searchPath.push_back(s); }}
     });
diff --git a/src/libmain/common-args.cc b/src/libmain/common-args.cc
index 09f4cd133..3411e2d7a 100644
--- a/src/libmain/common-args.cc
+++ b/src/libmain/common-args.cc
@@ -28,7 +28,7 @@ MixCommonArgs::MixCommonArgs(const string & programName)
 
     addFlag({
         .longName = "option",
-        .description = "set a Nix configuration option (overriding nix.conf)",
+        .description = "set a Nix configuration option (overriding `nix.conf`)",
         .labels = {"name", "value"},
         .handler = {[](std::string name, std::string value) {
             try {
@@ -51,8 +51,8 @@ MixCommonArgs::MixCommonArgs(const string & programName)
 
     addFlag({
         .longName = "log-format",
-        .description = "format of log output; \"raw\", \"internal-json\", \"bar\" "
-                        "or \"bar-with-logs\"",
+        .description = "format of log output; `raw`, `internal-json`, `bar` "
+                        "or `bar-with-logs`",
         .labels = {"format"},
         .handler = {[](std::string format) { setLogFormat(format); }},
     });
diff --git a/src/nix/installables.cc b/src/nix/installables.cc
index d34f87982..1f1ed680f 100644
--- a/src/nix/installables.cc
+++ b/src/nix/installables.cc
@@ -76,7 +76,7 @@ MixFlakeOptions::MixFlakeOptions()
 
     addFlag({
         .longName = "override-input",
-        .description = "override a specific flake input (e.g. 'dwarffs/nixpkgs')",
+        .description = "override a specific flake input (e.g. `dwarffs/nixpkgs`)",
         .labels = {"input-path", "flake-url"},
         .handler = {[&](std::string inputPath, std::string flakeRef) {
             lockFlags.inputOverrides.insert_or_assign(
@@ -116,7 +116,7 @@ SourceExprCommand::SourceExprCommand()
     addFlag({
         .longName = "file",
         .shortName = 'f',
-        .description = "evaluate FILE rather than the default",
+        .description = "evaluate *file* rather than the default",
         .labels = {"file"},
         .handler = {&file},
         .completer = completePath
@@ -124,7 +124,7 @@ SourceExprCommand::SourceExprCommand()
 
     addFlag({
         .longName ="expr",
-        .description = "evaluate attributes from EXPR",
+        .description = "evaluate attributes from *expr*",
         .labels = {"expr"},
         .handler = {&expr}
     });

From c8fa39324ad7a56a78f8c6f55c42f8f49dbbbf9a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Aug 2020 18:28:04 +0200
Subject: [PATCH 063/176] Generate the nix.conf docs from the source code

This means we don't have two (divergent) sets of option descriptions
anymore.
---
 .gitignore                                    |   2 +
 doc/manual/generate-options.jq                |  11 +
 doc/manual/local.mk                           |   7 +
 .../src/command-ref/conf-file-prefix.md       |  39 +
 doc/manual/src/command-ref/conf-file.md       | 691 ----------------
 src/libexpr/eval.hh                           |  51 +-
 src/libstore/filetransfer.hh                  |  27 +-
 src/libstore/globals.hh                       | 759 +++++++++++++++---
 src/libutil/config.cc                         |  39 +-
 src/libutil/logging.hh                        |  10 +-
 10 files changed, 802 insertions(+), 834 deletions(-)
 create mode 100644 doc/manual/generate-options.jq
 create mode 100644 doc/manual/src/command-ref/conf-file-prefix.md
 delete mode 100644 doc/manual/src/command-ref/conf-file.md

diff --git a/.gitignore b/.gitignore
index b8028e665..44dbaa5d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,7 +26,9 @@ perl/Makefile.config
 /doc/manual/*.5
 /doc/manual/*.8
 /doc/manual/nix.json
+/doc/manual/conf-file.json
 /doc/manual/src/command-ref/nix.md
+/doc/manual/src/command-ref/conf-file.md
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/doc/manual/generate-options.jq b/doc/manual/generate-options.jq
new file mode 100644
index 000000000..3ee51ddea
--- /dev/null
+++ b/doc/manual/generate-options.jq
@@ -0,0 +1,11 @@
+. | to_entries | sort_by(.key) | map(
+  "  - `" + .key + "`  \n"
+  + (.value.description | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
+  + "    **Default**: " + (
+      if .value.value == "" or .value.value == []
+      then "*empty*"
+      elif (.value.value | type) == "array"
+      then "`" + (.value.value | join(" ")) + "`"
+      else "`" + (.value.value | tostring) + "`" end)
+  + "\n\n"
+) | join("")
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 04c57b23b..dcc02d538 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -27,9 +27,16 @@ $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
 $(d)/src/command-ref/nix.md: $(d)/nix.json $(d)/generate-manpage.jq
 	jq -r -f doc/manual/generate-manpage.jq $< > $@
 
+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.jq $(d)/src/command-ref/conf-file-prefix.md
+	cat doc/manual/src/command-ref/conf-file-prefix.md > $@
+	jq -r -f doc/manual/generate-options.jq $< >> $@
+
 $(d)/nix.json: $(bindir)/nix
 	$(trace-gen) $(bindir)/nix dump-args > $@
 
+$(d)/conf-file.json: $(bindir)/nix
+	$(trace-gen) env -i NIX_CONF_DIR=/dummy HOME=/dummy $(bindir)/nix show-config --json --experimental-features nix-command > $@
+
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
 
diff --git a/doc/manual/src/command-ref/conf-file-prefix.md b/doc/manual/src/command-ref/conf-file-prefix.md
new file mode 100644
index 000000000..04c6cd859
--- /dev/null
+++ b/doc/manual/src/command-ref/conf-file-prefix.md
@@ -0,0 +1,39 @@
+Title: nix.conf
+
+# Name
+
+`nix.conf` - Nix configuration file
+
+# Description
+
+By default Nix reads settings from the following places:
+
+  - The system-wide configuration file `sysconfdir/nix/nix.conf` (i.e.
+    `/etc/nix/nix.conf` on most systems), or `$NIX_CONF_DIR/nix.conf` if
+    `NIX_CONF_DIR` is set. Values loaded in this file are not forwarded
+    to the Nix daemon. The client assumes that the daemon has already
+    loaded them.
+
+  - If `NIX_USER_CONF_FILES` is set, then each path separated by `:`
+    will be loaded in reverse order.
+
+    Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
+    and `XDG_CONFIG_HOME`. If these are unset, it will look in
+    `$HOME/.config/nix.conf`.
+
+The configuration files consist of `name =
+value` pairs, one per line. Other files can be included with a line like
+`include
+path`, where *path* is interpreted relative to the current conf file and
+a missing file is an error unless `!include` is used instead. Comments
+start with a `#` character. Here is an example configuration file:
+
+    keep-outputs = true       # Nice for developers
+    keep-derivations = true   # Idem
+
+You can override settings on the command line using the `--option` flag,
+e.g. `--option keep-outputs
+false`.
+
+The following settings are currently available:
+
diff --git a/doc/manual/src/command-ref/conf-file.md b/doc/manual/src/command-ref/conf-file.md
deleted file mode 100644
index fdc8f5265..000000000
--- a/doc/manual/src/command-ref/conf-file.md
+++ /dev/null
@@ -1,691 +0,0 @@
-Title: nix.conf
-
-# Name
-
-`nix.conf` - Nix configuration file
-
-# Description
-
-By default Nix reads settings from the following places:
-
-  - The system-wide configuration file `sysconfdir/nix/nix.conf` (i.e.
-    `/etc/nix/nix.conf` on most systems), or `$NIX_CONF_DIR/nix.conf` if
-    `NIX_CONF_DIR` is set. Values loaded in this file are not forwarded
-    to the Nix daemon. The client assumes that the daemon has already
-    loaded them.
-
-  - If `NIX_USER_CONF_FILES` is set, then each path separated by `:`
-    will be loaded in reverse order.
-
-    Otherwise it will look for `nix/nix.conf` files in `XDG_CONFIG_DIRS`
-    and `XDG_CONFIG_HOME`. If these are unset, it will look in
-    `$HOME/.config/nix.conf`.
-
-The configuration files consist of `name =
-value` pairs, one per line. Other files can be included with a line like
-`include
-path`, where *path* is interpreted relative to the current conf file and
-a missing file is an error unless `!include` is used instead. Comments
-start with a `#` character. Here is an example configuration file:
-
-    keep-outputs = true       # Nice for developers
-    keep-derivations = true   # Idem
-
-You can override settings on the command line using the `--option` flag,
-e.g. `--option keep-outputs
-false`.
-
-The following settings are currently available:
-
-  - `allowed-uris`  
-    A list of URI prefixes to which access is allowed in restricted
-    evaluation mode. For example, when set to
-    `https://github.com/NixOS`, builtin functions such as `fetchGit` are
-    allowed to access `https://github.com/NixOS/patchelf.git`.
-
-  - `allow-import-from-derivation`  
-    By default, Nix allows you to `import` from a derivation, allowing
-    building at evaluation time. With this option set to false, Nix will
-    throw an error when evaluating an expression that uses this feature,
-    allowing users to ensure their evaluation will not require any
-    builds to take place.
-
-  - `allow-new-privileges`  
-    (Linux-specific.) By default, builders on Linux cannot acquire new
-    privileges by calling setuid/setgid programs or programs that have
-    file capabilities. For example, programs such as `sudo` or `ping`
-    will fail. (Note that in sandbox builds, no such programs are
-    available unless you bind-mount them into the sandbox via the
-    `sandbox-paths` option.) You can allow the use of such programs by
-    enabling this option. This is impure and usually undesirable, but
-    may be useful in certain scenarios (e.g. to spin up containers or
-    set up userspace network interfaces in tests).
-
-  - `allowed-users`  
-    A list of names of users (separated by whitespace) that are allowed
-    to connect to the Nix daemon. As with the `trusted-users` option,
-    you can specify groups by prefixing them with `@`. Also, you can
-    allow all users by specifying `*`. The default is `*`.
-    
-    Note that trusted users are always allowed to connect.
-
-  - `auto-optimise-store`  
-    If set to `true`, Nix automatically detects files in the store
-    that have identical contents, and replaces them with hard links to
-    a single copy. This saves disk space. If set to `false` (the
-    default), you can still run `nix-store --optimise` to get rid of
-    duplicate files.
-
-  - `builders`  
-    A list of machines on which to perform builds.
-
-  - `builders-use-substitutes`  
-    If set to `true`, Nix will instruct remote build machines to use
-    their own binary substitutes if available. In practical terms, this
-    means that remote hosts will fetch as many build dependencies as
-    possible from their own substitutes (e.g, from `cache.nixos.org`),
-    instead of waiting for this host to upload them all. This can
-    drastically reduce build times if the network connection between
-    this computer and the remote build host is slow. Defaults to
-    `false`.
-
-  - `build-users-group`  
-    This options specifies the Unix group containing the Nix build user
-    accounts. In multi-user Nix installations, builds should not be
-    performed by the Nix account since that would allow users to
-    arbitrarily modify the Nix store and database by supplying specially
-    crafted builders; and they cannot be performed by the calling user
-    since that would allow him/her to influence the build result.
-    
-    Therefore, if this option is non-empty and specifies a valid group,
-    builds will be performed under the user accounts that are a member
-    of the group specified here (as listed in `/etc/group`). Those user
-    accounts should not be used for any other purpose\!
-    
-    Nix will never run two builds under the same user account at the
-    same time. This is to prevent an obvious security hole: a malicious
-    user writing a Nix expression that modifies the build result of a
-    legitimate Nix expression being built by another user. Therefore it
-    is good to have as many Nix build user accounts as you can spare.
-    (Remember: uids are cheap.)
-    
-    The build users should have permission to create files in the Nix
-    store, but not delete them. Therefore, `/nix/store` should be owned
-    by the Nix account, its group should be the group specified here,
-    and its mode should be `1775`.
-    
-    If the build users group is empty, builds will be performed under
-    the uid of the Nix process (that is, the uid of the caller if
-    `NIX_REMOTE` is empty, the uid under which the Nix daemon runs if
-    `NIX_REMOTE` is `daemon`). Obviously, this should not be used in
-    multi-user settings with untrusted users.
-
-  - `compress-build-log`  
-    If set to `true` (the default), build logs written to
-    `/nix/var/log/nix/drvs` will be compressed on the fly using bzip2.
-    Otherwise, they will not be compressed.
-
-  - `connect-timeout`  
-    The timeout (in seconds) for establishing connections in the binary
-    cache substituter. It corresponds to `curl`’s `--connect-timeout`
-    option.
-
-  - `cores`  
-    Sets the value of the `NIX_BUILD_CORES` environment variable in the
-    invocation of builders. Builders can use this variable at their
-    discretion to control the maximum amount of parallelism. For
-    instance, in Nixpkgs, if the derivation attribute
-    `enableParallelBuilding` is set to `true`, the builder passes the
-    `-jN` flag to GNU Make. It can be overridden using the `--cores`
-    command line switch and defaults to `1`. The value `0` means that
-    the builder should use all available CPU cores in the system.
-
-  - `diff-hook`  
-    Absolute path to an executable capable of diffing build
-    results. The hook is executed if `run-diff-hook` is true, and the
-    output of a build is known to not be the same. This program is not
-    executed to determine if two results are the same.
-    
-    The diff hook is executed by the same user and group who ran the
-    build. However, the diff hook does not have write access to the
-    store path just built.
-    
-    The diff hook program receives three parameters:
-    
-    1.  A path to the previous build's results
-    
-    2.  A path to the current build's results
-    
-    3.  The path to the build's derivation
-    
-    4.  The path to the build's scratch directory. This directory will
-        exist only if the build was run with `--keep-failed`.
-    
-    The stderr and stdout output from the diff hook will not be
-    displayed to the user. Instead, it will print to the nix-daemon's
-    log.
-    
-    When using the Nix daemon, `diff-hook` must be set in the `nix.conf`
-    configuration file, and cannot be passed at the command line.
-
-  - `enforce-determinism`  
-    See `repeat`.
-
-  - `extra-sandbox-paths`  
-    A list of additional paths appended to `sandbox-paths`. Useful if
-    you want to extend its default value.
-
-  - `extra-platforms`  
-    Platforms other than the native one which this machine is capable of
-    building for. This can be useful for supporting additional
-    architectures on compatible machines: i686-linux can be built on
-    x86\_64-linux machines (and the default for this setting reflects
-    this); armv7 is backwards-compatible with armv6 and armv5tel; some
-    aarch64 machines can also natively run 32-bit ARM code; and
-    qemu-user may be used to support non-native platforms (though this
-    may be slow and buggy). Most values for this are not enabled by
-    default because build systems will often misdetect the target
-    platform and generate incompatible code, so you may wish to
-    cross-check the results of using this option against proper
-    natively-built versions of your derivations.
-
-  - `extra-substituters`  
-    Additional binary caches appended to those specified in
-    `substituters`. When used by unprivileged users, untrusted
-    substituters (i.e. those not listed in `trusted-substituters`) are
-    silently ignored.
-
-  - `fallback`  
-    If set to `true`, Nix will fall back to building from source if a
-    binary substitute fails. This is equivalent to the `--fallback`
-    flag. The default is `false`.
-
-  - `fsync-metadata`  
-    If set to `true`, changes to the Nix store metadata (in
-    `/nix/var/nix/db`) are synchronously flushed to disk. This improves
-    robustness in case of system crashes, but reduces performance. The
-    default is `true`.
-
-  - `hashed-mirrors`  
-    A list of web servers used by `builtins.fetchurl` to obtain files by
-    hash. The default is `http://tarballs.nixos.org/`. Given a hash type
-    *ht* and a base-16 hash *h*, Nix will try to download the file from
-    *hashed-mirror*/*ht*/*h*. This allows files to be downloaded even if
-    they have disappeared from their original URI. For example, given
-    the default mirror `http://tarballs.nixos.org/`, when building the
-    derivation
-
-    ```nix
-    builtins.fetchurl {
-      url = "https://example.org/foo-1.2.3.tar.xz";
-      sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
-    }
-    ```
-    
-    Nix will attempt to download this file from
-    `http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae`
-    first. If it is not available there, if will try the original URI.
-
-  - `http-connections`  
-    The maximum number of parallel TCP connections used to fetch files
-    from binary caches and by other downloads. It defaults to 25. 0
-    means no limit.
-
-  - `keep-build-log`  
-    If set to `true` (the default), Nix will write the build log of a
-    derivation (i.e. the standard output and error of its builder) to
-    the directory `/nix/var/log/nix/drvs`. The build log can be
-    retrieved using the command `nix-store -l path`.
-
-  - `keep-derivations`  
-    If `true` (default), the garbage collector will keep the derivations
-    from which non-garbage store paths were built. If `false`, they will
-    be deleted unless explicitly registered as a root (or reachable from
-    other roots).
-    
-    Keeping derivation around is useful for querying and traceability
-    (e.g., it allows you to ask with what dependencies or options a
-    store path was built), so by default this option is on. Turn it off
-    to save a bit of disk space (or a lot if `keep-outputs` is also
-    turned on).
-
-  - `keep-env-derivations`  
-    If `false` (default), derivations are not stored in Nix user
-    environments. That is, the derivations of any build-time-only
-    dependencies may be garbage-collected.
-    
-    If `true`, when you add a Nix derivation to a user environment, the
-    path of the derivation is stored in the user environment. Thus, the
-    derivation will not be garbage-collected until the user environment
-    generation is deleted (`nix-env --delete-generations`). To prevent
-    build-time-only dependencies from being collected, you should also
-    turn on `keep-outputs`.
-    
-    The difference between this option and `keep-derivations` is that
-    this one is “sticky”: it applies to any user environment created
-    while this option was enabled, while `keep-derivations` only applies
-    at the moment the garbage collector is run.
-
-  - `keep-outputs`  
-    If `true`, the garbage collector will keep the outputs of
-    non-garbage derivations. If `false` (default), outputs will be
-    deleted unless they are GC roots themselves (or reachable from other
-    roots).
-    
-    In general, outputs must be registered as roots separately. However,
-    even if the output of a derivation is registered as a root, the
-    collector will still delete store paths that are used only at build
-    time (e.g., the C compiler, or source tarballs downloaded from the
-    network). To prevent it from doing so, set this option to `true`.
-
-  - `max-build-log-size`  
-    This option defines the maximum number of bytes that a builder can
-    write to its stdout/stderr. If the builder exceeds this limit, it’s
-    killed. A value of `0` (the default) means that there is no limit.
-
-  - `max-free`  
-    When a garbage collection is triggered by the `min-free` option, it
-    stops as soon as `max-free` bytes are available. The default is
-    infinity (i.e. delete all garbage).
-
-  - `max-jobs`  
-    This option defines the maximum number of jobs that Nix will try to
-    build in parallel. The default is `1`. The special value `auto`
-    causes Nix to use the number of CPUs in your system. `0` is useful
-    when using remote builders to prevent any local builds (except for
-    `preferLocalBuild` derivation attribute which executes locally
-    regardless). It can be overridden using the `--max-jobs` (`-j`)
-    command line switch.
-
-  - `max-silent-time`  
-    This option defines the maximum number of seconds that a builder can
-    go without producing any data on standard output or standard error.
-    This is useful (for instance in an automated build system) to catch
-    builds that are stuck in an infinite loop, or to catch remote builds
-    that are hanging due to network problems. It can be overridden using
-    the `--max-silent-time` command line switch.
-    
-    The value `0` means that there is no timeout. This is also the
-    default.
-
-  - `min-free`  
-    When free disk space in `/nix/store` drops below `min-free` during a
-    build, Nix performs a garbage-collection until `max-free` bytes are
-    available or there is no more garbage. A value of `0` (the default)
-    disables this feature.
-
-  - `narinfo-cache-negative-ttl`  
-    The TTL in seconds for negative lookups. If a store path is queried
-    from a substituter but was not found, there will be a negative
-    lookup cached in the local disk cache database for the specified
-    duration.
-
-  - `narinfo-cache-positive-ttl`  
-    The TTL in seconds for positive lookups. If a store path is queried
-    from a substituter, the result of the query will be cached in the
-    local disk cache database including some of the NAR metadata. The
-    default TTL is a month, setting a shorter TTL for positive lookups
-    can be useful for binary caches that have frequent garbage
-    collection, in which case having a more frequent cache invalidation
-    would prevent trying to pull the path again and failing with a hash
-    mismatch if the build isn't reproducible.
-
-  - `netrc-file`  
-    If set to an absolute path to a `netrc` file, Nix will use the HTTP
-    authentication credentials in this file when trying to download from
-    a remote host through HTTP or HTTPS. Defaults to
-    `$NIX_CONF_DIR/netrc`.
-    
-    The `netrc` file consists of a list of accounts in the following
-    format:
-    
-        machine my-machine
-        login my-username
-        password my-password
-    
-    For the exact syntax, see [the `curl`
-    documentation](https://ec.haxx.se/usingcurl-netrc.html).
-    
-    > **Note**
-    > 
-    > This must be an absolute path, and `~` is not resolved. For
-    > example, `~/.netrc` won't resolve to your home directory's
-    > `.netrc`.
-
-  - `plugin-files`  
-    A list of plugin files to be loaded by Nix. Each of these files will
-    be dlopened by Nix, allowing them to affect execution through static
-    initialization. In particular, these plugins may construct static
-    instances of RegisterPrimOp to add new primops or constants to the
-    expression language, RegisterStoreImplementation to add new store
-    implementations, RegisterCommand to add new subcommands to the `nix`
-    command, and RegisterSetting to add new nix config settings. See the
-    constructors for those types for more details.
-    
-    Since these files are loaded into the same address space as Nix
-    itself, they must be DSOs compatible with the instance of Nix
-    running at the time (i.e. compiled against the same headers, not
-    linked to any incompatible libraries). They should not be linked to
-    any Nix libs directly, as those will be available already at load
-    time.
-    
-    If an entry in the list is a directory, all files in the directory
-    are loaded as plugins (non-recursively).
-
-  - `pre-build-hook`  
-    If set, the path to a program that can set extra derivation-specific
-    settings for this system. This is used for settings that can't be
-    captured by the derivation model itself and are too variable between
-    different versions of the same system to be hard-coded into nix.
-    
-    The hook is passed the derivation path and, if sandboxes are
-    enabled, the sandbox directory. It can then modify the sandbox and
-    send a series of commands to modify various settings to stdout. The
-    currently recognized commands are:
-    
-      - `extra-sandbox-paths`  
-        Pass a list of files and directories to be included in the
-        sandbox for this build. One entry per line, terminated by an
-        empty line. Entries have the same format as `sandbox-paths`.
-
-  - `post-build-hook`  
-    Optional. The path to a program to execute after each build.
-    
-    This option is only settable in the global `nix.conf`, or on the
-    command line by trusted users.
-    
-    When using the nix-daemon, the daemon executes the hook as `root`.
-    If the nix-daemon is not involved, the hook runs as the user
-    executing the nix-build.
-    
-      - The hook executes after an evaluation-time build.
-    
-      - The hook does not execute on substituted paths.
-    
-      - The hook's output always goes to the user's terminal.
-    
-      - If the hook fails, the build succeeds but no further builds
-        execute.
-    
-      - The hook executes synchronously, and blocks other builds from
-        progressing while it runs.
-    
-    The program executes with no arguments. The program's environment
-    contains the following environment variables:
-    
-      - `DRV_PATH`  
-        The derivation for the built paths.
-        
-        Example:
-        `/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3f-bash-4.4-p23.drv`
-    
-      - `OUT_PATHS`  
-        Output paths of the built derivation, separated by a space
-        character.
-        
-        Example:
-        `/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev
-        /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
-        /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
-        /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
-        /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`.
-
-  - `repeat`  
-    How many times to repeat builds to check whether they are
-    deterministic. The default value is 0. If the value is non-zero,
-    every build is repeated the specified number of times. If the
-    contents of any of the runs differs from the previous ones and
-    `enforce-determinism` is true, the build is rejected and the
-    resulting store paths are not registered as “valid” in Nix’s
-    database.
-
-  - `require-sigs`  
-    If set to `true` (the default), any non-content-addressed path added
-    or copied to the Nix store (e.g. when substituting from a binary
-    cache) must have a valid signature, that is, be signed using one of
-    the keys listed in `trusted-public-keys` or `secret-key-files`. Set
-    to `false` to disable signature checking.
-
-  - `restrict-eval`  
-    If set to `true`, the Nix evaluator will not allow access to any
-    files outside of the Nix search path (as set via the `NIX_PATH`
-    environment variable or the `-I` option), or to URIs outside of
-    `allowed-uri`. The default is `false`.
-
-  - `run-diff-hook`  
-    If true, enable the execution of the `diff-hook` program.
-    
-    When using the Nix daemon, `run-diff-hook` must be set in the
-    `nix.conf` configuration file, and cannot be passed at the command
-    line.
-
-  - `sandbox`  
-    If set to `true`, builds will be performed in a *sandboxed
-    environment*, i.e., they’re isolated from the normal file system
-    hierarchy and will only see their dependencies in the Nix store,
-    the temporary build directory, private versions of `/proc`,
-    `/dev`, `/dev/shm` and `/dev/pts` (on Linux), and the paths
-    configured with the `sandbox-paths` option. This is useful to
-    prevent undeclared dependencies on files in directories such as
-    `/usr/bin`. In addition, on Linux, builds run in private PID,
-    mount, network, IPC and UTS namespaces to isolate them from other
-    processes in the system (except that fixed-output derivations do
-    not run in private network namespace to ensure they can access the
-    network).
-    
-    Currently, sandboxing only work on Linux and macOS. The use of a
-    sandbox requires that Nix is run as root (so you should use the
-    “build users” feature to perform the actual builds under different
-    users than root).
-    
-    If this option is set to `relaxed`, then fixed-output derivations
-    and derivations that have the `__noChroot` attribute set to `true`
-    do not run in sandboxes.
-    
-    The default is `true` on Linux and `false` on all other platforms.
-
-  - `sandbox-dev-shm-size`  
-    This option determines the maximum size of the `tmpfs` filesystem
-    mounted on `/dev/shm` in Linux sandboxes. For the format, see the
-    description of the `size` option of `tmpfs` in mount8. The default
-    is `50%`.
-
-  - `sandbox-paths`  
-    A list of paths bind-mounted into Nix sandbox environments. You can
-    use the syntax `target=source` to mount a path in a different
-    location in the sandbox; for instance, `/bin=/nix-bin` will mount
-    the path `/nix-bin` as `/bin` inside the sandbox. If *source* is
-    followed by `?`, then it is not an error if *source* does not exist;
-    for example, `/dev/nvidiactl?` specifies that `/dev/nvidiactl` will
-    only be mounted in the sandbox if it exists in the host filesystem.
-    
-    Depending on how Nix was built, the default value for this option
-    may be empty or provide `/bin/sh` as a bind-mount of `bash`.
-
-  - `secret-key-files`  
-    A whitespace-separated list of files containing secret (private)
-    keys. These are used to sign locally-built paths. They can be
-    generated using `nix-store --generate-binary-cache-key`. The
-    corresponding public key can be distributed to other users, who
-    can add it to `trusted-public-keys` in their `nix.conf`.
-
-  - `show-trace`  
-    Causes Nix to print out a stack trace in case of Nix expression
-    evaluation errors.
-
-  - `substitute`  
-    If set to `true` (default), Nix will use binary substitutes if
-    available. This option can be disabled to force building from
-    source.
-
-  - `stalled-download-timeout`  
-    The timeout (in seconds) for receiving data from servers during
-    download. Nix cancels idle downloads after this timeout's duration.
-
-  - `substituters`  
-    A list of URLs of substituters, separated by whitespace. The default
-    is `https://cache.nixos.org`.
-
-  - `system`  
-    This option specifies the canonical Nix system name of the current
-    installation, such as `i686-linux` or `x86_64-darwin`. Nix can only
-    build derivations whose `system` attribute equals the value
-    specified here. In general, it never makes sense to modify this
-    value from its default, since you can use it to ‘lie’ about the
-    platform you are building on (e.g., perform a Mac OS build on a
-    Linux machine; the result would obviously be wrong). It only makes
-    sense if the Nix binaries can run on multiple platforms, e.g.,
-    ‘universal binaries’ that run on `x86_64-linux` and `i686-linux`.
-    
-    It defaults to the canonical Nix system name detected by `configure`
-    at build time.
-
-  - `system-features`  
-    A set of system “features” supported by this machine, e.g. `kvm`.
-    Derivations can express a dependency on such features through the
-    derivation attribute `requiredSystemFeatures`. For example, the
-    attribute
-    
-        requiredSystemFeatures = [ "kvm" ];
-    
-    ensures that the derivation can only be built on a machine with the
-    `kvm` feature.
-    
-    This setting by default includes `kvm` if `/dev/kvm` is accessible,
-    and the pseudo-features `nixos-test`, `benchmark` and `big-parallel`
-    that are used in Nixpkgs to route builds to specific machines.
-
-  - `tarball-ttl`  
-    Default: `3600` seconds.
-    
-    The number of seconds a downloaded tarball is considered fresh. If
-    the cached tarball is stale, Nix will check whether it is still up
-    to date using the ETag header. Nix will download a new version if
-    the ETag header is unsupported, or the cached ETag doesn't match.
-    
-    Setting the TTL to `0` forces Nix to always check if the tarball is
-    up to date.
-    
-    Nix caches tarballs in `$XDG_CACHE_HOME/nix/tarballs`.
-    
-    Files fetched via `NIX_PATH`, `fetchGit`, `fetchMercurial`,
-    `fetchTarball`, and `fetchurl` respect this TTL.
-
-  - `timeout`  
-    This option defines the maximum number of seconds that a builder can
-    run. This is useful (for instance in an automated build system) to
-    catch builds that are stuck in an infinite loop but keep writing to
-    their standard output or standard error. It can be overridden using
-    the `--timeout` command line switch.
-    
-    The value `0` means that there is no timeout. This is also the
-    default.
-
-  - `trace-function-calls`  
-    Default: `false`.
-    
-    If set to `true`, the Nix evaluator will trace every function call.
-    Nix will print a log message at the "vomit" level for every function
-    entrance and function exit.
-    
-        function-trace entered undefined position at 1565795816999559622
-        function-trace exited undefined position at 1565795816999581277
-        function-trace entered /nix/store/.../example.nix:226:41 at 1565795253249935150
-        function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
-    
-    The `undefined position` means the function call is a builtin.
-    
-    Use the `contrib/stack-collapse.py` script distributed with the Nix
-    source code to convert the trace logs in to a format suitable for
-    `flamegraph.pl`.
-
-  - `trusted-public-keys`  
-    A whitespace-separated list of public keys. When paths are copied
-    from another Nix store (such as a binary cache), they must be
-    signed with one of these keys. For example:
-    `cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
-    hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=`.
-
-  - `trusted-substituters`  
-    A list of URLs of substituters, separated by whitespace. These are
-    not used by default, but can be enabled by users of the Nix daemon
-    by specifying `--option substituters urls` on the command
-    line. Unprivileged users are only allowed to pass a subset of the
-    URLs listed in `substituters` and `trusted-substituters`.
-
-  - `trusted-users`  
-    A list of names of users (separated by whitespace) that have
-    additional rights when connecting to the Nix daemon, such as the
-    ability to specify additional binary caches, or to import unsigned
-    NARs. You can also specify groups by prefixing them with `@`; for
-    instance, `@wheel` means all users in the `wheel` group. The default
-    is `root`.
-    
-    > **Warning**
-    > 
-    > Adding a user to `trusted-users` is essentially equivalent to
-    > giving that user root access to the system. For example, the user
-    > can set `sandbox-paths` and thereby obtain read access to
-    > directories that are otherwise inacessible to them.
-
-## Deprecated Settings
-
-  - `binary-caches`  
-    *Deprecated:* `binary-caches` is now an alias to `substituters`.
-
-  - `binary-cache-public-keys`  
-    *Deprecated:* `binary-cache-public-keys` is now an alias `trusted-public-keys`.
-
-  - `build-compress-log`  
-    *Deprecated:* `build-compress-log` is now an alias to `compress-build-log`.
-
-  - `build-cores`  
-    *Deprecated:* `build-cores` is now an alias to `cores`.
-
-  - `build-extra-chroot-dirs`  
-    *Deprecated:* `build-extra-chroot-dirs` is now an alias to `extra-sandbox-paths`.
-
-  - `build-extra-sandbox-paths`  
-    *Deprecated:* `build-extra-sandbox-paths` is now an alias to `extra-sandbox-paths`.
-
-  - `build-fallback`  
-    *Deprecated:* `build-fallback` is now an alias to `fallback`.
-
-  - `build-max-jobs`  
-    *Deprecated:* `build-max-jobs` is now an alias to `max-jobs`.
-
-  - `build-max-log-size`  
-    *Deprecated:* `build-max-log-size` is now an alias to `max-build-log-size`.
-
-  - `build-max-silent-time`  
-    *Deprecated:* `build-max-silent-time` is now an alias to `max-silent-time`.
-
-  - `build-repeat`  
-    *Deprecated:* `build-repeat` is now an alias to `repeat`.
-
-  - `build-timeout`  
-    *Deprecated:* `build-timeout` is now an alias to `timeout`.
-
-  - `build-use-chroot`  
-    *Deprecated:* `build-use-chroot` is now an alias to `sandbox`.
-
-  - `build-use-sandbox`  
-    *Deprecated:* `build-use-sandbox` is now an alias to `sandbox`.
-
-  - `build-use-substitutes`  
-    *Deprecated:* `build-use-substitutes` is now an alias to `substitute`.
-
-  - `gc-keep-derivations`  
-    *Deprecated:* `gc-keep-derivations` is now an alias to `keep-derivations`.
-
-  - `gc-keep-outputs`  
-    *Deprecated:* `gc-keep-outputs` is now an alias to `keep-outputs`.
-
-  - `env-keep-derivations`  
-    *Deprecated:* `env-keep-derivations` is now an alias to `keep-env-derivations`.
-
-  - `extra-binary-caches`  
-    *Deprecated:* `extra-binary-caches` is now an alias to `extra-substituters`.
-
-  - `trusted-binary-caches`  
-    *Deprecated:* `trusted-binary-caches` is now an alias to `trusted-substituters`.
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 5855b4ef2..1db3aa766 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -357,24 +357,57 @@ struct EvalSettings : Config
     Setting<bool> enableNativeCode{this, false, "allow-unsafe-native-code-during-evaluation",
         "Whether builtin functions that allow executing native code should be enabled."};
 
-    Setting<Strings> nixPath{this, getDefaultNixPath(), "nix-path",
-        "List of directories to be searched for <...> file references."};
+    Setting<Strings> nixPath{
+        this, getDefaultNixPath(), "nix-path",
+        "List of directories to be searched for `<...>` file references."};
 
-    Setting<bool> restrictEval{this, false, "restrict-eval",
-        "Whether to restrict file system access to paths in $NIX_PATH, "
-        "and network access to the URI prefixes listed in 'allowed-uris'."};
+    Setting<bool> restrictEval{
+        this, false, "restrict-eval",
+        R"(
+          If set to `true`, the Nix evaluator will not allow access to any
+          files outside of the Nix search path (as set via the `NIX_PATH`
+          environment variable or the `-I` option), or to URIs outside of
+          `allowed-uri`. The default is `false`.
+        )"};
 
     Setting<bool> pureEval{this, false, "pure-eval",
         "Whether to restrict file system and network access to files specified by cryptographic hash."};
 
-    Setting<bool> enableImportFromDerivation{this, true, "allow-import-from-derivation",
-        "Whether the evaluator allows importing the result of a derivation."};
+    Setting<bool> enableImportFromDerivation{
+        this, true, "allow-import-from-derivation",
+        R"(
+          By default, Nix allows you to `import` from a derivation, allowing
+          building at evaluation time. With this option set to false, Nix will
+          throw an error when evaluating an expression that uses this feature,
+          allowing users to ensure their evaluation will not require any
+          builds to take place.
+        )"};
 
     Setting<Strings> allowedUris{this, {}, "allowed-uris",
-        "Prefixes of URIs that builtin functions such as fetchurl and fetchGit are allowed to fetch."};
+        R"(
+          A list of URI prefixes to which access is allowed in restricted
+          evaluation mode. For example, when set to
+          `https://github.com/NixOS`, builtin functions such as `fetchGit` are
+          allowed to access `https://github.com/NixOS/patchelf.git`.
+        )"};
 
     Setting<bool> traceFunctionCalls{this, false, "trace-function-calls",
-        "Emit log messages for each function entry and exit at the 'vomit' log level (-vvvv)."};
+        R"(
+          If set to `true`, the Nix evaluator will trace every function call.
+          Nix will print a log message at the "vomit" level for every function
+          entrance and function exit.
+
+              function-trace entered undefined position at 1565795816999559622
+              function-trace exited undefined position at 1565795816999581277
+              function-trace entered /nix/store/.../example.nix:226:41 at 1565795253249935150
+              function-trace exited /nix/store/.../example.nix:226:41 at 1565795253249941684
+
+          The `undefined position` means the function call is a builtin.
+
+          Use the `contrib/stack-collapse.py` script distributed with the Nix
+          source code to convert the trace logs in to a format suitable for
+          `flamegraph.pl`.
+        )"};
 
     Setting<bool> useEvalCache{this, true, "eval-cache",
         "Whether to use the flake evaluation cache."};
diff --git a/src/libstore/filetransfer.hh b/src/libstore/filetransfer.hh
index 25ade0add..0d608c8d8 100644
--- a/src/libstore/filetransfer.hh
+++ b/src/libstore/filetransfer.hh
@@ -17,15 +17,30 @@ struct FileTransferSettings : Config
     Setting<std::string> userAgentSuffix{this, "", "user-agent-suffix",
         "String appended to the user agent in HTTP requests."};
 
-    Setting<size_t> httpConnections{this, 25, "http-connections",
-        "Number of parallel HTTP connections.",
+    Setting<size_t> httpConnections{
+        this, 25, "http-connections",
+        R"(
+          The maximum number of parallel TCP connections used to fetch
+          files from binary caches and by other downloads. It defaults
+          to 25. 0 means no limit.
+        )",
         {"binary-caches-parallel-connections"}};
 
-    Setting<unsigned long> connectTimeout{this, 0, "connect-timeout",
-        "Timeout for connecting to servers during downloads. 0 means use curl's builtin default."};
+    Setting<unsigned long> connectTimeout{
+        this, 0, "connect-timeout",
+        R"(
+          The timeout (in seconds) for establishing connections in the
+          binary cache substituter. It corresponds to `curl`’s
+          `--connect-timeout` option.
+        )"};
 
-    Setting<unsigned long> stalledDownloadTimeout{this, 300, "stalled-download-timeout",
-        "Timeout (in seconds) for receiving data from servers during download. Nix cancels idle downloads after this timeout's duration."};
+    Setting<unsigned long> stalledDownloadTimeout{
+        this, 300, "stalled-download-timeout",
+        R"(
+          The timeout (in seconds) for receiving data from servers
+          during download. Nix cancels idle downloads after this
+          timeout's duration.
+        )"};
 
     Setting<unsigned int> tries{this, 5, "download-attempts",
         "How often Nix will attempt to download a file before giving up."};
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index e3bb4cf84..ab9f42ce6 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -80,89 +80,209 @@ public:
     Setting<bool> keepGoing{this, false, "keep-going",
         "Whether to keep building derivations when another build fails."};
 
-    Setting<bool> tryFallback{this, false, "fallback",
-        "Whether to fall back to building when substitution fails.",
+    Setting<bool> tryFallback{
+        this, false, "fallback",
+        R"(
+          If set to `true`, Nix will fall back to building from source if a
+          binary substitute fails. This is equivalent to the `--fallback`
+          flag. The default is `false`.
+        )",
         {"build-fallback"}};
 
     /* Whether to show build log output in real time. */
     bool verboseBuild = true;
 
     Setting<size_t> logLines{this, 10, "log-lines",
-        "If verbose-build is false, the number of lines of the tail of "
+        "If `verbose-build` is false, the number of lines of the tail of "
         "the log to show if a build fails."};
 
-    MaxBuildJobsSetting maxBuildJobs{this, 1, "max-jobs",
-        "Maximum number of parallel build jobs. \"auto\" means use number of cores.",
+    MaxBuildJobsSetting maxBuildJobs{
+        this, 1, "max-jobs",
+        R"(
+          This option defines the maximum number of jobs that Nix will try to
+          build in parallel. The default is `1`. The special value `auto`
+          causes Nix to use the number of CPUs in your system. `0` is useful
+          when using remote builders to prevent any local builds (except for
+          `preferLocalBuild` derivation attribute which executes locally
+          regardless). It can be overridden using the `--max-jobs` (`-j`)
+          command line switch.
+        )",
         {"build-max-jobs"}};
 
-    Setting<unsigned int> buildCores{this, getDefaultCores(), "cores",
-        "Number of CPU cores to utilize in parallel within a build, "
-        "i.e. by passing this number to Make via '-j'. 0 means that the "
-        "number of actual CPU cores on the local host ought to be "
-        "auto-detected.", {"build-cores"}};
+    Setting<unsigned int> buildCores{
+        this, getDefaultCores(), "cores",
+        R"(
+          Sets the value of the `NIX_BUILD_CORES` environment variable in the
+          invocation of builders. Builders can use this variable at their
+          discretion to control the maximum amount of parallelism. For
+          instance, in Nixpkgs, if the derivation attribute
+          `enableParallelBuilding` is set to `true`, the builder passes the
+          `-jN` flag to GNU Make. It can be overridden using the `--cores`
+          command line switch and defaults to `1`. The value `0` means that
+          the builder should use all available CPU cores in the system.
+        )",
+        {"build-cores"}};
 
     /* Read-only mode.  Don't copy stuff to the store, don't change
        the database. */
     bool readOnlyMode = false;
 
-    Setting<std::string> thisSystem{this, SYSTEM, "system",
-        "The canonical Nix system name."};
+    Setting<std::string> thisSystem{
+        this, SYSTEM, "system",
+        R"(
+          This option specifies the canonical Nix system name of the current
+          installation, such as `i686-linux` or `x86_64-darwin`. Nix can only
+          build derivations whose `system` attribute equals the value
+          specified here. In general, it never makes sense to modify this
+          value from its default, since you can use it to ‘lie’ about the
+          platform you are building on (e.g., perform a Mac OS build on a
+          Linux machine; the result would obviously be wrong). It only makes
+          sense if the Nix binaries can run on multiple platforms, e.g.,
+          ‘universal binaries’ that run on `x86_64-linux` and `i686-linux`.
 
-    Setting<time_t> maxSilentTime{this, 0, "max-silent-time",
-        "The maximum time in seconds that a builer can go without "
-        "producing any output on stdout/stderr before it is killed. "
-        "0 means infinity.",
+          It defaults to the canonical Nix system name detected by `configure`
+          at build time.
+        )"};
+
+    Setting<time_t> maxSilentTime{
+        this, 0, "max-silent-time",
+        R"(
+          This option defines the maximum number of seconds that a builder can
+          go without producing any data on standard output or standard error.
+          This is useful (for instance in an automated build system) to catch
+          builds that are stuck in an infinite loop, or to catch remote builds
+          that are hanging due to network problems. It can be overridden using
+          the `--max-silent-time` command line switch.
+
+          The value `0` means that there is no timeout. This is also the
+          default.
+        )",
         {"build-max-silent-time"}};
 
-    Setting<time_t> buildTimeout{this, 0, "timeout",
-        "The maximum duration in seconds that a builder can run. "
-        "0 means infinity.", {"build-timeout"}};
+    Setting<time_t> buildTimeout{
+        this, 0, "timeout",
+        R"(
+          This option defines the maximum number of seconds that a builder can
+          run. This is useful (for instance in an automated build system) to
+          catch builds that are stuck in an infinite loop but keep writing to
+          their standard output or standard error. It can be overridden using
+          the `--timeout` command line switch.
+
+          The value `0` means that there is no timeout. This is also the
+          default.
+        )",
+        {"build-timeout"}};
 
     PathSetting buildHook{this, true, nixLibexecDir + "/nix/build-remote", "build-hook",
         "The path of the helper program that executes builds to remote machines."};
 
-    Setting<std::string> builders{this, "@" + nixConfDir + "/machines", "builders",
-        "A semicolon-separated list of build machines, in the format of nix.machines."};
+    Setting<std::string> builders{
+        this, "@" + nixConfDir + "/machines", "builders",
+        "A semicolon-separated list of build machines, in the format of `nix.machines`."};
 
-    Setting<bool> buildersUseSubstitutes{this, false, "builders-use-substitutes",
-        "Whether build machines should use their own substitutes for obtaining "
-        "build dependencies if possible, rather than waiting for this host to "
-        "upload them."};
+    Setting<bool> buildersUseSubstitutes{
+        this, false, "builders-use-substitutes",
+        R"(
+          If set to `true`, Nix will instruct remote build machines to use
+          their own binary substitutes if available. In practical terms, this
+          means that remote hosts will fetch as many build dependencies as
+          possible from their own substitutes (e.g, from `cache.nixos.org`),
+          instead of waiting for this host to upload them all. This can
+          drastically reduce build times if the network connection between
+          this computer and the remote build host is slow.
+        )"};
 
     Setting<off_t> reservedSize{this, 8 * 1024 * 1024, "gc-reserved-space",
         "Amount of reserved disk space for the garbage collector."};
 
-    Setting<bool> fsyncMetadata{this, true, "fsync-metadata",
-        "Whether SQLite should use fsync()."};
+    Setting<bool> fsyncMetadata{
+        this, true, "fsync-metadata",
+        R"(
+          If set to `true`, changes to the Nix store metadata (in
+          `/nix/var/nix/db`) are synchronously flushed to disk. This improves
+          robustness in case of system crashes, but reduces performance. The
+          default is `true`.
+        )"};
 
     Setting<bool> useSQLiteWAL{this, !isWSL1(), "use-sqlite-wal",
         "Whether SQLite should use WAL mode."};
 
     Setting<bool> syncBeforeRegistering{this, false, "sync-before-registering",
-        "Whether to call sync() before registering a path as valid."};
+        "Whether to call `sync()` before registering a path as valid."};
 
-    Setting<bool> useSubstitutes{this, true, "substitute",
-        "Whether to use substitutes.",
+    Setting<bool> useSubstitutes{
+        this, true, "substitute",
+        R"(
+          If set to `true` (default), Nix will use binary substitutes if
+          available. This option can be disabled to force building from
+          source.
+        )",
         {"build-use-substitutes"}};
 
-    Setting<std::string> buildUsersGroup{this, "", "build-users-group",
-        "The Unix group that contains the build users."};
+    Setting<std::string> buildUsersGroup{
+        this, "", "build-users-group",
+        R"(
+          This options specifies the Unix group containing the Nix build user
+          accounts. In multi-user Nix installations, builds should not be
+          performed by the Nix account since that would allow users to
+          arbitrarily modify the Nix store and database by supplying specially
+          crafted builders; and they cannot be performed by the calling user
+          since that would allow him/her to influence the build result.
+
+          Therefore, if this option is non-empty and specifies a valid group,
+          builds will be performed under the user accounts that are a member
+          of the group specified here (as listed in `/etc/group`). Those user
+          accounts should not be used for any other purpose\!
+
+          Nix will never run two builds under the same user account at the
+          same time. This is to prevent an obvious security hole: a malicious
+          user writing a Nix expression that modifies the build result of a
+          legitimate Nix expression being built by another user. Therefore it
+          is good to have as many Nix build user accounts as you can spare.
+          (Remember: uids are cheap.)
+
+          The build users should have permission to create files in the Nix
+          store, but not delete them. Therefore, `/nix/store` should be owned
+          by the Nix account, its group should be the group specified here,
+          and its mode should be `1775`.
+
+          If the build users group is empty, builds will be performed under
+          the uid of the Nix process (that is, the uid of the caller if
+          `NIX_REMOTE` is empty, the uid under which the Nix daemon runs if
+          `NIX_REMOTE` is `daemon`). Obviously, this should not be used in
+          multi-user settings with untrusted users.
+        )"};
 
     Setting<bool> impersonateLinux26{this, false, "impersonate-linux-26",
         "Whether to impersonate a Linux 2.6 machine on newer kernels.",
         {"build-impersonate-linux-26"}};
 
-    Setting<bool> keepLog{this, true, "keep-build-log",
-        "Whether to store build logs.",
+    Setting<bool> keepLog{
+        this, true, "keep-build-log",
+        R"(
+          If set to `true` (the default), Nix will write the build log of a
+          derivation (i.e. the standard output and error of its builder) to
+          the directory `/nix/var/log/nix/drvs`. The build log can be
+          retrieved using the command `nix-store -l path`.
+        )",
         {"build-keep-log"}};
 
-    Setting<bool> compressLog{this, true, "compress-build-log",
-        "Whether to compress logs.",
+    Setting<bool> compressLog{
+        this, true, "compress-build-log",
+        R"(
+          If set to `true` (the default), build logs written to
+          `/nix/var/log/nix/drvs` will be compressed on the fly using bzip2.
+          Otherwise, they will not be compressed.
+        )",
         {"build-compress-log"}};
 
-    Setting<unsigned long> maxLogSize{this, 0, "max-build-log-size",
-        "Maximum number of bytes a builder can write to stdout/stderr "
-        "before being killed (0 means no limit).",
+    Setting<unsigned long> maxLogSize{
+        this, 0, "max-build-log-size",
+        R"(
+          This option defines the maximum number of bytes that a builder can
+          write to its stdout/stderr. If the builder exceeds this limit, it’s
+          killed. A value of `0` (the default) means that there is no limit.
+        )",
         {"build-max-log-size"}};
 
     /* When buildRepeat > 0 and verboseBuild == true, whether to print
@@ -177,53 +297,156 @@ public:
         "Whether to check if new GC roots can in fact be found by the "
         "garbage collector."};
 
-    Setting<bool> gcKeepOutputs{this, false, "keep-outputs",
-        "Whether the garbage collector should keep outputs of live derivations.",
+    Setting<bool> gcKeepOutputs{
+        this, false, "keep-outputs",
+        R"(
+          If `true`, the garbage collector will keep the outputs of
+          non-garbage derivations. If `false` (default), outputs will be
+          deleted unless they are GC roots themselves (or reachable from other
+          roots).
+
+          In general, outputs must be registered as roots separately. However,
+          even if the output of a derivation is registered as a root, the
+          collector will still delete store paths that are used only at build
+          time (e.g., the C compiler, or source tarballs downloaded from the
+          network). To prevent it from doing so, set this option to `true`.
+        )",
         {"gc-keep-outputs"}};
 
-    Setting<bool> gcKeepDerivations{this, true, "keep-derivations",
-        "Whether the garbage collector should keep derivers of live paths.",
+    Setting<bool> gcKeepDerivations{
+        this, true, "keep-derivations",
+        R"(
+          If `true` (default), the garbage collector will keep the derivations
+          from which non-garbage store paths were built. If `false`, they will
+          be deleted unless explicitly registered as a root (or reachable from
+          other roots).
+
+          Keeping derivation around is useful for querying and traceability
+          (e.g., it allows you to ask with what dependencies or options a
+          store path was built), so by default this option is on. Turn it off
+          to save a bit of disk space (or a lot if `keep-outputs` is also
+          turned on).
+        )",
         {"gc-keep-derivations"}};
 
-    Setting<bool> autoOptimiseStore{this, false, "auto-optimise-store",
-        "Whether to automatically replace files with identical contents with hard links."};
+    Setting<bool> autoOptimiseStore{
+        this, false, "auto-optimise-store",
+        R"(
+          If set to `true`, Nix automatically detects files in the store
+          that have identical contents, and replaces them with hard links to
+          a single copy. This saves disk space. If set to `false` (the
+          default), you can still run `nix-store --optimise` to get rid of
+          duplicate files.
+        )"};
 
-    Setting<bool> envKeepDerivations{this, false, "keep-env-derivations",
-        "Whether to add derivations as a dependency of user environments "
-        "(to prevent them from being GCed).",
+    Setting<bool> envKeepDerivations{
+        this, false, "keep-env-derivations",
+        R"(
+          If `false` (default), derivations are not stored in Nix user
+          environments. That is, the derivations of any build-time-only
+          dependencies may be garbage-collected.
+
+          If `true`, when you add a Nix derivation to a user environment, the
+          path of the derivation is stored in the user environment. Thus, the
+          derivation will not be garbage-collected until the user environment
+          generation is deleted (`nix-env --delete-generations`). To prevent
+          build-time-only dependencies from being collected, you should also
+          turn on `keep-outputs`.
+
+          The difference between this option and `keep-derivations` is that
+          this one is “sticky”: it applies to any user environment created
+          while this option was enabled, while `keep-derivations` only applies
+          at the moment the garbage collector is run.
+        )",
         {"env-keep-derivations"}};
 
     /* Whether to lock the Nix client and worker to the same CPU. */
     bool lockCPU;
 
-    Setting<SandboxMode> sandboxMode{this,
+    Setting<SandboxMode> sandboxMode{
+        this,
         #if __linux__
           smEnabled
         #else
           smDisabled
         #endif
         , "sandbox",
-        "Whether to enable sandboxed builds. Can be \"true\", \"false\" or \"relaxed\".",
+        R"(
+          If set to `true`, builds will be performed in a *sandboxed
+          environment*, i.e., they’re isolated from the normal file system
+          hierarchy and will only see their dependencies in the Nix store,
+          the temporary build directory, private versions of `/proc`,
+          `/dev`, `/dev/shm` and `/dev/pts` (on Linux), and the paths
+          configured with the `sandbox-paths` option. This is useful to
+          prevent undeclared dependencies on files in directories such as
+          `/usr/bin`. In addition, on Linux, builds run in private PID,
+          mount, network, IPC and UTS namespaces to isolate them from other
+          processes in the system (except that fixed-output derivations do
+          not run in private network namespace to ensure they can access the
+          network).
+
+          Currently, sandboxing only work on Linux and macOS. The use of a
+          sandbox requires that Nix is run as root (so you should use the
+          “build users” feature to perform the actual builds under different
+          users than root).
+
+          If this option is set to `relaxed`, then fixed-output derivations
+          and derivations that have the `__noChroot` attribute set to `true`
+          do not run in sandboxes.
+
+          The default is `true` on Linux and `false` on all other platforms.
+        )",
         {"build-use-chroot", "build-use-sandbox"}};
 
-    Setting<PathSet> sandboxPaths{this, {}, "sandbox-paths",
-        "The paths to make available inside the build sandbox.",
+    Setting<PathSet> sandboxPaths{
+        this, {}, "sandbox-paths",
+        R"(
+          A list of paths bind-mounted into Nix sandbox environments. You can
+          use the syntax `target=source` to mount a path in a different
+          location in the sandbox; for instance, `/bin=/nix-bin` will mount
+          the path `/nix-bin` as `/bin` inside the sandbox. If *source* is
+          followed by `?`, then it is not an error if *source* does not exist;
+          for example, `/dev/nvidiactl?` specifies that `/dev/nvidiactl` will
+          only be mounted in the sandbox if it exists in the host filesystem.
+
+          Depending on how Nix was built, the default value for this option
+          may be empty or provide `/bin/sh` as a bind-mount of `bash`.
+        )",
         {"build-chroot-dirs", "build-sandbox-paths"}};
 
     Setting<bool> sandboxFallback{this, true, "sandbox-fallback",
         "Whether to disable sandboxing when the kernel doesn't allow it."};
 
-    Setting<PathSet> extraSandboxPaths{this, {}, "extra-sandbox-paths",
-        "Additional paths to make available inside the build sandbox.",
+    Setting<PathSet> extraSandboxPaths{
+        this, {}, "extra-sandbox-paths",
+        R"(
+          A list of additional paths appended to `sandbox-paths`. Useful if
+          you want to extend its default value.
+        )",
         {"build-extra-chroot-dirs", "build-extra-sandbox-paths"}};
 
-    Setting<size_t> buildRepeat{this, 0, "repeat",
-        "The number of times to repeat a build in order to verify determinism.",
+    Setting<size_t> buildRepeat{
+        this, 0, "repeat",
+        R"(
+          How many times to repeat builds to check whether they are
+          deterministic. The default value is 0. If the value is non-zero,
+          every build is repeated the specified number of times. If the
+          contents of any of the runs differs from the previous ones and
+          `enforce-determinism` is true, the build is rejected and the
+          resulting store paths are not registered as “valid” in Nix’s
+          database.
+        )",
         {"build-repeat"}};
 
 #if __linux__
-    Setting<std::string> sandboxShmSize{this, "50%", "sandbox-dev-shm-size",
-        "The size of /dev/shm in the build sandbox."};
+    Setting<std::string> sandboxShmSize{
+        this, "50%", "sandbox-dev-shm-size",
+        R"(
+          This option determines the maximum size of the `tmpfs` filesystem
+          mounted on `/dev/shm` in Linux sandboxes. For the format, see the
+          description of the `size` option of `tmpfs` in mount8. The default
+          is `50%`.
+        )"};
 
     Setting<Path> sandboxBuildDir{this, "/build", "sandbox-build-dir",
         "The build directory inside the sandbox."};
@@ -237,121 +460,411 @@ public:
         "Whether to log Darwin sandbox access violations to the system log."};
 #endif
 
-    Setting<bool> runDiffHook{this, false, "run-diff-hook",
-        "Whether to run the program specified by the diff-hook setting "
-        "repeated builds produce a different result. Typically used to "
-        "plug in diffoscope."};
+    Setting<bool> runDiffHook{
+        this, false, "run-diff-hook",
+        R"(
+          If true, enable the execution of the `diff-hook` program.
 
-    PathSetting diffHook{this, true, "", "diff-hook",
-        "A program that prints out the differences between the two paths "
-        "specified on its command line."};
+          When using the Nix daemon, `run-diff-hook` must be set in the
+          `nix.conf` configuration file, and cannot be passed at the command
+          line.
+        )"};
 
-    Setting<bool> enforceDeterminism{this, true, "enforce-determinism",
-        "Whether to fail if repeated builds produce different output."};
+    PathSetting diffHook{
+        this, true, "", "diff-hook",
+        R"(
+          Absolute path to an executable capable of diffing build
+          results. The hook is executed if `run-diff-hook` is true, and the
+          output of a build is known to not be the same. This program is not
+          executed to determine if two results are the same.
 
-    Setting<Strings> trustedPublicKeys{this,
+          The diff hook is executed by the same user and group who ran the
+          build. However, the diff hook does not have write access to the
+          store path just built.
+
+          The diff hook program receives three parameters:
+
+          1.  A path to the previous build's results
+
+          2.  A path to the current build's results
+
+          3.  The path to the build's derivation
+
+          4.  The path to the build's scratch directory. This directory will
+              exist only if the build was run with `--keep-failed`.
+
+          The stderr and stdout output from the diff hook will not be
+          displayed to the user. Instead, it will print to the nix-daemon's
+          log.
+
+          When using the Nix daemon, `diff-hook` must be set in the `nix.conf`
+          configuration file, and cannot be passed at the command line.
+        )"};
+
+    Setting<bool> enforceDeterminism{
+        this, true, "enforce-determinism",
+        "Whether to fail if repeated builds produce different output. See `repeat`."};
+
+    Setting<Strings> trustedPublicKeys{
+        this,
         {"cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY="},
         "trusted-public-keys",
-        "Trusted public keys for secure substitution.",
+        R"(
+          A whitespace-separated list of public keys. When paths are copied
+          from another Nix store (such as a binary cache), they must be
+          signed with one of these keys. For example:
+          `cache.nixos.org-1:6NCHdD59X431o0gWypbMrAURkbJ16ZPMQFGspcDShjY=
+          hydra.nixos.org-1:CNHJZBh9K4tP3EKF6FkkgeVYsS3ohTl+oS0Qa8bezVs=`.
+        )",
         {"binary-cache-public-keys"}};
 
-    Setting<Strings> secretKeyFiles{this, {}, "secret-key-files",
-        "Secret keys with which to sign local builds."};
+    Setting<Strings> secretKeyFiles{
+        this, {}, "secret-key-files",
+        R"(
+          A whitespace-separated list of files containing secret (private)
+          keys. These are used to sign locally-built paths. They can be
+          generated using `nix-store --generate-binary-cache-key`. The
+          corresponding public key can be distributed to other users, who
+          can add it to `trusted-public-keys` in their `nix.conf`.
+        )"};
 
-    Setting<unsigned int> tarballTtl{this, 60 * 60, "tarball-ttl",
-        "How long downloaded files are considered up-to-date."};
+    Setting<unsigned int> tarballTtl{
+        this, 60 * 60, "tarball-ttl",
+        R"(
+          The number of seconds a downloaded tarball is considered fresh. If
+          the cached tarball is stale, Nix will check whether it is still up
+          to date using the ETag header. Nix will download a new version if
+          the ETag header is unsupported, or the cached ETag doesn't match.
 
-    Setting<bool> requireSigs{this, true, "require-sigs",
-        "Whether to check that any non-content-addressed path added to the "
-        "Nix store has a valid signature (that is, one signed using a key "
-        "listed in 'trusted-public-keys'."};
+          Setting the TTL to `0` forces Nix to always check if the tarball is
+          up to date.
 
-    Setting<StringSet> extraPlatforms{this,
+          Nix caches tarballs in `$XDG_CACHE_HOME/nix/tarballs`.
+
+          Files fetched via `NIX_PATH`, `fetchGit`, `fetchMercurial`,
+          `fetchTarball`, and `fetchurl` respect this TTL.
+        )"};
+
+    Setting<bool> requireSigs{
+        this, true, "require-sigs",
+        R"(
+          If set to `true` (the default), any non-content-addressed path added
+          or copied to the Nix store (e.g. when substituting from a binary
+          cache) must have a valid signature, that is, be signed using one of
+          the keys listed in `trusted-public-keys` or `secret-key-files`. Set
+          to `false` to disable signature checking.
+        )"};
+
+    Setting<StringSet> extraPlatforms{
+        this,
         std::string{SYSTEM} == "x86_64-linux" && !isWSL1() ? StringSet{"i686-linux"} : StringSet{},
         "extra-platforms",
-        "Additional platforms that can be built on the local system. "
-        "These may be supported natively (e.g. armv7 on some aarch64 CPUs "
-        "or using hacks like qemu-user."};
+        R"(
+          Platforms other than the native one which this machine is capable of
+          building for. This can be useful for supporting additional
+          architectures on compatible machines: i686-linux can be built on
+          x86\_64-linux machines (and the default for this setting reflects
+          this); armv7 is backwards-compatible with armv6 and armv5tel; some
+          aarch64 machines can also natively run 32-bit ARM code; and
+          qemu-user may be used to support non-native platforms (though this
+          may be slow and buggy). Most values for this are not enabled by
+          default because build systems will often misdetect the target
+          platform and generate incompatible code, so you may wish to
+          cross-check the results of using this option against proper
+          natively-built versions of your derivations.
+        )"};
 
-    Setting<StringSet> systemFeatures{this, getDefaultSystemFeatures(),
+    Setting<StringSet> systemFeatures{
+        this, getDefaultSystemFeatures(),
         "system-features",
-        "Optional features that this system implements (like \"kvm\")."};
+        R"(
+          A set of system “features” supported by this machine, e.g. `kvm`.
+          Derivations can express a dependency on such features through the
+          derivation attribute `requiredSystemFeatures`. For example, the
+          attribute
 
-    Setting<Strings> substituters{this,
+              requiredSystemFeatures = [ "kvm" ];
+
+          ensures that the derivation can only be built on a machine with the
+          `kvm` feature.
+
+          This setting by default includes `kvm` if `/dev/kvm` is accessible,
+          and the pseudo-features `nixos-test`, `benchmark` and `big-parallel`
+          that are used in Nixpkgs to route builds to specific machines.
+        )"};
+
+    Setting<Strings> substituters{
+        this,
         nixStore == "/nix/store" ? Strings{"https://cache.nixos.org/"} : Strings(),
         "substituters",
-        "The URIs of substituters (such as https://cache.nixos.org/).",
+        R"(
+          A list of URLs of substituters, separated by whitespace. The default
+          is `https://cache.nixos.org`.
+        )",
         {"binary-caches"}};
 
     // FIXME: provide a way to add to option values.
-    Setting<Strings> extraSubstituters{this, {}, "extra-substituters",
-        "Additional URIs of substituters.",
+    Setting<Strings> extraSubstituters{
+        this, {}, "extra-substituters",
+        R"(
+          Additional binary caches appended to those specified in
+          `substituters`. When used by unprivileged users, untrusted
+          substituters (i.e. those not listed in `trusted-substituters`) are
+          silently ignored.
+        )",
         {"extra-binary-caches"}};
 
-    Setting<StringSet> trustedSubstituters{this, {}, "trusted-substituters",
-        "Disabled substituters that may be enabled via the substituters option by untrusted users.",
+    Setting<StringSet> trustedSubstituters{
+        this, {}, "trusted-substituters",
+        R"(
+          A list of URLs of substituters, separated by whitespace. These are
+          not used by default, but can be enabled by users of the Nix daemon
+          by specifying `--option substituters urls` on the command
+          line. Unprivileged users are only allowed to pass a subset of the
+          URLs listed in `substituters` and `trusted-substituters`.
+        )",
         {"trusted-binary-caches"}};
 
-    Setting<Strings> trustedUsers{this, {"root"}, "trusted-users",
-        "Which users or groups are trusted to ask the daemon to do unsafe things."};
+    Setting<Strings> trustedUsers{
+        this, {"root"}, "trusted-users",
+        R"(
+          A list of names of users (separated by whitespace) that have
+          additional rights when connecting to the Nix daemon, such as the
+          ability to specify additional binary caches, or to import unsigned
+          NARs. You can also specify groups by prefixing them with `@`; for
+          instance, `@wheel` means all users in the `wheel` group. The default
+          is `root`.
 
-    Setting<unsigned int> ttlNegativeNarInfoCache{this, 3600, "narinfo-cache-negative-ttl",
-        "The TTL in seconds for negative lookups in the disk cache i.e binary cache lookups that "
-        "return an invalid path result"};
+          > **Warning**
+          > 
+          > Adding a user to `trusted-users` is essentially equivalent to
+          > giving that user root access to the system. For example, the user
+          > can set `sandbox-paths` and thereby obtain read access to
+          > directories that are otherwise inacessible to them.
+        )"};
 
-    Setting<unsigned int> ttlPositiveNarInfoCache{this, 30 * 24 * 3600, "narinfo-cache-positive-ttl",
-        "The TTL in seconds for positive lookups in the disk cache i.e binary cache lookups that "
-        "return a valid path result."};
+    Setting<unsigned int> ttlNegativeNarInfoCache{
+        this, 3600, "narinfo-cache-negative-ttl",
+        R"(
+          The TTL in seconds for negative lookups. If a store path is queried
+          from a substituter but was not found, there will be a negative
+          lookup cached in the local disk cache database for the specified
+          duration.
+        )"};
+
+    Setting<unsigned int> ttlPositiveNarInfoCache{
+        this, 30 * 24 * 3600, "narinfo-cache-positive-ttl",
+        R"(
+          The TTL in seconds for positive lookups. If a store path is queried
+          from a substituter, the result of the query will be cached in the
+          local disk cache database including some of the NAR metadata. The
+          default TTL is a month, setting a shorter TTL for positive lookups
+          can be useful for binary caches that have frequent garbage
+          collection, in which case having a more frequent cache invalidation
+          would prevent trying to pull the path again and failing with a hash
+          mismatch if the build isn't reproducible.
+        )"};
 
     /* ?Who we trust to use the daemon in safe ways */
-    Setting<Strings> allowedUsers{this, {"*"}, "allowed-users",
-        "Which users or groups are allowed to connect to the daemon."};
+    Setting<Strings> allowedUsers{
+        this, {"*"}, "allowed-users",
+        R"(
+          A list of names of users (separated by whitespace) that are allowed
+          to connect to the Nix daemon. As with the `trusted-users` option,
+          you can specify groups by prefixing them with `@`. Also, you can
+          allow all users by specifying `*`. The default is `*`.
+
+          Note that trusted users are always allowed to connect.
+        )"};
 
     Setting<bool> printMissing{this, true, "print-missing",
         "Whether to print what paths need to be built or downloaded."};
 
-    Setting<std::string> preBuildHook{this, "",
-        "pre-build-hook",
-        "A program to run just before a build to set derivation-specific build settings."};
+    Setting<std::string> preBuildHook{
+        this, "", "pre-build-hook",
+        R"(
+          If set, the path to a program that can set extra derivation-specific
+          settings for this system. This is used for settings that can't be
+          captured by the derivation model itself and are too variable between
+          different versions of the same system to be hard-coded into nix.
 
-    Setting<std::string> postBuildHook{this, "", "post-build-hook",
-        "A program to run just after each successful build."};
+          The hook is passed the derivation path and, if sandboxes are
+          enabled, the sandbox directory. It can then modify the sandbox and
+          send a series of commands to modify various settings to stdout. The
+          currently recognized commands are:
 
-    Setting<std::string> netrcFile{this, fmt("%s/%s", nixConfDir, "netrc"), "netrc-file",
-        "Path to the netrc file used to obtain usernames/passwords for downloads."};
+            - `extra-sandbox-paths`  
+              Pass a list of files and directories to be included in the
+              sandbox for this build. One entry per line, terminated by an
+              empty line. Entries have the same format as `sandbox-paths`.
+        )"};
+
+    Setting<std::string> postBuildHook{
+        this, "", "post-build-hook",
+        R"(
+          Optional. The path to a program to execute after each build.
+
+          This option is only settable in the global `nix.conf`, or on the
+          command line by trusted users.
+
+          When using the nix-daemon, the daemon executes the hook as `root`.
+          If the nix-daemon is not involved, the hook runs as the user
+          executing the nix-build.
+
+            - The hook executes after an evaluation-time build.
+
+            - The hook does not execute on substituted paths.
+
+            - The hook's output always goes to the user's terminal.
+
+            - If the hook fails, the build succeeds but no further builds
+              execute.
+
+            - The hook executes synchronously, and blocks other builds from
+              progressing while it runs.
+
+          The program executes with no arguments. The program's environment
+          contains the following environment variables:
+
+            - `DRV_PATH`  
+              The derivation for the built paths.
+
+              Example:
+              `/nix/store/5nihn1a7pa8b25l9zafqaqibznlvvp3f-bash-4.4-p23.drv`
+
+            - `OUT_PATHS`  
+              Output paths of the built derivation, separated by a space
+              character.
+
+              Example:
+              `/nix/store/zf5lbh336mnzf1nlswdn11g4n2m8zh3g-bash-4.4-p23-dev
+              /nix/store/rjxwxwv1fpn9wa2x5ssk5phzwlcv4mna-bash-4.4-p23-doc
+              /nix/store/6bqvbzjkcp9695dq0dpl5y43nvy37pq1-bash-4.4-p23-info
+              /nix/store/r7fng3kk3vlpdlh2idnrbn37vh4imlj2-bash-4.4-p23-man
+              /nix/store/xfghy8ixrhz3kyy6p724iv3cxji088dx-bash-4.4-p23`.
+        )"};
+
+    Setting<std::string> netrcFile{
+        this, fmt("%s/%s", nixConfDir, "netrc"), "netrc-file",
+        R"(
+          If set to an absolute path to a `netrc` file, Nix will use the HTTP
+          authentication credentials in this file when trying to download from
+          a remote host through HTTP or HTTPS. Defaults to
+          `$NIX_CONF_DIR/netrc`.
+
+          The `netrc` file consists of a list of accounts in the following
+          format:
+
+              machine my-machine
+              login my-username
+              password my-password
+
+          For the exact syntax, see [the `curl`
+          documentation](https://ec.haxx.se/usingcurl-netrc.html).
+
+          > **Note**
+          > 
+          > This must be an absolute path, and `~` is not resolved. For
+          > example, `~/.netrc` won't resolve to your home directory's
+          > `.netrc`.
+        )"};
 
     /* Path to the SSL CA file used */
     Path caFile;
 
 #if __linux__
-    Setting<bool> filterSyscalls{this, true, "filter-syscalls",
-            "Whether to prevent certain dangerous system calls, such as "
-            "creation of setuid/setgid files or adding ACLs or extended "
-            "attributes. Only disable this if you're aware of the "
-            "security implications."};
+    Setting<bool> filterSyscalls{
+        this, true, "filter-syscalls",
+        R"(
+          Whether to prevent certain dangerous system calls, such as
+          creation of setuid/setgid files or adding ACLs or extended
+          attributes. Only disable this if you're aware of the
+          security implications.
+        )"};
 
-    Setting<bool> allowNewPrivileges{this, false, "allow-new-privileges",
-        "Whether builders can acquire new privileges by calling programs with "
-        "setuid/setgid bits or with file capabilities."};
+    Setting<bool> allowNewPrivileges{
+        this, false, "allow-new-privileges",
+        R"(
+          (Linux-specific.) By default, builders on Linux cannot acquire new
+          privileges by calling setuid/setgid programs or programs that have
+          file capabilities. For example, programs such as `sudo` or `ping`
+          will fail. (Note that in sandbox builds, no such programs are
+          available unless you bind-mount them into the sandbox via the
+          `sandbox-paths` option.) You can allow the use of such programs by
+          enabling this option. This is impure and usually undesirable, but
+          may be useful in certain scenarios (e.g. to spin up containers or
+          set up userspace network interfaces in tests).
+        )"};
 #endif
 
-    Setting<Strings> hashedMirrors{this, {}, "hashed-mirrors",
-        "A list of servers used by builtins.fetchurl to fetch files by hash."};
+    Setting<Strings> hashedMirrors{
+        this, {}, "hashed-mirrors",
+        R"(
+          A list of web servers used by `builtins.fetchurl` to obtain files by
+          hash. The default is `http://tarballs.nixos.org/`. Given a hash type
+          *ht* and a base-16 hash *h*, Nix will try to download the file from
+          *hashed-mirror*/*ht*/*h*. This allows files to be downloaded even if
+          they have disappeared from their original URI. For example, given
+          the default mirror `http://tarballs.nixos.org/`, when building the
+          derivation
 
-    Setting<uint64_t> minFree{this, 0, "min-free",
-        "Automatically run the garbage collector when free disk space drops below the specified amount."};
+          ```nix
+          builtins.fetchurl {
+            url = "https://example.org/foo-1.2.3.tar.xz";
+            sha256 = "2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae";
+          }
+          ```
 
-    Setting<uint64_t> maxFree{this, std::numeric_limits<uint64_t>::max(), "max-free",
-        "Stop deleting garbage when free disk space is above the specified amount."};
+          Nix will attempt to download this file from
+          `http://tarballs.nixos.org/sha256/2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae`
+          first. If it is not available there, if will try the original URI.
+        )"};
+
+    Setting<uint64_t> minFree{
+        this, 0, "min-free",
+        R"(
+          When free disk space in `/nix/store` drops below `min-free` during a
+          build, Nix performs a garbage-collection until `max-free` bytes are
+          available or there is no more garbage. A value of `0` (the default)
+          disables this feature.
+        )"};
+
+    Setting<uint64_t> maxFree{
+        this, std::numeric_limits<uint64_t>::max(), "max-free",
+        R"(
+          When a garbage collection is triggered by the `min-free` option, it
+          stops as soon as `max-free` bytes are available. The default is
+          infinity (i.e. delete all garbage).
+        )"};
 
     Setting<uint64_t> minFreeCheckInterval{this, 5, "min-free-check-interval",
         "Number of seconds between checking free disk space."};
 
-    Setting<Paths> pluginFiles{this, {}, "plugin-files",
-        "Plugins to dynamically load at nix initialization time."};
+    Setting<Paths> pluginFiles{
+        this, {}, "plugin-files",
+        R"(
+          A list of plugin files to be loaded by Nix. Each of these files will
+          be dlopened by Nix, allowing them to affect execution through static
+          initialization. In particular, these plugins may construct static
+          instances of RegisterPrimOp to add new primops or constants to the
+          expression language, RegisterStoreImplementation to add new store
+          implementations, RegisterCommand to add new subcommands to the `nix`
+          command, and RegisterSetting to add new nix config settings. See the
+          constructors for those types for more details.
+
+          Since these files are loaded into the same address space as Nix
+          itself, they must be DSOs compatible with the instance of Nix
+          running at the time (i.e. compiled against the same headers, not
+          linked to any incompatible libraries). They should not be linked to
+          any Nix libs directly, as those will be available already at load
+          time.
+
+          If an entry in the list is a directory, all files in the directory
+          are loaded as plugins (non-recursively).
+        )"};
 
     Setting<std::string> githubAccessToken{this, "", "github-access-token",
-        "GitHub access token to get access to GitHub data through the GitHub API for github:<..> flakes."};
+        "GitHub access token to get access to GitHub data through the GitHub API for `github:<..>` flakes."};
 
     Setting<Strings> experimentalFeatures{this, {}, "experimental-features",
         "Experimental Nix features to enable."};
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index 8fc700a2b..ff1a71fba 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -149,11 +149,48 @@ void Config::convertToArgs(Args & args, const std::string & category)
             s.second.setting->convertToArg(args, category);
 }
 
+static std::string stripIndentation(std::string_view s)
+{
+    size_t minIndent = 10000;
+    size_t curIndent = 0;
+    bool atStartOfLine = true;
+
+    for (auto & c : s) {
+        if (atStartOfLine && c == ' ')
+            curIndent++;
+        else if (c == '\n') {
+            if (atStartOfLine)
+                minIndent = std::max(minIndent, curIndent);
+            curIndent = 0;
+            atStartOfLine = true;
+        } else {
+            if (atStartOfLine) {
+                minIndent = std::min(minIndent, curIndent);
+                atStartOfLine = false;
+            }
+        }
+    }
+
+    std::string res;
+
+    size_t pos = 0;
+    while (pos < s.size()) {
+        auto eol = s.find('\n', pos);
+        if (eol == s.npos) eol = s.size();
+        if (eol - pos > minIndent)
+            res.append(s.substr(pos + minIndent, eol - pos - minIndent));
+        res.push_back('\n');
+        pos = eol + 1;
+    }
+
+    return res;
+}
+
 AbstractSetting::AbstractSetting(
     const std::string & name,
     const std::string & description,
     const std::set<std::string> & aliases)
-    : name(name), description(description), aliases(aliases)
+    : name(name), description(stripIndentation(description)), aliases(aliases)
 {
 }
 
diff --git a/src/libutil/logging.hh b/src/libutil/logging.hh
index 09619aac6..63cb2b268 100644
--- a/src/libutil/logging.hh
+++ b/src/libutil/logging.hh
@@ -37,10 +37,12 @@ typedef uint64_t ActivityId;
 
 struct LoggerSettings : Config
 {
-    Setting<bool> showTrace{this,
-        false,
-        "show-trace",
-        "Whether to show a stack trace on evaluation errors."};
+    Setting<bool> showTrace{
+        this, false, "show-trace",
+        R"(
+          Where Nix should print out a stack trace in case of Nix
+          expression evaluation errors.
+        )"};
 };
 
 extern LoggerSettings loggerSettings;

From c3e20d8c28ac777fff17c56f57ac8aa28c9272b4 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Aug 2020 18:30:17 +0200
Subject: [PATCH 064/176] Consistency

---
 doc/manual/generate-options.jq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/generate-options.jq b/doc/manual/generate-options.jq
index 3ee51ddea..e0cf496d6 100644
--- a/doc/manual/generate-options.jq
+++ b/doc/manual/generate-options.jq
@@ -1,5 +1,5 @@
 . | to_entries | sort_by(.key) | map(
-  "  - `" + .key + "`  \n"
+  "  - `" + .key + "`  \n\n"
   + (.value.description | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
   + "    **Default**: " + (
       if .value.value == "" or .value.value == []

From b4ef3d7078133d6c31c77da45a991bfe2210623a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 19 Aug 2020 21:00:57 +0200
Subject: [PATCH 065/176] Revert "Add a separate manual job"

This reverts commit 5e3ad1dde0a03b3bd094e1d4ecc0f4fc7abdaa5c. Manual
generation now depends on the 'nix' command.
---
 flake.nix | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/flake.nix b/flake.nix
index 8f5a3055c..f97197cce 100644
--- a/flake.nix
+++ b/flake.nix
@@ -144,6 +144,11 @@
 
           installFlags = "sysconfdir=$(out)/etc";
 
+          postInstall = ''
+            mkdir -p $doc/nix-support
+            echo "doc manual $doc/share/doc/nix/manual" >> $doc/nix-support/hydra-build-products
+          '';
+
           doInstallCheck = true;
           installCheckFlags = "sysconfdir=$(out)/etc";
 
@@ -210,25 +215,6 @@
         # Perl bindings for various platforms.
         perlBindings = nixpkgs.lib.genAttrs systems (system: nixpkgsFor.${system}.nix.perl-bindings);
 
-        # Separate build for just the manual.
-        manual =
-          with nixpkgsFor.x86_64-linux;
-          stdenv.mkDerivation {
-            name = "nix-manual-${version}";
-            src = self;
-            buildInputs = [ mdbook ];
-            configurePhase = ":";
-            buildPhase = ":";
-            installPhase =
-              ''
-                touch Makefile.config
-                docdir=$out/share/doc/nix
-                make docdir=$docdir doc_generate=yes $docdir/manual/index.html
-                mkdir -p $out/nix-support
-                echo "doc manual $docdir/manual" >> $out/nix-support/hydra-build-products
-              '';
-          };
-
         # Binary tarball for various platforms, containing a Nix store
         # with the closure of 'nix' package, and the second half of
         # the installation script.

From a83694c7a1212567ec2f032f84c0d72722bcf5ea Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Wed, 19 Aug 2020 19:34:47 +0000
Subject: [PATCH 066/176] Use `RemoteStore` to open connection for proxying
 daemon

Removes duplicate websocket opening code, and also means we should be
able to to ssh-ssh-... daemon relays, not just uds-uds-... ones.
---
 src/libstore/remote-store.cc | 13 ++++++++++---
 src/libstore/remote-store.hh |  4 ++--
 src/libstore/ssh-store.cc    |  1 -
 src/nix-daemon/nix-daemon.cc | 36 +++++++++---------------------------
 4 files changed, 21 insertions(+), 33 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 553069b89..ff7149643 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -86,7 +86,16 @@ RemoteStore::RemoteStore(const Params & params)
     : Store(params)
     , connections(make_ref<Pool<Connection>>(
             std::max(1, (int) maxConnections),
-            [this]() { return openConnectionWrapper(); },
+            [this]() {
+                auto conn = openConnectionWrapper();
+                try {
+                    initConnection(*conn);
+                } catch (...) {
+                    failed = true;
+                    throw;
+                }
+                return conn;
+            },
             [this](const ref<Connection> & r) {
                 return
                     r->to.good()
@@ -169,8 +178,6 @@ ref<RemoteStore::Connection> UDSRemoteStore::openConnection()
 
     conn->startTime = std::chrono::steady_clock::now();
 
-    initConnection(*conn);
-
     return conn;
 }
 
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 72d2a6689..5ad2dc75b 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -102,8 +102,6 @@ public:
 
     void flushBadConnections();
 
-protected:
-
     struct Connection
     {
         AutoCloseFD fd;
@@ -119,6 +117,8 @@ protected:
 
     ref<Connection> openConnectionWrapper();
 
+protected:
+
     virtual ref<Connection> openConnection() = 0;
 
     void initConnection(Connection & conn);
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index caae6b596..7e9b44afe 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -89,7 +89,6 @@ ref<RemoteStore::Connection> SSHStore::openConnection()
         + (remoteStore.get() == "" ? "" : " --store " + shellEscape(remoteStore.get())));
     conn->to = FdSink(conn->sshConn->in.get());
     conn->from = FdSource(conn->sshConn->out.get());
-    initConnection(*conn);
     return conn;
 }
 
diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index 9613cb7d3..bdf56d2e2 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -286,46 +286,28 @@ static int _main(int argc, char * * argv)
         initPlugins();
 
         if (stdio) {
-            if (openUncachedStore().dynamic_pointer_cast<UDSRemoteStore>()) {
-                // FIXME Use the connection the UDSRemoteStore opened
+            if (auto store = openUncachedStore().dynamic_pointer_cast<RemoteStore>()) {
+                auto conn = store->openConnectionWrapper();
+                int from = conn->from.fd;
+                int to = conn->to.fd;
 
-                //  Forward on this connection to the real daemon
-                auto socketPath = settings.nixDaemonSocketFile;
-                auto s = socket(PF_UNIX, SOCK_STREAM, 0);
-                if (s == -1)
-                    throw SysError("creating Unix domain socket");
-
-                auto socketDir = dirOf(socketPath);
-                if (chdir(socketDir.c_str()) == -1)
-                    throw SysError("changing to socket directory '%1%'", socketDir);
-
-                auto socketName = std::string(baseNameOf(socketPath));
-                auto addr = sockaddr_un{};
-                addr.sun_family = AF_UNIX;
-                if (socketName.size() + 1 >= sizeof(addr.sun_path))
-                    throw Error("socket name %1% is too long", socketName);
-                strcpy(addr.sun_path, socketName.c_str());
-
-                if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) == -1)
-                    throw SysError("cannot connect to daemon at %1%", socketPath);
-
-                auto nfds = (s > STDIN_FILENO ? s : STDIN_FILENO) + 1;
+                auto nfds = std::max(from, to) + 1;
                 while (true) {
                     fd_set fds;
                     FD_ZERO(&fds);
-                    FD_SET(s, &fds);
+                    FD_SET(from, &fds);
                     FD_SET(STDIN_FILENO, &fds);
                     if (select(nfds, &fds, nullptr, nullptr, nullptr) == -1)
                         throw SysError("waiting for data from client or server");
-                    if (FD_ISSET(s, &fds)) {
-                        auto res = splice(s, nullptr, STDOUT_FILENO, nullptr, SSIZE_MAX, SPLICE_F_MOVE);
+                    if (FD_ISSET(from, &fds)) {
+                        auto res = splice(from, nullptr, STDOUT_FILENO, nullptr, SSIZE_MAX, SPLICE_F_MOVE);
                         if (res == -1)
                             throw SysError("splicing data from daemon socket to stdout");
                         else if (res == 0)
                             throw EndOfFile("unexpected EOF from daemon socket");
                     }
                     if (FD_ISSET(STDIN_FILENO, &fds)) {
-                        auto res = splice(STDIN_FILENO, nullptr, s, nullptr, SSIZE_MAX, SPLICE_F_MOVE);
+                        auto res = splice(STDIN_FILENO, nullptr, to, nullptr, SSIZE_MAX, SPLICE_F_MOVE);
                         if (res == -1)
                             throw SysError("splicing data from stdin to daemon socket");
                         else if (res == 0)

From f36793c7b950001f80291e162b34f1f9f2152fa0 Mon Sep 17 00:00:00 2001
From: Ryan Mulligan <ryan@ryantm.com>
Date: Wed, 19 Aug 2020 20:31:01 -0700
Subject: [PATCH 067/176] fix spelling

---
 src/nix/develop.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 434088da7..9aaa80822 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -246,7 +246,7 @@ struct CmdDevelop : Common, MixEnvironment
         addFlag({
             .longName = "command",
             .shortName = 'c',
-            .description = "command and arguments to be executed insted of an interactive shell",
+            .description = "command and arguments to be executed instead of an interactive shell",
             .labels = {"command", "args"},
             .handler = {[&](std::vector<std::string> ss) {
                 if (ss.empty()) throw UsageError("--command requires at least one argument");

From 3df78858f2ad91a80e30ba910119a0c16c05c66a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 20 Aug 2020 05:08:50 +0000
Subject: [PATCH 068/176] Fix max fd calc and add test

---
 src/nix-daemon/nix-daemon.cc |  2 +-
 tests/local.mk               |  1 +
 tests/ssh-relay.sh           | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 tests/ssh-relay.sh

diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc
index bdf56d2e2..6e652ccbf 100644
--- a/src/nix-daemon/nix-daemon.cc
+++ b/src/nix-daemon/nix-daemon.cc
@@ -291,7 +291,7 @@ static int _main(int argc, char * * argv)
                 int from = conn->from.fd;
                 int to = conn->to.fd;
 
-                auto nfds = std::max(from, to) + 1;
+                auto nfds = std::max(from, STDIN_FILENO) + 1;
                 while (true) {
                     fd_set fds;
                     FD_ZERO(&fds);
diff --git a/tests/local.mk b/tests/local.mk
index 53035da41..fd9438386 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -15,6 +15,7 @@ nix_tests = \
   linux-sandbox.sh \
   build-dry.sh \
   build-remote-input-addressed.sh \
+  ssh-relay.sh \
   nar-access.sh \
   structured-attrs.sh \
   fetchGit.sh \
diff --git a/tests/ssh-relay.sh b/tests/ssh-relay.sh
new file mode 100644
index 000000000..dce50974b
--- /dev/null
+++ b/tests/ssh-relay.sh
@@ -0,0 +1,16 @@
+source common.sh
+
+echo foo > $TEST_ROOT/hello.sh
+
+ssh_localhost=ssh://localhost
+remote_store=?remote-store=$ssh_localhost
+
+store=$ssh_localhost
+
+store+=$remote_store
+store+=$remote_store
+store+=$remote_store
+
+out=$(nix add-to-store --store "$store" $TEST_ROOT/hello.sh)
+
+[ foo = $(< $out) ]

From acb99f03f963d00670e5a286c76a92d022ef44b0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Aug 2020 11:02:16 +0200
Subject: [PATCH 069/176] Config: Use nlohmann/json

---
 precompiled-headers.h   |  2 ++
 src/libstore/globals.cc |  6 ++++--
 src/libutil/config.cc   | 41 +++++++++++++++++++++--------------------
 src/libutil/config.hh   | 14 +++++++-------
 src/nix/show-config.cc  |  6 +++---
 5 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/precompiled-headers.h b/precompiled-headers.h
index 079aa496e..f52f1cab8 100644
--- a/precompiled-headers.h
+++ b/precompiled-headers.h
@@ -56,3 +56,5 @@
 #include <sys/wait.h>
 #include <termios.h>
 #include <unistd.h>
+
+#include <nlohmann/json.hpp>
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 683fa5196..4a5971c3f 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -9,6 +9,8 @@
 #include <dlfcn.h>
 #include <sys/utsname.h>
 
+#include <nlohmann/json.hpp>
+
 
 namespace nix {
 
@@ -160,9 +162,9 @@ template<> std::string BaseSetting<SandboxMode>::to_string() const
     else abort();
 }
 
-template<> void BaseSetting<SandboxMode>::toJSON(JSONPlaceholder & out)
+template<> nlohmann::json BaseSetting<SandboxMode>::toJSON()
 {
-    AbstractSetting::toJSON(out);
+    return AbstractSetting::toJSON();
 }
 
 template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::string & category)
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index ff1a71fba..4c5b80d49 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -1,6 +1,7 @@
 #include "config.hh"
 #include "args.hh"
-#include "json.hh"
+
+#include <nlohmann/json.hpp>
 
 namespace nix {
 
@@ -131,15 +132,17 @@ void Config::resetOverriden()
         s.second.setting->overriden = false;
 }
 
-void Config::toJSON(JSONObject & out)
+nlohmann::json Config::toJSON()
 {
+    auto res = nlohmann::json::object();
     for (auto & s : _settings)
         if (!s.second.isAlias) {
-            JSONObject out2(out.object(s.first));
-            out2.attr("description", s.second.setting->description);
-            JSONPlaceholder out3(out2.placeholder("value"));
-            s.second.setting->toJSON(out3);
+            auto obj = nlohmann::json::object();
+            obj.emplace("description", s.second.setting->description);
+            obj.emplace("value", s.second.setting->toJSON());
+            res.emplace(s.first, obj);
         }
+    return res;
 }
 
 void Config::convertToArgs(Args & args, const std::string & category)
@@ -199,9 +202,9 @@ void AbstractSetting::setDefault(const std::string & str)
     if (!overriden) set(str);
 }
 
-void AbstractSetting::toJSON(JSONPlaceholder & out)
+nlohmann::json AbstractSetting::toJSON()
 {
-    out.write(to_string());
+    return to_string();
 }
 
 void AbstractSetting::convertToArg(Args & args, const std::string & category)
@@ -209,9 +212,9 @@ void AbstractSetting::convertToArg(Args & args, const std::string & category)
 }
 
 template<typename T>
-void BaseSetting<T>::toJSON(JSONPlaceholder & out)
+nlohmann::json BaseSetting<T>::toJSON()
 {
-    out.write(value);
+    return value;
 }
 
 template<typename T>
@@ -292,11 +295,9 @@ template<> std::string BaseSetting<Strings>::to_string() const
     return concatStringsSep(" ", value);
 }
 
-template<> void BaseSetting<Strings>::toJSON(JSONPlaceholder & out)
+template<> nlohmann::json BaseSetting<Strings>::toJSON()
 {
-    JSONList list(out.list());
-    for (auto & s : value)
-        list.elem(s);
+    return value;
 }
 
 template<> void BaseSetting<StringSet>::set(const std::string & str)
@@ -309,11 +310,9 @@ template<> std::string BaseSetting<StringSet>::to_string() const
     return concatStringsSep(" ", value);
 }
 
-template<> void BaseSetting<StringSet>::toJSON(JSONPlaceholder & out)
+template<> nlohmann::json BaseSetting<StringSet>::toJSON()
 {
-    JSONList list(out.list());
-    for (auto & s : value)
-        list.elem(s);
+    return value;
 }
 
 template class BaseSetting<int>;
@@ -360,10 +359,12 @@ void GlobalConfig::resetOverriden()
         config->resetOverriden();
 }
 
-void GlobalConfig::toJSON(JSONObject & out)
+nlohmann::json GlobalConfig::toJSON()
 {
+    auto res = nlohmann::json::object();
     for (auto & config : *configRegistrations)
-        config->toJSON(out);
+        res.update(config->toJSON());
+    return res;
 }
 
 void GlobalConfig::convertToArgs(Args & args, const std::string & category)
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 66073546e..2b4265806 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -4,6 +4,8 @@
 
 #include "types.hh"
 
+#include <nlohmann/json_fwd.hpp>
+
 #pragma once
 
 namespace nix {
@@ -42,8 +44,6 @@ namespace nix {
 
 class Args;
 class AbstractSetting;
-class JSONPlaceholder;
-class JSONObject;
 
 class AbstractConfig
 {
@@ -97,7 +97,7 @@ public:
      * Outputs all settings to JSON
      * - out: JSONObject to write the configuration to
      */
-    virtual void toJSON(JSONObject & out) = 0;
+    virtual nlohmann::json toJSON() = 0;
 
     /**
      * Converts settings to `Args` to be used on the command line interface
@@ -167,7 +167,7 @@ public:
 
     void resetOverriden() override;
 
-    void toJSON(JSONObject & out) override;
+    nlohmann::json toJSON() override;
 
     void convertToArgs(Args & args, const std::string & category) override;
 };
@@ -206,7 +206,7 @@ protected:
 
     virtual std::string to_string() const = 0;
 
-    virtual void toJSON(JSONPlaceholder & out);
+    virtual nlohmann::json toJSON();
 
     virtual void convertToArg(Args & args, const std::string & category);
 
@@ -251,7 +251,7 @@ public:
 
     void convertToArg(Args & args, const std::string & category) override;
 
-    void toJSON(JSONPlaceholder & out) override;
+    nlohmann::json toJSON() override;
 };
 
 template<typename T>
@@ -319,7 +319,7 @@ struct GlobalConfig : public AbstractConfig
 
     void resetOverriden() override;
 
-    void toJSON(JSONObject & out) override;
+    nlohmann::json toJSON() override;
 
     void convertToArgs(Args & args, const std::string & category) override;
 
diff --git a/src/nix/show-config.cc b/src/nix/show-config.cc
index 4fd8886de..3ed1ad2aa 100644
--- a/src/nix/show-config.cc
+++ b/src/nix/show-config.cc
@@ -2,7 +2,8 @@
 #include "common-args.hh"
 #include "shared.hh"
 #include "store-api.hh"
-#include "json.hh"
+
+#include <nlohmann/json.hpp>
 
 using namespace nix;
 
@@ -19,8 +20,7 @@ struct CmdShowConfig : Command, MixJSON
     {
         if (json) {
             // FIXME: use appropriate JSON types (bool, ints, etc).
-            JSONObject jsonObj(std::cout);
-            globalConfig.toJSON(jsonObj);
+            logger->stdout("%s", globalConfig.toJSON().dump());
         } else {
             std::map<std::string, Config::SettingInfo> settings;
             globalConfig.getSettings(settings);

From 3c4f8c91759ac5ed6a211f8e72b9d4e8438db833 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Aug 2020 11:13:17 +0200
Subject: [PATCH 070/176] List deprecated option aliases in the docs

---
 doc/manual/generate-options.jq | 9 +++++++--
 src/libutil/config.cc          | 1 +
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/manual/generate-options.jq b/doc/manual/generate-options.jq
index e0cf496d6..ccf62e8ed 100644
--- a/doc/manual/generate-options.jq
+++ b/doc/manual/generate-options.jq
@@ -1,11 +1,16 @@
 . | to_entries | sort_by(.key) | map(
   "  - `" + .key + "`  \n\n"
   + (.value.description | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
-  + "    **Default**: " + (
+  + "    **Default:** " + (
       if .value.value == "" or .value.value == []
       then "*empty*"
       elif (.value.value | type) == "array"
       then "`" + (.value.value | join(" ")) + "`"
-      else "`" + (.value.value | tostring) + "`" end)
+      else "`" + (.value.value | tostring) + "`"
+      end)
   + "\n\n"
+  + (if (.value.aliases | length) > 0
+     then "    **Deprecated alias:** " + (.value.aliases | map("`" + . + "`") | join(", ")) + "\n\n"
+     else ""
+     end)
 ) | join("")
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index 4c5b80d49..e5297c653 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -139,6 +139,7 @@ nlohmann::json Config::toJSON()
         if (!s.second.isAlias) {
             auto obj = nlohmann::json::object();
             obj.emplace("description", s.second.setting->description);
+            obj.emplace("aliases", s.second.setting->aliases);
             obj.emplace("value", s.second.setting->toJSON());
             res.emplace(s.first, obj);
         }

From dc2f278c95ce4a73749cbb8221a568201535d46a Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Aug 2020 12:21:46 +0200
Subject: [PATCH 071/176] Allow 'nix' subcommands to provide docs in Markdown
 format

---
 doc/manual/generate-manpage.jq |  6 ++++-
 src/libutil/args.cc            |  4 +++-
 src/libutil/args.hh            |  4 ++++
 src/libutil/config.cc          | 37 ------------------------------
 src/libutil/util.cc            | 41 ++++++++++++++++++++++++++++++++++
 src/libutil/util.hh            |  6 +++++
 src/nix/add-to-store.cc        |  8 +++++++
 src/nix/repl.cc                |  2 +-
 8 files changed, 68 insertions(+), 40 deletions(-)

diff --git a/doc/manual/generate-manpage.jq b/doc/manual/generate-manpage.jq
index d3cf1c601..dd632f162 100644
--- a/doc/manual/generate-manpage.jq
+++ b/doc/manual/generate-manpage.jq
@@ -12,7 +12,7 @@ def show_flags:
   ;
 
 def show_synopsis:
-  "`" + .command + "` " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n\n"
+  "`" + .command + "` [*flags*...] " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n\n"
   ;
 
 def show_command:
@@ -21,6 +21,10 @@ def show_command:
   + "`" + .command + "` - " + .def.description + "\n\n"
   + .section + " Synopsis\n\n"
   + ({"command": .command, "args": .def.args} | show_synopsis)
+  + (if .def | has("doc")
+     then .section + " Description\n\n" + .def.doc + "\n\n"
+     else ""
+     end)
   + (if (.def.flags | length) > 0 then
       .section + " Flags\n\n"
       + (.def | show_flags)
diff --git a/src/libutil/args.cc b/src/libutil/args.cc
index ad83a2414..147602415 100644
--- a/src/libutil/args.cc
+++ b/src/libutil/args.cc
@@ -359,12 +359,14 @@ nlohmann::json Command::toJSON()
     for (auto & example : examples()) {
         auto ex = nlohmann::json::object();
         ex["description"] = example.description;
-        ex["command"] = example.command;
+        ex["command"] = chomp(stripIndentation(example.command));
         exs.push_back(std::move(ex));
     }
 
     auto res = Args::toJSON();
     res["examples"] = std::move(exs);
+    auto s = doc();
+    if (s != "") res.emplace("doc", stripIndentation(s));
     return res;
 }
 
diff --git a/src/libutil/args.hh b/src/libutil/args.hh
index c56044f1d..3c1f87f7e 100644
--- a/src/libutil/args.hh
+++ b/src/libutil/args.hh
@@ -22,6 +22,7 @@ public:
 
     virtual void printHelp(const string & programName, std::ostream & out);
 
+    /* Return a short one-line description of the command. */
     virtual std::string description() { return ""; }
 
 protected:
@@ -221,6 +222,9 @@ struct Command : virtual Args
     virtual void prepare() { };
     virtual void run() = 0;
 
+    /* Return documentation about this command, in Markdown format. */
+    virtual std::string doc() { return ""; }
+
     struct Example
     {
         std::string description;
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index e5297c653..3cf720bce 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -153,43 +153,6 @@ void Config::convertToArgs(Args & args, const std::string & category)
             s.second.setting->convertToArg(args, category);
 }
 
-static std::string stripIndentation(std::string_view s)
-{
-    size_t minIndent = 10000;
-    size_t curIndent = 0;
-    bool atStartOfLine = true;
-
-    for (auto & c : s) {
-        if (atStartOfLine && c == ' ')
-            curIndent++;
-        else if (c == '\n') {
-            if (atStartOfLine)
-                minIndent = std::max(minIndent, curIndent);
-            curIndent = 0;
-            atStartOfLine = true;
-        } else {
-            if (atStartOfLine) {
-                minIndent = std::min(minIndent, curIndent);
-                atStartOfLine = false;
-            }
-        }
-    }
-
-    std::string res;
-
-    size_t pos = 0;
-    while (pos < s.size()) {
-        auto eol = s.find('\n', pos);
-        if (eol == s.npos) eol = s.size();
-        if (eol - pos > minIndent)
-            res.append(s.substr(pos + minIndent, eol - pos - minIndent));
-        res.push_back('\n');
-        pos = eol + 1;
-    }
-
-    return res;
-}
-
 AbstractSetting::AbstractSetting(
     const std::string & name,
     const std::string & description,
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index c0b9698ee..9e7142e01 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -1464,6 +1464,47 @@ string base64Decode(std::string_view s)
 }
 
 
+std::string stripIndentation(std::string_view s)
+{
+    size_t minIndent = 10000;
+    size_t curIndent = 0;
+    bool atStartOfLine = true;
+
+    for (auto & c : s) {
+        if (atStartOfLine && c == ' ')
+            curIndent++;
+        else if (c == '\n') {
+            if (atStartOfLine)
+                minIndent = std::max(minIndent, curIndent);
+            curIndent = 0;
+            atStartOfLine = true;
+        } else {
+            if (atStartOfLine) {
+                minIndent = std::min(minIndent, curIndent);
+                atStartOfLine = false;
+            }
+        }
+    }
+
+    std::string res;
+
+    size_t pos = 0;
+    while (pos < s.size()) {
+        auto eol = s.find('\n', pos);
+        if (eol == s.npos) eol = s.size();
+        if (eol - pos > minIndent)
+            res.append(s.substr(pos + minIndent, eol - pos - minIndent));
+        res.push_back('\n');
+        pos = eol + 1;
+    }
+
+    return res;
+}
+
+
+//////////////////////////////////////////////////////////////////////
+
+
 static Sync<std::pair<unsigned short, unsigned short>> windowSize{{0, 0}};
 
 
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 3a20679a8..082e26375 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -464,6 +464,12 @@ string base64Encode(std::string_view s);
 string base64Decode(std::string_view s);
 
 
+/* Remove common leading whitespace from the lines in the string
+   's'. For example, if every line is indented by at least 3 spaces,
+   then we remove 3 spaces from the start of every line. */
+std::string stripIndentation(std::string_view s);
+
+
 /* Get a value for the specified key from an associate container. */
 template <class T>
 std::optional<typename T::mapped_type> get(const T & map, const typename T::key_type & key)
diff --git a/src/nix/add-to-store.cc b/src/nix/add-to-store.cc
index 713155840..023ffa4ed 100644
--- a/src/nix/add-to-store.cc
+++ b/src/nix/add-to-store.cc
@@ -36,6 +36,14 @@ struct CmdAddToStore : MixDryRun, StoreCommand
         return "add a path to the Nix store";
     }
 
+    std::string doc() override
+    {
+        return R"(
+          Copy the file or directory *path* to the Nix store, and
+          print the resulting store path on standard output.
+        )";
+    }
+
     Examples examples() override
     {
         return {
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index a74655200..0cbe9643c 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -782,7 +782,7 @@ struct CmdRepl : StoreCommand, MixEvalArgs
         return {
           Example{
             "Display all special commands within the REPL:",
-              "nix repl\n  nix-repl> :?"
+            "nix repl\nnix-repl> :?"
           }
         };
     }

From 25ecfffdc322d8df5834e6add1c5e28fcf2818f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 20 Aug 2020 12:34:04 +0200
Subject: [PATCH 072/176] Remove PrimOp constructor

---
 src/libexpr/eval.cc | 4 ++--
 src/libexpr/eval.hh | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 0123070d1..9a155c055 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -509,7 +509,7 @@ Value * EvalState::addPrimOp(const string & name,
     if (arity == 0) {
         auto vPrimOp = allocValue();
         vPrimOp->type = tPrimOp;
-        vPrimOp->primOp = new PrimOp(primOp, 1, sym);
+        vPrimOp->primOp = new PrimOp { .fun = primOp, .arity = 1, .name = sym };
         Value v;
         mkApp(v, *vPrimOp, *vPrimOp);
         return addConstant(name, v);
@@ -517,7 +517,7 @@ Value * EvalState::addPrimOp(const string & name,
 
     Value * v = allocValue();
     v->type = tPrimOp;
-    v->primOp = new PrimOp(primOp, arity, sym);
+    v->primOp = new PrimOp { .fun = primOp, .arity = arity, .name = sym };
     staticBaseEnv.vars[symbols.create(name)] = baseEnvDispl;
     baseEnv.values[baseEnvDispl++] = v;
     baseEnv.values[0]->attrs->push_back(Attr(sym, v));
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 1db3aa766..38e025a3d 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -30,8 +30,6 @@ struct PrimOp
     PrimOpFun fun;
     size_t arity;
     Symbol name;
-    PrimOp(PrimOpFun fun, size_t arity, Symbol name)
-        : fun(fun), arity(arity), name(name) { }
 };
 
 

From 8ce88adad9728142e1f11f7e00d2f31925f8fdd1 Mon Sep 17 00:00:00 2001
From: Rok Garbas <rok@garbas.si>
Date: Thu, 20 Aug 2020 13:21:22 +0200
Subject: [PATCH 073/176] set Content-Type to "text/plain" for install script

fixes #3947
---
 maintainers/upload-release.pl | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/upload-release.pl b/maintainers/upload-release.pl
index 91ae896d6..6f3882a12 100755
--- a/maintainers/upload-release.pl
+++ b/maintainers/upload-release.pl
@@ -117,7 +117,16 @@ for my $fn (glob "$tmpDir/*") {
     my $dstKey = "$releaseDir/" . $name;
     unless (defined $releasesBucket->head_key($dstKey)) {
         print STDERR "uploading $fn to s3://$releasesBucketName/$dstKey...\n";
-        $releasesBucket->add_key_filename($dstKey, $fn)
+
+        my $configuration = ();
+        $configuration->{content_type} = "application/octet-stream";
+
+        if ($fn =~ /.sha256|.asc|install/) {
+            # Text files
+            $configuration->{content_type} = "text/plain";
+        }
+
+        $releasesBucket->add_key_filename($dstKey, $fn, $configuration)
             or die $releasesBucket->err . ": " . $releasesBucket->errstr;
     }
 }

From 9a9d834dc7bde0a4eafa2f7412e7a2f0df8c3262 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 20 Aug 2020 14:12:51 +0000
Subject: [PATCH 074/176] Rename drv output querying functions

 - `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap`
 - `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap`
---
 src/libstore/build.cc        | 4 ++--
 src/libstore/daemon.cc       | 2 +-
 src/libstore/local-store.cc  | 2 +-
 src/libstore/local-store.hh  | 2 +-
 src/libstore/remote-store.cc | 2 +-
 src/libstore/remote-store.hh | 2 +-
 src/libstore/store-api.cc    | 6 +++---
 src/libstore/store-api.hh    | 6 +++---
 src/nix-env/nix-env.cc       | 2 +-
 9 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index b47aeff3b..5592b32eb 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2756,11 +2756,11 @@ struct RestrictedStore : public LocalFSStore
     void queryReferrers(const StorePath & path, StorePathSet & referrers) override
     { }
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override
     {
         if (!goal.isAllowed(path))
             throw InvalidPath("cannot query output map for unknown path '%s' in recursive Nix", printStorePath(path));
-        return next->queryDerivationOutputMap(path);
+        return next->queryPartialDerivationOutputMap(path);
     }
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 9503915eb..0580101a2 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -325,7 +325,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
     case wopQueryDerivationOutputMap: {
         auto path = store->parseStorePath(readString(from));
         logger->startWork();
-        auto outputs = store->queryDerivationOutputMap(path);
+        auto outputs = store->queryPartialDerivationOutputMap(path);
         logger->stopWork();
         worker_proto::write(*store, to, outputs);
         break;
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index e96091aae..218b56861 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -782,7 +782,7 @@ StorePathSet LocalStore::queryValidDerivers(const StorePath & path)
 }
 
 
-std::map<std::string, std::optional<StorePath>> LocalStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> LocalStore::queryPartialDerivationOutputMap(const StorePath & path)
 {
     std::map<std::string, std::optional<StorePath>> outputs;
     BasicDerivation drv = readDerivation(path);
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 627b1f557..5af12c2b2 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -133,7 +133,7 @@ public:
 
     StorePathSet queryValidDerivers(const StorePath & path) override;
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override;
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 005415666..3ee907d1a 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -474,7 +474,7 @@ StorePathSet RemoteStore::queryDerivationOutputs(const StorePath & path)
 }
 
 
-std::map<std::string, std::optional<StorePath>> RemoteStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> RemoteStore::queryPartialDerivationOutputMap(const StorePath & path)
 {
     auto conn(getConnection());
     conn->to << wopQueryDerivationOutputMap << printStorePath(path);
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 4b093ad3b..b319e774b 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -51,7 +51,7 @@ public:
 
     StorePathSet queryDerivationOutputs(const StorePath & path) override;
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override;
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
     StorePathSet querySubstitutablePaths(const StorePathSet & paths) override;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index e66c04df4..7e016ac2e 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -357,8 +357,8 @@ bool Store::PathInfoCacheValue::isKnownNow()
     return std::chrono::steady_clock::now() < time_point + ttl;
 }
 
-OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path) {
-    auto resp = queryDerivationOutputMap(path);
+OutputPathMap Store::queryDerivationOutputMap(const StorePath & path) {
+    auto resp = queryPartialDerivationOutputMap(path);
     OutputPathMap result;
     for (auto & [outName, optOutPath] : resp) {
         if (!optOutPath)
@@ -370,7 +370,7 @@ OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path)
 
 StorePathSet Store::queryDerivationOutputs(const StorePath & path)
 {
-    auto outputMap = this->queryDerivationOutputMapAssumeTotal(path);
+    auto outputMap = this->queryDerivationOutputMap(path);
     StorePathSet outputPaths;
     for (auto & i: outputMap) {
         outputPaths.emplace(std::move(i.second));
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 9003ab541..68d66be7c 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -343,12 +343,12 @@ public:
     /* Query the mapping outputName => outputPath for the given derivation. All
        outputs are mentioned so ones mising the mapping are mapped to
        `std::nullopt`.  */
-    virtual std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path)
-    { unsupported("queryDerivationOutputMap"); }
+    virtual std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path)
+    { unsupported("queryPartialDerivationOutputMap"); }
 
     /* Query the mapping outputName=>outputPath for the given derivation.
        Assume every output has a mapping and throw an exception otherwise. */
-    OutputPathMap queryDerivationOutputMapAssumeTotal(const StorePath & path);
+    OutputPathMap queryDerivationOutputMap(const StorePath & path);
 
     /* Query the full store path given the hash part of a valid store
        path, or empty if the path doesn't exist. */
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index d36804658..ddd036070 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -381,7 +381,7 @@ static void queryInstSources(EvalState & state,
 
                 if (path.isDerivation()) {
                     elem.setDrvPath(state.store->printStorePath(path));
-                    auto outputs = state.store->queryDerivationOutputMapAssumeTotal(path);
+                    auto outputs = state.store->queryDerivationOutputMap(path);
                     elem.setOutPath(state.store->printStorePath(outputs.at("out")));
                     if (name.size() >= drvExtension.size() &&
                         string(name, name.size() - drvExtension.size()) == drvExtension)

From 45a2f1baaba8dbd4a4fb27b6ab9baee3c2820220 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 20 Aug 2020 18:14:12 +0000
Subject: [PATCH 075/176] Rename drv output querying functions, like master

 - `queryDerivationOutputMapAssumeTotal` -> `queryPartialDerivationOutputMap`
 - `queryDerivationOutputMapAssumeTotal` -> `queryDerivationOutputMap
---
 src/libexpr/primops.cc       |  2 +-
 src/libstore/build.cc        | 26 +++++++++++++-------------
 src/libstore/daemon.cc       |  2 +-
 src/libstore/local-store.cc  |  2 +-
 src/libstore/local-store.hh  |  2 +-
 src/libstore/misc.cc         |  2 +-
 src/libstore/remote-store.cc |  2 +-
 src/libstore/remote-store.hh |  2 +-
 src/libstore/store-api.cc    |  6 +++---
 src/libstore/store-api.hh    |  6 +++---
 src/nix-build/nix-build.cc   |  2 +-
 src/nix-env/nix-env.cc       |  2 +-
 src/nix-store/nix-store.cc   |  2 +-
 src/nix/build.cc             |  2 +-
 src/nix/repl.cc              |  2 +-
 15 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index e6391f509..c3d01eea3 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -64,7 +64,7 @@ void EvalState::realiseContext(const PathSet & context)
        paths. */
     if (allowedPaths) {
         for (auto & [drvPath, outputs] : drvs) {
-            auto outputPaths = store->queryDerivationOutputMapAssumeTotal(drvPath);
+            auto outputPaths = store->queryDerivationOutputMap(drvPath);
             for (auto & outputName : outputs) {
                 if (outputPaths.count(outputName) == 0)
                     throw Error("derivation '%s' does not have an output named '%s'",
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index db93d6092..ba28e78c8 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1041,8 +1041,8 @@ private:
     /* Wrappers around the corresponding Store methods that first consult the
        derivation.  This is currently needed because when there is no drv file
        there also is no DB entry. */
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap();
-    OutputPathMap queryDerivationOutputMapAssumeTotal();
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap();
+    OutputPathMap queryDerivationOutputMap();
 
     /* Return the set of (in)valid paths. */
     void checkPathValidity();
@@ -1367,7 +1367,7 @@ void DerivationGoal::repairClosure()
        that produced those outputs. */
 
     /* Get the output closure. */
-    auto outputs = queryDerivationOutputMapAssumeTotal();
+    auto outputs = queryDerivationOutputMap();
     StorePathSet outputClosure;
     for (auto & i : outputs) {
         if (!wantOutput(i.first, wantedOutputs)) continue;
@@ -1386,7 +1386,7 @@ void DerivationGoal::repairClosure()
     std::map<StorePath, StorePath> outputsToDrv;
     for (auto & i : inputClosure)
         if (i.isDerivation()) {
-            auto depOutputs = worker.store.queryDerivationOutputMap(i);
+            auto depOutputs = worker.store.queryPartialDerivationOutputMap(i);
             for (auto & j : depOutputs)
                 if (j.second)
                     outputsToDrv.insert_or_assign(*j.second, i);
@@ -1457,7 +1457,7 @@ void DerivationGoal::inputsRealised()
                `i' as input paths.  Only add the closures of output paths
                that are specified as inputs. */
             assert(worker.store.isValidPath(drvPath));
-            auto outputs = worker.store.queryDerivationOutputMap(depDrvPath);
+            auto outputs = worker.store.queryPartialDerivationOutputMap(depDrvPath);
             for (auto & j : wantedDepOutputs) {
                 if (outputs.count(j) > 0) {
                     auto optRealizedInput = outputs.at(j);
@@ -2912,11 +2912,11 @@ struct RestrictedStore : public LocalFSStore
     void queryReferrers(const StorePath & path, StorePathSet & referrers) override
     { }
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override
     {
         if (!goal.isAllowed(path))
             throw InvalidPath("cannot query output map for unknown path '%s' in recursive Nix", printStorePath(path));
-        return next->queryDerivationOutputMap(path);
+        return next->queryPartialDerivationOutputMap(path);
     }
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override
@@ -2979,7 +2979,7 @@ struct RestrictedStore : public LocalFSStore
 
         for (auto & path : paths) {
             if (!path.path.isDerivation()) continue;
-            auto outputs = next->queryDerivationOutputMapAssumeTotal(path.path);
+            auto outputs = next->queryDerivationOutputMap(path.path);
             for (auto & output : outputs)
                 if (wantOutput(output.first, path.outputs))
                     newPaths.insert(output.second);
@@ -4548,7 +4548,7 @@ void DerivationGoal::flushLine()
 }
 
 
-std::map<std::string, std::optional<StorePath>> DerivationGoal::queryDerivationOutputMap()
+std::map<std::string, std::optional<StorePath>> DerivationGoal::queryPartialDerivationOutputMap()
 {
     if (drv->type() != DerivationType::CAFloating) {
         std::map<std::string, std::optional<StorePath>> res;
@@ -4556,11 +4556,11 @@ std::map<std::string, std::optional<StorePath>> DerivationGoal::queryDerivationO
             res.insert_or_assign(name, output.pathOpt(worker.store, drv->name, name));
         return res;
     } else {
-        return worker.store.queryDerivationOutputMap(drvPath);
+        return worker.store.queryPartialDerivationOutputMap(drvPath);
     }
 }
 
-OutputPathMap DerivationGoal::queryDerivationOutputMapAssumeTotal()
+OutputPathMap DerivationGoal::queryDerivationOutputMap()
 {
     if (drv->type() != DerivationType::CAFloating) {
         OutputPathMap res;
@@ -4568,7 +4568,7 @@ OutputPathMap DerivationGoal::queryDerivationOutputMapAssumeTotal()
             res.insert_or_assign(name, *output.second);
         return res;
     } else {
-        return worker.store.queryDerivationOutputMapAssumeTotal(drvPath);
+        return worker.store.queryDerivationOutputMap(drvPath);
     }
 }
 
@@ -4576,7 +4576,7 @@ OutputPathMap DerivationGoal::queryDerivationOutputMapAssumeTotal()
 void DerivationGoal::checkPathValidity()
 {
     bool checkHash = buildMode == bmRepair;
-    for (auto & i : queryDerivationOutputMap()) {
+    for (auto & i : queryPartialDerivationOutputMap()) {
         InitialOutputStatus status {
             .wanted = wantOutput(i.first, wantedOutputs),
         };
diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index 046dfbe6e..a4eeebaab 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -325,7 +325,7 @@ static void performOp(TunnelLogger * logger, ref<Store> store,
     case wopQueryDerivationOutputMap: {
         auto path = store->parseStorePath(readString(from));
         logger->startWork();
-        auto outputs = store->queryDerivationOutputMap(path);
+        auto outputs = store->queryPartialDerivationOutputMap(path);
         logger->stopWork();
         worker_proto::write(*store, to, outputs);
         break;
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 634a8046b..0086bb13e 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -803,7 +803,7 @@ StorePathSet LocalStore::queryValidDerivers(const StorePath & path)
 }
 
 
-std::map<std::string, std::optional<StorePath>> LocalStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> LocalStore::queryPartialDerivationOutputMap(const StorePath & path)
 {
     std::map<std::string, std::optional<StorePath>> outputs;
     BasicDerivation drv = readDerivation(path);
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index bf4016b13..4d99e5cf6 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -133,7 +133,7 @@ public:
 
     StorePathSet queryValidDerivers(const StorePath & path) override;
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override;
 
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index 9024fb2bd..da3981696 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -207,7 +207,7 @@ void Store::queryMissing(const std::vector<StorePathWithOutputs> & targets,
             /* true for regular derivations, and CA derivations for which we
                have a trust mapping for all wanted outputs. */
             auto knownOutputPaths = true;
-            for (auto & [outputName, pathOpt] : queryDerivationOutputMap(path.path)) {
+            for (auto & [outputName, pathOpt] : queryPartialDerivationOutputMap(path.path)) {
                 if (!pathOpt) {
                     knownOutputPaths = false;
                     break;
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 1b1260900..adba17c5e 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -474,7 +474,7 @@ StorePathSet RemoteStore::queryDerivationOutputs(const StorePath & path)
 }
 
 
-std::map<std::string, std::optional<StorePath>> RemoteStore::queryDerivationOutputMap(const StorePath & path)
+std::map<std::string, std::optional<StorePath>> RemoteStore::queryPartialDerivationOutputMap(const StorePath & path)
 {
     auto conn(getConnection());
     conn->to << wopQueryDerivationOutputMap << printStorePath(path);
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 4b093ad3b..b319e774b 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -51,7 +51,7 @@ public:
 
     StorePathSet queryDerivationOutputs(const StorePath & path) override;
 
-    std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path) override;
+    std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path) override;
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override;
 
     StorePathSet querySubstitutablePaths(const StorePathSet & paths) override;
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 1f10f0663..09608646e 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -366,8 +366,8 @@ bool Store::PathInfoCacheValue::isKnownNow()
     return std::chrono::steady_clock::now() < time_point + ttl;
 }
 
-OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path) {
-    auto resp = queryDerivationOutputMap(path);
+OutputPathMap Store::queryDerivationOutputMap(const StorePath & path) {
+    auto resp = queryPartialDerivationOutputMap(path);
     OutputPathMap result;
     for (auto & [outName, optOutPath] : resp) {
         if (!optOutPath)
@@ -379,7 +379,7 @@ OutputPathMap Store::queryDerivationOutputMapAssumeTotal(const StorePath & path)
 
 StorePathSet Store::queryDerivationOutputs(const StorePath & path)
 {
-    auto outputMap = this->queryDerivationOutputMapAssumeTotal(path);
+    auto outputMap = this->queryDerivationOutputMap(path);
     StorePathSet outputPaths;
     for (auto & i: outputMap) {
         outputPaths.emplace(std::move(i.second));
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 58e9b16c6..6583413a6 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -348,12 +348,12 @@ public:
     /* Query the mapping outputName => outputPath for the given derivation. All
        outputs are mentioned so ones mising the mapping are mapped to
        `std::nullopt`.  */
-    virtual std::map<std::string, std::optional<StorePath>> queryDerivationOutputMap(const StorePath & path)
-    { unsupported("queryDerivationOutputMap"); }
+    virtual std::map<std::string, std::optional<StorePath>> queryPartialDerivationOutputMap(const StorePath & path)
+    { unsupported("queryPartialDerivationOutputMap"); }
 
     /* Query the mapping outputName=>outputPath for the given derivation.
        Assume every output has a mapping and throw an exception otherwise. */
-    OutputPathMap queryDerivationOutputMapAssumeTotal(const StorePath & path);
+    OutputPathMap queryDerivationOutputMap(const StorePath & path);
 
     /* Query the full store path given the hash part of a valid store
        path, or empty if the path doesn't exist. */
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index be73ea724..ea4b407e7 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -518,7 +518,7 @@ static void _main(int argc, char * * argv)
             if (counter)
                 drvPrefix += fmt("-%d", counter + 1);
 
-            auto builtOutputs = store->queryDerivationOutputMapAssumeTotal(drvPath);
+            auto builtOutputs = store->queryDerivationOutputMap(drvPath);
 
             for (auto & outputName : wantedOutputs) {
                 auto outputPath = builtOutputs.at(outputName);
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index d36804658..ddd036070 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -381,7 +381,7 @@ static void queryInstSources(EvalState & state,
 
                 if (path.isDerivation()) {
                     elem.setDrvPath(state.store->printStorePath(path));
-                    auto outputs = state.store->queryDerivationOutputMapAssumeTotal(path);
+                    auto outputs = state.store->queryDerivationOutputMap(path);
                     elem.setOutPath(state.store->printStorePath(outputs.at("out")));
                     if (name.size() >= drvExtension.size() &&
                         string(name, name.size() - drvExtension.size()) == drvExtension)
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index cfe97f061..ce5de2ae5 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -65,7 +65,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
 
     if (path.path.isDerivation()) {
         if (build) store->buildPaths({path});
-        auto outputPaths = store->queryDerivationOutputMapAssumeTotal(path.path);
+        auto outputPaths = store->queryDerivationOutputMap(path.path);
         Derivation drv = store->derivationFromPath(path.path);
         rootNr++;
 
diff --git a/src/nix/build.cc b/src/nix/build.cc
index a66e8dac4..cb12ee933 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -74,7 +74,7 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile
                             store2->addPermRoot(bo.path, absPath(symlink), true);
                         },
                         [&](BuildableFromDrv bfd) {
-                            auto builtOutputs = store->queryDerivationOutputMapAssumeTotal(bfd.drvPath);
+                            auto builtOutputs = store->queryDerivationOutputMap(bfd.drvPath);
                             for (auto & output : builtOutputs) {
                                 std::string symlink = outLink;
                                 if (i) symlink += fmt("-%d", i);
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 0224f891d..2bde85cb7 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -488,7 +488,7 @@ bool NixRepl::processLine(string line)
                but doing it in a child makes it easier to recover from
                problems / SIGINT. */
             if (runProgram(settings.nixBinDir + "/nix", Strings{"build", "--no-link", drvPath}) == 0) {
-                auto outputs = state->store->queryDerivationOutputMapAssumeTotal(state->store->parseStorePath(drvPath));
+                auto outputs = state->store->queryDerivationOutputMap(state->store->parseStorePath(drvPath));
                 std::cout << std::endl << "this derivation produced the following outputs:" << std::endl;
                 for (auto & i : outputs)
                     std::cout << fmt("  %s -> %s\n", i.first, state->store->printStorePath(i.second));

From 422affe1027058c7807adec0dac1aee09b65ec4c Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 21 Aug 2020 19:19:14 +0000
Subject: [PATCH 076/176] tabs -> spaces

Sorry I let the tab sneak in there in the first place.
---
 src/libstore/remote-store.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index c2c6eff66..adba17c5e 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -74,7 +74,7 @@ void write(const Store & store, Sink & out, const StorePath & storePath)
 template<>
 std::optional<StorePath> read(const Store & store, Source & from, Phantom<std::optional<StorePath>> _)
 {
-	auto s = readString(from);
+    auto s = readString(from);
     return s == "" ? std::optional<StorePath> {} : store.parseStorePath(s);
 }
 

From 3a7b330b64c6ea77e18a0a96aad7fb14947382d9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 21 Aug 2020 19:35:35 +0000
Subject: [PATCH 077/176] "Downstream placeholders" should not be store paths

Insead they should be opaque `/<hash>` like the placeholders we already
have.
---
 src/libexpr/primops.cc      | 6 +++---
 src/libstore/derivations.cc | 8 +++-----
 src/libstore/derivations.hh | 2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 0ddba6384..d28024639 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -82,13 +82,13 @@ static void mkOutputString(EvalState & state, Value & v,
     auto optOutputPath = o.second.pathOpt(*state.store, drv.name, o.first);
     mkString(
         *state.allocAttr(v, state.symbols.create(o.first)),
-        state.store->printStorePath(optOutputPath
-            ? *optOutputPath
+        optOutputPath
+            ? state.store->printStorePath(*optOutputPath)
             /* Downstream we would substitute this for an actual path once
                we build the floating CA derivation */
             /* FIXME: we need to depend on the basic derivation, not
                derivation */
-            : downstreamPlaceholder(*state.store, drvPath, o.first)),
+            : downstreamPlaceholder(*state.store, drvPath, o.first),
         {"!" + o.first + "!" + state.store->printStorePath(drvPath)});
 }
 
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index fb1d06466..5319c1a38 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -664,14 +664,12 @@ std::string hashPlaceholder(const std::string & outputName)
     return "/" + hashString(htSHA256, "nix-output:" + outputName).to_string(Base32, false);
 }
 
-StorePath downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName)
+std::string downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName)
 {
     auto drvNameWithExtension = drvPath.name();
     auto drvName = drvNameWithExtension.substr(0, drvNameWithExtension.size() - 4);
-    return store.makeStorePath(
-        "downstream-placeholder:" + std::string { drvPath.name() } + ":" + std::string { outputName },
-        "compressed:" + std::string { drvPath.hashPart() },
-        outputPathName(drvName, outputName));
+    auto clearText = "nix-upstream-output:" + std::string { drvPath.hashPart() } + ":" + outputPathName(drvName, outputName);
+    return "/" + hashString(htSHA256, clearText).to_string(Base32, false);
 }
 
 }
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 49374d046..76f983561 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -196,6 +196,6 @@ void writeDerivation(Sink & out, const Store & store, const BasicDerivation & dr
 
 std::string hashPlaceholder(const std::string & outputName);
 
-StorePath downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName);
+std::string downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName);
 
 }

From 35e6288be1a2384a29caccd64d88a6b623e6c033 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Sun, 23 Aug 2020 15:00:25 +0000
Subject: [PATCH 078/176] `writeDerivation` just needs a plain store reference

---
 src/libexpr/primops.cc      | 2 +-
 src/libstore/derivations.cc | 8 ++++----
 src/libstore/derivations.hh | 2 +-
 src/nix/develop.cc          | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 30f4c3529..dcc34407b 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -839,7 +839,7 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     }
 
     /* Write the resulting term into the Nix store directory. */
-    auto drvPath = writeDerivation(state.store, drv, state.repair);
+    auto drvPath = writeDerivation(*state.store, drv, state.repair);
     auto drvPathS = state.store->printStorePath(drvPath);
 
     printMsg(lvlChatty, "instantiated '%1%' -> '%2%'", drvName, drvPathS);
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index a9fed2564..43bc61e55 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -61,7 +61,7 @@ bool BasicDerivation::isBuiltin() const
 }
 
 
-StorePath writeDerivation(ref<Store> store,
+StorePath writeDerivation(Store & store,
     const Derivation & drv, RepairFlag repair)
 {
     auto references = drv.inputSrcs;
@@ -71,10 +71,10 @@ StorePath writeDerivation(ref<Store> store,
        (that can be missing (of course) and should not necessarily be
        held during a garbage collection). */
     auto suffix = std::string(drv.name) + drvExtension;
-    auto contents = drv.unparse(*store, false);
+    auto contents = drv.unparse(store, false);
     return settings.readOnlyMode
-        ? store->computeStorePathForText(suffix, contents, references)
-        : store->addTextToStore(suffix, contents, references, repair);
+        ? store.computeStorePathForText(suffix, contents, references)
+        : store.addTextToStore(suffix, contents, references, repair);
 }
 
 
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 3aae30ab2..9656a32f2 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -146,7 +146,7 @@ class Store;
 enum RepairFlag : bool { NoRepair = false, Repair = true };
 
 /* Write a derivation to the Nix store, and return its path. */
-StorePath writeDerivation(ref<Store> store,
+StorePath writeDerivation(Store & store,
     const Derivation & drv, RepairFlag repair = NoRepair);
 
 /* Read a derivation from a file. */
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 9aaa80822..8a14e45c9 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -138,7 +138,7 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
                 .path = shellOutPath
             } });
     drv.env["out"] = store->printStorePath(shellOutPath);
-    auto shellDrvPath2 = writeDerivation(store, drv);
+    auto shellDrvPath2 = writeDerivation(*store, drv);
 
     /* Build the derivation. */
     store->buildPaths({{shellDrvPath2}});

From 88d5c9ec584f000c9a66ad34631fe4eb5c194172 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 10:37:10 +0200
Subject: [PATCH 079/176] Fix tests

---
 src/libutil/tests/config.cc | 31 +++++++++----------------------
 1 file changed, 9 insertions(+), 22 deletions(-)

diff --git a/src/libutil/tests/config.cc b/src/libutil/tests/config.cc
index 74c59fd31..9465fba3f 100644
--- a/src/libutil/tests/config.cc
+++ b/src/libutil/tests/config.cc
@@ -33,7 +33,7 @@ namespace nix {
         const auto iter = settings.find("name-of-the-setting");
         ASSERT_NE(iter, settings.end());
         ASSERT_EQ(iter->second.value, "");
-        ASSERT_EQ(iter->second.description, "description");
+        ASSERT_EQ(iter->second.description, "description\n");
     }
 
     TEST(Config, getDefinedOverridenSettingNotSet) {
@@ -59,7 +59,7 @@ namespace nix {
         const auto iter = settings.find("name-of-the-setting");
         ASSERT_NE(iter, settings.end());
         ASSERT_EQ(iter->second.value, "value");
-        ASSERT_EQ(iter->second.description, "description");
+        ASSERT_EQ(iter->second.description, "description\n");
     }
 
     TEST(Config, getDefinedSettingSet2) {
@@ -73,7 +73,7 @@ namespace nix {
         const auto e = settings.find("name-of-the-setting");
         ASSERT_NE(e, settings.end());
         ASSERT_EQ(e->second.value, "value");
-        ASSERT_EQ(e->second.description, "description");
+        ASSERT_EQ(e->second.description, "description\n");
     }
 
     TEST(Config, addSetting) {
@@ -152,29 +152,16 @@ namespace nix {
     }
 
     TEST(Config, toJSONOnEmptyConfig) {
-        std::stringstream out;
-        { // Scoped to force the destructor of JSONObject to write the final `}`
-            JSONObject obj(out);
-            Config config;
-            config.toJSON(obj);
-        }
-
-        ASSERT_EQ(out.str(), "{}");
+        ASSERT_EQ(Config().toJSON().dump(), "{}");
     }
 
     TEST(Config, toJSONOnNonEmptyConfig) {
-        std::stringstream out;
-        { // Scoped to force the destructor of JSONObject to write the final `}`
-            JSONObject obj(out);
+        Config config;
+        std::map<std::string, Config::SettingInfo> settings;
+        Setting<std::string> setting{&config, "", "name-of-the-setting", "description"};
+        setting.assign("value");
 
-            Config config;
-            std::map<std::string, Config::SettingInfo> settings;
-            Setting<std::string> setting{&config, "", "name-of-the-setting", "description"};
-            setting.assign("value");
-
-            config.toJSON(obj);
-        }
-        ASSERT_EQ(out.str(), R"#({"name-of-the-setting":{"description":"description","value":"value"}})#");
+        ASSERT_EQ(config.toJSON().dump(), R"#({"name-of-the-setting":{"aliases":[],"description":"description\n","value":"value"}})#");
     }
 
     TEST(Config, setSettingAlias) {

From 33b1679d75f2a3a5dac053431a41897ebf96a3f3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 13:11:56 +0200
Subject: [PATCH 080/176] Allow primops to have Markdown documentation

---
 doc/manual/src/expressions/builtins.md |  3 --
 src/libexpr/eval.cc                    | 28 +++++++++++++++++
 src/libexpr/eval.hh                    |  4 +++
 src/libexpr/primops.cc                 | 43 ++++++++++++++++++++------
 src/libexpr/primops.hh                 |  8 +++--
 src/nix/repl.cc                        | 21 ++++++++++++-
 6 files changed, 92 insertions(+), 15 deletions(-)

diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index 7c4a62f54..c258fb3b3 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -9,9 +9,6 @@ scope. Instead, you can access them through the `builtins` built-in
 value, which is a set that contains all built-in functions and values.
 For instance, `derivation` is also available as `builtins.derivation`.
 
-  - `abort` *s*; `builtins.abort` *s*  
-    Abort Nix expression evaluation, print error message *s*.
-
   - `builtins.add` *e1* *e2*  
     Return the sum of the numbers *e1* and *e2*.
 
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 9a155c055..6ac8bbc9f 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -525,6 +525,34 @@ Value * EvalState::addPrimOp(const string & name,
 }
 
 
+Value * EvalState::addPrimOp(PrimOp && primOp)
+{
+    /* Hack to make constants lazy: turn them into a application of
+       the primop to a dummy value. */
+    if (primOp.arity == 0) {
+        primOp.arity = 1;
+        auto vPrimOp = allocValue();
+        vPrimOp->type = tPrimOp;
+        vPrimOp->primOp = new PrimOp(std::move(primOp));
+        Value v;
+        mkApp(v, *vPrimOp, *vPrimOp);
+        return addConstant(primOp.name, v);
+    }
+
+    Symbol envName = primOp.name;
+    if (hasPrefix(primOp.name, "__"))
+        primOp.name = symbols.create(std::string(primOp.name, 2));
+
+    Value * v = allocValue();
+    v->type = tPrimOp;
+    v->primOp = new PrimOp(std::move(primOp));
+    staticBaseEnv.vars[envName] = baseEnvDispl;
+    baseEnv.values[baseEnvDispl++] = v;
+    baseEnv.values[0]->attrs->push_back(Attr(primOp.name, v));
+    return v;
+}
+
+
 Value & EvalState::getBuiltin(const string & name)
 {
     return *baseEnv.values[0]->attrs->find(symbols.create(name))->value;
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 38e025a3d..db8eb3e16 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -30,6 +30,8 @@ struct PrimOp
     PrimOpFun fun;
     size_t arity;
     Symbol name;
+    std::vector<std::string> args;
+    const char * doc = nullptr;
 };
 
 
@@ -240,6 +242,8 @@ private:
     Value * addPrimOp(const string & name,
         size_t arity, PrimOpFun primOp);
 
+    Value * addPrimOp(PrimOp && primOp);
+
 public:
 
     Value & getBuiltin(const string & name);
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 4e35dedb0..902a37e6b 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -445,12 +445,19 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
 }
 
 
-static void prim_abort(EvalState & state, const Pos & pos, Value * * args, Value & v)
-{
-    PathSet context;
-    string s = state.coerceToString(pos, *args[0], context);
-    throw Abort("evaluation aborted with the following error message: '%1%'", s);
-}
+static RegisterPrimOp primop_abort({
+    .name = "abort",
+    .args = {"s"},
+    .doc = R"(
+      Abort Nix expression evaluation and print the error message *s*.
+    )",
+    .fun = [](EvalState & state, const Pos & pos, Value * * args, Value & v)
+    {
+        PathSet context;
+        string s = state.coerceToString(pos, *args[0], context);
+        throw Abort("evaluation aborted with the following error message: '%1%'", s);
+    }
+});
 
 
 static void prim_throw(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -2238,7 +2245,20 @@ RegisterPrimOp::RegisterPrimOp(std::string name, size_t arity, PrimOpFun fun,
     std::optional<std::string> requiredFeature)
 {
     if (!primOps) primOps = new PrimOps;
-    primOps->push_back({name, arity, fun, requiredFeature});
+    primOps->push_back({
+        .name = name,
+        .args = {},
+        .arity = arity,
+        .requiredFeature = std::move(requiredFeature),
+        .fun = fun
+    });
+}
+
+
+RegisterPrimOp::RegisterPrimOp(Info && info)
+{
+    if (!primOps) primOps = new PrimOps;
+    primOps->push_back(std::move(info));
 }
 
 
@@ -2314,7 +2334,6 @@ void EvalState::createBaseEnv()
     addPrimOp("__isBool", 1, prim_isBool);
     addPrimOp("__isPath", 1, prim_isPath);
     addPrimOp("__genericClosure", 1, prim_genericClosure);
-    addPrimOp("abort", 1, prim_abort);
     addPrimOp("__addErrorContext", 2, prim_addErrorContext);
     addPrimOp("__tryEval", 1, prim_tryEval);
     addPrimOp("__getEnv", 1, prim_getEnv);
@@ -2431,7 +2450,13 @@ void EvalState::createBaseEnv()
     if (RegisterPrimOp::primOps)
         for (auto & primOp : *RegisterPrimOp::primOps)
             if (!primOp.requiredFeature || settings.isExperimentalFeatureEnabled(*primOp.requiredFeature))
-                addPrimOp(primOp.name, primOp.arity, primOp.primOp);
+                addPrimOp({
+                    .fun = primOp.fun,
+                    .arity = std::max(primOp.args.size(), primOp.arity),
+                    .name = symbols.create(primOp.name),
+                    .args = std::move(primOp.args),
+                    .doc = primOp.doc,
+                });
 
     /* Now that we've added all primops, sort the `builtins' set,
        because attribute lookups expect it to be sorted. */
diff --git a/src/libexpr/primops.hh b/src/libexpr/primops.hh
index 75c460ecf..ed5e2ea58 100644
--- a/src/libexpr/primops.hh
+++ b/src/libexpr/primops.hh
@@ -10,9 +10,11 @@ struct RegisterPrimOp
     struct Info
     {
         std::string name;
-        size_t arity;
-        PrimOpFun primOp;
+        std::vector<std::string> args;
+        size_t arity = 0;
+        const char * doc;
         std::optional<std::string> requiredFeature;
+        PrimOpFun fun;
     };
 
     typedef std::vector<Info> PrimOps;
@@ -26,6 +28,8 @@ struct RegisterPrimOp
         size_t arity,
         PrimOpFun fun,
         std::optional<std::string> requiredFeature = {});
+
+    RegisterPrimOp(Info && info);
 };
 
 /* These primops are disabled without enableNativeCode, but plugins
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index 0cbe9643c..d370ca767 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -416,7 +416,8 @@ bool NixRepl::processLine(string line)
              << "  :r            Reload all files\n"
              << "  :s <expr>     Build dependencies of derivation, then start nix-shell\n"
              << "  :t <expr>     Describe result of evaluation\n"
-             << "  :u <expr>     Build derivation, then start nix-shell\n";
+             << "  :u <expr>     Build derivation, then start nix-shell\n"
+             << "  :doc <expr>   Show documentation of a builtin function\n";
     }
 
     else if (command == ":a" || command == ":add") {
@@ -509,6 +510,24 @@ bool NixRepl::processLine(string line)
     else if (command == ":q" || command == ":quit")
         return false;
 
+    else if (command == ":doc") {
+        Value v;
+        evalString(arg, v);
+        if (v.type == tPrimOp || v.type == tPrimOpApp) {
+            auto v2 = &v;
+            while (v2->type == tPrimOpApp)
+                v2 = v2->primOpApp.left;
+            if (v2->primOp->doc) {
+                // FIXME: format markdown.
+                if (!v2->primOp->args.empty())
+                    std::cout << fmt("Arguments: %s\n\n", concatStringsSep(" ", v2->primOp->args));
+                std::cout << trim(stripIndentation(v2->primOp->doc)) << "\n";
+            } else
+                throw Error("builtin function '%s' does not have documentation", v2->primOp->name);
+        } else
+            throw Error("value does not have documentation");
+    }
+
     else if (command != "")
         throw Error("unknown command '%1%'", command);
 

From a990f063ff7afc6028ab430170ad23e1285d1a6d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 14:31:10 +0200
Subject: [PATCH 081/176] Move primop docs inline

This makes them available to 'nix repl'.
---
 doc/manual/src/SUMMARY.md                     |    1 +
 .../src/expressions/builtin-constants.md      |   20 +
 doc/manual/src/expressions/builtins.md        |  878 +-----------
 src/libexpr/primops.cc                        | 1178 +++++++++++++++--
 src/libexpr/primops/fetchTree.cc              |  175 ++-
 5 files changed, 1274 insertions(+), 978 deletions(-)
 create mode 100644 doc/manual/src/expressions/builtin-constants.md

diff --git a/doc/manual/src/SUMMARY.md b/doc/manual/src/SUMMARY.md
index 4089caf8a..8281f683f 100644
--- a/doc/manual/src/SUMMARY.md
+++ b/doc/manual/src/SUMMARY.md
@@ -38,6 +38,7 @@
     - [Operators](expressions/language-operators.md)
     - [Derivations](expressions/derivations.md)
       - [Advanced Attributes](expressions/advanced-attributes.md)
+    - [Built-in Constants](expressions/builtin-constants.md)
     - [Built-in Functions](expressions/builtins.md)
 - [Advanced Topics](advanced-topics/advanced-topics.md)
   - [Remote Builds](advanced-topics/distributed-builds.md)
diff --git a/doc/manual/src/expressions/builtin-constants.md b/doc/manual/src/expressions/builtin-constants.md
new file mode 100644
index 000000000..3345a715b
--- /dev/null
+++ b/doc/manual/src/expressions/builtin-constants.md
@@ -0,0 +1,20 @@
+# Built-in Constants
+
+Here are the constants built into the Nix expression evaluator:
+
+  - `builtins`  
+    The set `builtins` contains all the built-in functions and values.
+    You can use `builtins` to test for the availability of features in
+    the Nix installation, e.g.,
+    
+    ```nix
+    if builtins ? getEnv then builtins.getEnv "PATH" else ""
+    ```
+    
+    This allows a Nix expression to fall back gracefully on older Nix
+    installations that don’t have the desired built-in function.
+
+  - `builtins.currentSystem`  
+    The built-in value `currentSystem` evaluates to the Nix platform
+    identifier for the Nix installation on which the expression is being
+    evaluated, such as `"i686-linux"` or `"x86_64-darwin"`.
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins.md
index c258fb3b3..ae3bb150c 100644
--- a/doc/manual/src/expressions/builtins.md
+++ b/doc/manual/src/expressions/builtins.md
@@ -1,374 +1,20 @@
 # Built-in Functions
 
-This section lists the functions and constants built into the Nix
-expression evaluator. (The built-in function `derivation` is discussed
-above.) Some built-ins, such as `derivation`, are always in scope of
-every Nix expression; you can just access them right away. But to
-prevent polluting the namespace too much, most built-ins are not in
+This section lists the functions built into the Nix expression
+evaluator. (The built-in function `derivation` is discussed above.)
+Some built-ins, such as `derivation`, are always in scope of every Nix
+expression; you can just access them right away. But to prevent
+polluting the namespace too much, most built-ins are not in
 scope. Instead, you can access them through the `builtins` built-in
 value, which is a set that contains all built-in functions and values.
 For instance, `derivation` is also available as `builtins.derivation`.
 
-  - `builtins.add` *e1* *e2*  
-    Return the sum of the numbers *e1* and *e2*.
-
-  - `builtins.all` *pred* *list*  
-    Return `true` if the function *pred* returns `true` for all elements
-    of *list*, and `false` otherwise.
-
-  - `builtins.any` *pred* *list*  
-    Return `true` if the function *pred* returns `true` for at least one
-    element of *list*, and `false` otherwise.
-
-  - `builtins.attrNames` *set*  
-    Return the names of the attributes in the set *set* in an
-    alphabetically sorted list. For instance, `builtins.attrNames { y
-    = 1; x = "foo"; }` evaluates to `[ "x" "y" ]`.
-
-  - `builtins.attrValues` *set*  
-    Return the values of the attributes in the set *set* in the order
-    corresponding to the sorted attribute names.
-
-  - `baseNameOf` *s*  
-    Return the *base name* of the string *s*, that is, everything
-    following the final slash in the string. This is similar to the GNU
-    `basename` command.
-
-  - `builtins.bitAnd` *e1* *e2*  
-    Return the bitwise AND of the integers *e1* and *e2*.
-
-  - `builtins.bitOr` *e1* *e2*  
-    Return the bitwise OR of the integers *e1* and *e2*.
-
-  - `builtins.bitXor` *e1* *e2*  
-    Return the bitwise XOR of the integers *e1* and *e2*.
-
-  - `builtins`  
-    The set `builtins` contains all the built-in functions and values.
-    You can use `builtins` to test for the availability of features in
-    the Nix installation, e.g.,
-    
-    ```nix
-    if builtins ? getEnv then builtins.getEnv "PATH" else ""
-    ```
-    
-    This allows a Nix expression to fall back gracefully on older Nix
-    installations that don’t have the desired built-in function.
-
-  - `builtins.compareVersions` *s1* *s2*  
-    Compare two strings representing versions and return `-1` if
-    version *s1* is older than version *s2*, `0` if they are the same,
-    and `1` if *s1* is newer than *s2*. The version comparison
-    algorithm is the same as the one used by [`nix-env
-    -u`](../command-ref/nix-env.md#operation---upgrade).
-
-  - `builtins.concatLists` *lists*  
-    Concatenate a list of lists into a single list.
-
-  - `builtins.concatStringsSep` *separator* *list*  
-    Concatenate a list of strings with a separator between each
-    element, e.g. `concatStringsSep "/" ["usr" "local" "bin"] ==
-    "usr/local/bin"`
-
-  - `builtins.currentSystem`  
-    The built-in value `currentSystem` evaluates to the Nix platform
-    identifier for the Nix installation on which the expression is being
-    evaluated, such as `"i686-linux"` or `"x86_64-darwin"`.
-
-  - `builtins.deepSeq` *e1* *e2*  
-    This is like `seq e1 e2`, except that *e1* is evaluated *deeply*:
-    if it’s a list or set, its elements or attributes are also
-    evaluated recursively.
-
   - `derivation` *attrs*; `builtins.derivation` *attrs*  
+
     `derivation` is described in [its own section](derivations.md).
 
-  - `dirOf` *s*; `builtins.dirOf` *s*  
-    Return the directory part of the string *s*, that is, everything
-    before the final slash in the string. This is similar to the GNU
-    `dirname` command.
-
-  - `builtins.div` *e1* *e2*  
-    Return the quotient of the numbers *e1* and *e2*.
-
-  - `builtins.elem` *x* *xs*  
-    Return `true` if a value equal to *x* occurs in the list *xs*, and
-    `false` otherwise.
-
-  - `builtins.elemAt` *xs* *n*  
-    Return element *n* from the list *xs*. Elements are counted starting
-    from 0. A fatal error occurs if the index is out of bounds.
-
-  - `builtins.fetchurl` *url*  
-    Download the specified URL and return the path of the downloaded
-    file. This function is not available if [restricted evaluation
-    mode](../command-ref/conf-file.md) is enabled.
-
-  - `fetchTarball` *url*; `builtins.fetchTarball` *url*  
-    Download the specified URL, unpack it and return the path of the
-    unpacked tree. The file must be a tape archive (`.tar`) compressed
-    with `gzip`, `bzip2` or `xz`. The top-level path component of the
-    files in the tarball is removed, so it is best if the tarball
-    contains a single directory at top level. The typical use of the
-    function is to obtain external Nix expression dependencies, such as
-    a particular version of Nixpkgs, e.g.
-    
-    ```nix
-    with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
-
-    stdenv.mkDerivation { … }
-    ```
-    
-    The fetched tarball is cached for a certain amount of time (1 hour
-    by default) in `~/.cache/nix/tarballs/`. You can change the cache
-    timeout either on the command line with `--option tarball-ttl number
-    of seconds` or in the Nix configuration file with this option: ` 
-    number of seconds to cache `.
-    
-    Note that when obtaining the hash with ` nix-prefetch-url ` the
-    option `--unpack` is required.
-    
-    This function can also verify the contents against a hash. In that
-    case, the function takes a set instead of a URL. The set requires
-    the attribute `url` and the attribute `sha256`, e.g.
-    
-    ```nix
-    with import (fetchTarball {
-      url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
-      sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
-    }) {};
-
-    stdenv.mkDerivation { … }
-    ```
-    
-    This function is not available if [restricted evaluation
-    mode](../command-ref/conf-file.md) is enabled.
-
-  - `builtins.fetchGit` *args*  
-    Fetch a path from git. *args* can be a URL, in which case the HEAD
-    of the repo at that URL is fetched. Otherwise, it can be an
-    attribute with the following attributes (all except `url` optional):
-    
-      - url  
-        The URL of the repo.
-    
-      - name  
-        The name of the directory the repo should be exported to in the
-        store. Defaults to the basename of the URL.
-    
-      - rev  
-        The git revision to fetch. Defaults to the tip of `ref`.
-    
-      - ref  
-        The git ref to look for the requested revision under. This is
-        often a branch or tag name. Defaults to `HEAD`.
-        
-        By default, the `ref` value is prefixed with `refs/heads/`. As
-        of Nix 2.3.0 Nix will not prefix `refs/heads/` if `ref` starts
-        with `refs/`.
-    
-      - submodules  
-        A Boolean parameter that specifies whether submodules should be
-        checked out. Defaults to `false`.
-    
-    Here are some examples of how to use `fetchGit`.
-    
-      - To fetch a private repository over SSH:
-        
-        ```nix
-        builtins.fetchGit {
-          url = "git@github.com:my-secret/repository.git";
-          ref = "master";
-          rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
-        }
-        ```
-    
-      - To fetch an arbitrary reference:
-        
-        ```nix
-        builtins.fetchGit {
-          url = "https://github.com/NixOS/nix.git";
-          ref = "refs/heads/0.5-release";
-        }
-        ```
-    
-      - If the revision you're looking for is in the default branch of
-        the git repository you don't strictly need to specify the branch
-        name in the `ref` attribute.
-        
-        However, if the revision you're looking for is in a future
-        branch for the non-default branch you will need to specify the
-        the `ref` attribute as well.
-        
-        ```nix
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-          ref = "1.11-maintenance";
-        }
-        ```
-        
-        > **Note**
-        > 
-        > It is nice to always specify the branch which a revision
-        > belongs to. Without the branch being specified, the fetcher
-        > might fail if the default branch changes. Additionally, it can
-        > be confusing to try a commit from a non-default branch and see
-        > the fetch fail. If the branch is specified the fault is much
-        > more obvious.
-    
-      - If the revision you're looking for is in the default branch of
-        the git repository you may omit the `ref` attribute.
-        
-        ```nix
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
-        }
-        ```
-    
-      - To fetch a specific tag:
-        
-        ```nix
-        builtins.fetchGit {
-          url = "https://github.com/nixos/nix.git";
-          ref = "refs/tags/1.9";
-        }
-        ```
-    
-      - To fetch the latest version of a remote branch:
-        
-        ```nix
-        builtins.fetchGit {
-          url = "ssh://git@github.com/nixos/nix.git";
-          ref = "master";
-        }
-        ```
-        
-        > **Note**
-        > 
-        > Nix will refetch the branch in accordance with
-        > the option `tarball-ttl`.
-        
-        > **Note**
-        > 
-        > This behavior is disabled in *Pure evaluation mode*.
-
-  - `builtins.filter` *f* *xs*  
-    Return a list consisting of the elements of *xs* for which the
-    function *f* returns `true`.
-
-  - `builtins.filterSource` *e1* *e2*  
-    This function allows you to copy sources into the Nix store while
-    filtering certain files. For instance, suppose that you want to use
-    the directory `source-dir` as an input to a Nix expression, e.g.
-    
-    ```nix
-    stdenv.mkDerivation {
-      ...
-      src = ./source-dir;
-    }
-    ```
-    
-    However, if `source-dir` is a Subversion working copy, then all
-    those annoying `.svn` subdirectories will also be copied to the
-    store. Worse, the contents of those directories may change a lot,
-    causing lots of spurious rebuilds. With `filterSource` you can
-    filter out the `.svn` directories:
-    
-    ```nix
-    src = builtins.filterSource
-      (path: type: type != "directory" || baseNameOf path != ".svn")
-      ./source-dir;
-    ```
-    
-    Thus, the first argument *e1* must be a predicate function that is
-    called for each regular file, directory or symlink in the source
-    tree *e2*. If the function returns `true`, the file is copied to the
-    Nix store, otherwise it is omitted. The function is called with two
-    arguments. The first is the full path of the file. The second is a
-    string that identifies the type of the file, which is either
-    `"regular"`, `"directory"`, `"symlink"` or `"unknown"` (for other
-    kinds of files such as device nodes or fifos — but note that those
-    cannot be copied to the Nix store, so if the predicate returns
-    `true` for them, the copy will fail). If you exclude a directory,
-    the entire corresponding subtree of *e2* will be excluded.
-
-  - `builtins.foldl’` *op* *nul* *list*  
-    Reduce a list by applying a binary operator, from left to right,
-    e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op (op nul x0) x1) x2)
-    ...`. The operator is applied strictly, i.e., its arguments are
-    evaluated first. For example, `foldl’ (x: y: x + y) 0 [1 2 3]`
-    evaluates to 6.
-
-  - `builtins.functionArgs` *f*  
-    Return a set containing the names of the formal arguments expected
-    by the function *f*. The value of each attribute is a Boolean
-    denoting whether the corresponding argument has a default value. For
-    instance, `functionArgs ({ x, y ? 123}: ...) = { x = false; y =
-    true; }`.
-    
-    "Formal argument" here refers to the attributes pattern-matched by
-    the function. Plain lambdas are not included, e.g. `functionArgs (x:
-    ...) = { }`.
-
-  - `builtins.fromJSON` *e*  
-    Convert a JSON string to a Nix value. For example,
-    
-    ```nix
-    builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
-    ```
-    
-    returns the value `{ x = [ 1 2 3 ]; y = null; }`.
-
-  - `builtins.genList` *generator* *length*  
-    Generate list of size *length*, with each element *i* equal to the
-    value returned by *generator* `i`. For example,
-    
-    ```nix
-    builtins.genList (x: x * x) 5
-    ```
-    
-    returns the list `[ 0 1 4 9 16 ]`.
-
-  - `builtins.getAttr` *s* *set*  
-    `getAttr` returns the attribute named *s* from *set*. Evaluation
-    aborts if the attribute doesn’t exist. This is a dynamic version of
-    the `.` operator, since *s* is an expression rather than an
-    identifier.
-
-  - `builtins.getEnv` *s*  
-    `getEnv` returns the value of the environment variable *s*, or an
-    empty string if the variable doesn’t exist. This function should be
-    used with care, as it can introduce all sorts of nasty environment
-    dependencies in your Nix expression.
-    
-    `getEnv` is used in Nix Packages to locate the file
-    `~/.nixpkgs/config.nix`, which contains user-local settings for Nix
-    Packages. (That is, it does a `getEnv "HOME"` to locate the user’s
-    home directory.)
-
-  - `builtins.hasAttr` *s* *set*  
-    `hasAttr` returns `true` if *set* has an attribute named *s*, and
-    `false` otherwise. This is a dynamic version of the `?` operator,
-    since *s* is an expression rather than an identifier.
-
-  - `builtins.hashString` *type* *s*  
-    Return a base-16 representation of the cryptographic hash of string
-    *s*. The hash algorithm specified by *type* must be one of `"md5"`,
-    `"sha1"`, `"sha256"` or `"sha512"`.
-
-  - `builtins.hashFile` *type* *p*  
-    Return a base-16 representation of the cryptographic hash of the
-    file at path *p*. The hash algorithm specified by *type* must be one
-    of `"md5"`, `"sha1"`, `"sha256"` or `"sha512"`.
-
-  - `builtins.head` *list*  
-    Return the first element of a list; abort evaluation if the argument
-    isn’t a list or is an empty list. You can test whether a list is
-    empty by comparing it with `[]`.
-
   - `import` *path*; `builtins.import` *path*  
+
     Load, parse and return the Nix expression in the file *path*. If
     *path* is a directory, the file ` default.nix ` in that directory
     is loaded. Evaluation aborts if the file doesn’t exist or contains
@@ -376,535 +22,47 @@ For instance, `derivation` is also available as `builtins.derivation`.
     system: you can put any Nix expression (such as a set or a
     function) in a separate file, and use it from Nix expressions in
     other files.
-    
+
     > **Note**
-    > 
+    >
     > Unlike some languages, `import` is a regular function in Nix.
     > Paths using the angle bracket syntax (e.g., `import` *\<foo\>*)
     > are [normal path values](language-values.md).
-    
+
     A Nix expression loaded by `import` must not contain any *free
     variables* (identifiers that are not defined in the Nix expression
     itself and are not built-in). Therefore, it cannot refer to
     variables that are in scope at the call site. For instance, if you
     have a calling expression
-    
+
     ```nix
     rec {
       x = 123;
       y = import ./foo.nix;
     }
     ```
-    
+
     then the following `foo.nix` will give an error:
-    
+
     ```nix
     x + 456
     ```
-    
+
     since `x` is not in scope in `foo.nix`. If you want `x` to be
     available in `foo.nix`, you should pass it as a function argument:
-    
+
     ```nix
     rec {
       x = 123;
       y = import ./foo.nix x;
     }
     ```
-    
+
     and
-    
+
     ```nix
     x: x + 456
     ```
-    
+
     (The function argument doesn’t have to be called `x` in `foo.nix`;
     any name would work.)
-
-  - `builtins.intersectAttrs` *e1* *e2*  
-    Return a set consisting of the attributes in the set *e2* that also
-    exist in the set *e1*.
-
-  - `builtins.isAttrs` *e*  
-    Return `true` if *e* evaluates to a set, and `false` otherwise.
-
-  - `builtins.isList` *e*  
-    Return `true` if *e* evaluates to a list, and `false` otherwise.
-
-  - `builtins.isFunction` *e*  
-    Return `true` if *e* evaluates to a function, and `false` otherwise.
-
-  - `builtins.isString` *e*  
-    Return `true` if *e* evaluates to a string, and `false` otherwise.
-
-  - `builtins.isInt` *e*  
-    Return `true` if *e* evaluates to an int, and `false` otherwise.
-
-  - `builtins.isFloat` *e*  
-    Return `true` if *e* evaluates to a float, and `false` otherwise.
-
-  - `builtins.isBool` *e*  
-    Return `true` if *e* evaluates to a bool, and `false` otherwise.
-
-  - `builtins.isPath` *e*  
-    Return `true` if *e* evaluates to a path, and `false` otherwise.
-
-  - `isNull` *e*; `builtins.isNull` *e*  
-    Return `true` if *e* evaluates to `null`, and `false` otherwise.
-    
-    > **Warning**
-    > 
-    > This function is *deprecated*; just write `e == null` instead.
-
-  - `builtins.length` *e*  
-    Return the length of the list *e*.
-
-  - `builtins.lessThan` *e1* *e2*  
-    Return `true` if the number *e1* is less than the number *e2*, and
-    `false` otherwise. Evaluation aborts if either *e1* or *e2* does not
-    evaluate to a number.
-
-  - `builtins.listToAttrs` *e*  
-    Construct a set from a list specifying the names and values of each
-    attribute. Each element of the list should be a set consisting of a
-    string-valued attribute `name` specifying the name of the attribute,
-    and an attribute `value` specifying its value. Example:
-    
-    ```nix
-    builtins.listToAttrs
-      [ { name = "foo"; value = 123; }
-        { name = "bar"; value = 456; }
-      ]
-    ```
-    
-    evaluates to
-    
-    ```nix
-    { foo = 123; bar = 456; }
-    ```
-
-  - `map` *f* *list*; `builtins.map` *f* *list*  
-    Apply the function *f* to each element in the list *list*. For
-    example,
-    
-    ```nix
-    map (x: "foo" + x) [ "bar" "bla" "abc" ]
-    ```
-    
-    evaluates to `[ "foobar" "foobla" "fooabc" ]`.
-
-  - `builtins.match` *regex* *str*  
-    Returns a list if the [extended POSIX regular
-    expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
-    *regex* matches *str* precisely, otherwise returns `null`. Each item
-    in the list is a regex group.
-    
-    ```nix
-    builtins.match "ab" "abc"
-    ```
-    
-    Evaluates to `null`.
-    
-    ```nix
-    builtins.match "abc" "abc"
-    ```
-    
-    Evaluates to `[ ]`.
-    
-    ```nix
-    builtins.match "a(b)(c)" "abc"
-    ```
-    
-    Evaluates to `[ "b" "c" ]`.
-    
-    ```nix
-    builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
-    ```
-    
-    Evaluates to `[ "foo" ]`.
-
-  - `builtins.mul` *e1* *e2*  
-    Return the product of the numbers *e1* and *e2*.
-
-  - `builtins.parseDrvName` *s*  
-    Split the string *s* into a package name and version. The package
-    name is everything up to but not including the first dash followed
-    by a digit, and the version is everything following that dash. The
-    result is returned in a set `{ name, version }`. Thus,
-    `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name =
-    "nix"; version = "0.12pre12876"; }`.
-
-  - `builtins.path` *args*  
-    An enrichment of the built-in path type, based on the attributes
-    present in *args*. All are optional except `path`:
-    
-      - path  
-        The underlying path.
-    
-      - name  
-        The name of the path when added to the store. This can used to
-        reference paths that have nix-illegal characters in their names,
-        like `@`.
-    
-      - filter  
-        A function of the type expected by `builtins.filterSource`,
-        with the same semantics.
-    
-      - recursive  
-        When `false`, when `path` is added to the store it is with a
-        flat hash, rather than a hash of the NAR serialization of the
-        file. Thus, `path` must refer to a regular file, not a
-        directory. This allows similar behavior to `fetchurl`. Defaults
-        to `true`.
-    
-      - sha256  
-        When provided, this is the expected hash of the file at the
-        path. Evaluation will fail if the hash is incorrect, and
-        providing a hash allows `builtins.path` to be used even when the
-        `pure-eval` nix config option is on.
-
-  - `builtins.pathExists` *path*  
-    Return `true` if the path *path* exists at evaluation time, and
-    `false` otherwise.
-
-  - `builtins.placeholder` *output*  
-    Return a placeholder string for the specified *output* that will be
-    substituted by the corresponding output path at build time. Typical
-    outputs would be `"out"`, `"bin"` or `"dev"`.
-
-  - `builtins.readDir` *path*  
-    Return the contents of the directory *path* as a set mapping
-    directory entries to the corresponding file type. For instance, if
-    directory `A` contains a regular file `B` and another directory
-    `C`, then `builtins.readDir ./A` will return the set
-    
-    ```nix
-    { B = "regular"; C = "directory"; }
-    ```
-    
-    The possible values for the file type are `"regular"`,
-    `"directory"`, `"symlink"` and `"unknown"`.
-
-  - `builtins.readFile` *path*  
-    Return the contents of the file *path* as a string.
-
-  - `removeAttrs` *set* *list*; `builtins.removeAttrs` *set* *list*  
-    Remove the attributes listed in *list* from *set*. The attributes
-    don’t have to exist in *set*. For instance,
-    
-    ```nix
-    removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
-    ```
-    
-    evaluates to `{ y = 2; }`.
-
-  - `builtins.replaceStrings` *from* *to* *s*  
-    Given string *s*, replace every occurrence of the strings in *from*
-    with the corresponding string in *to*. For example,
-    
-    ```nix
-    builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
-    ```
-    
-    evaluates to `"fabir"`.
-
-  - `builtins.seq` *e1* *e2*  
-    Evaluate *e1*, then evaluate and return *e2*. This ensures that a
-    computation is strict in the value of *e1*.
-
-  - `builtins.sort` *comparator* *list*  
-    Return *list* in sorted order. It repeatedly calls the function
-    *comparator* with two elements. The comparator should return `true`
-    if the first element is less than the second, and `false` otherwise.
-    For example,
-    
-    ```nix
-    builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
-    ```
-    
-    produces the list `[ 42 77 147 249 483 526 ]`.
-    
-    This is a stable sort: it preserves the relative order of elements
-    deemed equal by the comparator.
-
-  - `builtins.split` *regex* *str*  
-    Returns a list composed of non matched strings interleaved with the
-    lists of the [extended POSIX regular
-    expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
-    *regex* matches of *str*. Each item in the lists of matched
-    sequences is a regex group.
-    
-    ```nix
-    builtins.split "(a)b" "abc"
-    ```
-    
-    Evaluates to `[ "" [ "a" ] "c" ]`.
-    
-    ```nix
-    builtins.split "([ac])" "abc"
-    ```
-    
-    Evaluates to `[ "" [ "a" ] "b" [ "c" ] "" ]`.
-    
-    ```nix
-    builtins.split "(a)|(c)" "abc"
-    ```
-    
-    Evaluates to `[ "" [ "a" null ] "b" [ null "c" ] "" ]`.
-    
-    ```nix
-    builtins.split "([[:upper:]]+)" "  FOO   "
-    ```
-    
-    Evaluates to `[ " " [ "FOO" ] " " ]`.
-
-  - `builtins.splitVersion` *s*  
-    Split a string representing a version into its components, by the
-    same version splitting logic underlying the version comparison in
-    [`nix-env -u`](../command-ref/nix-env.md#operation---upgrade).
-
-  - `builtins.stringLength` *e*  
-    Return the length of the string *e*. If *e* is not a string,
-    evaluation is aborted.
-
-  - `builtins.sub` *e1* *e2*  
-    Return the difference between the numbers *e1* and *e2*.
-
-  - `builtins.substring` *start* *len* *s*  
-    Return the substring of *s* from character position *start*
-    (zero-based) up to but not including *start + len*. If *start* is
-    greater than the length of the string, an empty string is returned,
-    and if *start + len* lies beyond the end of the string, only the
-    substring up to the end of the string is returned. *start* must be
-    non-negative. For example,
-    
-    ```nix
-    builtins.substring 0 3 "nixos"
-    ```
-    
-    evaluates to `"nix"`.
-
-  - `builtins.tail` *list*  
-    Return the second to last elements of a list; abort evaluation if
-    the argument isn’t a list or is an empty list.
-
-  - `throw` *s*; `builtins.throw` *s*  
-    Throw an error message *s*. This usually aborts Nix expression
-    evaluation, but in `nix-env -qa` and other commands that try to
-    evaluate a set of derivations to get information about those
-    derivations, a derivation that throws an error is silently skipped
-    (which is not the case for `abort`).
-
-  - `builtins.toFile` *name* *s*  
-    Store the string *s* in a file in the Nix store and return its
-    path.  The file has suffix *name*. This file can be used as an
-    input to derivations. One application is to write builders
-    “inline”. For instance, the following Nix expression combines the
-    [Nix expression for GNU Hello](expression-syntax.md) and its
-    [build script](build-script.md) into one file:
-
-    ```nix
-    { stdenv, fetchurl, perl }:
-
-    stdenv.mkDerivation {
-      name = "hello-2.1.1";
-
-      builder = builtins.toFile "builder.sh" "
-        source $stdenv/setup
-
-        PATH=$perl/bin:$PATH
-
-        tar xvfz $src
-        cd hello-*
-        ./configure --prefix=$out
-        make
-        make install
-      ";
-
-      src = fetchurl {
-        url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
-        sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
-      };
-      inherit perl;
-    }
-    ```
-    
-    It is even possible for one file to refer to another, e.g.,
-    
-    ```nix
-    builder = let
-      configFile = builtins.toFile "foo.conf" "
-        # This is some dummy configuration file.
-        ...
-      ";
-    in builtins.toFile "builder.sh" "
-      source $stdenv/setup
-      ...
-      cp ${configFile} $out/etc/foo.conf
-    ";
-  ```
-    
-    Note that `${configFile}` is an
-    [antiquotation](language-values.md), so the result of the
-    expression `configFile`
-    (i.e., a path like `/nix/store/m7p7jfny445k...-foo.conf`) will be
-    spliced into the resulting string.
-    
-    It is however *not* allowed to have files mutually referring to each
-    other, like so:
-    
-    ```nix
-    let
-      foo = builtins.toFile "foo" "...${bar}...";
-      bar = builtins.toFile "bar" "...${foo}...";
-    in foo
-    ```
-    
-    This is not allowed because it would cause a cyclic dependency in
-    the computation of the cryptographic hashes for `foo` and `bar`.
-    
-    It is also not possible to reference the result of a derivation. If
-    you are using Nixpkgs, the `writeTextFile` function is able to do
-    that.
-
-  - `builtins.toJSON` *e*  
-    Return a string containing a JSON representation of *e*. Strings,
-    integers, floats, booleans, nulls and lists are mapped to their JSON
-    equivalents. Sets (except derivations) are represented as objects.
-    Derivations are translated to a JSON string containing the
-    derivation’s output path. Paths are copied to the store and
-    represented as a JSON string of the resulting store path.
-
-  - `builtins.toPath` *s*  
-    DEPRECATED. Use `/. + "/path"` to convert a string into an absolute
-    path. For relative paths, use `./. + "/path"`.
-
-  - `toString` *e*; `builtins.toString` *e*  
-    Convert the expression *e* to a string. *e* can be:
-    
-      - A string (in which case the string is returned unmodified).
-    
-      - A path (e.g., `toString /foo/bar` yields `"/foo/bar"`.
-    
-      - A set containing `{ __toString = self: ...; }`.
-    
-      - An integer.
-    
-      - A list, in which case the string representations of its elements
-        are joined with spaces.
-    
-      - A Boolean (`false` yields `""`, `true` yields `"1"`).
-    
-      - `null`, which yields the empty string.
-
-  - `builtins.toXML` *e*  
-    Return a string containing an XML representation of *e*. The main
-    application for `toXML` is to communicate information with the
-    builder in a more structured format than plain environment
-    variables.
-    
-    Here is an example where this is the case:
-    
-    ```nix
-    { stdenv, fetchurl, libxslt, jira, uberwiki }:
-
-    stdenv.mkDerivation (rec {
-      name = "web-server";
-
-      buildInputs = [ libxslt ];
-
-      builder = builtins.toFile "builder.sh" "
-        source $stdenv/setup
-        mkdir $out
-        echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml ① 
-      ";
-
-      stylesheet = builtins.toFile "stylesheet.xsl" ② 
-       "<?xml version='1.0' encoding='UTF-8'?>
-        <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
-          <xsl:template match='/'>
-            <Configure>
-              <xsl:for-each select='/expr/list/attrs'>
-                <Call name='addWebApplication'>
-                  <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
-                  <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
-                </Call>
-              </xsl:for-each>
-            </Configure>
-          </xsl:template>
-        </xsl:stylesheet>
-      ";
-
-      servlets = builtins.toXML [ ③ 
-        { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
-        { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
-      ];
-    })
-    ```
-    
-    The builder is supposed to generate the configuration file for a
-    [Jetty servlet container](http://jetty.mortbay.org/). A servlet
-    container contains a number of servlets (`*.war` files) each
-    exported under a specific URI prefix. So the servlet configuration
-    is a list of sets containing the `path` and `war` of the servlet
-    (①). This kind of information is difficult to communicate with the
-    normal method of passing information through an environment
-    variable, which just concatenates everything together into a
-    string (which might just work in this case, but wouldn’t work if
-    fields are optional or contain lists themselves). Instead the Nix
-    expression is converted to an XML representation with `toXML`,
-    which is unambiguous and can easily be processed with the
-    appropriate tools. For instance, in the example an XSLT stylesheet
-    (at point ②) is applied to it (at point ①) to generate the XML
-    configuration file for the Jetty server. The XML representation
-    produced at point ③ by `toXML` is as follows:
-    
-    ```xml
-    <?xml version='1.0' encoding='utf-8'?>
-    <expr>
-      <list>
-        <attrs>
-          <attr name="path">
-            <string value="/bugtracker" />
-          </attr>
-          <attr name="war">
-            <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
-          </attr>
-        </attrs>
-        <attrs>
-          <attr name="path">
-            <string value="/wiki" />
-          </attr>
-          <attr name="war">
-            <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
-          </attr>
-        </attrs>
-      </list>
-    </expr>
-    ```
-    
-    Note that we used the `toFile` built-in to write the builder and
-    the stylesheet “inline” in the Nix expression. The path of the
-    stylesheet is spliced into the builder using the syntax `xsltproc
-    ${stylesheet}`.
-
-  - `builtins.trace` *e1* *e2*  
-    Evaluate *e1* and print its abstract syntax representation on
-    standard error. Then return *e2*. This function is useful for
-    debugging.
-
-  - `builtins.tryEval` *e*  
-    Try to shallowly evaluate *e*. Return a set containing the
-    attributes `success` (`true` if *e* evaluated successfully,
-    `false` if an error was thrown) and `value`, equalling *e* if
-    successful and `false` otherwise. Note that this doesn't evaluate
-    *e* deeply, so ` let e = { x = throw ""; }; in (builtins.tryEval
-    e).success ` will be `true`. Using ` builtins.deepSeq ` one can
-    get the expected result: `let e = { x = throw ""; }; in
-    (builtins.tryEval (builtins.deepSeq e e)).success` will be
-    `false`.
-
-  - `builtins.typeOf` *e*  
-    Return a string representing the type of the value *e*, namely
-    `"int"`, `"bool"`, `"string"`, `"path"`, `"null"`, `"set"`,
-    `"list"`, `"lambda"` or `"float"`.
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 902a37e6b..78892053a 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -275,6 +275,16 @@ static void prim_typeOf(EvalState & state, const Pos & pos, Value * * args, Valu
     mkString(v, state.symbols.create(t));
 }
 
+static RegisterPrimOp primop_typeOf({
+    .name = "__typeOf",
+    .args = {"e"},
+    .doc = R"(
+      Return a string representing the type of the value *e*, namely
+      `"int"`, `"bool"`, `"string"`, `"path"`, `"null"`, `"set"`,
+      `"list"`, `"lambda"` or `"float"`.
+    )",
+    .fun = prim_typeOf,
+});
 
 /* Determine whether the argument is the null value. */
 static void prim_isNull(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -283,6 +293,18 @@ static void prim_isNull(EvalState & state, const Pos & pos, Value * * args, Valu
     mkBool(v, args[0]->type == tNull);
 }
 
+static RegisterPrimOp primop_isNull({
+    .name = "isNull",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to `null`, and `false` otherwise.
+
+      > **Warning**
+      > 
+      > This function is *deprecated*; just write `e == null` instead.
+    )",
+    .fun = prim_isNull,
+});
 
 /* Determine whether the argument is a function. */
 static void prim_isFunction(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -302,6 +324,14 @@ static void prim_isFunction(EvalState & state, const Pos & pos, Value * * args,
     mkBool(v, res);
 }
 
+static RegisterPrimOp primop_isFunction({
+    .name = "__isFunction",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a function, and `false` otherwise.
+    )",
+    .fun = prim_isFunction,
+});
 
 /* Determine whether the argument is an integer. */
 static void prim_isInt(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -310,6 +340,15 @@ static void prim_isInt(EvalState & state, const Pos & pos, Value * * args, Value
     mkBool(v, args[0]->type == tInt);
 }
 
+static RegisterPrimOp primop_isInt({
+    .name = "__isInt",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to an integer, and `false` otherwise.
+    )",
+    .fun = prim_isInt,
+});
+
 /* Determine whether the argument is a float. */
 static void prim_isFloat(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -317,6 +356,15 @@ static void prim_isFloat(EvalState & state, const Pos & pos, Value * * args, Val
     mkBool(v, args[0]->type == tFloat);
 }
 
+static RegisterPrimOp primop_isFloat({
+    .name = "__isFloat",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a float, and `false` otherwise.
+    )",
+    .fun = prim_isFloat,
+});
+
 /* Determine whether the argument is a string. */
 static void prim_isString(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -324,6 +372,14 @@ static void prim_isString(EvalState & state, const Pos & pos, Value * * args, Va
     mkBool(v, args[0]->type == tString);
 }
 
+static RegisterPrimOp primop_isString({
+    .name = "__isString",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a string, and `false` otherwise.
+    )",
+    .fun = prim_isString,
+});
 
 /* Determine whether the argument is a Boolean. */
 static void prim_isBool(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -332,6 +388,15 @@ static void prim_isBool(EvalState & state, const Pos & pos, Value * * args, Valu
     mkBool(v, args[0]->type == tBool);
 }
 
+static RegisterPrimOp primop_isBool({
+    .name = "__isBool",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a bool, and `false` otherwise.
+    )",
+    .fun = prim_isBool,
+});
+
 /* Determine whether the argument is a path. */
 static void prim_isPath(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -339,6 +404,15 @@ static void prim_isPath(EvalState & state, const Pos & pos, Value * * args, Valu
     mkBool(v, args[0]->type == tPath);
 }
 
+static RegisterPrimOp primop_isPath({
+    .name = "__isPath",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a path, and `false` otherwise.
+    )",
+    .fun = prim_isPath,
+});
+
 struct CompareValues
 {
     bool operator () (const Value * v1, const Value * v2) const
@@ -459,14 +533,23 @@ static RegisterPrimOp primop_abort({
     }
 });
 
-
-static void prim_throw(EvalState & state, const Pos & pos, Value * * args, Value & v)
-{
-    PathSet context;
-    string s = state.coerceToString(pos, *args[0], context);
-    throw ThrownError(s);
-}
-
+static RegisterPrimOp primop_throw({
+    .name = "throw",
+    .args = {"s"},
+    .doc = R"(
+      Throw an error message *s*. This usually aborts Nix expression
+      evaluation, but in `nix-env -qa` and other commands that try to
+      evaluate a set of derivations to get information about those
+      derivations, a derivation that throws an error is silently skipped
+      (which is not the case for `abort`).
+    )",
+    .fun = [](EvalState & state, const Pos & pos, Value * * args, Value & v)
+    {
+      PathSet context;
+      string s = state.coerceToString(pos, *args[0], context);
+      throw ThrownError(s);
+    }
+});
 
 static void prim_addErrorContext(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -497,6 +580,22 @@ static void prim_tryEval(EvalState & state, const Pos & pos, Value * * args, Val
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_tryEval({
+    .name = "__tryEval",
+    .args = {"e"},
+    .doc = R"(
+      Try to shallowly evaluate *e*. Return a set containing the
+      attributes `success` (`true` if *e* evaluated successfully,
+      `false` if an error was thrown) and `value`, equalling *e* if
+      successful and `false` otherwise. Note that this doesn't evaluate
+      *e* deeply, so ` let e = { x = throw ""; }; in (builtins.tryEval
+      e).success ` will be `true`. Using ` builtins.deepSeq ` one can
+      get the expected result: `let e = { x = throw ""; }; in
+      (builtins.tryEval (builtins.deepSeq e e)).success` will be
+      `false`.
+    )",
+    .fun = prim_tryEval,
+});
 
 /* Return an environment variable.  Use with care. */
 static void prim_getEnv(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -505,6 +604,22 @@ static void prim_getEnv(EvalState & state, const Pos & pos, Value * * args, Valu
     mkString(v, evalSettings.restrictEval || evalSettings.pureEval ? "" : getEnv(name).value_or(""));
 }
 
+static RegisterPrimOp primop_getEnv({
+    .name = "__getEnv",
+    .args = {"s"},
+    .doc = R"(
+      `getEnv` returns the value of the environment variable *s*, or an
+      empty string if the variable doesn’t exist. This function should be
+      used with care, as it can introduce all sorts of nasty environment
+      dependencies in your Nix expression.
+
+      `getEnv` is used in Nix Packages to locate the file
+      `~/.nixpkgs/config.nix`, which contains user-local settings for Nix
+      Packages. (That is, it does a `getEnv "HOME"` to locate the user’s
+      home directory.)
+    )",
+    .fun = prim_getEnv,
+});
 
 /* Evaluate the first argument, then return the second argument. */
 static void prim_seq(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -514,6 +629,15 @@ static void prim_seq(EvalState & state, const Pos & pos, Value * * args, Value &
     v = *args[1];
 }
 
+static RegisterPrimOp primop_seq({
+    .name = "__seq",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Evaluate *e1*, then evaluate and return *e2*. This ensures that a
+      computation is strict in the value of *e1*.
+    )",
+    .fun = prim_seq,
+});
 
 /* Evaluate the first argument deeply (i.e. recursing into lists and
    attrsets), then return the second argument. */
@@ -524,6 +648,16 @@ static void prim_deepSeq(EvalState & state, const Pos & pos, Value * * args, Val
     v = *args[1];
 }
 
+static RegisterPrimOp primop_deepSeq({
+    .name = "__deepSeq",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      This is like `seq e1 e2`, except that *e1* is evaluated *deeply*:
+      if it’s a list or set, its elements or attributes are also
+      evaluated recursively.
+    )",
+    .fun = prim_deepSeq,
+});
 
 /* Evaluate the first expression and print it on standard error.  Then
    return the second expression.  Useful for debugging. */
@@ -538,6 +672,17 @@ static void prim_trace(EvalState & state, const Pos & pos, Value * * args, Value
     v = *args[1];
 }
 
+static RegisterPrimOp primop_trace({
+    .name = "__trace",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Evaluate *e1* and print its abstract syntax representation on
+      standard error. Then return *e2*. This function is useful for
+      debugging.
+    )",
+    .fun = prim_trace,
+});
+
 
 /*************************************************************
  * Derivations
@@ -879,6 +1024,17 @@ static void prim_placeholder(EvalState & state, const Pos & pos, Value * * args,
     mkString(v, hashPlaceholder(state.forceStringNoCtx(*args[0], pos)));
 }
 
+static RegisterPrimOp primop_placeholder({
+    .name = "placeholder",
+    .args = {"output"},
+    .doc = R"(
+      Return a placeholder string for the specified *output* that will be
+      substituted by the corresponding output path at build time. Typical
+      outputs would be `"out"`, `"bin"` or `"dev"`.
+    )",
+    .fun = prim_placeholder,
+});
+
 
 /*************************************************************
  * Paths
@@ -893,6 +1049,15 @@ static void prim_toPath(EvalState & state, const Pos & pos, Value * * args, Valu
     mkString(v, canonPath(path), context);
 }
 
+static RegisterPrimOp primop_toPath({
+    .name = "__toPath",
+    .args = {"s"},
+    .doc = R"(
+      DEPRECATED. Use `/. + "/path"` to convert a string into an absolute
+      path. For relative paths, use `./. + "/path"`.
+    )",
+    .fun = prim_toPath,
+});
 
 /* Allow a valid store path to be used in an expression.  This is
    useful in some generated expressions such as in nix-push, which
@@ -904,6 +1069,9 @@ static void prim_toPath(EvalState & state, const Pos & pos, Value * * args, Valu
    corner cases. */
 static void prim_storePath(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
+    if (evalSettings.pureEval)
+        throw EvalError("builtins.storePath' is not allowed in pure evaluation mode");
+
     PathSet context;
     Path path = state.checkSourcePath(state.coerceToPath(pos, *args[0], context));
     /* Resolve symlinks in ‘path’, unless ‘path’ itself is a symlink
@@ -949,6 +1117,15 @@ static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args,
     }
 }
 
+static RegisterPrimOp primop_pathExists({
+    .name = "__pathExists",
+    .args = {"path"},
+    .doc = R"(
+      Return `true` if the path *path* exists at evaluation time, and
+      `false` otherwise.
+    )",
+    .fun = prim_pathExists,
+});
 
 /* Return the base name of the given string, i.e., everything
    following the last slash. */
@@ -958,6 +1135,16 @@ static void prim_baseNameOf(EvalState & state, const Pos & pos, Value * * args,
     mkString(v, baseNameOf(state.coerceToString(pos, *args[0], context, false, false)), context);
 }
 
+static RegisterPrimOp primop_baseNameOf({
+    .name = "baseNameOf",
+    .args = {"s"},
+    .doc = R"(
+      Return the *base name* of the string *s*, that is, everything
+      following the final slash in the string. This is similar to the GNU
+      `basename` command.
+    )",
+    .fun = prim_baseNameOf,
+});
 
 /* Return the directory of the given path, i.e., everything before the
    last slash.  Return either a path or a string depending on the type
@@ -969,6 +1156,16 @@ static void prim_dirOf(EvalState & state, const Pos & pos, Value * * args, Value
     if (args[0]->type == tPath) mkPath(v, dir.c_str()); else mkString(v, dir, context);
 }
 
+static RegisterPrimOp primop_dirOf({
+    .name = "dirOf",
+    .args = {"s"},
+    .doc = R"(
+      Return the directory part of the string *s*, that is, everything
+      before the final slash in the string. This is similar to the GNU
+      `dirname` command.
+    )",
+    .fun = prim_dirOf,
+});
 
 /* Return the contents of a file as a string. */
 static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -989,6 +1186,14 @@ static void prim_readFile(EvalState & state, const Pos & pos, Value * * args, Va
     mkString(v, s.c_str());
 }
 
+static RegisterPrimOp primop_readFile({
+    .name = "__readFile",
+    .args = {"path"},
+    .doc = R"(
+      Return the contents of the file *path* as a string.
+    )",
+    .fun = prim_readFile,
+});
 
 /* Find a file in the Nix search path. Used to implement <x> paths,
    which are desugared to 'findFile __nixPath "x"'. */
@@ -1051,6 +1256,17 @@ static void prim_hashFile(EvalState & state, const Pos & pos, Value * * args, Va
     mkString(v, hashFile(*ht, state.checkSourcePath(p)).to_string(Base16, false), context);
 }
 
+static RegisterPrimOp primop_hashFile({
+    .name = "__hashFile",
+    .args = {"type", "p"},
+    .doc = R"(
+      Return a base-16 representation of the cryptographic hash of the
+      file at path *p*. The hash algorithm specified by *type* must be one
+      of `"md5"`, `"sha1"`, `"sha256"` or `"sha512"`.
+    )",
+    .fun = prim_hashFile,
+});
+
 /* Read a directory (without . or ..) */
 static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1082,6 +1298,25 @@ static void prim_readDir(EvalState & state, const Pos & pos, Value * * args, Val
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_readDir({
+    .name = "__readDir",
+    .args = {"path"},
+    .doc = R"(
+      Return the contents of the directory *path* as a set mapping
+      directory entries to the corresponding file type. For instance, if
+      directory `A` contains a regular file `B` and another directory
+      `C`, then `builtins.readDir ./A` will return the set
+
+      ```nix
+      { B = "regular"; C = "directory"; }
+      ```
+
+      The possible values for the file type are `"regular"`,
+      `"directory"`, `"symlink"` and `"unknown"`.
+    )",
+    .fun = prim_readDir,
+});
+
 
 /*************************************************************
  * Creating files
@@ -1099,6 +1334,102 @@ static void prim_toXML(EvalState & state, const Pos & pos, Value * * args, Value
     mkString(v, out.str(), context);
 }
 
+static RegisterPrimOp primop_toXML({
+    .name = "__toXML",
+    .args = {"e"},
+    .doc = R"(
+      Return a string containing an XML representation of *e*. The main
+      application for `toXML` is to communicate information with the
+      builder in a more structured format than plain environment
+      variables.
+
+      Here is an example where this is the case:
+
+      ```nix
+      { stdenv, fetchurl, libxslt, jira, uberwiki }:
+
+      stdenv.mkDerivation (rec {
+        name = "web-server";
+
+        buildInputs = [ libxslt ];
+
+        builder = builtins.toFile "builder.sh" "
+          source $stdenv/setup
+          mkdir $out
+          echo "$servlets" | xsltproc ${stylesheet} - > $out/server-conf.xml ①
+        ";
+
+        stylesheet = builtins.toFile "stylesheet.xsl" ②
+         "<?xml version='1.0' encoding='UTF-8'?>
+          <xsl:stylesheet xmlns:xsl='http://www.w3.org/1999/XSL/Transform' version='1.0'>
+            <xsl:template match='/'>
+              <Configure>
+                <xsl:for-each select='/expr/list/attrs'>
+                  <Call name='addWebApplication'>
+                    <Arg><xsl:value-of select=\"attr[@name = 'path']/string/@value\" /></Arg>
+                    <Arg><xsl:value-of select=\"attr[@name = 'war']/path/@value\" /></Arg>
+                  </Call>
+                </xsl:for-each>
+              </Configure>
+            </xsl:template>
+          </xsl:stylesheet>
+        ";
+
+        servlets = builtins.toXML [ ③
+          { path = "/bugtracker"; war = jira + "/lib/atlassian-jira.war"; }
+          { path = "/wiki"; war = uberwiki + "/uberwiki.war"; }
+        ];
+      })
+      ```
+
+      The builder is supposed to generate the configuration file for a
+      [Jetty servlet container](http://jetty.mortbay.org/). A servlet
+      container contains a number of servlets (`*.war` files) each
+      exported under a specific URI prefix. So the servlet configuration
+      is a list of sets containing the `path` and `war` of the servlet
+      (①). This kind of information is difficult to communicate with the
+      normal method of passing information through an environment
+      variable, which just concatenates everything together into a
+      string (which might just work in this case, but wouldn’t work if
+      fields are optional or contain lists themselves). Instead the Nix
+      expression is converted to an XML representation with `toXML`,
+      which is unambiguous and can easily be processed with the
+      appropriate tools. For instance, in the example an XSLT stylesheet
+      (at point ②) is applied to it (at point ①) to generate the XML
+      configuration file for the Jetty server. The XML representation
+      produced at point ③ by `toXML` is as follows:
+
+      ```xml
+      <?xml version='1.0' encoding='utf-8'?>
+      <expr>
+        <list>
+          <attrs>
+            <attr name="path">
+              <string value="/bugtracker" />
+            </attr>
+            <attr name="war">
+              <path value="/nix/store/d1jh9pasa7k2...-jira/lib/atlassian-jira.war" />
+            </attr>
+          </attrs>
+          <attrs>
+            <attr name="path">
+              <string value="/wiki" />
+            </attr>
+            <attr name="war">
+              <path value="/nix/store/y6423b1yi4sx...-uberwiki/uberwiki.war" />
+            </attr>
+          </attrs>
+        </list>
+      </expr>
+      ```
+
+      Note that we used the `toFile` built-in to write the builder and
+      the stylesheet “inline” in the Nix expression. The path of the
+      stylesheet is spliced into the builder using the syntax `xsltproc
+      ${stylesheet}`.
+    )",
+    .fun = prim_toXML,
+});
 
 /* Convert the argument (which can be any Nix expression) to a JSON
    string.  Not all Nix expressions can be sensibly or completely
@@ -1111,6 +1442,19 @@ static void prim_toJSON(EvalState & state, const Pos & pos, Value * * args, Valu
     mkString(v, out.str(), context);
 }
 
+static RegisterPrimOp primop_toJSON({
+    .name = "__toJSON",
+    .args = {"e"},
+    .doc = R"(
+      Return a string containing a JSON representation of *e*. Strings,
+      integers, floats, booleans, nulls and lists are mapped to their JSON
+      equivalents. Sets (except derivations) are represented as objects.
+      Derivations are translated to a JSON string containing the
+      derivation’s output path. Paths are copied to the store and
+      represented as a JSON string of the resulting store path.
+    )",
+    .fun = prim_toJSON,
+});
 
 /* Parse a JSON string to a value. */
 static void prim_fromJSON(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1119,6 +1463,20 @@ static void prim_fromJSON(EvalState & state, const Pos & pos, Value * * args, Va
     parseJSON(state, s, v);
 }
 
+static RegisterPrimOp primop_fromJSON({
+    .name = "__fromJSON",
+    .args = {"e"},
+    .doc = R"(
+      Convert a JSON string to a Nix value. For example,
+
+      ```nix
+      builtins.fromJSON ''{"x": [1, 2, 3], "y": null}''
+      ```
+
+      returns the value `{ x = [ 1 2 3 ]; y = null; }`.
+    )",
+    .fun = prim_fromJSON,
+});
 
 /* Store a string in the Nix store as a source file that can be used
    as an input by derivations. */
@@ -1153,6 +1511,83 @@ static void prim_toFile(EvalState & state, const Pos & pos, Value * * args, Valu
     mkString(v, storePath, {storePath});
 }
 
+static RegisterPrimOp primop_toFile({
+    .name = "__toFile",
+    .args = {"name", "s"},
+    .doc = R"(
+      Store the string *s* in a file in the Nix store and return its
+      path.  The file has suffix *name*. This file can be used as an
+      input to derivations. One application is to write builders
+      “inline”. For instance, the following Nix expression combines the
+      [Nix expression for GNU Hello](expression-syntax.md) and its
+      [build script](build-script.md) into one file:
+
+      ```nix
+      { stdenv, fetchurl, perl }:
+
+      stdenv.mkDerivation {
+        name = "hello-2.1.1";
+
+        builder = builtins.toFile "builder.sh" "
+          source $stdenv/setup
+
+          PATH=$perl/bin:$PATH
+
+          tar xvfz $src
+          cd hello-*
+          ./configure --prefix=$out
+          make
+          make install
+        ";
+
+        src = fetchurl {
+          url = "http://ftp.nluug.nl/pub/gnu/hello/hello-2.1.1.tar.gz";
+          sha256 = "1md7jsfd8pa45z73bz1kszpp01yw6x5ljkjk2hx7wl800any6465";
+        };
+        inherit perl;
+      }
+      ```
+
+      It is even possible for one file to refer to another, e.g.,
+
+      ```nix
+      builder = let
+        configFile = builtins.toFile "foo.conf" "
+          # This is some dummy configuration file.
+          ...
+        ";
+      in builtins.toFile "builder.sh" "
+        source $stdenv/setup
+        ...
+        cp ${configFile} $out/etc/foo.conf
+      ";
+    ```
+
+      Note that `${configFile}` is an
+      [antiquotation](language-values.md), so the result of the
+      expression `configFile`
+      (i.e., a path like `/nix/store/m7p7jfny445k...-foo.conf`) will be
+      spliced into the resulting string.
+
+      It is however *not* allowed to have files mutually referring to each
+      other, like so:
+
+      ```nix
+      let
+        foo = builtins.toFile "foo" "...${bar}...";
+        bar = builtins.toFile "bar" "...${foo}...";
+      in foo
+      ```
+
+      This is not allowed because it would cause a cyclic dependency in
+      the computation of the cryptographic hashes for `foo` and `bar`.
+
+      It is also not possible to reference the result of a derivation. If
+      you are using Nixpkgs, the `writeTextFile` function is able to do
+      that.
+    )",
+    .fun = prim_toFile,
+});
 
 static void addPath(EvalState & state, const Pos & pos, const string & name, const Path & path_,
     Value * filterFun, FileIngestionMethod method, const std::optional<Hash> expectedHash, Value & v)
@@ -1223,6 +1658,48 @@ static void prim_filterSource(EvalState & state, const Pos & pos, Value * * args
     addPath(state, pos, std::string(baseNameOf(path)), path, args[0], FileIngestionMethod::Recursive, std::nullopt, v);
 }
 
+static RegisterPrimOp primop_filterSource({
+    .name = "__filterSource",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      This function allows you to copy sources into the Nix store while
+      filtering certain files. For instance, suppose that you want to use
+      the directory `source-dir` as an input to a Nix expression, e.g.
+
+      ```nix
+      stdenv.mkDerivation {
+        ...
+        src = ./source-dir;
+      }
+      ```
+
+      However, if `source-dir` is a Subversion working copy, then all
+      those annoying `.svn` subdirectories will also be copied to the
+      store. Worse, the contents of those directories may change a lot,
+      causing lots of spurious rebuilds. With `filterSource` you can
+      filter out the `.svn` directories:
+
+      ```nix
+      src = builtins.filterSource
+        (path: type: type != "directory" || baseNameOf path != ".svn")
+        ./source-dir;
+      ```
+
+      Thus, the first argument *e1* must be a predicate function that is
+      called for each regular file, directory or symlink in the source
+      tree *e2*. If the function returns `true`, the file is copied to the
+      Nix store, otherwise it is omitted. The function is called with two
+      arguments. The first is the full path of the file. The second is a
+      string that identifies the type of the file, which is either
+      `"regular"`, `"directory"`, `"symlink"` or `"unknown"` (for other
+      kinds of files such as device nodes or fifos — but note that those
+      cannot be copied to the Nix store, so if the predicate returns
+      `true` for them, the copy will fail). If you exclude a directory,
+      the entire corresponding subtree of *e2* will be excluded.
+    )",
+    .fun = prim_filterSource,
+});
+
 static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceAttrs(*args[0], pos);
@@ -1268,6 +1745,41 @@ static void prim_path(EvalState & state, const Pos & pos, Value * * args, Value
     addPath(state, pos, name, path, filterFun, method, expectedHash, v);
 }
 
+static RegisterPrimOp primop_path({
+    .name = "__path",
+    .args = {"args"},
+    .doc = R"(
+      An enrichment of the built-in path type, based on the attributes
+      present in *args*. All are optional except `path`:
+
+        - path  
+          The underlying path.
+
+        - name  
+          The name of the path when added to the store. This can used to
+          reference paths that have nix-illegal characters in their names,
+          like `@`.
+
+        - filter  
+          A function of the type expected by `builtins.filterSource`,
+          with the same semantics.
+
+        - recursive  
+          When `false`, when `path` is added to the store it is with a
+          flat hash, rather than a hash of the NAR serialization of the
+          file. Thus, `path` must refer to a regular file, not a
+          directory. This allows similar behavior to `fetchurl`. Defaults
+          to `true`.
+
+        - sha256  
+          When provided, this is the expected hash of the file at the
+          path. Evaluation will fail if the hash is incorrect, and
+          providing a hash allows `builtins.path` to be used even when the
+          `pure-eval` nix config option is on.
+    )",
+    .fun = prim_path,
+});
+
 
 /*************************************************************
  * Sets
@@ -1290,6 +1802,16 @@ static void prim_attrNames(EvalState & state, const Pos & pos, Value * * args, V
               [](Value * v1, Value * v2) { return strcmp(v1->string.s, v2->string.s) < 0; });
 }
 
+static RegisterPrimOp primop_attrNames({
+    .name = "__attrNames",
+    .args = {"set"},
+    .doc = R"(
+      Return the names of the attributes in the set *set* in an
+      alphabetically sorted list. For instance, `builtins.attrNames { y
+      = 1; x = "foo"; }` evaluates to `[ "x" "y" ]`.
+    )",
+    .fun = prim_attrNames,
+});
 
 /* Return the values of the attributes in a set as a list, in the same
    order as attrNames. */
@@ -1310,6 +1832,15 @@ static void prim_attrValues(EvalState & state, const Pos & pos, Value * * args,
         v.listElems()[i] = ((Attr *) v.listElems()[i])->value;
 }
 
+static RegisterPrimOp primop_attrValues({
+    .name = "__attrValues",
+    .args = {"set"},
+    .doc = R"(
+      Return the values of the attributes in the set *set* in the order
+      corresponding to the sorted attribute names.
+    )",
+    .fun = prim_attrValues,
+});
 
 /* Dynamic version of the `.' operator. */
 void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1329,9 +1860,20 @@ void prim_getAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
     v = *i->value;
 }
 
+static RegisterPrimOp primop_getAttr({
+    .name = "__getAttr",
+    .args = {"s", "set"},
+    .doc = R"(
+      `getAttr` returns the attribute named *s* from *set*. Evaluation
+      aborts if the attribute doesn’t exist. This is a dynamic version of
+      the `.` operator, since *s* is an expression rather than an
+      identifier.
+    )",
+    .fun = prim_getAttr,
+});
 
 /* Return position information of the specified attribute. */
-void prim_unsafeGetAttrPos(EvalState & state, const Pos & pos, Value * * args, Value & v)
+static void prim_unsafeGetAttrPos(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     string attr = state.forceStringNoCtx(*args[0], pos);
     state.forceAttrs(*args[1], pos);
@@ -1342,7 +1884,6 @@ void prim_unsafeGetAttrPos(EvalState & state, const Pos & pos, Value * * args, V
         state.mkPos(v, i->pos);
 }
 
-
 /* Dynamic version of the `?' operator. */
 static void prim_hasAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1351,6 +1892,16 @@ static void prim_hasAttr(EvalState & state, const Pos & pos, Value * * args, Val
     mkBool(v, args[1]->attrs->find(state.symbols.create(attr)) != args[1]->attrs->end());
 }
 
+static RegisterPrimOp primop_hasAttr({
+    .name = "__hasAttr",
+    .args = {"s", "set"},
+    .doc = R"(
+      `hasAttr` returns `true` if *set* has an attribute named *s*, and
+      `false` otherwise. This is a dynamic version of the `?` operator,
+      since *s* is an expression rather than an identifier.
+    )",
+    .fun = prim_hasAttr,
+});
 
 /* Determine whether the argument is a set. */
 static void prim_isAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1359,6 +1910,14 @@ static void prim_isAttrs(EvalState & state, const Pos & pos, Value * * args, Val
     mkBool(v, args[0]->type == tAttrs);
 }
 
+static RegisterPrimOp primop_isAttrs({
+    .name = "__isAttrs",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a set, and `false` otherwise.
+    )",
+    .fun = prim_isAttrs,
+});
 
 static void prim_removeAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1382,6 +1941,21 @@ static void prim_removeAttrs(EvalState & state, const Pos & pos, Value * * args,
     }
 }
 
+static RegisterPrimOp primop_removeAttrs({
+    .name = "removeAttrs",
+    .args = {"set", "list"},
+    .doc = R"(
+      Remove the attributes listed in *list* from *set*. The attributes
+      don’t have to exist in *set*. For instance,
+
+      ```nix
+      removeAttrs { x = 1; y = 2; z = 3; } [ "a" "x" "z" ]
+      ```
+
+      evaluates to `{ y = 2; }`.
+    )",
+    .fun = prim_removeAttrs,
+});
 
 /* Builds a set from a list specifying (name, value) pairs.  To be
    precise, a list [{name = "name1"; value = value1;} ... {name =
@@ -1423,6 +1997,30 @@ static void prim_listToAttrs(EvalState & state, const Pos & pos, Value * * args,
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_listToAttrs({
+    .name = "__listToAttrs",
+    .args = {"e"},
+    .doc = R"(
+      Construct a set from a list specifying the names and values of each
+      attribute. Each element of the list should be a set consisting of a
+      string-valued attribute `name` specifying the name of the attribute,
+      and an attribute `value` specifying its value. Example:
+
+      ```nix
+      builtins.listToAttrs
+        [ { name = "foo"; value = 123; }
+          { name = "bar"; value = 456; }
+        ]
+      ```
+
+      evaluates to
+
+      ```nix
+      { foo = 123; bar = 456; }
+      ```
+    )",
+    .fun = prim_listToAttrs,
+});
 
 /* Return the right-biased intersection of two sets as1 and as2,
    i.e. a set that contains every attribute from as2 that is also a
@@ -1441,6 +2039,15 @@ static void prim_intersectAttrs(EvalState & state, const Pos & pos, Value * * ar
     }
 }
 
+static RegisterPrimOp primop_intersectAttrs({
+    .name = "__intersectAttrs",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return a set consisting of the attributes in the set *e2* that also
+      exist in the set *e1*.
+    )",
+    .fun = prim_intersectAttrs,
+});
 
 /* Collect each attribute named `attr' from a list of attribute sets.
    Sets that don't contain the named attribute are ignored.
@@ -1470,7 +2077,6 @@ static void prim_catAttrs(EvalState & state, const Pos & pos, Value * * args, Va
         v.listElems()[n] = res[n];
 }
 
-
 /* Return a set containing the names of the formal arguments expected
    by the function `f'.  The value of each attribute is a Boolean
    denoting whether the corresponding argument has a default value.  For instance,
@@ -1508,6 +2114,22 @@ static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_functionArgs({
+    .name = "__functionArgs",
+    .args = {"f"},
+    .doc = R"(
+      Return a set containing the names of the formal arguments expected
+      by the function *f*. The value of each attribute is a Boolean
+      denoting whether the corresponding argument has a default value. For
+      instance, `functionArgs ({ x, y ? 123}: ...) = { x = false; y =
+      true; }`.
+
+      "Formal argument" here refers to the attributes pattern-matched by
+      the function. Plain lambdas are not included, e.g. `functionArgs (x:
+      ...) = { }`.
+    )",
+    .fun = prim_functionArgs,
+});
 
 /* Apply a function to every element of an attribute set. */
 static void prim_mapAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1526,7 +2148,6 @@ static void prim_mapAttrs(EvalState & state, const Pos & pos, Value * * args, Va
 }
 
 
-
 /*************************************************************
  * Lists
  *************************************************************/
@@ -1539,6 +2160,14 @@ static void prim_isList(EvalState & state, const Pos & pos, Value * * args, Valu
     mkBool(v, args[0]->isList());
 }
 
+static RegisterPrimOp primop_isList({
+    .name = "__isList",
+    .args = {"e"},
+    .doc = R"(
+      Return `true` if *e* evaluates to a list, and `false` otherwise.
+    )",
+    .fun = prim_isList,
+});
 
 static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Value & v)
 {
@@ -1552,13 +2181,21 @@ static void elemAt(EvalState & state, const Pos & pos, Value & list, int n, Valu
     v = *list.listElems()[n];
 }
 
-
 /* Return the n-1'th element of a list. */
 static void prim_elemAt(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     elemAt(state, pos, *args[0], state.forceInt(*args[1], pos), v);
 }
 
+static RegisterPrimOp primop_elemAt({
+    .name = "__elemAt",
+    .args = {"xs", "n"},
+    .doc = R"(
+      Return element *n* from the list *xs*. Elements are counted starting
+      from 0. A fatal error occurs if the index is out of bounds.
+    )",
+    .fun = prim_elemAt,
+});
 
 /* Return the first element of a list. */
 static void prim_head(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1566,6 +2203,16 @@ static void prim_head(EvalState & state, const Pos & pos, Value * * args, Value
     elemAt(state, pos, *args[0], 0, v);
 }
 
+static RegisterPrimOp primop_head({
+    .name = "__head",
+    .args = {"list"},
+    .doc = R"(
+      Return the first element of a list; abort evaluation if the argument
+      isn’t a list or is an empty list. You can test whether a list is
+      empty by comparing it with `[]`.
+    )",
+    .fun = prim_head,
+});
 
 /* Return a list consisting of everything but the first element of
    a list.  Warning: this function takes O(n) time, so you probably
@@ -1584,6 +2231,21 @@ static void prim_tail(EvalState & state, const Pos & pos, Value * * args, Value
         v.listElems()[n] = args[0]->listElems()[n + 1];
 }
 
+static RegisterPrimOp primop_tail({
+    .name = "__tail",
+    .args = {"list"},
+    .doc = R"(
+      Return the second to last elements of a list; abort evaluation if
+      the argument isn’t a list or is an empty list.
+
+      > **Warning**
+      > 
+      > This function should generally be avoided since it's inefficient:
+      > unlike Haskell's `tail`, it takes O(n) time, so recursing over a
+      > list by repeatedly calling `tail` takes O(n^2) time.
+    )",
+    .fun = prim_tail,
+});
 
 /* Apply a function to every element of a list. */
 static void prim_map(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1597,6 +2259,21 @@ static void prim_map(EvalState & state, const Pos & pos, Value * * args, Value &
             *args[0], *args[1]->listElems()[n]);
 }
 
+static RegisterPrimOp primop_map({
+    .name = "map",
+    .args = {"f", "list"},
+    .doc = R"(
+      Apply the function *f* to each element in the list *list*. For
+      example,
+
+      ```nix
+      map (x: "foo" + x) [ "bar" "bla" "abc" ]
+      ```
+
+      evaluates to `[ "foobar" "foobla" "fooabc" ]`.
+    )",
+    .fun = prim_map,
+});
 
 /* Filter a list using a predicate; that is, return a list containing
    every element from the list for which the predicate function
@@ -1628,6 +2305,15 @@ static void prim_filter(EvalState & state, const Pos & pos, Value * * args, Valu
     }
 }
 
+static RegisterPrimOp primop_filter({
+    .name = "__filter",
+    .args = {"f", "list"},
+    .doc = R"(
+      Return a list consisting of the elements of *list* for which the
+      function *f* returns `true`.
+    )",
+    .fun = prim_filter,
+});
 
 /* Return true if a list contains a given element. */
 static void prim_elem(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1642,6 +2328,15 @@ static void prim_elem(EvalState & state, const Pos & pos, Value * * args, Value
     mkBool(v, res);
 }
 
+static RegisterPrimOp primop_elem({
+    .name = "__elem",
+    .args = {"x", "xs"},
+    .doc = R"(
+      Return `true` if a value equal to *x* occurs in the list *xs*, and
+      `false` otherwise.
+    )",
+    .fun = prim_elem,
+});
 
 /* Concatenate a list of lists. */
 static void prim_concatLists(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1650,6 +2345,14 @@ static void prim_concatLists(EvalState & state, const Pos & pos, Value * * args,
     state.concatLists(v, args[0]->listSize(), args[0]->listElems(), pos);
 }
 
+static RegisterPrimOp primop_concatLists({
+    .name = "__concatLists",
+    .args = {"lists"},
+    .doc = R"(
+      Concatenate a list of lists into a single list.
+    )",
+    .fun = prim_concatLists,
+});
 
 /* Return the length of a list.  This is an O(1) time operation. */
 static void prim_length(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1658,6 +2361,14 @@ static void prim_length(EvalState & state, const Pos & pos, Value * * args, Valu
     mkInt(v, args[0]->listSize());
 }
 
+static RegisterPrimOp primop_length({
+    .name = "__length",
+    .args = {"e"},
+    .doc = R"(
+      Return the length of the list *e*.
+    )",
+    .fun = prim_length,
+});
 
 /* Reduce a list by applying a binary operator, from left to
    right. The operator is applied strictly. */
@@ -1682,6 +2393,18 @@ static void prim_foldlStrict(EvalState & state, const Pos & pos, Value * * args,
     }
 }
 
+static RegisterPrimOp primop_foldlStrict({
+    .name = "__foldl'",
+    .args = {"op", "nul", "list"},
+    .doc = R"(
+      Reduce a list by applying a binary operator, from left to right,
+      e.g. `foldl’ op nul [x0 x1 x2 ...] = op (op (op nul x0) x1) x2)
+      ...`. The operator is applied strictly, i.e., its arguments are
+      evaluated first. For example, `foldl’ (x: y: x + y) 0 [1 2 3]`
+      evaluates to 6.
+    )",
+    .fun = prim_foldlStrict,
+});
 
 static void anyOrAll(bool any, EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1707,12 +2430,30 @@ static void prim_any(EvalState & state, const Pos & pos, Value * * args, Value &
     anyOrAll(true, state, pos, args, v);
 }
 
+static RegisterPrimOp primop_any({
+    .name = "__any",
+    .args = {"pred", "list"},
+    .doc = R"(
+      Return `true` if the function *pred* returns `true` for at least one
+      element of *list*, and `false` otherwise.
+    )",
+    .fun = prim_any,
+});
 
 static void prim_all(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     anyOrAll(false, state, pos, args, v);
 }
 
+static RegisterPrimOp primop_all({
+    .name = "__all",
+    .args = {"pred", "list"},
+    .doc = R"(
+      Return `true` if the function *pred* returns `true` for all elements
+      of *list*, and `false` otherwise.
+    )",
+    .fun = prim_all,
+});
 
 static void prim_genList(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1733,6 +2474,21 @@ static void prim_genList(EvalState & state, const Pos & pos, Value * * args, Val
     }
 }
 
+static RegisterPrimOp primop_genList({
+    .name = "__genList",
+    .args = {"generator", "length"},
+    .doc = R"(
+      Generate list of size *length*, with each element *i* equal to the
+      value returned by *generator* `i`. For example,
+
+      ```nix
+      builtins.genList (x: x * x) 5
+      ```
+
+      returns the list `[ 0 1 4 9 16 ]`.
+    )",
+    .fun = prim_genList,
+});
 
 static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Value & v);
 
@@ -1768,6 +2524,26 @@ static void prim_sort(EvalState & state, const Pos & pos, Value * * args, Value
     std::stable_sort(v.listElems(), v.listElems() + len, comparator);
 }
 
+static RegisterPrimOp primop_sort({
+    .name = "__sort",
+    .args = {"comparator", "list"},
+    .doc = R"(
+      Return *list* in sorted order. It repeatedly calls the function
+      *comparator* with two elements. The comparator should return `true`
+      if the first element is less than the second, and `false` otherwise.
+      For example,
+
+      ```nix
+      builtins.sort builtins.lessThan [ 483 249 526 147 42 77 ]
+      ```
+
+      produces the list `[ 42 77 147 249 483 526 ]`.
+
+      This is a stable sort: it preserves the relative order of elements
+      deemed equal by the comparator.
+    )",
+    .fun = prim_sort,
+});
 
 static void prim_partition(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1851,6 +2627,14 @@ static void prim_add(EvalState & state, const Pos & pos, Value * * args, Value &
         mkInt(v, state.forceInt(*args[0], pos) + state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_add({
+    .name = "__add",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the sum of the numbers *e1* and *e2*.
+    )",
+    .fun = prim_add,
+});
 
 static void prim_sub(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1862,6 +2646,14 @@ static void prim_sub(EvalState & state, const Pos & pos, Value * * args, Value &
         mkInt(v, state.forceInt(*args[0], pos) - state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_sub({
+    .name = "__sub",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the difference between the numbers *e1* and *e2*.
+    )",
+    .fun = prim_sub,
+});
 
 static void prim_mul(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1873,6 +2665,14 @@ static void prim_mul(EvalState & state, const Pos & pos, Value * * args, Value &
         mkInt(v, state.forceInt(*args[0], pos) * state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_mul({
+    .name = "__mul",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the product of the numbers *e1* and *e2*.
+    )",
+    .fun = prim_mul,
+});
 
 static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1902,21 +2702,57 @@ static void prim_div(EvalState & state, const Pos & pos, Value * * args, Value &
     }
 }
 
+static RegisterPrimOp primop_div({
+    .name = "__div",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the quotient of the numbers *e1* and *e2*.
+    )",
+    .fun = prim_div,
+});
+
 static void prim_bitAnd(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     mkInt(v, state.forceInt(*args[0], pos) & state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_bitAnd({
+    .name = "__bitAnd",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the bitwise AND of the integers *e1* and *e2*.
+    )",
+    .fun = prim_bitAnd,
+});
+
 static void prim_bitOr(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     mkInt(v, state.forceInt(*args[0], pos) | state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_bitOr({
+    .name = "__bitOr",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the bitwise OR of the integers *e1* and *e2*.
+    )",
+    .fun = prim_bitOr,
+});
+
 static void prim_bitXor(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     mkInt(v, state.forceInt(*args[0], pos) ^ state.forceInt(*args[1], pos));
 }
 
+static RegisterPrimOp primop_bitXor({
+    .name = "__bitXor",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return the bitwise XOR of the integers *e1* and *e2*.
+    )",
+    .fun = prim_bitXor,
+});
+
 static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceValue(*args[0], pos);
@@ -1925,6 +2761,17 @@ static void prim_lessThan(EvalState & state, const Pos & pos, Value * * args, Va
     mkBool(v, comp(args[0], args[1]));
 }
 
+static RegisterPrimOp primop_lessThan({
+    .name = "__lessThan",
+    .args = {"e1", "e2"},
+    .doc = R"(
+      Return `true` if the number *e1* is less than the number *e2*, and
+      `false` otherwise. Evaluation aborts if either *e1* or *e2* does not
+      evaluate to a number.
+    )",
+    .fun = prim_lessThan,
+});
+
 
 /*************************************************************
  * String manipulation
@@ -1941,6 +2788,29 @@ static void prim_toString(EvalState & state, const Pos & pos, Value * * args, Va
     mkString(v, s, context);
 }
 
+static RegisterPrimOp primop_toString({
+    .name = "toString",
+    .args = {"e"},
+    .doc = R"(
+      Convert the expression *e* to a string. *e* can be:
+
+        - A string (in which case the string is returned unmodified).
+
+        - A path (e.g., `toString /foo/bar` yields `"/foo/bar"`.
+
+        - A set containing `{ __toString = self: ...; }`.
+
+        - An integer.
+
+        - A list, in which case the string representations of its elements
+          are joined with spaces.
+
+        - A Boolean (`false` yields `""`, `true` yields `"1"`).
+
+        - `null`, which yields the empty string.
+    )",
+    .fun = prim_toString,
+});
 
 /* `substring start len str' returns the substring of `str' starting
    at character position `min(start, stringLength str)' inclusive and
@@ -1962,6 +2832,25 @@ static void prim_substring(EvalState & state, const Pos & pos, Value * * args, V
     mkString(v, (unsigned int) start >= s.size() ? "" : string(s, start, len), context);
 }
 
+static RegisterPrimOp primop_substring({
+    .name = "__substring",
+    .args = {"start", "len", "s"},
+    .doc = R"(
+      Return the substring of *s* from character position *start*
+      (zero-based) up to but not including *start + len*. If *start* is
+      greater than the length of the string, an empty string is returned,
+      and if *start + len* lies beyond the end of the string, only the
+      substring up to the end of the string is returned. *start* must be
+      non-negative. For example,
+
+      ```nix
+      builtins.substring 0 3 "nixos"
+      ```
+
+      evaluates to `"nix"`.
+    )",
+    .fun = prim_substring,
+});
 
 static void prim_stringLength(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1970,6 +2859,15 @@ static void prim_stringLength(EvalState & state, const Pos & pos, Value * * args
     mkInt(v, s.size());
 }
 
+static RegisterPrimOp primop_stringLength({
+    .name = "__stringLength",
+    .args = {"e"},
+    .doc = R"(
+      Return the length of the string *e*. If *e* is not a string,
+      evaluation is aborted.
+    )",
+    .fun = prim_stringLength,
+});
 
 /* Return the cryptographic hash of a string in base-16. */
 static void prim_hashString(EvalState & state, const Pos & pos, Value * * args, Value & v)
@@ -1988,6 +2886,16 @@ static void prim_hashString(EvalState & state, const Pos & pos, Value * * args,
     mkString(v, hashString(*ht, s).to_string(Base16, false), context);
 }
 
+static RegisterPrimOp primop_hashString({
+    .name = "__hashString",
+    .args = {"type", "s"},
+    .doc = R"(
+      Return a base-16 representation of the cryptographic hash of string
+      *s*. The hash algorithm specified by *type* must be one of `"md5"`,
+      `"sha1"`, `"sha256"` or `"sha512"`.
+    )",
+    .fun = prim_hashString,
+});
 
 /* Match a regular expression against a string and return either
    ‘null’ or a list containing substring matches. */
@@ -2036,6 +2944,41 @@ void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
     }
 }
 
+static RegisterPrimOp primop_match({
+    .name = "__match",
+    .args = {"regex", "str"},
+    .doc = R"s(
+      Returns a list if the [extended POSIX regular
+      expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
+      *regex* matches *str* precisely, otherwise returns `null`. Each item
+      in the list is a regex group.
+
+      ```nix
+      builtins.match "ab" "abc"
+      ```
+
+      Evaluates to `null`.
+
+      ```nix
+      builtins.match "abc" "abc"
+      ```
+
+      Evaluates to `[ ]`.
+
+      ```nix
+      builtins.match "a(b)(c)" "abc"
+      ```
+
+      Evaluates to `[ "b" "c" ]`.
+
+      ```nix
+      builtins.match "[[:space:]]+([[:upper:]]+)[[:space:]]+" "  FOO   "
+      ```
+
+      Evaluates to `[ "foo" ]`.
+    )s",
+    .fun = prim_match,
+});
 
 /* Split a string with a regular expression, and return a list of the
    non-matching parts interleaved by the lists of the matching groups. */
@@ -2109,8 +3052,44 @@ static void prim_split(EvalState & state, const Pos & pos, Value * * args, Value
     }
 }
 
+static RegisterPrimOp primop_split({
+    .name = "__split",
+    .args = {"regex", "str"},
+    .doc = R"s(
+      Returns a list composed of non matched strings interleaved with the
+      lists of the [extended POSIX regular
+      expression](http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html#tag_09_04)
+      *regex* matches of *str*. Each item in the lists of matched
+      sequences is a regex group.
 
-static void prim_concatStringSep(EvalState & state, const Pos & pos, Value * * args, Value & v)
+      ```nix
+      builtins.split "(a)b" "abc"
+      ```
+
+      Evaluates to `[ "" [ "a" ] "c" ]`.
+
+      ```nix
+      builtins.split "([ac])" "abc"
+      ```
+
+      Evaluates to `[ "" [ "a" ] "b" [ "c" ] "" ]`.
+
+      ```nix
+      builtins.split "(a)|(c)" "abc"
+      ```
+
+      Evaluates to `[ "" [ "a" null ] "b" [ null "c" ] "" ]`.
+
+      ```nix
+      builtins.split "([[:upper:]]+)" "  FOO   "
+      ```
+
+      Evaluates to `[ " " [ "FOO" ] " " ]`.
+    )s",
+    .fun = prim_split,
+});
+
+static void prim_concatStringsSep(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     PathSet context;
 
@@ -2129,6 +3108,16 @@ static void prim_concatStringSep(EvalState & state, const Pos & pos, Value * * a
     mkString(v, res, context);
 }
 
+static RegisterPrimOp primop_concatStringsSep({
+    .name = "__concatStringsSep",
+    .args = {"separator", "list"},
+    .doc = R"(
+      Concatenate a list of strings with a separator between each
+      element, e.g. `concatStringsSep "/" ["usr" "local" "bin"] ==
+      "usr/local/bin"`.
+    )",
+    .fun = prim_concatStringsSep,
+});
 
 static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -2188,6 +3177,22 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar
     mkString(v, res, context);
 }
 
+static RegisterPrimOp primop_replaceStrings({
+    .name = "__replaceStrings",
+    .args = {"from", "to", "s"},
+    .doc = R"(
+      Given string *s*, replace every occurrence of the strings in *from*
+      with the corresponding string in *to*. For example,
+
+      ```nix
+      builtins.replaceStrings ["oo" "a"] ["a" "i"] "foobar"
+      ```
+
+      evaluates to `"fabir"`.
+    )",
+    .fun = prim_replaceStrings,
+});
+
 
 /*************************************************************
  * Versions
@@ -2204,6 +3209,19 @@ static void prim_parseDrvName(EvalState & state, const Pos & pos, Value * * args
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_parseDrvName({
+    .name = "__parseDrvName",
+    .args = {"s"},
+    .doc = R"(
+      Split the string *s* into a package name and version. The package
+      name is everything up to but not including the first dash followed
+      by a digit, and the version is everything following that dash. The
+      result is returned in a set `{ name, version }`. Thus,
+      `builtins.parseDrvName "nix-0.12pre12876"` returns `{ name =
+      "nix"; version = "0.12pre12876"; }`.
+    )",
+    .fun = prim_parseDrvName,
+});
 
 static void prim_compareVersions(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -2212,6 +3230,18 @@ static void prim_compareVersions(EvalState & state, const Pos & pos, Value * * a
     mkInt(v, compareVersions(version1, version2));
 }
 
+static RegisterPrimOp primop_compareVersions({
+    .name = "__compareVersions",
+    .args = {"s1", "s2"},
+    .doc = R"(
+      Compare two strings representing versions and return `-1` if
+      version *s1* is older than version *s2*, `0` if they are the same,
+      and `1` if *s1* is newer than *s2*. The version comparison
+      algorithm is the same as the one used by [`nix-env
+      -u`](../command-ref/nix-env.md#operation---upgrade).
+    )",
+    .fun = prim_compareVersions,
+});
 
 static void prim_splitVersion(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -2232,6 +3262,17 @@ static void prim_splitVersion(EvalState & state, const Pos & pos, Value * * args
     }
 }
 
+static RegisterPrimOp primop_splitVersion({
+    .name = "__splitVersion",
+    .args = {"s"},
+    .doc = R"(
+      Split a string representing a version into its components, by the
+      same version splitting logic underlying the version comparison in
+      [`nix-env -u`](../command-ref/nix-env.md#operation---upgrade).
+    )",
+    .fun = prim_splitVersion,
+});
+
 
 /*************************************************************
  * Primop registration
@@ -2282,15 +3323,6 @@ void EvalState::createBaseEnv()
     mkNull(v);
     addConstant("null", v);
 
-    auto vThrow = addPrimOp("throw", 1, prim_throw);
-
-    auto addPurityError = [&](const std::string & name) {
-        Value * v2 = allocValue();
-        mkString(*v2, fmt("'%s' is not allowed in pure evaluation mode", name));
-        mkApp(v, *vThrow, *v2);
-        addConstant(name, v);
-    };
-
     if (!evalSettings.pureEval) {
         mkInt(v, time(0));
         addConstant("__currentTime", v);
@@ -2325,115 +3357,24 @@ void EvalState::createBaseEnv()
         addPrimOp("__importNative", 2, prim_importNative);
         addPrimOp("__exec", 1, prim_exec);
     }
-    addPrimOp("__typeOf", 1, prim_typeOf);
-    addPrimOp("isNull", 1, prim_isNull);
-    addPrimOp("__isFunction", 1, prim_isFunction);
-    addPrimOp("__isString", 1, prim_isString);
-    addPrimOp("__isInt", 1, prim_isInt);
-    addPrimOp("__isFloat", 1, prim_isFloat);
-    addPrimOp("__isBool", 1, prim_isBool);
-    addPrimOp("__isPath", 1, prim_isPath);
     addPrimOp("__genericClosure", 1, prim_genericClosure);
     addPrimOp("__addErrorContext", 2, prim_addErrorContext);
-    addPrimOp("__tryEval", 1, prim_tryEval);
-    addPrimOp("__getEnv", 1, prim_getEnv);
-
-    // Strictness
-    addPrimOp("__seq", 2, prim_seq);
-    addPrimOp("__deepSeq", 2, prim_deepSeq);
-
-    // Debugging
-    addPrimOp("__trace", 2, prim_trace);
 
     // Paths
-    addPrimOp("__toPath", 1, prim_toPath);
-    if (evalSettings.pureEval)
-        addPurityError("__storePath");
-    else
-        addPrimOp("__storePath", 1, prim_storePath);
-    addPrimOp("__pathExists", 1, prim_pathExists);
-    addPrimOp("baseNameOf", 1, prim_baseNameOf);
-    addPrimOp("dirOf", 1, prim_dirOf);
-    addPrimOp("__readFile", 1, prim_readFile);
-    addPrimOp("__readDir", 1, prim_readDir);
+    addPrimOp("__storePath", 1, prim_storePath);
     addPrimOp("__findFile", 2, prim_findFile);
-    addPrimOp("__hashFile", 2, prim_hashFile);
-
-    // Creating files
-    addPrimOp("__toXML", 1, prim_toXML);
-    addPrimOp("__toJSON", 1, prim_toJSON);
-    addPrimOp("__fromJSON", 1, prim_fromJSON);
-    addPrimOp("__toFile", 2, prim_toFile);
-    addPrimOp("__filterSource", 2, prim_filterSource);
-    addPrimOp("__path", 1, prim_path);
 
     // Sets
-    addPrimOp("__attrNames", 1, prim_attrNames);
-    addPrimOp("__attrValues", 1, prim_attrValues);
-    addPrimOp("__getAttr", 2, prim_getAttr);
     addPrimOp("__unsafeGetAttrPos", 2, prim_unsafeGetAttrPos);
-    addPrimOp("__hasAttr", 2, prim_hasAttr);
-    addPrimOp("__isAttrs", 1, prim_isAttrs);
-    addPrimOp("removeAttrs", 2, prim_removeAttrs);
-    addPrimOp("__listToAttrs", 1, prim_listToAttrs);
-    addPrimOp("__intersectAttrs", 2, prim_intersectAttrs);
     addPrimOp("__catAttrs", 2, prim_catAttrs);
-    addPrimOp("__functionArgs", 1, prim_functionArgs);
     addPrimOp("__mapAttrs", 2, prim_mapAttrs);
 
     // Lists
-    addPrimOp("__isList", 1, prim_isList);
-    addPrimOp("__elemAt", 2, prim_elemAt);
-    addPrimOp("__head", 1, prim_head);
-    addPrimOp("__tail", 1, prim_tail);
-    addPrimOp("map", 2, prim_map);
-    addPrimOp("__filter", 2, prim_filter);
-    addPrimOp("__elem", 2, prim_elem);
-    addPrimOp("__concatLists", 1, prim_concatLists);
-    addPrimOp("__length", 1, prim_length);
-    addPrimOp("__foldl'", 3, prim_foldlStrict);
-    addPrimOp("__any", 2, prim_any);
-    addPrimOp("__all", 2, prim_all);
-    addPrimOp("__genList", 2, prim_genList);
-    addPrimOp("__sort", 2, prim_sort);
     addPrimOp("__partition", 2, prim_partition);
     addPrimOp("__concatMap", 2, prim_concatMap);
 
-    // Integer arithmetic
-    addPrimOp("__add", 2, prim_add);
-    addPrimOp("__sub", 2, prim_sub);
-    addPrimOp("__mul", 2, prim_mul);
-    addPrimOp("__div", 2, prim_div);
-    addPrimOp("__bitAnd", 2, prim_bitAnd);
-    addPrimOp("__bitOr", 2, prim_bitOr);
-    addPrimOp("__bitXor", 2, prim_bitXor);
-    addPrimOp("__lessThan", 2, prim_lessThan);
-
-    // String manipulation
-    addPrimOp("toString", 1, prim_toString);
-    addPrimOp("__substring", 3, prim_substring);
-    addPrimOp("__stringLength", 1, prim_stringLength);
-    addPrimOp("__hashString", 2, prim_hashString);
-    addPrimOp("__match", 2, prim_match);
-    addPrimOp("__split", 2, prim_split);
-    addPrimOp("__concatStringsSep", 2, prim_concatStringSep);
-    addPrimOp("__replaceStrings", 3, prim_replaceStrings);
-
-    // Versions
-    addPrimOp("__parseDrvName", 1, prim_parseDrvName);
-    addPrimOp("__compareVersions", 2, prim_compareVersions);
-    addPrimOp("__splitVersion", 1, prim_splitVersion);
-
     // Derivations
     addPrimOp("derivationStrict", 1, prim_derivationStrict);
-    addPrimOp("placeholder", 1, prim_placeholder);
-
-    /* Add a wrapper around the derivation primop that computes the
-       `drvPath' and `outPath' attributes lazily. */
-    string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true);
-    sDerivationNix = symbols.create(path);
-    evalFile(path, v);
-    addConstant("derivation", v);
 
     /* Add a value containing the current Nix expression search path. */
     mkList(v, searchPath.size());
@@ -2458,6 +3399,13 @@ void EvalState::createBaseEnv()
                     .doc = primOp.doc,
                 });
 
+    /* Add a wrapper around the derivation primop that computes the
+       `drvPath' and `outPath' attributes lazily. */
+    string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true);
+    sDerivationNix = symbols.create(path);
+    evalFile(path, v);
+    addConstant("derivation", v);
+
     /* Now that we've added all primops, sort the `builtins' set,
        because attribute lookups expect it to be sorted. */
     baseEnv.values[0]->attrs->sort();
diff --git a/src/libexpr/primops/fetchTree.cc b/src/libexpr/primops/fetchTree.cc
index 0dbf4ae1d..06e8304b8 100644
--- a/src/libexpr/primops/fetchTree.cc
+++ b/src/libexpr/primops/fetchTree.cc
@@ -226,18 +226,187 @@ static void prim_fetchurl(EvalState & state, const Pos & pos, Value * * args, Va
     fetch(state, pos, args, v, "fetchurl", false, "");
 }
 
+static RegisterPrimOp primop_fetchurl({
+    .name = "__fetchurl",
+    .args = {"url"},
+    .doc = R"(
+      Download the specified URL and return the path of the downloaded
+      file. This function is not available if [restricted evaluation
+      mode](../command-ref/conf-file.md) is enabled.
+    )",
+    .fun = prim_fetchurl,
+});
+
 static void prim_fetchTarball(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     fetch(state, pos, args, v, "fetchTarball", true, "source");
 }
 
+static RegisterPrimOp primop_fetchTarball({
+    .name = "fetchTarball",
+    .args = {"args"},
+    .doc = R"(
+      Download the specified URL, unpack it and return the path of the
+      unpacked tree. The file must be a tape archive (`.tar`) compressed
+      with `gzip`, `bzip2` or `xz`. The top-level path component of the
+      files in the tarball is removed, so it is best if the tarball
+      contains a single directory at top level. The typical use of the
+      function is to obtain external Nix expression dependencies, such as
+      a particular version of Nixpkgs, e.g.
+
+      ```nix
+      with import (fetchTarball https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz) {};
+
+      stdenv.mkDerivation { … }
+      ```
+
+      The fetched tarball is cached for a certain amount of time (1 hour
+      by default) in `~/.cache/nix/tarballs/`. You can change the cache
+      timeout either on the command line with `--option tarball-ttl number
+      of seconds` or in the Nix configuration file with this option: ` 
+      number of seconds to cache `.
+
+      Note that when obtaining the hash with ` nix-prefetch-url ` the
+      option `--unpack` is required.
+
+      This function can also verify the contents against a hash. In that
+      case, the function takes a set instead of a URL. The set requires
+      the attribute `url` and the attribute `sha256`, e.g.
+
+      ```nix
+      with import (fetchTarball {
+        url = "https://github.com/NixOS/nixpkgs/archive/nixos-14.12.tar.gz";
+        sha256 = "1jppksrfvbk5ypiqdz4cddxdl8z6zyzdb2srq8fcffr327ld5jj2";
+      }) {};
+
+      stdenv.mkDerivation { … }
+      ```
+
+      This function is not available if [restricted evaluation
+      mode](../command-ref/conf-file.md) is enabled.
+    )",
+    .fun = prim_fetchTarball,
+});
+
 static void prim_fetchGit(EvalState &state, const Pos &pos, Value **args, Value &v)
 {
     fetchTree(state, pos, args, v, "git", true);
 }
 
-static RegisterPrimOp r2("__fetchurl", 1, prim_fetchurl);
-static RegisterPrimOp r3("fetchTarball", 1, prim_fetchTarball);
-static RegisterPrimOp r4("fetchGit", 1, prim_fetchGit);
+static RegisterPrimOp primop_fetchGit({
+    .name = "fetchGit",
+    .args = {"args"},
+    .doc = R"(
+      Fetch a path from git. *args* can be a URL, in which case the HEAD
+      of the repo at that URL is fetched. Otherwise, it can be an
+      attribute with the following attributes (all except `url` optional):
+
+        - url  
+          The URL of the repo.
+
+        - name  
+          The name of the directory the repo should be exported to in the
+          store. Defaults to the basename of the URL.
+
+        - rev  
+          The git revision to fetch. Defaults to the tip of `ref`.
+
+        - ref  
+          The git ref to look for the requested revision under. This is
+          often a branch or tag name. Defaults to `HEAD`.
+
+          By default, the `ref` value is prefixed with `refs/heads/`. As
+          of Nix 2.3.0 Nix will not prefix `refs/heads/` if `ref` starts
+          with `refs/`.
+
+        - submodules  
+          A Boolean parameter that specifies whether submodules should be
+          checked out. Defaults to `false`.
+
+      Here are some examples of how to use `fetchGit`.
+
+        - To fetch a private repository over SSH:
+
+          ```nix
+          builtins.fetchGit {
+            url = "git@github.com:my-secret/repository.git";
+            ref = "master";
+            rev = "adab8b916a45068c044658c4158d81878f9ed1c3";
+          }
+          ```
+
+        - To fetch an arbitrary reference:
+
+          ```nix
+          builtins.fetchGit {
+            url = "https://github.com/NixOS/nix.git";
+            ref = "refs/heads/0.5-release";
+          }
+          ```
+
+        - If the revision you're looking for is in the default branch of
+          the git repository you don't strictly need to specify the branch
+          name in the `ref` attribute.
+
+          However, if the revision you're looking for is in a future
+          branch for the non-default branch you will need to specify the
+          the `ref` attribute as well.
+
+          ```nix
+          builtins.fetchGit {
+            url = "https://github.com/nixos/nix.git";
+            rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+            ref = "1.11-maintenance";
+          }
+          ```
+
+          > **Note**
+          > 
+          > It is nice to always specify the branch which a revision
+          > belongs to. Without the branch being specified, the fetcher
+          > might fail if the default branch changes. Additionally, it can
+          > be confusing to try a commit from a non-default branch and see
+          > the fetch fail. If the branch is specified the fault is much
+          > more obvious.
+
+        - If the revision you're looking for is in the default branch of
+          the git repository you may omit the `ref` attribute.
+
+          ```nix
+          builtins.fetchGit {
+            url = "https://github.com/nixos/nix.git";
+            rev = "841fcbd04755c7a2865c51c1e2d3b045976b7452";
+          }
+          ```
+
+        - To fetch a specific tag:
+
+          ```nix
+          builtins.fetchGit {
+            url = "https://github.com/nixos/nix.git";
+            ref = "refs/tags/1.9";
+          }
+          ```
+
+        - To fetch the latest version of a remote branch:
+
+          ```nix
+          builtins.fetchGit {
+            url = "ssh://git@github.com/nixos/nix.git";
+            ref = "master";
+          }
+          ```
+
+          > **Note**
+          > 
+          > Nix will refetch the branch in accordance with
+          > the option `tarball-ttl`.
+
+          > **Note**
+          > 
+          > This behavior is disabled in *Pure evaluation mode*.
+    )",
+    .fun = prim_fetchGit,
+});
 
 }

From 0f314f3c2594e80322c675b70a61dcfda11bf423 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 14:49:30 +0200
Subject: [PATCH 082/176] Generate builtins section of the manual

---
 .gitignore                                    |  2 ++
 doc/manual/generate-builtins.jq               |  6 ++++++
 doc/manual/local.mk                           | 11 ++++++++--
 .../{builtins.md => builtins-prefix.md}       |  0
 src/nix/main.cc                               | 20 ++++++++++++++++++-
 5 files changed, 36 insertions(+), 3 deletions(-)
 create mode 100644 doc/manual/generate-builtins.jq
 rename doc/manual/src/expressions/{builtins.md => builtins-prefix.md} (100%)

diff --git a/.gitignore b/.gitignore
index 44dbaa5d7..0ea27c8c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,8 +27,10 @@ perl/Makefile.config
 /doc/manual/*.8
 /doc/manual/nix.json
 /doc/manual/conf-file.json
+/doc/manual/builtins.json
 /doc/manual/src/command-ref/nix.md
 /doc/manual/src/command-ref/conf-file.md
+/doc/manual/src/expressions/builtins.md
 
 # /scripts/
 /scripts/nix-profile.sh
diff --git a/doc/manual/generate-builtins.jq b/doc/manual/generate-builtins.jq
new file mode 100644
index 000000000..c38799479
--- /dev/null
+++ b/doc/manual/generate-builtins.jq
@@ -0,0 +1,6 @@
+. | to_entries | sort_by(.key) | map(
+  "  - `builtins." + .key + "` "
+  + (.value.args | map("*" + . + "*") | join(" "))
+  + "  \n\n"
+  + (.value.doc | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
+) | join("")
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index dcc02d538..297a73414 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -32,15 +32,22 @@ $(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.jq
 	jq -r -f doc/manual/generate-options.jq $< >> $@
 
 $(d)/nix.json: $(bindir)/nix
-	$(trace-gen) $(bindir)/nix dump-args > $@
+	$(trace-gen) $(bindir)/nix __dump-args > $@
 
 $(d)/conf-file.json: $(bindir)/nix
 	$(trace-gen) env -i NIX_CONF_DIR=/dummy HOME=/dummy $(bindir)/nix show-config --json --experimental-features nix-command > $@
 
+$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.jq $(d)/src/expressions/builtins-prefix.md
+	cat doc/manual/src/expressions/builtins-prefix.md > $@
+	jq -r -f doc/manual/generate-builtins.jq $< >> $@
+
+$(d)/builtins.json: $(bindir)/nix
+	$(trace-gen) $(bindir)/nix __dump-builtins > $@
+
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
 
-$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css
+$(docdir)/manual/index.html: $(MANUAL_SRCS) $(d)/book.toml $(d)/custom.css $(d)/src/command-ref/nix.md $(d)/src/command-ref/conf-file.md $(d)/src/expressions/builtins.md
 	$(trace-gen) mdbook build doc/manual -d $(docdir)/manual
 	@cp doc/manual/highlight.pack.js $(docdir)/manual/highlight.js
 
diff --git a/doc/manual/src/expressions/builtins.md b/doc/manual/src/expressions/builtins-prefix.md
similarity index 100%
rename from doc/manual/src/expressions/builtins.md
rename to doc/manual/src/expressions/builtins-prefix.md
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 0c4fd46fd..210327927 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -179,11 +179,29 @@ void mainWrapped(int argc, char * * argv)
 
     NixArgs args;
 
-    if (argc == 2 && std::string(argv[1]) == "dump-args") {
+    if (argc == 2 && std::string(argv[1]) == "__dump-args") {
         std::cout << args.toJSON().dump() << "\n";
         return;
     }
 
+    if (argc == 2 && std::string(argv[1]) == "__dump-builtins") {
+        EvalState state({}, openStore("ssh://foo.invalid/"));
+        auto res = nlohmann::json::object();
+        auto builtins = state.baseEnv.values[0]->attrs;
+        for (auto & builtin : *builtins) {
+            auto b = nlohmann::json::object();
+            if (builtin.value->type != tPrimOp) continue;
+            auto primOp = builtin.value->primOp;
+            if (!primOp->doc) continue;
+            b["arity"] = primOp->arity;
+            b["args"] = primOp->args;
+            b["doc"] = trim(stripIndentation(primOp->doc));
+            res[(std::string) builtin.name] = std::move(b);
+        }
+        std::cout << res.dump() << "\n";
+        return;
+    }
+
     Finally printCompletions([&]()
     {
         if (completions) {

From d0690bc311ee4969fc35604fed0fe819d4938704 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 18:10:33 +0200
Subject: [PATCH 083/176] nix repl ':doc': Render using lowdown

---
 src/nix/local.mk    |  5 +++--
 src/nix/markdown.cc | 50 +++++++++++++++++++++++++++++++++++++++++++++
 src/nix/markdown.hh |  7 +++++++
 src/nix/repl.cc     | 15 ++++++++++----
 4 files changed, 71 insertions(+), 6 deletions(-)
 create mode 100644 src/nix/markdown.cc
 create mode 100644 src/nix/markdown.hh

diff --git a/src/nix/local.mk b/src/nix/local.mk
index b057b7cc6..8ed8eaef7 100644
--- a/src/nix/local.mk
+++ b/src/nix/local.mk
@@ -15,11 +15,12 @@ nix_SOURCES := \
   $(wildcard src/nix-prefetch-url/*.cc) \
   $(wildcard src/nix-store/*.cc) \
 
-nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain
+# -fpermissive is needed by lowdown.
+nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain -fpermissive
 
 nix_LIBS = libexpr libmain libfetchers libstore libutil
 
-nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system
+nix_LDFLAGS = -pthread $(SODIUM_LIBS) $(EDITLINE_LIBS) $(BOOST_LDFLAGS) -lboost_context -lboost_thread -lboost_system -llowdown
 
 $(foreach name, \
   nix-build nix-channel nix-collect-garbage nix-copy-closure nix-daemon nix-env nix-hash nix-instantiate nix-prefetch-url nix-shell nix-store, \
diff --git a/src/nix/markdown.cc b/src/nix/markdown.cc
new file mode 100644
index 000000000..40788a42f
--- /dev/null
+++ b/src/nix/markdown.cc
@@ -0,0 +1,50 @@
+#include "markdown.hh"
+#include "util.hh"
+#include "finally.hh"
+
+#include <sys/queue.h>
+extern "C" {
+#include <lowdown.h>
+}
+
+namespace nix {
+
+std::string renderMarkdownToTerminal(std::string_view markdown)
+{
+    struct lowdown_opts opts {
+        .type = LOWDOWN_TERM,
+        .maxdepth = 20,
+        .cols = std::min(getWindowSize().second, (unsigned short) 80),
+        .hmargin = 0,
+        .vmargin = 0,
+        .feat = LOWDOWN_COMMONMARK | LOWDOWN_FENCED | LOWDOWN_DEFLIST | LOWDOWN_TABLES,
+        .oflags = 0,
+    };
+
+    auto doc = lowdown_doc_new(&opts);
+    if (!doc)
+        throw Error("cannot allocate Markdown document");
+    Finally freeDoc([&]() { lowdown_doc_free(doc); });
+
+    size_t maxn = 0;
+    auto node = lowdown_doc_parse(doc, &maxn, markdown.data(), markdown.size());
+    if (!node)
+        throw Error("cannot parse Markdown document");
+    Finally freeNode([&]() { lowdown_node_free(node); });
+
+    auto renderer = lowdown_term_new(&opts);
+    if (!renderer)
+        throw Error("cannot allocate Markdown renderer");
+    Finally freeRenderer([&]() { lowdown_term_free(renderer); });
+
+    auto buf = lowdown_buf_new(16384);
+    if (!buf)
+        throw Error("cannot allocate Markdown output buffer");
+    Finally freeBuffer([&]() { lowdown_buf_free(buf); });
+
+    lowdown_term_rndr(buf, nullptr, renderer, node);
+
+    return std::string(buf->data, buf->size);
+}
+
+}
diff --git a/src/nix/markdown.hh b/src/nix/markdown.hh
new file mode 100644
index 000000000..78320fcf5
--- /dev/null
+++ b/src/nix/markdown.hh
@@ -0,0 +1,7 @@
+#include "types.hh"
+
+namespace nix {
+
+std::string renderMarkdownToTerminal(std::string_view markdown);
+
+}
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index d370ca767..c7f8af742 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -32,6 +32,7 @@ extern "C" {
 #include "globals.hh"
 #include "command.hh"
 #include "finally.hh"
+#include "markdown.hh"
 
 #if HAVE_BOEHMGC
 #define GC_INCLUDE_NEW
@@ -518,10 +519,16 @@ bool NixRepl::processLine(string line)
             while (v2->type == tPrimOpApp)
                 v2 = v2->primOpApp.left;
             if (v2->primOp->doc) {
-                // FIXME: format markdown.
-                if (!v2->primOp->args.empty())
-                    std::cout << fmt("Arguments: %s\n\n", concatStringsSep(" ", v2->primOp->args));
-                std::cout << trim(stripIndentation(v2->primOp->doc)) << "\n";
+                auto args = v2->primOp->args;
+                for (auto & arg : args)
+                    arg = "*" + arg + "*";
+
+                auto markdown =
+                    "**Synopsis:** `builtins." + (std::string) v2->primOp->name + "` "
+                    + concatStringsSep(" ", args) + "\n\n"
+                    + trim(stripIndentation(v2->primOp->doc));
+
+                std::cout << renderMarkdownToTerminal(markdown);
             } else
                 throw Error("builtin function '%s' does not have documentation", v2->primOp->name);
         } else

From 6a67e57019f39e43866866661df17394c168d29b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 18:54:16 +0200
Subject: [PATCH 084/176] Add DummyStore (dummy://)

DummyStore does not allow building or adding paths. This is useful for
evaluation tests when you don't want to initialize a "proper" store.
---
 src/libstore/dummy-store.cc | 59 +++++++++++++++++++++++++++++++++++++
 src/nix/main.cc             |  2 +-
 tests/lang.sh               |  1 +
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 src/libstore/dummy-store.cc

diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
new file mode 100644
index 000000000..7a5744bc1
--- /dev/null
+++ b/src/libstore/dummy-store.cc
@@ -0,0 +1,59 @@
+#include "store-api.hh"
+
+namespace nix {
+
+static std::string uriScheme = "dummy://";
+
+struct DummyStore : public Store
+{
+    DummyStore(const Params & params)
+        : Store(params)
+    { }
+
+    string getUri() override
+    {
+        return uriScheme;
+    }
+
+    void queryPathInfoUncached(const StorePath & path,
+        Callback<std::shared_ptr<const ValidPathInfo>> callback) noexcept override
+    {
+        callback(nullptr);
+    }
+
+    std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override
+    { unsupported("queryPathFromHashPart"); }
+
+    void addToStore(const ValidPathInfo & info, Source & source,
+        RepairFlag repair, CheckSigsFlag checkSigs) override
+    { unsupported("addToStore"); }
+
+    StorePath addToStore(const string & name, const Path & srcPath,
+        FileIngestionMethod method, HashType hashAlgo,
+        PathFilter & filter, RepairFlag repair) override
+    { unsupported("addToStore"); }
+
+    StorePath addTextToStore(const string & name, const string & s,
+        const StorePathSet & references, RepairFlag repair) override
+    { unsupported("addTextToStore"); }
+
+    void narFromPath(const StorePath & path, Sink & sink) override
+    { unsupported("narFromPath"); }
+
+    void ensurePath(const StorePath & path) override
+    { unsupported("ensurePath"); }
+
+    BuildResult buildDerivation(const StorePath & drvPath, const BasicDerivation & drv,
+        BuildMode buildMode) override
+    { unsupported("buildDerivation"); }
+};
+
+static RegisterStoreImplementation regStore([](
+    const std::string & uri, const Store::Params & params)
+    -> std::shared_ptr<Store>
+{
+    if (uri != uriScheme) return nullptr;
+    return std::make_shared<DummyStore>(params);
+});
+
+}
diff --git a/src/nix/main.cc b/src/nix/main.cc
index 210327927..e9479f564 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -185,7 +185,7 @@ void mainWrapped(int argc, char * * argv)
     }
 
     if (argc == 2 && std::string(argv[1]) == "__dump-builtins") {
-        EvalState state({}, openStore("ssh://foo.invalid/"));
+        EvalState state({}, openStore("dummy://"));
         auto res = nlohmann::json::object();
         auto builtins = state.baseEnv.values[0]->attrs;
         for (auto & builtin : *builtins) {
diff --git a/tests/lang.sh b/tests/lang.sh
index c797a2a74..61bb444ba 100644
--- a/tests/lang.sh
+++ b/tests/lang.sh
@@ -1,6 +1,7 @@
 source common.sh
 
 export TEST_VAR=foo # for eval-okay-getenv.nix
+export NIX_REMOTE=dummy://
 
 nix-instantiate --eval -E 'builtins.trace "Hello" 123' 2>&1 | grep -q Hello
 (! nix-instantiate --show-trace --eval -E 'builtins.addErrorContext "Hello" 123' 2>&1 | grep -q Hello)

From d9a8619762fa56bca8ddec5d9bcd5c411adb5b95 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 19:15:17 +0200
Subject: [PATCH 085/176] Don't barf if corepkgs is in the store but not a
 valid path

This can happen when using a dummy store (or indeed any non-local store).
---
 src/libexpr/eval.cc | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 6ac8bbc9f..a5ebd1bf0 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -381,10 +381,14 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
             auto path = r.second;
 
             if (store->isInStore(r.second)) {
-                StorePathSet closure;
-                store->computeFSClosure(store->toStorePath(r.second).first, closure);
-                for (auto & path : closure)
-                    allowedPaths->insert(store->printStorePath(path));
+                try {
+                    StorePathSet closure;
+                    store->computeFSClosure(store->toStorePath(r.second).first, closure);
+                    for (auto & path : closure)
+                        allowedPaths->insert(store->printStorePath(path));
+                } catch (InvalidPath &) {
+                    allowedPaths->insert(r.second);
+                }
             } else
                 allowedPaths->insert(r.second);
         }

From b42789f01382c49256b2b5073098f5fb01841950 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 24 Aug 2020 21:13:39 +0200
Subject: [PATCH 086/176] Fix clang build

---
 flake.lock       | 20 +++++++++++++++++++-
 flake.nix        |  7 ++++++-
 src/nix/local.mk |  2 +-
 3 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/flake.lock b/flake.lock
index 74326d294..f4368b170 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,22 @@
 {
   "nodes": {
+    "lowdown-src": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1598296217,
+        "narHash": "sha256-ha7lyNY1d8m+osmDpPc9f/bfZ3ZC1IVIXwfyklSWg8I=",
+        "owner": "edolstra",
+        "repo": "lowdown",
+        "rev": "c7a4e715af1e233080842db82d15b261cb74cb28",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "ref": "no-structs-in-anonymous-unions",
+        "repo": "lowdown",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1591633336,
@@ -17,10 +34,11 @@
     },
     "root": {
       "inputs": {
+        "lowdown-src": "lowdown-src",
         "nixpkgs": "nixpkgs"
       }
     }
   },
   "root": "root",
-  "version": 6
+  "version": 7
 }
diff --git a/flake.nix b/flake.nix
index f97197cce..ea0ad7b8a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,9 @@
   description = "The purely functional package manager";
 
   inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
+  inputs.lowdown-src = { url = "github:edolstra/lowdown/no-structs-in-anonymous-unions"; flake = false; };
 
-  outputs = { self, nixpkgs }:
+  outputs = { self, nixpkgs, lowdown-src }:
 
     let
 
@@ -188,10 +189,14 @@
         lowdown = with final; stdenv.mkDerivation {
           name = "lowdown-0.7.1";
 
+          /*
           src = fetchurl {
             url = https://kristaps.bsd.lv/lowdown/snapshots/lowdown-0.7.1.tar.gz;
             hash = "sha512-1daoAQfYD0LdhK6aFhrSQvadjc5GsSPBZw0fJDb+BEHYMBLjqiUl2A7H8N+l0W4YfGKqbsPYSrCy4vct+7U6FQ==";
           };
+          */
+
+          src = lowdown-src;
 
           outputs = [ "out" "dev" ];
 
diff --git a/src/nix/local.mk b/src/nix/local.mk
index 8ed8eaef7..cfe97b0f0 100644
--- a/src/nix/local.mk
+++ b/src/nix/local.mk
@@ -16,7 +16,7 @@ nix_SOURCES := \
   $(wildcard src/nix-store/*.cc) \
 
 # -fpermissive is needed by lowdown.
-nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain -fpermissive
+nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain
 
 nix_LIBS = libexpr libmain libfetchers libstore libutil
 

From f5219f8d84af57c68f6eb129260bf9f0805b9b47 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 10:33:41 +0200
Subject: [PATCH 087/176] Fix perlBindings job

---
 flake.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/flake.nix b/flake.nix
index ea0ad7b8a..3f67bfd40 100644
--- a/flake.nix
+++ b/flake.nix
@@ -73,9 +73,6 @@
             openssl pkgconfig sqlite
             libarchive
             boost
-            (if lib.versionAtLeast lib.version "20.03pre"
-             then nlohmann_json
-             else nlohmann_json.override { multipleHeaders = true; })
             nlohmann_json
 
             # Tests
@@ -171,6 +168,7 @@
                 pkgconfig
                 pkgs.perl
                 boost
+                nlohmann_json
               ]
               ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
 

From 24b1c2c66b2f7ee8bbb9f62f4d914eb87a998999 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 10:51:14 +0200
Subject: [PATCH 088/176] Fix tests

---
 src/libutil/tests/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/tests/config.cc b/src/libutil/tests/config.cc
index 9465fba3f..c5abefe11 100644
--- a/src/libutil/tests/config.cc
+++ b/src/libutil/tests/config.cc
@@ -1,9 +1,9 @@
-#include "json.hh"
 #include "config.hh"
 #include "args.hh"
 
 #include <sstream>
 #include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
 
 namespace nix {
 

From b8416779e3c17be819a27f1527a53d83c7eccbcf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 11:16:45 +0200
Subject: [PATCH 089/176] Document some primops

---
 src/libexpr/primops.cc | 111 +++++++++++++++++++++++++++++------------
 1 file changed, 80 insertions(+), 31 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 78892053a..cdc526de3 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1053,7 +1053,7 @@ static RegisterPrimOp primop_toPath({
     .name = "__toPath",
     .args = {"s"},
     .doc = R"(
-      DEPRECATED. Use `/. + "/path"` to convert a string into an absolute
+      **DEPRECATED.** Use `/. + "/path"` to convert a string into an absolute
       path. For relative paths, use `./. + "/path"`.
     )",
     .fun = prim_toPath,
@@ -1090,6 +1090,23 @@ static void prim_storePath(EvalState & state, const Pos & pos, Value * * args, V
     mkString(v, path, context);
 }
 
+static RegisterPrimOp primop_storePath({
+    .name = "__storePath",
+    .args = {"path"},
+    .doc = R"(
+      This function allows you to define a dependency on an already
+      existing store path. For example, the derivation attribute `src
+      = builtins.storePath /nix/store/f1d18v1y…-source` causes the
+      derivation to depend on the specified path, which must exist or
+      be substitutable. Note that this differs from a plain path
+      (e.g. `src = /nix/store/f1d18v1y…-source`) in that the latter
+      causes the path to be *copied* again to the Nix store, resulting
+      in a new path (e.g. `/nix/store/ld01dnzc…-source-source`).
+
+      This function is not available in pure evaluation mode.
+    )",
+    .fun = prim_storePath,
+});
 
 static void prim_pathExists(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -2022,9 +2039,6 @@ static RegisterPrimOp primop_listToAttrs({
     .fun = prim_listToAttrs,
 });
 
-/* Return the right-biased intersection of two sets as1 and as2,
-   i.e. a set that contains every attribute from as2 that is also a
-   member of as1. */
 static void prim_intersectAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceAttrs(*args[0], pos);
@@ -2049,13 +2063,6 @@ static RegisterPrimOp primop_intersectAttrs({
     .fun = prim_intersectAttrs,
 });
 
-/* Collect each attribute named `attr' from a list of attribute sets.
-   Sets that don't contain the named attribute are ignored.
-
-   Example:
-     catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
-     => [1 2]
-*/
 static void prim_catAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     Symbol attrName = state.symbols.create(state.forceStringNoCtx(*args[0], pos));
@@ -2077,19 +2084,23 @@ static void prim_catAttrs(EvalState & state, const Pos & pos, Value * * args, Va
         v.listElems()[n] = res[n];
 }
 
-/* Return a set containing the names of the formal arguments expected
-   by the function `f'.  The value of each attribute is a Boolean
-   denoting whether the corresponding argument has a default value.  For instance,
+static RegisterPrimOp primop_catAttrs({
+    .name = "__catAttrs",
+    .args = {"attr", "list"},
+    .doc = R"(
+      Collect each attribute named *attr* from a list of attribute
+      sets.  Attrsets that don't contain the named attribute are
+      ignored. For example,
 
-      functionArgs ({ x, y ? 123}: ...)
-   => { x = false; y = true; }
+      ```nix
+      builtins.catAttrs "a" [{a = 1;} {b = 0;} {a = 2;}]
+      ```
 
-   "Formal argument" here refers to the attributes pattern-matched by
-   the function.  Plain lambdas are not included, e.g.
+      evaluates to `[1 2]`.
+    )",
+    .fun = prim_catAttrs,
+});
 
-      functionArgs (x: ...)
-   => { }
-*/
 static void prim_functionArgs(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceValue(*args[0], pos);
@@ -2131,7 +2142,7 @@ static RegisterPrimOp primop_functionArgs({
     .fun = prim_functionArgs,
 });
 
-/* Apply a function to every element of an attribute set. */
+/*  */
 static void prim_mapAttrs(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceAttrs(*args[1], pos);
@@ -2147,6 +2158,21 @@ static void prim_mapAttrs(EvalState & state, const Pos & pos, Value * * args, Va
     }
 }
 
+static RegisterPrimOp primop_mapAttrs({
+    .name = "__mapAttrs",
+    .args = {"f", "attrset"},
+    .doc = R"(
+      Apply function *f* to every element of *attrset*. For example,
+
+      ```nix
+      builtins.mapAttrs (name: value: value * 10) { a = 1; b = 2; }
+      ```
+
+      evaluates to `{ a = 10; b = 20; }`.
+    )",
+    .fun = prim_mapAttrs,
+});
+
 
 /*************************************************************
  * Lists
@@ -2582,9 +2608,29 @@ static void prim_partition(EvalState & state, const Pos & pos, Value * * args, V
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_partition({
+    .name = "__partition",
+    .args = {"pred", "list"},
+    .doc = R"(
+      Given a predicate function *pred*, this function returns an
+      attrset containing a list named `right`, containing the elements
+      in *list* for which *pred* returned `true`, and a list named
+      `wrong`, containing the elements for which it returned
+      `false`. For example,
+
+      ```nix
+      builtins.partition (x: x > 10) [1 23 9 3 42]
+      ```
+
+      evaluates to
+
+      ```nix
+      { right = [ 23 42 ]; wrong = [ 1 9 3 ]; }
+      ```
+    )",
+    .fun = prim_partition,
+});
 
-/* concatMap = f: list: concatLists (map f list); */
-/* C++-version is to avoid allocating `mkApp', call `f' eagerly */
 static void prim_concatMap(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     state.forceFunction(*args[0], pos);
@@ -2611,6 +2657,16 @@ static void prim_concatMap(EvalState & state, const Pos & pos, Value * * args, V
     }
 }
 
+static RegisterPrimOp primop_concatMap({
+    .name = "__concatMap",
+    .args = {"f", "list"},
+    .doc = R"(
+      This function is equivalent to `builtins.concatLists (map f list)`
+      but is more efficient.
+    )",
+    .fun = prim_concatMap,
+});
+
 
 /*************************************************************
  * Integer arithmetic
@@ -3361,17 +3417,10 @@ void EvalState::createBaseEnv()
     addPrimOp("__addErrorContext", 2, prim_addErrorContext);
 
     // Paths
-    addPrimOp("__storePath", 1, prim_storePath);
     addPrimOp("__findFile", 2, prim_findFile);
 
     // Sets
     addPrimOp("__unsafeGetAttrPos", 2, prim_unsafeGetAttrPos);
-    addPrimOp("__catAttrs", 2, prim_catAttrs);
-    addPrimOp("__mapAttrs", 2, prim_mapAttrs);
-
-    // Lists
-    addPrimOp("__partition", 2, prim_partition);
-    addPrimOp("__concatMap", 2, prim_concatMap);
 
     // Derivations
     addPrimOp("derivationStrict", 1, prim_derivationStrict);

From 2a2121d264911abaa042be30238a14ec950c1ea7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 11:25:01 +0200
Subject: [PATCH 090/176] Use RegisterPrimOp for some undocumented primops

---
 src/libexpr/primops.cc | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index cdc526de3..2d3433200 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -156,7 +156,6 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
     }
 }
 
-
 /* Want reasonable symbol names, so extern C */
 /* !!! Should we pass the Pos or the file name too? */
 extern "C" typedef void (*ValueInitializer)(EvalState & state, Value & v);
@@ -518,6 +517,11 @@ static void prim_genericClosure(EvalState & state, const Pos & pos, Value * * ar
         v.listElems()[n++] = i;
 }
 
+static RegisterPrimOp primop_genericClosure(RegisterPrimOp::Info {
+    .name = "__genericClosure",
+    .arity = 1,
+    .fun = prim_genericClosure,
+});
 
 static RegisterPrimOp primop_abort({
     .name = "abort",
@@ -563,6 +567,11 @@ static void prim_addErrorContext(EvalState & state, const Pos & pos, Value * * a
     }
 }
 
+static RegisterPrimOp primop_addErrorContext(RegisterPrimOp::Info {
+    .name = "__addErrorContext",
+    .arity = 2,
+    .fun = prim_addErrorContext,
+});
 
 /* Try evaluating the argument. Success => {success=true; value=something;},
  * else => {success=false; value=false;} */
@@ -1011,6 +1020,11 @@ static void prim_derivationStrict(EvalState & state, const Pos & pos, Value * *
     v.attrs->sort();
 }
 
+static RegisterPrimOp primop_derivationStrict(RegisterPrimOp::Info {
+    .name = "derivationStrict",
+    .arity = 1,
+    .fun = prim_derivationStrict,
+});
 
 /* Return a placeholder string for the specified output that will be
    substituted by the corresponding output path at build time. For
@@ -1256,6 +1270,12 @@ static void prim_findFile(EvalState & state, const Pos & pos, Value * * args, Va
     mkPath(v, state.checkSourcePath(state.findFile(searchPath, path, pos)).c_str());
 }
 
+static RegisterPrimOp primop_findFile(RegisterPrimOp::Info {
+    .name = "__findFile",
+    .arity = 2,
+    .fun = prim_findFile,
+});
+
 /* Return the cryptographic hash of a file in base-16. */
 static void prim_hashFile(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -1901,6 +1921,12 @@ static void prim_unsafeGetAttrPos(EvalState & state, const Pos & pos, Value * *
         state.mkPos(v, i->pos);
 }
 
+static RegisterPrimOp primop_unsafeGetAttrPos(RegisterPrimOp::Info {
+    .name = "__unsafeGetAttrPos",
+    .arity = 2,
+    .fun = prim_unsafeGetAttrPos,
+});
+
 /* Dynamic version of the `?' operator. */
 static void prim_hasAttr(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
@@ -3413,17 +3439,6 @@ void EvalState::createBaseEnv()
         addPrimOp("__importNative", 2, prim_importNative);
         addPrimOp("__exec", 1, prim_exec);
     }
-    addPrimOp("__genericClosure", 1, prim_genericClosure);
-    addPrimOp("__addErrorContext", 2, prim_addErrorContext);
-
-    // Paths
-    addPrimOp("__findFile", 2, prim_findFile);
-
-    // Sets
-    addPrimOp("__unsafeGetAttrPos", 2, prim_unsafeGetAttrPos);
-
-    // Derivations
-    addPrimOp("derivationStrict", 1, prim_derivationStrict);
 
     /* Add a value containing the current Nix expression search path. */
     mkList(v, searchPath.size());

From f53b5f10585b1d4c939e45faf0dd2f4dacbca013 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 13:31:11 +0200
Subject: [PATCH 091/176] Add getDoc() function

---
 src/libexpr/eval.cc | 19 +++++++++++++++++++
 src/libexpr/eval.hh | 11 +++++++++++
 src/nix/repl.cc     | 25 ++++++++++++-------------
 3 files changed, 42 insertions(+), 13 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index a5ebd1bf0..4f2fd36c1 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -563,6 +563,25 @@ Value & EvalState::getBuiltin(const string & name)
 }
 
 
+std::optional<EvalState::Doc> EvalState::getDoc(Value & v)
+{
+    if (v.type == tPrimOp || v.type == tPrimOpApp) {
+        auto v2 = &v;
+        while (v2->type == tPrimOpApp)
+            v2 = v2->primOpApp.left;
+        if (v2->primOp->doc)
+            return Doc {
+                .pos = noPos,
+                .name = v2->primOp->name,
+                .arity = v2->primOp->arity,
+                .args = v2->primOp->args,
+                .doc = v2->primOp->doc,
+            };
+    }
+    return {};
+}
+
+
 /* Every "format" object (even temporary) takes up a few hundred bytes
    of stack space, which is a real killer in the recursive
    evaluator.  So here are some helper functions for throwing
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index db8eb3e16..80078d8a5 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -248,6 +248,17 @@ public:
 
     Value & getBuiltin(const string & name);
 
+    struct Doc
+    {
+        Pos pos;
+        std::optional<Symbol> name;
+        size_t arity;
+        std::vector<std::string> args;
+        const char * doc;
+    };
+
+    std::optional<Doc> getDoc(Value & v);
+
 private:
 
     inline Value * lookupVar(Env * env, const ExprVar & var, bool noEval);
diff --git a/src/nix/repl.cc b/src/nix/repl.cc
index c7f8af742..8ecf11900 100644
--- a/src/nix/repl.cc
+++ b/src/nix/repl.cc
@@ -514,23 +514,22 @@ bool NixRepl::processLine(string line)
     else if (command == ":doc") {
         Value v;
         evalString(arg, v);
-        if (v.type == tPrimOp || v.type == tPrimOpApp) {
-            auto v2 = &v;
-            while (v2->type == tPrimOpApp)
-                v2 = v2->primOpApp.left;
-            if (v2->primOp->doc) {
-                auto args = v2->primOp->args;
+        if (auto doc = state->getDoc(v)) {
+            std::string markdown;
+
+            if (!doc->args.empty() && doc->name) {
+                auto args = doc->args;
                 for (auto & arg : args)
                     arg = "*" + arg + "*";
 
-                auto markdown =
-                    "**Synopsis:** `builtins." + (std::string) v2->primOp->name + "` "
-                    + concatStringsSep(" ", args) + "\n\n"
-                    + trim(stripIndentation(v2->primOp->doc));
+                markdown +=
+                    "**Synopsis:** `builtins." + (std::string) (*doc->name) + "` "
+                    + concatStringsSep(" ", args) + "\n\n";
+            }
 
-                std::cout << renderMarkdownToTerminal(markdown);
-            } else
-                throw Error("builtin function '%s' does not have documentation", v2->primOp->name);
+            markdown += trim(stripIndentation(doc->doc));
+
+            std::cout << renderMarkdownToTerminal(markdown);
         } else
             throw Error("value does not have documentation");
     }

From 7a02865b94f107de1c1ef797b89d45ecd3f01cf1 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 25 Aug 2020 14:06:01 +0200
Subject: [PATCH 092/176] Move import docs

---
 doc/manual/src/expressions/builtins-prefix.md | 53 -----------
 src/libexpr/primops.cc                        | 93 ++++++++++++++++---
 tests/function-trace.sh                       | 12 ---
 3 files changed, 80 insertions(+), 78 deletions(-)

diff --git a/doc/manual/src/expressions/builtins-prefix.md b/doc/manual/src/expressions/builtins-prefix.md
index ae3bb150c..0f7c3d32f 100644
--- a/doc/manual/src/expressions/builtins-prefix.md
+++ b/doc/manual/src/expressions/builtins-prefix.md
@@ -13,56 +13,3 @@ For instance, `derivation` is also available as `builtins.derivation`.
 
     `derivation` is described in [its own section](derivations.md).
 
-  - `import` *path*; `builtins.import` *path*  
-
-    Load, parse and return the Nix expression in the file *path*. If
-    *path* is a directory, the file ` default.nix ` in that directory
-    is loaded. Evaluation aborts if the file doesn’t exist or contains
-    an incorrect Nix expression. `import` implements Nix’s module
-    system: you can put any Nix expression (such as a set or a
-    function) in a separate file, and use it from Nix expressions in
-    other files.
-
-    > **Note**
-    >
-    > Unlike some languages, `import` is a regular function in Nix.
-    > Paths using the angle bracket syntax (e.g., `import` *\<foo\>*)
-    > are [normal path values](language-values.md).
-
-    A Nix expression loaded by `import` must not contain any *free
-    variables* (identifiers that are not defined in the Nix expression
-    itself and are not built-in). Therefore, it cannot refer to
-    variables that are in scope at the call site. For instance, if you
-    have a calling expression
-
-    ```nix
-    rec {
-      x = 123;
-      y = import ./foo.nix;
-    }
-    ```
-
-    then the following `foo.nix` will give an error:
-
-    ```nix
-    x + 456
-    ```
-
-    since `x` is not in scope in `foo.nix`. If you want `x` to be
-    available in `foo.nix`, you should pass it as a function argument:
-
-    ```nix
-    rec {
-      x = 123;
-      y = import ./foo.nix x;
-    }
-    ```
-
-    and
-
-    ```nix
-    x: x + 456
-    ```
-
-    (The function argument doesn’t have to be called `x` in `foo.nix`;
-    any name would work.)
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 2d3433200..821cf0782 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -74,10 +74,10 @@ void EvalState::realiseContext(const PathSet & context)
 
 /* Load and evaluate an expression from path specified by the
    argument. */
-static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args, Value & v)
+static void import(EvalState & state, const Pos & pos, Value & vPath, Value * vScope, Value & v)
 {
     PathSet context;
-    Path path = state.coerceToPath(pos, *args[1], context);
+    Path path = state.coerceToPath(pos, vPath, context);
 
     try {
         state.realiseContext(context);
@@ -99,6 +99,7 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
             return std::nullopt;
         return storePath;
     };
+
     if (auto optStorePath = isValidDerivationInStore()) {
         auto storePath = *optStorePath;
         Derivation drv = readDerivation(*state.store, realPath, Derivation::nameFromPath(storePath));
@@ -133,17 +134,18 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
         mkApp(v, **fun, w);
         state.forceAttrs(v, pos);
     } else {
-        state.forceAttrs(*args[0]);
-        if (args[0]->attrs->empty())
+        if (!vScope)
             state.evalFile(realPath, v);
         else {
-            Env * env = &state.allocEnv(args[0]->attrs->size());
+            state.forceAttrs(*vScope);
+
+            Env * env = &state.allocEnv(vScope->attrs->size());
             env->up = &state.baseEnv;
 
             StaticEnv staticEnv(false, &state.staticBaseEnv);
 
             unsigned int displ = 0;
-            for (auto & attr : *args[0]->attrs) {
+            for (auto & attr : *vScope->attrs) {
                 staticEnv.vars[attr.name] = displ;
                 env->values[displ++] = attr.value;
             }
@@ -156,6 +158,77 @@ static void prim_scopedImport(EvalState & state, const Pos & pos, Value * * args
     }
 }
 
+static RegisterPrimOp primop_scopedImport(RegisterPrimOp::Info {
+    .name = "scopedImport",
+    .arity = 2,
+    .fun = [](EvalState & state, const Pos & pos, Value * * args, Value & v)
+    {
+        import(state, pos, *args[1], args[0], v);
+    }
+});
+
+static RegisterPrimOp primop_import({
+    .name = "import",
+    .args = {"path"},
+    .doc = R"(
+      Load, parse and return the Nix expression in the file *path*. If
+      *path* is a directory, the file ` default.nix ` in that directory
+      is loaded. Evaluation aborts if the file doesn’t exist or contains
+      an incorrect Nix expression. `import` implements Nix’s module
+      system: you can put any Nix expression (such as a set or a
+      function) in a separate file, and use it from Nix expressions in
+      other files.
+
+      > **Note**
+      >
+      > Unlike some languages, `import` is a regular function in Nix.
+      > Paths using the angle bracket syntax (e.g., `import` *\<foo\>*)
+      > are [normal path values](language-values.md).
+
+      A Nix expression loaded by `import` must not contain any *free
+      variables* (identifiers that are not defined in the Nix expression
+      itself and are not built-in). Therefore, it cannot refer to
+      variables that are in scope at the call site. For instance, if you
+      have a calling expression
+
+      ```nix
+      rec {
+        x = 123;
+        y = import ./foo.nix;
+      }
+      ```
+
+      then the following `foo.nix` will give an error:
+
+      ```nix
+      x + 456
+      ```
+
+      since `x` is not in scope in `foo.nix`. If you want `x` to be
+      available in `foo.nix`, you should pass it as a function argument:
+
+      ```nix
+      rec {
+        x = 123;
+        y = import ./foo.nix x;
+      }
+      ```
+
+      and
+
+      ```nix
+      x: x + 456
+      ```
+
+      (The function argument doesn’t have to be called `x` in `foo.nix`;
+      any name would work.)
+    )",
+    .fun = [](EvalState & state, const Pos & pos, Value * * args, Value & v)
+    {
+        import(state, pos, *args[0], nullptr, v);
+    }
+});
+
 /* Want reasonable symbol names, so extern C */
 /* !!! Should we pass the Pos or the file name too? */
 extern "C" typedef void (*ValueInitializer)(EvalState & state, Value & v);
@@ -3429,12 +3502,6 @@ void EvalState::createBaseEnv()
     addConstant("__langVersion", v);
 
     // Miscellaneous
-    auto vScopedImport = addPrimOp("scopedImport", 2, prim_scopedImport);
-    Value * v2 = allocValue();
-    mkAttrs(*v2, 0);
-    mkApp(v, *vScopedImport, *v2);
-    forceValue(v);
-    addConstant("import", v);
     if (evalSettings.enableNativeCode) {
         addPrimOp("__importNative", 2, prim_importNative);
         addPrimOp("__exec", 1, prim_exec);
@@ -3444,7 +3511,7 @@ void EvalState::createBaseEnv()
     mkList(v, searchPath.size());
     int n = 0;
     for (auto & i : searchPath) {
-        v2 = v.listElems()[n++] = allocValue();
+        auto v2 = v.listElems()[n++] = allocValue();
         mkAttrs(*v2, 2);
         mkString(*allocAttr(*v2, symbols.create("path")), i.second);
         mkString(*allocAttr(*v2, symbols.create("prefix")), i.first);
diff --git a/tests/function-trace.sh b/tests/function-trace.sh
index 182a4d5c2..3b7f364e3 100755
--- a/tests/function-trace.sh
+++ b/tests/function-trace.sh
@@ -32,8 +32,6 @@ expect_trace() {
 
 # failure inside a tryEval
 expect_trace 'builtins.tryEval (throw "example")' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace entered (string):1:19 at
 function-trace exited (string):1:19 at
@@ -42,32 +40,24 @@ function-trace exited (string):1:1 at
 
 # Missing argument to a formal function
 expect_trace '({ x }: x) { }' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace exited (string):1:1 at
 "
 
 # Too many arguments to a formal function
 expect_trace '({ x }: x) { x = "x"; y = "y"; }' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace exited (string):1:1 at
 "
 
 # Not enough arguments to a lambda
 expect_trace '(x: y: x + y) 1' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace exited (string):1:1 at
 "
 
 # Too many arguments to a lambda
 expect_trace '(x: x) 1 2' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace exited (string):1:1 at
 function-trace entered (string):1:1 at
@@ -76,8 +66,6 @@ function-trace exited (string):1:1 at
 
 # Not a function
 expect_trace '1 2' "
-function-trace entered undefined position at
-function-trace exited undefined position at
 function-trace entered (string):1:1 at
 function-trace exited (string):1:1 at
 "

From c3efef9275ce6db3d65a2eb97aee507e79b626a6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 26 Aug 2020 09:28:10 +0200
Subject: [PATCH 093/176] Remove obsolete comment

---
 src/nix/local.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nix/local.mk b/src/nix/local.mk
index cfe97b0f0..e96200685 100644
--- a/src/nix/local.mk
+++ b/src/nix/local.mk
@@ -15,7 +15,6 @@ nix_SOURCES := \
   $(wildcard src/nix-prefetch-url/*.cc) \
   $(wildcard src/nix-store/*.cc) \
 
-# -fpermissive is needed by lowdown.
 nix_CXXFLAGS += -I src/libutil -I src/libstore -I src/libfetchers -I src/libexpr -I src/libmain
 
 nix_LIBS = libexpr libmain libfetchers libstore libutil

From a0f19d9f3a009961869a077922f15986ce05738e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 27 Aug 2020 14:48:08 +0200
Subject: [PATCH 094/176] RemoteStore::addToStore(): Fix race between
 stderrThread and NAR writer

As pointed out by @B4dM4n, the call to to.flush() on stderrThread is
unsafe because the NAR writer thread is also writing to 'to'.

Fixes #3943.
---
 src/libstore/remote-store.cc | 13 ++++++++-----
 src/libstore/remote-store.hh |  2 +-
 src/libutil/serialise.hh     |  6 ++++--
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index adba17c5e..e4a4ef5af 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -284,9 +284,9 @@ struct ConnectionHandle
 
     RemoteStore::Connection * operator -> () { return &*handle; }
 
-    void processStderr(Sink * sink = 0, Source * source = 0)
+    void processStderr(Sink * sink = 0, Source * source = 0, bool flush = true)
     {
-        auto ex = handle->processStderr(sink, source);
+        auto ex = handle->processStderr(sink, source, flush);
         if (ex) {
             daemonException = true;
             std::rethrow_exception(ex);
@@ -535,6 +535,8 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
 
         if (GET_PROTOCOL_MINOR(conn->daemonVersion) >= 23) {
 
+            conn->to.flush();
+
             std::exception_ptr ex;
 
             struct FramedSink : BufferedSink
@@ -574,7 +576,7 @@ void RemoteStore::addToStore(const ValidPathInfo & info, Source & source,
             std::thread stderrThread([&]()
             {
                 try {
-                    conn.processStderr();
+                    conn.processStderr(nullptr, nullptr, false);
                 } catch (...) {
                     ex = std::current_exception();
                 }
@@ -884,9 +886,10 @@ static Logger::Fields readFields(Source & from)
 }
 
 
-std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source * source)
+std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source * source, bool flush)
 {
-    to.flush();
+    if (flush)
+        to.flush();
 
     while (true) {
 
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index b319e774b..7cf4c4d12 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -114,7 +114,7 @@ protected:
 
         virtual ~Connection();
 
-        std::exception_ptr processStderr(Sink * sink = 0, Source * source = 0);
+        std::exception_ptr processStderr(Sink * sink = 0, Source * source = 0, bool flush = true);
     };
 
     ref<Connection> openConnectionWrapper();
diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 69ae0874a..8f17bc34c 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -23,7 +23,8 @@ struct Sink
 };
 
 
-/* A buffered abstract sink. */
+/* A buffered abstract sink. Warning: a BufferedSink should not be
+   used from multiple threads concurrently. */
 struct BufferedSink : virtual Sink
 {
     size_t bufSize, bufPos;
@@ -66,7 +67,8 @@ struct Source
 };
 
 
-/* A buffered abstract source. */
+/* A buffered abstract source. Warning: a BufferedSink should not be
+   used from multiple threads concurrently. */
 struct BufferedSource : Source
 {
     size_t bufSize, bufPosIn, bufPosOut;

From e915fd6d2afb0299bcb77069503698faabe5f233 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 27 Aug 2020 14:51:50 +0200
Subject: [PATCH 095/176] Typo

---
 src/libutil/serialise.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/serialise.hh b/src/libutil/serialise.hh
index 8f17bc34c..a6f1c42e9 100644
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -67,7 +67,7 @@ struct Source
 };
 
 
-/* A buffered abstract source. Warning: a BufferedSink should not be
+/* A buffered abstract source. Warning: a BufferedSource should not be
    used from multiple threads concurrently. */
 struct BufferedSource : Source
 {

From 626200713bb3cc844a9feb6af583c9b6b42c6dbc Mon Sep 17 00:00:00 2001
From: Griffin Smith <root@gws.fyi>
Date: Thu, 27 Aug 2020 12:28:12 -0400
Subject: [PATCH 096/176] Pass all args when auto-calling a function with an
 ellipsis

The command line options --arg and --argstr that are used by a bunch of
CLI commands to pass arguments to top-level functions in files go
through the same code-path as auto-calling top-level functions with
their default arguments - this, however, was only passing the arguments
that were *explicitly* mentioned in the formals of the function - in the
case of an as-pattern with an ellipsis (eg args @ { ... }) extra passed
arguments would get omitted. This fixes that to instead pass *all*
specified auto args in the case that our function has an ellipsis.

Fixes #598
---
 src/libexpr/eval.cc | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 0123070d1..00191bce0 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -1299,12 +1299,23 @@ void EvalState::autoCallFunction(Bindings & args, Value & fun, Value & res)
     Value * actualArgs = allocValue();
     mkAttrs(*actualArgs, fun.lambda.fun->formals->formals.size());
 
-    for (auto & i : fun.lambda.fun->formals->formals) {
-        Bindings::iterator j = args.find(i.name);
-        if (j != args.end())
-            actualArgs->attrs->push_back(*j);
-        else if (!i.def)
-            throwTypeError("cannot auto-call a function that has an argument without a default value ('%1%')", i.name);
+    if (fun.lambda.fun->formals->ellipsis) {
+        // If the formals have an ellipsis (eg the function accepts extra args) pass
+        // all available automatic arguments (which includes arguments specified on
+        // the command line via --arg/--argstr)
+        for (auto& v : args) {
+            actualArgs->attrs->push_back(v);
+        }
+    } else {
+        // Otherwise, only pass the arguments that the function accepts
+        for (auto & i : fun.lambda.fun->formals->formals) {
+            Bindings::iterator j = args.find(i.name);
+            if (j != args.end()) {
+                actualArgs->attrs->push_back(*j);
+            } else if (!i.def) {
+                throwTypeError("cannot auto-call a function that has an argument without a default value ('%1%')", i.name);
+            }
+        }
     }
 
     actualArgs->attrs->sort();

From 3156560d413634eea170e8dd88b3c2208149d999 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Aug 2020 18:16:03 +0200
Subject: [PATCH 097/176] nix develop: Set output paths to writable locations

Currently, they're set to $(pwd)/outputs/$outputName. This allows
commands like 'make install' to work.
---
 flake.nix          | 11 ++-----
 src/nix/develop.cc | 81 +++++++++++++++++++++++++++++-----------------
 src/nix/get-env.sh | 17 +++++-----
 3 files changed, 63 insertions(+), 46 deletions(-)

diff --git a/flake.nix b/flake.nix
index a707e90e7..32ebb4936 100644
--- a/flake.nix
+++ b/flake.nix
@@ -421,6 +421,8 @@
         stdenv.mkDerivation {
           name = "nix";
 
+          outputs = [ "out" "dev" "doc" ];
+
           buildInputs = buildDeps ++ propagatedDeps ++ perlDeps;
 
           inherit configureFlags;
@@ -428,15 +430,6 @@
           enableParallelBuilding = true;
 
           installFlags = "sysconfdir=$(out)/etc";
-
-          shellHook =
-            ''
-              export prefix=$(pwd)/inst
-              configureFlags+=" --prefix=$prefix"
-              PKG_CONFIG_PATH=$prefix/lib/pkgconfig:$PKG_CONFIG_PATH
-              PATH=$prefix/bin:$PATH
-              unset PYTHONPATH
-            '';
         });
 
   };
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 8a14e45c9..20316c477 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -15,7 +15,7 @@ struct Var
 {
     bool exported = true;
     bool associative = false;
-    std::string value; // quoted string or array
+    std::string quoted; // quoted string or array
 };
 
 struct BuildEnvironment
@@ -75,12 +75,12 @@ BuildEnvironment readEnvironment(const Path & path)
 
         else if (std::regex_search(pos, file.cend(), match, varRegex, std::regex_constants::match_continuous)) {
             pos = match[0].second;
-            res.env.insert({match[1], Var { .exported = exported.count(match[1]) > 0, .value = match[2] }});
+            res.env.insert({match[1], Var { .exported = exported.count(match[1]) > 0, .quoted = match[2] }});
         }
 
         else if (std::regex_search(pos, file.cend(), match, assocArrayRegex, std::regex_constants::match_continuous)) {
             pos = match[0].second;
-            res.env.insert({match[1], Var { .associative = true, .value = match[2] }});
+            res.env.insert({match[1], Var { .associative = true, .quoted = match[2] }});
         }
 
         else if (std::regex_search(pos, file.cend(), match, functionRegex, std::regex_constants::match_continuous)) {
@@ -92,6 +92,8 @@ BuildEnvironment readEnvironment(const Path & path)
             path, file.substr(pos - file.cbegin(), 60));
     }
 
+    res.env.erase("__output");
+
     return res;
 }
 
@@ -125,27 +127,32 @@ StorePath getDerivationEnvironment(ref<Store> store, const StorePath & drvPath)
     /* Rehash and write the derivation. FIXME: would be nice to use
        'buildDerivation', but that's privileged. */
     drv.name += "-env";
-    for (auto & output : drv.outputs)
-        drv.env.erase(output.first);
-    drv.outputs = {{"out", DerivationOutput { .output = DerivationOutputInputAddressed { .path = StorePath::dummy }}}};
-    drv.env["out"] = "";
-    drv.env["_outputs_saved"] = drv.env["outputs"];
-    drv.env["outputs"] = "out";
+    for (auto & output : drv.outputs) {
+        output.second = { .output = DerivationOutputInputAddressed { .path = StorePath::dummy } };
+        drv.env[output.first] = "";
+    }
     drv.inputSrcs.insert(std::move(getEnvShPath));
     Hash h = std::get<0>(hashDerivationModulo(*store, drv, true));
-    auto shellOutPath = store->makeOutputPath("out", h, drv.name);
-    drv.outputs.insert_or_assign("out", DerivationOutput { .output = DerivationOutputInputAddressed {
-                .path = shellOutPath
-            } });
-    drv.env["out"] = store->printStorePath(shellOutPath);
-    auto shellDrvPath2 = writeDerivation(*store, drv);
+
+    for (auto & output : drv.outputs) {
+        auto outPath = store->makeOutputPath(output.first, h, drv.name);
+        output.second = { .output = DerivationOutputInputAddressed { .path = outPath } };
+        drv.env[output.first] = store->printStorePath(outPath);
+    }
+
+    auto shellDrvPath = writeDerivation(*store, drv);
 
     /* Build the derivation. */
-    store->buildPaths({{shellDrvPath2}});
+    store->buildPaths({{shellDrvPath}});
 
-    assert(store->isValidPath(shellOutPath));
+    for (auto & outPath : drv.outputPaths(*store)) {
+        assert(store->isValidPath(outPath));
+        auto outPathS = store->toRealPath(outPath);
+        if (lstat(outPathS).st_size)
+            return outPath;
+    }
 
-    return shellOutPath;
+    throw Error("get-env.sh failed to produce an environment");
 }
 
 struct Common : InstallableCommand, MixProfile
@@ -171,8 +178,12 @@ struct Common : InstallableCommand, MixProfile
         "UID",
     };
 
-    void makeRcScript(const BuildEnvironment & buildEnvironment, std::ostream & out)
+    std::string makeRcScript(
+        const BuildEnvironment & buildEnvironment,
+        const Path & outputsDir = absPath(".") + "/outputs")
     {
+        std::ostringstream out;
+
         out << "unset shellHook\n";
 
         out << "nix_saved_PATH=\"$PATH\"\n";
@@ -180,9 +191,9 @@ struct Common : InstallableCommand, MixProfile
         for (auto & i : buildEnvironment.env) {
             if (!ignoreVars.count(i.first) && !hasPrefix(i.first, "BASH_")) {
                 if (i.second.associative)
-                    out << fmt("declare -A %s=(%s)\n", i.first, i.second.value);
+                    out << fmt("declare -A %s=(%s)\n", i.first, i.second.quoted);
                 else {
-                    out << fmt("%s=%s\n", i.first, i.second.value);
+                    out << fmt("%s=%s\n", i.first, i.second.quoted);
                     if (i.second.exported)
                         out << fmt("export %s\n", i.first);
                 }
@@ -193,13 +204,26 @@ struct Common : InstallableCommand, MixProfile
 
         out << buildEnvironment.bashFunctions << "\n";
 
-        // FIXME: set outputs
-
         out << "export NIX_BUILD_TOP=\"$(mktemp -d --tmpdir nix-shell.XXXXXX)\"\n";
         for (auto & i : {"TMP", "TMPDIR", "TEMP", "TEMPDIR"})
             out << fmt("export %s=\"$NIX_BUILD_TOP\"\n", i);
 
         out << "eval \"$shellHook\"\n";
+
+        /* Substitute occurrences of output paths. */
+        auto outputs = buildEnvironment.env.find("outputs");
+        assert(outputs != buildEnvironment.env.end());
+
+        // FIXME: properly unquote 'outputs'.
+        StringMap rewrites;
+        for (auto & outputName : tokenizeString<std::vector<std::string>>(replaceStrings(outputs->second.quoted, "'", ""))) {
+            auto from = buildEnvironment.env.find(outputName);
+            assert(from != buildEnvironment.env.end());
+            // FIXME: unquote
+            rewrites.insert({from->second.quoted, outputsDir + "/" + outputName});
+        }
+
+        return rewriteStrings(out.str(), rewrites);
     }
 
     Strings getDefaultFlakeAttrPaths() override
@@ -288,19 +312,18 @@ struct CmdDevelop : Common, MixEnvironment
 
         auto [rcFileFd, rcFilePath] = createTempFile("nix-shell");
 
-        std::ostringstream ss;
-        makeRcScript(buildEnvironment, ss);
+        auto script = makeRcScript(buildEnvironment);
 
-        ss << fmt("rm -f '%s'\n", rcFilePath);
+        script +=  fmt("rm -f '%s'\n", rcFilePath);
 
         if (!command.empty()) {
             std::vector<std::string> args;
             for (auto s : command)
                 args.push_back(shellEscape(s));
-            ss << fmt("exec %s\n", concatStringsSep(" ", args));
+            script += fmt("exec %s\n", concatStringsSep(" ", args));
         }
 
-        writeFull(rcFileFd.get(), ss.str());
+        writeFull(rcFileFd.get(), script);
 
         stopProgressBar();
 
@@ -362,7 +385,7 @@ struct CmdPrintDevEnv : Common
 
         stopProgressBar();
 
-        makeRcScript(buildEnvironment, std::cout);
+        std::cout << makeRcScript(buildEnvironment);
     }
 };
 
diff --git a/src/nix/get-env.sh b/src/nix/get-env.sh
index 2e0e83561..091c0f573 100644
--- a/src/nix/get-env.sh
+++ b/src/nix/get-env.sh
@@ -1,12 +1,6 @@
 set -e
 if [ -e .attrs.sh ]; then source .attrs.sh; fi
 
-outputs=$_outputs_saved
-for __output in $_outputs_saved; do
-    declare "$__output"="$out"
-done
-unset _outputs_saved __output
-
 export IN_NIX_SHELL=impure
 export dontAddDisableDepTrack=1
 
@@ -14,5 +8,12 @@ if [[ -n $stdenv ]]; then
     source $stdenv/setup
 fi
 
-export > $out
-set >> $out
+for __output in $outputs; do
+    if [[ -z $__done ]]; then
+        export > ${!__output}
+        set >> ${!__output}
+        __done=1
+    else
+        echo -n >> ${!__output}
+    fi
+done

From 50a8710ed14c7a0236a656bb62d5117519ec5813 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Aug 2020 18:43:34 +0200
Subject: [PATCH 098/176] Close stdin while running tests

For some reason, the bash shell started by 'nix develop' sometimes
reads from stdin, which can hang.
---
 mk/tests.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mk/tests.mk b/mk/tests.mk
index 2e39bb694..c1e140bac 100644
--- a/mk/tests.mk
+++ b/mk/tests.mk
@@ -8,7 +8,7 @@ define run-install-test
 
   .PHONY: $1.test
   $1.test: $1 $(test-deps)
-	@env TEST_NAME=$(notdir $(basename $1)) TESTS_ENVIRONMENT="$(tests-environment)" mk/run_test.sh $1
+	@env TEST_NAME=$(notdir $(basename $1)) TESTS_ENVIRONMENT="$(tests-environment)" mk/run_test.sh $1 < /dev/null
 
 endef
 

From f15651303f8596bf34c67fc8d536b1e9e7843a87 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 28 Aug 2020 19:24:29 +0200
Subject: [PATCH 099/176] nix develop: Add convenience flags for running
 specific phases

For example, for building the Nix flake, you would do:

  $ nix develop --configure
  $ nix develop --install
  $ nix develop --installcheck
---
 src/nix/develop.cc | 55 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 53 insertions(+), 2 deletions(-)

diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index 20316c477..516e7bda9 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -264,6 +264,7 @@ struct Common : InstallableCommand, MixProfile
 struct CmdDevelop : Common, MixEnvironment
 {
     std::vector<std::string> command;
+    std::optional<std::string> phase;
 
     CmdDevelop()
     {
@@ -277,6 +278,43 @@ struct CmdDevelop : Common, MixEnvironment
                 command = ss;
             }}
         });
+
+        addFlag({
+            .longName = "phase",
+            .description = "phase to run (e.g. `build` or `configure`)",
+            .labels = {"phase-name"},
+            .handler = {&phase},
+        });
+
+        addFlag({
+            .longName = "configure",
+            .description = "run the configure phase",
+            .handler = {&phase, {"configure"}},
+        });
+
+        addFlag({
+            .longName = "build",
+            .description = "run the build phase",
+            .handler = {&phase, {"build"}},
+        });
+
+        addFlag({
+            .longName = "check",
+            .description = "run the check phase",
+            .handler = {&phase, {"check"}},
+        });
+
+        addFlag({
+            .longName = "install",
+            .description = "run the install phase",
+            .handler = {&phase, {"install"}},
+        });
+
+        addFlag({
+            .longName = "installcheck",
+            .description = "run the installcheck phase",
+            .handler = {&phase, {"installCheck"}},
+        });
     }
 
     std::string description() override
@@ -314,9 +352,22 @@ struct CmdDevelop : Common, MixEnvironment
 
         auto script = makeRcScript(buildEnvironment);
 
-        script +=  fmt("rm -f '%s'\n", rcFilePath);
+        if (verbosity >= lvlDebug)
+            script += "set -x\n";
 
-        if (!command.empty()) {
+        script += fmt("rm -f '%s'\n", rcFilePath);
+
+        if (phase) {
+            if (!command.empty())
+                throw UsageError("you cannot use both '--command' and '--phase'");
+            // FIXME: foundMakefile is set by buildPhase, need to get
+            // rid of that.
+            script += fmt("foundMakefile=1\n");
+            script += fmt("runHook %1%Phase\n", *phase);
+            script += fmt("exit 0\n", *phase);
+        }
+
+        else if (!command.empty()) {
             std::vector<std::string> args;
             for (auto s : command)
                 args.push_back(shellEscape(s));

From 8757e7022a9b407b69f173b3793fababf1e8ed84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 30 Aug 2020 19:41:21 +0200
Subject: [PATCH 100/176] mention how to run a single functional test for
 faster feedback loop

---
 doc/manual/hacking.xml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/manual/hacking.xml b/doc/manual/hacking.xml
index d25d4b84a..267386d42 100644
--- a/doc/manual/hacking.xml
+++ b/doc/manual/hacking.xml
@@ -57,6 +57,12 @@ To install it in <literal>$(pwd)/inst</literal> and test it:
 nix (Nix) 2.4
 </screen>
 
+To run a functional test:
+          
+<screen>
+make tests/test-name-should-auto-complete.sh.test
+</screen>
+
 If you have a flakes-enabled nix you can replace:
 
 <screen>

From f38fe24346ca6b0201aed716db9cf47336a708ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Sun, 30 Aug 2020 22:52:34 +0200
Subject: [PATCH 101/176] speed up CI

---
 .github/workflows/test.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e16e6c62d..1f504a8ea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -13,5 +13,7 @@ jobs:
       with:
         fetch-depth: 0
     - uses: cachix/install-nix-action@v10
+      with:
+        skip_adding_nixpkgs_channel: true
     #- run: nix flake check
     - run: nix-build -A checks.$(if [[ `uname` = Linux ]]; then echo x86_64-linux; else echo x86_64-darwin; fi)

From ebb8e076eb41e712be2eff51fbde971ddddda1ee Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 31 Aug 2020 16:39:45 +0200
Subject: [PATCH 102/176] Restore some of the shellHook

---
 flake.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/flake.nix b/flake.nix
index 32ebb4936..a0489ffd6 100644
--- a/flake.nix
+++ b/flake.nix
@@ -430,6 +430,12 @@
           enableParallelBuilding = true;
 
           installFlags = "sysconfdir=$(out)/etc";
+
+          shellHook =
+            ''
+              PATH=$prefix/bin:$PATH
+              unset PYTHONPATH
+            '';
         });
 
   };

From 6d7f7efb896c482ff6e7ce6c105e4dd3f7ee7218 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 1 Sep 2020 15:29:04 +0200
Subject: [PATCH 103/176] github: Use access token when calling .../commits API

---
 src/libfetchers/github.cc | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index 9f84ffb68..1cc0c5e2e 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -182,11 +182,21 @@ struct GitHubInputScheme : GitArchiveInputScheme
 {
     std::string type() override { return "github"; }
 
+    void addAccessToken(std::string & url) const
+    {
+        std::string accessToken = settings.githubAccessToken.get();
+        if (accessToken != "")
+            url += "?access_token=" + accessToken;
+    }
+
     Hash getRevFromRef(nix::ref<Store> store, const Input & input) const override
     {
         auto host_url = maybeGetStrAttr(input.attrs, "url").value_or("github.com");
         auto url = fmt("https://api.%s/repos/%s/%s/commits/%s", // FIXME: check
             host_url, getStrAttr(input.attrs, "owner"), getStrAttr(input.attrs, "repo"), *input.getRef());
+
+        addAccessToken(url);
+
         auto json = nlohmann::json::parse(
             readFile(
                 store->toRealPath(
@@ -205,9 +215,7 @@ struct GitHubInputScheme : GitArchiveInputScheme
             host_url, getStrAttr(input.attrs, "owner"), getStrAttr(input.attrs, "repo"),
             input.getRev()->to_string(Base16, false));
 
-        std::string accessToken = settings.githubAccessToken.get();
-        if (accessToken != "")
-            url += "?access_token=" + accessToken;
+        addAccessToken(url);
 
         return url;
     }

From a76b8b546753bc14aa2e8f8fdc74f70407aebd31 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Tue, 1 Sep 2020 12:05:49 -0700
Subject: [PATCH 104/176] README: update link to Hacking section

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 03c5deb7b..3cf4e44fa 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ Information on additional installation methods is available on the [Nix download
 
 ## Building And Developing
 
-See our [Hacking guide](https://hydra.nixos.org/job/nix/master/build.x86_64-linux/latest/download-by-type/doc/manual#chap-hacking) in our manual for instruction on how to
+See our [Hacking guide](https://hydra.nixos.org/job/nix/master/build.x86_64-linux/latest/download-by-type/doc/manual/hacking.html) in our manual for instruction on how to
 build nix from source with nix-build or how to get a development environment.
 
 ## Additional Resources

From a72ed3e8a1028c66c36b7dd66dc9dd50a0a6ecc1 Mon Sep 17 00:00:00 2001
From: Cole Helbling <cole.e.helbling@outlook.com>
Date: Tue, 1 Sep 2020 12:06:02 -0700
Subject: [PATCH 105/176] hacking.md: add --prefix flag to configure

Otherwise, the steps advertised in this document won't actually work
(e.g. `make install` will fail, trying to access /usr, and
`./inst/bin/nix` won't exist).
---
 doc/manual/src/hacking.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/manual/src/hacking.md b/doc/manual/src/hacking.md
index 9049e42bb..5bd884ce8 100644
--- a/doc/manual/src/hacking.md
+++ b/doc/manual/src/hacking.md
@@ -39,7 +39,7 @@ To build Nix itself in this shell:
 
 ```console
 [nix-shell]$ ./bootstrap.sh
-[nix-shell]$ ./configure $configureFlags
+[nix-shell]$ ./configure $configureFlags --prefix=$(pwd)/inst
 [nix-shell]$ make -j $NIX_BUILD_CORES
 ```
 

From dd4b56c87f8989c2d31a78b6c12cc2b1e3991fe2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Domen=20Ko=C5=BEar?= <domen@dev.si>
Date: Tue, 1 Sep 2020 16:41:42 +0200
Subject: [PATCH 106/176] Allow HTTP binary cache to request absolute uris

---
 src/libstore/http-binary-cache-store.cc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index c1ceb08cf..1733239fb 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -85,7 +85,7 @@ protected:
         checkEnabled();
 
         try {
-            FileTransferRequest request(cacheUri + "/" + path);
+            FileTransferRequest request(makeRequest(path));
             request.head = true;
             getFileTransfer()->download(request);
             return true;
@@ -103,7 +103,7 @@ protected:
         std::shared_ptr<std::basic_iostream<char>> istream,
         const std::string & mimeType) override
     {
-        auto req = FileTransferRequest(cacheUri + "/" + path);
+        auto req = makeRequest(path);
         req.data = std::make_shared<string>(StreamToSourceAdapter(istream).drain());
         req.mimeType = mimeType;
         try {
@@ -115,8 +115,11 @@ protected:
 
     FileTransferRequest makeRequest(const std::string & path)
     {
-        FileTransferRequest request(cacheUri + "/" + path);
-        return request;
+        return FileTransferRequest(
+            hasPrefix(path, "https://") || hasPrefix(path, "http://") || hasPrefix(path, "file://")
+            ? path
+            : cacheUri + "/" + path);
+
     }
 
     void getFile(const std::string & path, Sink & sink) override

From 94a043ff3b0e9de92bdb62372f9a82186d8e871c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 2 Sep 2020 14:16:44 +0200
Subject: [PATCH 107/176] EvalCache: Fix caching of strings

This was broken in 50f13b06fb1b2f50a97323c000d1094d090f08ea. Once
again it turns out that putting a bool in a std::variant is a bad
idea, since pointers get silently cast to them...
---
 src/libexpr/eval-cache.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libexpr/eval-cache.cc b/src/libexpr/eval-cache.cc
index 46177a0a4..381344b40 100644
--- a/src/libexpr/eval-cache.cc
+++ b/src/libexpr/eval-cache.cc
@@ -391,7 +391,8 @@ Value & AttrCursor::forceValue()
 
     if (root->db && (!cachedValue || std::get_if<placeholder_t>(&cachedValue->second))) {
         if (v.type == tString)
-            cachedValue = {root->db->setString(getKey(), v.string.s, v.string.context), v.string.s};
+            cachedValue = {root->db->setString(getKey(), v.string.s, v.string.context),
+                           string_t{v.string.s, {}}};
         else if (v.type == tPath)
             cachedValue = {root->db->setString(getKey(), v.path), v.path};
         else if (v.type == tBool)

From b74f5cdd2330ea1028eb6b04217bbe20c71a368b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Sep 2020 11:06:56 +0200
Subject: [PATCH 108/176] createGeneration(): Take a StorePath

---
 src/libstore/profiles.cc | 6 +++---
 src/libstore/profiles.hh | 4 +++-
 src/nix-env/nix-env.cc   | 4 +++-
 src/nix-env/user-env.cc  | 3 ++-
 src/nix/command.cc       | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc
index 6862b42f0..e91dd781e 100644
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -72,7 +72,7 @@ static void makeName(const Path & profile, GenerationNumber num,
 }
 
 
-Path createGeneration(ref<LocalFSStore> store, Path profile, Path outPath)
+Path createGeneration(ref<LocalFSStore> store, Path profile, StorePath outPath)
 {
     /* The new generation number should be higher than old the
        previous ones. */
@@ -82,7 +82,7 @@ Path createGeneration(ref<LocalFSStore> store, Path profile, Path outPath)
     if (gens.size() > 0) {
         Generation last = gens.back();
 
-        if (readLink(last.path) == outPath) {
+        if (readLink(last.path) == store->printStorePath(outPath)) {
             /* We only create a new generation symlink if it differs
                from the last one.
 
@@ -105,7 +105,7 @@ Path createGeneration(ref<LocalFSStore> store, Path profile, Path outPath)
        user environment etc. we've just built. */
     Path generation;
     makeName(profile, num + 1, generation);
-    store->addPermRoot(store->parseStorePath(outPath), generation, false, true);
+    store->addPermRoot(outPath, generation, false, true);
 
     return generation;
 }
diff --git a/src/libstore/profiles.hh b/src/libstore/profiles.hh
index abe507f0e..be55a65d4 100644
--- a/src/libstore/profiles.hh
+++ b/src/libstore/profiles.hh
@@ -8,6 +8,8 @@
 
 namespace nix {
 
+class StorePath;
+
 
 typedef unsigned int GenerationNumber;
 
@@ -28,7 +30,7 @@ std::pair<Generations, std::optional<GenerationNumber>> findGenerations(Path pro
 
 class LocalFSStore;
 
-Path createGeneration(ref<LocalFSStore> store, Path profile, Path outPath);
+Path createGeneration(ref<LocalFSStore> store, Path profile, StorePath outPath);
 
 void deleteGeneration(const Path & profile, GenerationNumber gen);
 
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index ddd036070..e5a433ac0 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -708,7 +708,9 @@ static void opSet(Globals & globals, Strings opFlags, Strings opArgs)
     }
 
     debug(format("switching to new user environment"));
-    Path generation = createGeneration(ref<LocalFSStore>(store2), globals.profile, drv.queryOutPath());
+    Path generation = createGeneration(
+        ref<LocalFSStore>(store2), globals.profile,
+        store2->parseStorePath(drv.queryOutPath()));
     switchLink(globals.profile, generation);
 }
 
diff --git a/src/nix-env/user-env.cc b/src/nix-env/user-env.cc
index 8e7f09e12..8c6c8af05 100644
--- a/src/nix-env/user-env.cc
+++ b/src/nix-env/user-env.cc
@@ -151,7 +151,8 @@ bool createUserEnv(EvalState & state, DrvInfos & elems,
         }
 
         debug(format("switching to new user environment"));
-        Path generation = createGeneration(ref<LocalFSStore>(store2), profile, topLevelOut);
+        Path generation = createGeneration(ref<LocalFSStore>(store2), profile,
+            store2->parseStorePath(topLevelOut));
         switchLink(profile, generation);
     }
 
diff --git a/src/nix/command.cc b/src/nix/command.cc
index 2f1fbded1..efac230bd 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -134,7 +134,7 @@ void MixProfile::updateProfile(const StorePath & storePath)
     switchLink(profile2,
         createGeneration(
             ref<LocalFSStore>(store),
-            profile2, store->printStorePath(storePath)));
+            profile2, storePath));
 }
 
 void MixProfile::updateProfile(const Buildables & buildables)

From b07167be5aeb91c06ca3487b3d18f6c8f59942a0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Sep 2020 11:12:38 +0200
Subject: [PATCH 109/176] createGeneration(): Always create an indirect root

This means profiles outside of /nix/var/nix/profiles don't get
garbage-collected. It also means we don't need to scan
/nix/var/nix/profiles for GC roots anymore, except for compatibility
with previously existing generations.
---
 src/libstore/profiles.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc
index e91dd781e..9b114f030 100644
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -105,7 +105,7 @@ Path createGeneration(ref<LocalFSStore> store, Path profile, StorePath outPath)
        user environment etc. we've just built. */
     Path generation;
     makeName(profile, num + 1, generation);
-    store->addPermRoot(outPath, generation, false, true);
+    store->addPermRoot(outPath, generation, true);
 
     return generation;
 }

From 00d25e84577659ccf0bc360c61c47b6cd25d1c26 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Sep 2020 11:22:00 +0200
Subject: [PATCH 110/176] Remove the --indirect flag

All GC roots are now indirect.
---
 doc/manual/src/command-ref/nix-instantiate.md |  5 ++-
 doc/manual/src/command-ref/nix-store.md       | 34 ++++++-------------
 src/nix-instantiate/nix-instantiate.cc        |  7 ++--
 src/nix-store/nix-store.cc                    |  7 ++--
 tests/nix-build.sh                            |  2 +-
 tests/nix-shell.sh                            |  4 +--
 6 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/doc/manual/src/command-ref/nix-instantiate.md b/doc/manual/src/command-ref/nix-instantiate.md
index 5b5ee0439..d09f5ed6a 100644
--- a/doc/manual/src/command-ref/nix-instantiate.md
+++ b/doc/manual/src/command-ref/nix-instantiate.md
@@ -12,7 +12,6 @@ Title: nix-instantiate
   [`--arg` *name* *value*]
   [{`--attr`| `-A`} *attrPath*]
   [`--add-root` *path*]
-  [`--indirect`]
   [`--expr` | `-E`]
   *files…*
 
@@ -32,8 +31,8 @@ standard input.
 
 # Options
 
-  - `--add-root` *path*; `--indirect`  
-    See the [corresponding options](nix-store.md) in `nix-store`.
+  - `--add-root` *path*  
+    See the [corresponding option](nix-store.md) in `nix-store`.
 
   - `--parse`  
     Just parse the input files, and print their abstract syntax trees on
diff --git a/doc/manual/src/command-ref/nix-store.md b/doc/manual/src/command-ref/nix-store.md
index 193d670c2..4680339e4 100644
--- a/doc/manual/src/command-ref/nix-store.md
+++ b/doc/manual/src/command-ref/nix-store.md
@@ -9,7 +9,6 @@ Title: nix-store
 `nix-store` *operation* [*options…*] [*arguments…*]
   [`--option` *name* *value*]
   [`--add-root` *path*]
-  [`--indirect`]
 
 # Description
 
@@ -28,27 +27,12 @@ have an effect.
   - `--add-root` *path*  
     Causes the result of a realisation (`--realise` and
     `--force-realise`) to be registered as a root of the garbage
-    collector. The root is stored in *path*, which must be inside a
-    directory that is scanned for roots by the garbage collector
-    (i.e., typically in a subdirectory of `/nix/var/nix/gcroots/`)
-    *unless* the `--indirect` flag is used.
-
-    If there are multiple results, then multiple symlinks will be
-    created by sequentially numbering symlinks beyond the first one
-    (e.g., `foo`, `foo-2`, `foo-3`, and so on).
-
-  - `--indirect`  
-    In conjunction with `--add-root`, this option allows roots to be
-    stored *outside* of the GC roots directory. This is useful for
-    commands such as `nix-build` that place a symlink to the build
-    result in the current directory; such a build result should not be
-    garbage-collected unless the symlink is removed.
-
-    The `--indirect` flag causes a uniquely named symlink to *path* to
-    be stored in `/nix/var/nix/gcroots/auto/`. For instance,
+    collector. *path* will be created as a symlink to the resulting
+    store path. In addition, a uniquely named symlink to *path* will
+    be created in `/nix/var/nix/gcroots/auto/`. For instance,
 
     ```console
-    $ nix-store --add-root /home/eelco/bla/result --indirect -r ...
+    $ nix-store --add-root /home/eelco/bla/result -r ...
 
     $ ls -l /nix/var/nix/gcroots/auto
     lrwxrwxrwx    1 ... 2005-03-13 21:10 dn54lcypm8f8... -> /home/eelco/bla/result
@@ -63,11 +47,13 @@ have an effect.
 
     > **Warning**
     >
-    > Note that it is not possible to move or rename indirect GC roots,
-    > since the symlink in the `auto` directory will still point to the
-    > old location.
+    > Note that it is not possible to move or rename GC roots, since
+    > the symlink in the `auto` directory will still point to the old
+    > location.
 
-<!-- end list -->
+    If there are multiple results, then multiple symlinks will be
+    created by sequentially numbering symlinks beyond the first one
+    (e.g., `foo`, `foo-2`, `foo-3`, and so on).
 
 # Operation `--realise`
 
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index bf353677a..d4996b93b 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -20,7 +20,6 @@ using namespace nix;
 
 static Path gcRoot;
 static int rootNr = 0;
-static bool indirectRoot = false;
 
 
 enum OutputKind { okPlain, okXML, okJSON };
@@ -71,11 +70,11 @@ void processExpr(EvalState & state, const Strings & attrPaths,
                 if (gcRoot == "")
                     printGCWarning();
                 else {
-                    Path rootName = indirectRoot ? absPath(gcRoot) : gcRoot;
+                    Path rootName = absPath(gcRoot);
                     if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
                     auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
                     if (store2)
-                        drvPath = store2->addPermRoot(store2->parseStorePath(drvPath), rootName, indirectRoot);
+                        drvPath = store2->addPermRoot(store2->parseStorePath(drvPath), rootName, true);
                 }
                 std::cout << fmt("%s%s\n", drvPath, (outputName != "out" ? "!" + outputName : ""));
             }
@@ -127,7 +126,7 @@ static int _main(int argc, char * * argv)
             else if (*arg == "--add-root")
                 gcRoot = getArg(*arg, arg, end);
             else if (*arg == "--indirect")
-                indirectRoot = true;
+                ;
             else if (*arg == "--xml")
                 outputKind = okXML;
             else if (*arg == "--json")
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index a58edff57..4382b1460 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -34,7 +34,6 @@ typedef void (* Operation) (Strings opFlags, Strings opArgs);
 
 static Path gcRoot;
 static int rootNr = 0;
-static bool indirectRoot = false;
 static bool noOutput = false;
 static std::shared_ptr<Store> store;
 
@@ -85,7 +84,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
                     Path rootName = gcRoot;
                     if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
                     if (i->first != "out") rootName += "-" + i->first;
-                    outPath = store2->addPermRoot(store->parseStorePath(outPath), rootName, indirectRoot);
+                    outPath = store2->addPermRoot(store->parseStorePath(outPath), rootName, true);
                 }
             }
             outputs.insert(outPath);
@@ -104,7 +103,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
                 Path rootName = gcRoot;
                 rootNr++;
                 if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
-                return {store2->addPermRoot(path.path, rootName, indirectRoot)};
+                return {store2->addPermRoot(path.path, rootName, true)};
             }
         }
         return {store->printStorePath(path.path)};
@@ -1085,7 +1084,7 @@ static int _main(int argc, char * * argv)
             else if (*arg == "--add-root")
                 gcRoot = absPath(getArg(*arg, arg, end));
             else if (*arg == "--indirect")
-                indirectRoot = true;
+                ;
             else if (*arg == "--no-output")
                 noOutput = true;
             else if (*arg != "" && arg->at(0) == '-') {
diff --git a/tests/nix-build.sh b/tests/nix-build.sh
index 0eb599608..3123c6da3 100644
--- a/tests/nix-build.sh
+++ b/tests/nix-build.sh
@@ -24,5 +24,5 @@ outPath2=$(nix-build $(nix-instantiate dependencies.nix) --no-out-link)
 outPath2=$(nix-build $(nix-instantiate dependencies.nix)!out --no-out-link)
 [[ $outPath = $outPath2 ]]
 
-outPath2=$(nix-store -r $(nix-instantiate --indirect --add-root $TEST_ROOT/indirect dependencies.nix)!out)
+outPath2=$(nix-store -r $(nix-instantiate --add-root $TEST_ROOT/indirect dependencies.nix)!out)
 [[ $outPath = $outPath2 ]]
diff --git a/tests/nix-shell.sh b/tests/nix-shell.sh
index 650904057..1228bb04f 100644
--- a/tests/nix-shell.sh
+++ b/tests/nix-shell.sh
@@ -27,12 +27,12 @@ output=$(nix-shell --pure --keep SELECTED_IMPURE_VAR shell.nix -A shellDrv --run
 # Test nix-shell on a .drv symlink
 
 # Legacy: absolute path and .drv extension required
-nix-instantiate shell.nix -A shellDrv --indirect --add-root $TEST_ROOT/shell.drv
+nix-instantiate shell.nix -A shellDrv --add-root $TEST_ROOT/shell.drv
 [[ $(nix-shell --pure $TEST_ROOT/shell.drv --run \
     'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]]
 
 # New behaviour: just needs to resolve to a derivation in the store
-nix-instantiate shell.nix -A shellDrv --indirect --add-root $TEST_ROOT/shell
+nix-instantiate shell.nix -A shellDrv --add-root $TEST_ROOT/shell
 [[ $(nix-shell --pure $TEST_ROOT/shell --run \
     'echo "$IMPURE_VAR - $VAR_FROM_STDENV_SETUP - $VAR_FROM_NIX"') = " - foo - bar" ]]
 

From 82b77a77262c414044fffc7ad8b955ad91827995 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Sep 2020 11:26:36 +0200
Subject: [PATCH 111/176] addPermRoot(): Remove indirect flag

---
 src/libfetchers/registry.cc            |  2 +-
 src/libstore/gc.cc                     | 34 ++++++--------------------
 src/libstore/profiles.cc               |  2 +-
 src/libstore/store-api.hh              |  3 +--
 src/nix-build/nix-build.cc             |  2 +-
 src/nix-instantiate/nix-instantiate.cc |  2 +-
 src/nix-store/nix-store.cc             |  4 +--
 src/nix/build.cc                       |  4 +--
 src/nix/bundle.cc                      |  2 +-
 9 files changed, 17 insertions(+), 38 deletions(-)

diff --git a/src/libfetchers/registry.cc b/src/libfetchers/registry.cc
index d4134ce29..4367ee810 100644
--- a/src/libfetchers/registry.cc
+++ b/src/libfetchers/registry.cc
@@ -147,7 +147,7 @@ static std::shared_ptr<Registry> getGlobalRegistry(ref<Store> store)
         if (!hasPrefix(path, "/")) {
             auto storePath = downloadFile(store, path, "flake-registry.json", false).storePath;
             if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>())
-                store2->addPermRoot(storePath, getCacheDir() + "/nix/flake-registry.json", true);
+                store2->addPermRoot(storePath, getCacheDir() + "/nix/flake-registry.json");
             path = store->toRealPath(storePath);
         }
 
diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index e74382ed2..81f812604 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -85,8 +85,7 @@ void LocalStore::addIndirectRoot(const Path & path)
 }
 
 
-Path LocalFSStore::addPermRoot(const StorePath & storePath,
-    const Path & _gcRoot, bool indirect, bool allowOutsideRootsDir)
+Path LocalFSStore::addPermRoot(const StorePath & storePath, const Path & _gcRoot)
 {
     Path gcRoot(canonPath(_gcRoot));
 
@@ -95,31 +94,12 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath,
                 "creating a garbage collector root (%1%) in the Nix store is forbidden "
                 "(are you running nix-build inside the store?)", gcRoot);
 
-    if (indirect) {
-        /* Don't clobber the link if it already exists and doesn't
-           point to the Nix store. */
-        if (pathExists(gcRoot) && (!isLink(gcRoot) || !isInStore(readLink(gcRoot))))
-            throw Error("cannot create symlink '%1%'; already exists", gcRoot);
-        makeSymlink(gcRoot, printStorePath(storePath));
-        addIndirectRoot(gcRoot);
-    }
-
-    else {
-        if (!allowOutsideRootsDir) {
-            Path rootsDir = canonPath((format("%1%/%2%") % stateDir % gcRootsDir).str());
-
-            if (string(gcRoot, 0, rootsDir.size() + 1) != rootsDir + "/")
-                throw Error(
-                    "path '%1%' is not a valid garbage collector root; "
-                    "it's not in the directory '%2%'",
-                    gcRoot, rootsDir);
-        }
-
-        if (baseNameOf(gcRoot) == std::string(storePath.to_string()))
-            writeFile(gcRoot, "");
-        else
-            makeSymlink(gcRoot, printStorePath(storePath));
-    }
+    /* Don't clobber the link if it already exists and doesn't
+       point to the Nix store. */
+    if (pathExists(gcRoot) && (!isLink(gcRoot) || !isInStore(readLink(gcRoot))))
+        throw Error("cannot create symlink '%1%'; already exists", gcRoot);
+    makeSymlink(gcRoot, printStorePath(storePath));
+    addIndirectRoot(gcRoot);
 
     /* Check that the root can be found by the garbage collector.
        !!! This can be very slow on machines that have many roots.
diff --git a/src/libstore/profiles.cc b/src/libstore/profiles.cc
index 9b114f030..c20386e2b 100644
--- a/src/libstore/profiles.cc
+++ b/src/libstore/profiles.cc
@@ -105,7 +105,7 @@ Path createGeneration(ref<LocalFSStore> store, Path profile, StorePath outPath)
        user environment etc. we've just built. */
     Path generation;
     makeName(profile, num + 1, generation);
-    store->addPermRoot(outPath, generation, true);
+    store->addPermRoot(outPath, generation);
 
     return generation;
 }
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 0ec14b5f2..61aa3ba7e 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -649,8 +649,7 @@ public:
     ref<FSAccessor> getFSAccessor() override;
 
     /* Register a permanent GC root. */
-    Path addPermRoot(const StorePath & storePath,
-        const Path & gcRoot, bool indirect, bool allowOutsideRootsDir = false);
+    Path addPermRoot(const StorePath & storePath, const Path & gcRoot);
 
     virtual Path getRealStoreDir() { return storeDir; }
 
diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 94412042f..471bcc10d 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -525,7 +525,7 @@ static void _main(int argc, char * * argv)
 
         for (auto & symlink : resultSymlinks)
             if (auto store2 = store.dynamic_pointer_cast<LocalFSStore>())
-                store2->addPermRoot(store->parseStorePath(symlink.second), absPath(symlink.first), true);
+                store2->addPermRoot(store->parseStorePath(symlink.second), absPath(symlink.first));
 
         logger->stop();
 
diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc
index d4996b93b..539092cbe 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -74,7 +74,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
                     if (++rootNr > 1) rootName += "-" + std::to_string(rootNr);
                     auto store2 = state.store.dynamic_pointer_cast<LocalFSStore>();
                     if (store2)
-                        drvPath = store2->addPermRoot(store2->parseStorePath(drvPath), rootName, true);
+                        drvPath = store2->addPermRoot(store2->parseStorePath(drvPath), rootName);
                 }
                 std::cout << fmt("%s%s\n", drvPath, (outputName != "out" ? "!" + outputName : ""));
             }
diff --git a/src/nix-store/nix-store.cc b/src/nix-store/nix-store.cc
index 4382b1460..3f2594712 100644
--- a/src/nix-store/nix-store.cc
+++ b/src/nix-store/nix-store.cc
@@ -84,7 +84,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
                     Path rootName = gcRoot;
                     if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
                     if (i->first != "out") rootName += "-" + i->first;
-                    outPath = store2->addPermRoot(store->parseStorePath(outPath), rootName, true);
+                    outPath = store2->addPermRoot(store->parseStorePath(outPath), rootName);
                 }
             }
             outputs.insert(outPath);
@@ -103,7 +103,7 @@ static PathSet realisePath(StorePathWithOutputs path, bool build = true)
                 Path rootName = gcRoot;
                 rootNr++;
                 if (rootNr > 1) rootName += "-" + std::to_string(rootNr);
-                return {store2->addPermRoot(path.path, rootName, true)};
+                return {store2->addPermRoot(path.path, rootName)};
             }
         }
         return {store->printStorePath(path.path)};
diff --git a/src/nix/build.cc b/src/nix/build.cc
index 13d14a7fb..75a42ac55 100644
--- a/src/nix/build.cc
+++ b/src/nix/build.cc
@@ -71,14 +71,14 @@ struct CmdBuild : InstallablesCommand, MixDryRun, MixProfile
                         [&](BuildableOpaque bo) {
                             std::string symlink = outLink;
                             if (i) symlink += fmt("-%d", i);
-                            store2->addPermRoot(bo.path, absPath(symlink), true);
+                            store2->addPermRoot(bo.path, absPath(symlink));
                         },
                         [&](BuildableFromDrv bfd) {
                             for (auto & output : bfd.outputs) {
                                 std::string symlink = outLink;
                                 if (i) symlink += fmt("-%d", i);
                                 if (output.first != "out") symlink += fmt("-%s", output.first);
-                                store2->addPermRoot(output.second, absPath(symlink), true);
+                                store2->addPermRoot(output.second, absPath(symlink));
                             }
                         },
                     }, buildables[i]);
diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index eb3339f5d..241c8699b 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -122,7 +122,7 @@ struct CmdBundle : InstallableCommand
         if (!outLink)
             outLink = baseNameOf(app.program);
 
-        store.dynamic_pointer_cast<LocalFSStore>()->addPermRoot(outPath, absPath(*outLink), true);
+        store.dynamic_pointer_cast<LocalFSStore>()->addPermRoot(outPath, absPath(*outLink));
     }
 };
 

From 8a945d6ddb0676b454458e6fe0e9ea6f8b4b5659 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 3 Sep 2020 11:30:15 +0200
Subject: [PATCH 112/176] Remove gc-check-reachability

---
 src/libstore/gc.cc      | 16 ----------------
 src/libstore/globals.hh |  4 ----
 2 files changed, 20 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index 81f812604..e6cbc525d 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -101,22 +101,6 @@ Path LocalFSStore::addPermRoot(const StorePath & storePath, const Path & _gcRoot
     makeSymlink(gcRoot, printStorePath(storePath));
     addIndirectRoot(gcRoot);
 
-    /* Check that the root can be found by the garbage collector.
-       !!! This can be very slow on machines that have many roots.
-       Instead of reading all the roots, it would be more efficient to
-       check if the root is in a directory in or linked from the
-       gcroots directory. */
-    if (settings.checkRootReachability) {
-        auto roots = findRoots(false);
-        if (roots[storePath].count(gcRoot) == 0)
-            logWarning({
-                .name = "GC root",
-                .hint = hintfmt("warning: '%1%' is not in a directory where the garbage collector looks for roots; "
-                    "therefore, '%2%' might be removed by the garbage collector",
-                    gcRoot, printStorePath(storePath))
-            });
-    }
-
     /* Grab the global GC root, causing us to block while a GC is in
        progress.  This prevents the set of permanent roots from
        increasing while a GC is in progress. */
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index ab9f42ce6..8a2d3ff75 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -293,10 +293,6 @@ public:
     Setting<unsigned int> pollInterval{this, 5, "build-poll-interval",
         "How often (in seconds) to poll for locks."};
 
-    Setting<bool> checkRootReachability{this, false, "gc-check-reachability",
-        "Whether to check if new GC roots can in fact be found by the "
-        "garbage collector."};
-
     Setting<bool> gcKeepOutputs{
         this, false, "keep-outputs",
         R"(

From 145915eb3901ad78e61f27df22e755fdf9a2c28a Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Sep 2020 22:14:21 +0000
Subject: [PATCH 113/176] Beef up floating CA derivations test a bit

---
 tests/content-addressed.nix | 37 +++++++++++++++++++++++++------------
 tests/content-addressed.sh  |  7 ++++---
 2 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/tests/content-addressed.nix b/tests/content-addressed.nix
index 586e4cba6..1fa6aabff 100644
--- a/tests/content-addressed.nix
+++ b/tests/content-addressed.nix
@@ -4,16 +4,29 @@ with import ./config.nix;
 # A simple content-addressed derivation.
 # The derivation can be arbitrarily modified by passing a different `seed`,
 # but the output will always be the same
-mkDerivation {
-  name = "simple-content-addressed";
-  buildCommand = ''
-    set -x
-    echo "Building a CA derivation"
-    echo "The seed is ${toString seed}"
-    mkdir -p $out
-    echo "Hello World" > $out/hello
-  '';
-  __contentAddressed = true;
-  outputHashMode = "recursive";
-  outputHashAlgo = "sha256";
+rec {
+  rootLegacy = mkDerivation {
+    name = "simple-content-addressed";
+    buildCommand = ''
+      set -x
+      echo "Building a legacy derivation"
+      mkdir -p $out
+      echo "Hello World" > $out/hello
+    '';
+    __contentAddressed = true;
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+  };
+  rootCA = mkDerivation {
+    name = "dependent";
+    buildCommand = ''
+      echo "building a CA derivation"
+      echo "The seed is ${toString seed}"
+      mkdir -p $out
+      echo ${rootLegacy}/hello > $out/dep
+    '';
+    __contentAddressed = true;
+    outputHashMode = "recursive";
+    outputHashAlgo = "sha256";
+  };
 }
diff --git a/tests/content-addressed.sh b/tests/content-addressed.sh
index 2968f3a8c..ae9e3c59e 100644
--- a/tests/content-addressed.sh
+++ b/tests/content-addressed.sh
@@ -7,10 +7,11 @@ clearCache
 
 export REMOTE_STORE=file://$cacheDir
 
-drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix --arg seed 1)
+drv=$(nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A rootCA --arg seed 1)
 nix --experimental-features 'nix-command ca-derivations' show-derivation --derivation "$drv" --arg seed 1
 
-out1=$(nix-build --experimental-features ca-derivations ./content-addressed.nix --arg seed 1 --no-out-link)
-out2=$(nix-build --experimental-features ca-derivations ./content-addressed.nix --arg seed 2 --no-out-link)
+commonArgs=("--experimental-features" "ca-derivations" "./content-addressed.nix" "-A" "rootCA" "--no-out-link")
+out1=$(nix-build "${commonArgs[@]}" ./content-addressed.nix --arg seed 1)
+out2=$(nix-build "${commonArgs[@]}" ./content-addressed.nix --arg seed 2)
 
 test $out1 == $out2

From c224a5e5c1e0a55c8e8e7c3c1c0e50ac831f9964 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Thu, 3 Sep 2020 22:35:13 +0000
Subject: [PATCH 114/176] Rename derivation in floating CA test

---
 tests/content-addressed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/content-addressed.nix b/tests/content-addressed.nix
index 1fa6aabff..79e8a8bf9 100644
--- a/tests/content-addressed.nix
+++ b/tests/content-addressed.nix
@@ -6,7 +6,7 @@ with import ./config.nix;
 # but the output will always be the same
 rec {
   rootLegacy = mkDerivation {
-    name = "simple-content-addressed";
+    name = "simple-input-addressed";
     buildCommand = ''
       set -x
       echo "Building a legacy derivation"

From b99062b023e56865ba20371b29fa3be6e6149d46 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Sep 2020 10:29:28 -0400
Subject: [PATCH 115/176] Update tests/content-addressed.nix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
---
 tests/content-addressed.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/content-addressed.nix b/tests/content-addressed.nix
index 79e8a8bf9..b0eb29c3f 100644
--- a/tests/content-addressed.nix
+++ b/tests/content-addressed.nix
@@ -13,9 +13,6 @@ rec {
       mkdir -p $out
       echo "Hello World" > $out/hello
     '';
-    __contentAddressed = true;
-    outputHashMode = "recursive";
-    outputHashAlgo = "sha256";
   };
   rootCA = mkDerivation {
     name = "dependent";

From c9f1ed912c2ed3d53fdfe84cbb0012b5c7c2332f Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Sep 2020 14:38:45 +0000
Subject: [PATCH 116/176] Don't chmod symlink before moving outputs around
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Théophane Hufschmitt <regnat@users.noreply.github.com>
---
 src/libstore/build.cc       | 11 ++++++++---
 tests/content-addressed.nix |  3 +++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index ba28e78c8..f406c89d2 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2065,7 +2065,7 @@ void linkOrCopy(const Path & from, const Path & to)
            file (e.g. 32000 of ext3), which is quite possible after a
            'nix-store --optimise'. FIXME: actually, why don't we just
            bind-mount in this case?
-           
+
            It can also fail with EPERM in BeegFS v7 and earlier versions
            which don't allow hard-links to other directories */
         if (errno != EMLINK && errno != EPERM)
@@ -4101,8 +4101,13 @@ void DerivationGoal::registerOutputs()
                     if (lstat(actualPath.c_str(), &st))
                         throw SysError("getting attributes of path '%1%'", actualPath);
                     mode |= 0200;
-                    if (chmod(actualPath.c_str(), mode) == -1)
-                        throw SysError("changing mode of '%1%' to %2$o", actualPath, mode);
+                    /* Try to change the perms, but only if the file isn't a
+                       symlink as symlinks permissions are mostly ignored and
+                       calling `chmod` on it will just forward the call to the
+                       target of the link. */
+                    if (!S_ISLNK(st.st_mode))
+                        if (chmod(actualPath.c_str(), mode) == -1)
+                            throw SysError("changing mode of '%1%' to %2$o", actualPath, mode);
                 }
                 if (rename(
                         actualPath.c_str(),
diff --git a/tests/content-addressed.nix b/tests/content-addressed.nix
index b0eb29c3f..5e9bad0ac 100644
--- a/tests/content-addressed.nix
+++ b/tests/content-addressed.nix
@@ -16,11 +16,14 @@ rec {
   };
   rootCA = mkDerivation {
     name = "dependent";
+    outputs = [ "out" "dev" ];
     buildCommand = ''
       echo "building a CA derivation"
       echo "The seed is ${toString seed}"
       mkdir -p $out
       echo ${rootLegacy}/hello > $out/dep
+      # test symlink at root
+      ln -s $out $dev
     '';
     __contentAddressed = true;
     outputHashMode = "recursive";

From e86dd59dccb550c7f1a4d9333eee3c3a5c4043e9 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Sep 2020 10:48:50 -0400
Subject: [PATCH 117/176] Apply suggestions from code review

Thanks!

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
---
 src/libstore/build.cc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index f406c89d2..5584249d2 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1266,7 +1266,7 @@ void DerivationGoal::haveDerivation()
         for (auto & [_, status] : initialOutputs) {
             if (!status.wanted) continue;
             if (!status.known) {
-                warn("Do not know how to query for unknown floating CA drv output yet");
+                warn("do not know how to query for unknown floating content-addressed derivation output yet");
                 /* Nothing to wait for; tail call */
                 return DerivationGoal::gaveUpOnSubstitution();
             }
@@ -1463,7 +1463,7 @@ void DerivationGoal::inputsRealised()
                     auto optRealizedInput = outputs.at(j);
                     if (!optRealizedInput)
                         throw Error(
-                            "derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output.",
+                            "derivation '%s' requires output '%s' from input derivation '%s', which is supposedly realized already, yet we still don't know what path corresponds to that output",
                             worker.store.printStorePath(drvPath), j, worker.store.printStorePath(drvPath));
                     worker.store.computeFSClosure(*optRealizedInput, inputPaths);
                 } else
@@ -2032,7 +2032,7 @@ StorePathSet DerivationGoal::exportReferences(const StorePathSet & storePaths)
                        `computeFSClosure` on the output path, rather than
                        derivation itself. That doesn't seem right to me, so I
                        won't try to implemented this for CA derivations. */
-                    throw UnimplementedError("export references including CA derivations (themselves) is not yet implemented");
+                    throw UnimplementedError("exportReferences on CA derivations is not yet implemented");
                 worker.store.computeFSClosure(*k.second.second, paths);
             }
         }
@@ -2175,7 +2175,7 @@ void DerivationGoal::startBuilder()
            differ. */
         if (fixedFinalPath == scratchPath) continue;
 
-        /* Ensure scratch scratch path is ours to use */
+        /* Ensure scratch path is ours to use. */
         deletePath(worker.store.printStorePath(scratchPath));
 
         /* Rewrite and unrewrite paths */

From e9fad3006b0b6f3a6430fdbfc61392cac6834502 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Sep 2020 15:15:51 +0000
Subject: [PATCH 118/176] Fix some of the issues raised by @edolstra

 - More and better comments

 - The easier renames
---
 src/libstore/build.cc       | 25 +++++++++++++------------
 src/libstore/derivations.hh | 18 ++++++++++++++++++
 src/libstore/local-store.hh |  5 ++---
 src/nix/command.cc          |  5 +++--
 4 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 5584249d2..9eff03f7b 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -718,7 +718,7 @@ typedef enum {rpAccept, rpDecline, rpPostpone} HookReply;
 
 class SubstitutionGoal;
 
-struct KnownInitialOutputStatus {
+struct InitialOutputStatus {
     StorePath path;
     /* The output optional indicates whether it's already valid; i.e. exists
        and is registered. If we're repairing, inner bool indicates whether the
@@ -731,9 +731,9 @@ struct KnownInitialOutputStatus {
     }
 };
 
-struct InitialOutputStatus {
+struct InitialOutput {
     bool wanted;
-    std::optional<KnownInitialOutputStatus> known;
+    std::optional<InitialOutputStatus> known;
 };
 
 class DerivationGoal : public Goal
@@ -770,7 +770,7 @@ private:
        immediate input paths). */
     StorePathSet inputPaths;
 
-    std::map<std::string, InitialOutputStatus> initialOutputs;
+    std::map<std::string, InitialOutput> initialOutputs;
 
     /* User selected for running the builder. */
     std::unique_ptr<UserLock> buildUser;
@@ -1050,11 +1050,14 @@ private:
     /* Forcibly kill the child process, if any. */
     void killChild();
 
-    /* Map a path to another (reproducably) so we can avoid overwriting outputs
+    /* Create alternative path calculated from but distinct from the
+       input, so we can avoid overwriting outputs (or other store paths)
        that already exist. */
     StorePath makeFallbackPath(const StorePath & path);
-    /* Make a path to another based on the output name alone, if one doesn't
-       want to use a random path for CA builds. */
+    /* Make a path to another based on the output name along with the
+       derivation hash. */
+    /* FIXME add option to randomize, so we can audit whether our
+       rewrites caught everything */
     StorePath makeFallbackPath(std::string_view outputName);
 
     void repairClosure();
@@ -2141,8 +2144,6 @@ void DerivationGoal::startBuilder()
            with the actual hashes. */
         auto scratchPath =
             !status.known
-                /* FIXME add option to randomize, so we can audit whether our
-                 * rewrites caught everything */
                 ? makeFallbackPath(outputName)
             : !needsHashRewrite()
                 /* Can always use original path in sandbox */
@@ -4582,19 +4583,19 @@ void DerivationGoal::checkPathValidity()
 {
     bool checkHash = buildMode == bmRepair;
     for (auto & i : queryPartialDerivationOutputMap()) {
-        InitialOutputStatus status {
+        InitialOutput info {
             .wanted = wantOutput(i.first, wantedOutputs),
         };
         if (i.second) {
             auto outputPath = *i.second;
-            status.known = {
+            info.known = {
                 .path = outputPath,
                 .valid = !worker.store.isValidPath(outputPath)
                     ? std::optional<bool> {}
                     : !checkHash || worker.pathContentsGood(outputPath),
             };
         }
-        initialOutputs.insert_or_assign(i.first, status);
+        initialOutputs.insert_or_assign(i.first, info);
     }
 }
 
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index c5c6e90ca..2c0b1feab 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -145,6 +145,11 @@ Derivation parseDerivation(const Store & store, std::string && s, std::string_vi
 // FIXME: remove
 bool isDerivation(const string & fileName);
 
+/* Calculate the name that will be used for the store path for this
+   output.
+
+   This is usually <drv-name>-<output-name>, but is just <drv-name> when
+   the output name is "out". */
 std::string outputPathName(std::string_view drvName, std::string_view outputName);
 
 // known CA drv's output hashes, current just for fixed-output derivations
@@ -194,8 +199,21 @@ struct Sink;
 Source & readDerivation(Source & in, const Store & store, BasicDerivation & drv, std::string_view name);
 void writeDerivation(Sink & out, const Store & store, const BasicDerivation & drv);
 
+/* This creates an opaque and almost certainly unique string
+   deterministically from the output name.
+
+   It is used as a placeholder to allow derivations to refer to their
+   own outputs without needing to use the hash of a derivation in
+   itself, making the hash near-impossible to calculate. */
 std::string hashPlaceholder(const std::string & outputName);
 
+/* This creates an opaque and almost certainly unique string
+   deterministically from a derivation path and output name.
+
+   It is used as a placeholder to allow derivations to refer to
+   content-addressed paths whose content --- and thus the path
+   themselves --- isn't yet known. This occurs when a derivation has a
+   dependency which is a CA derivation. */
 std::string downstreamPlaceholder(const Store & store, const StorePath & drvPath, std::string_view outputName);
 
 }
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index ea430fa14..d5e6d68ef 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -279,9 +279,8 @@ private:
        specified by the ‘secret-key-files’ option. */
     void signPathInfo(ValidPathInfo & info);
 
-    /* Add a mapping from the deriver of the path info (if specified) to its
-     * out path
-     */
+    /* Register the store path 'output' as the output named 'outputName' of
+       derivation 'deriver'. */
     void linkDeriverToPath(const StorePath & deriver, const string & outputName, const StorePath & output);
     void linkDeriverToPath(State & state, uint64_t deriver, const string & outputName, const StorePath & output);
 
diff --git a/src/nix/command.cc b/src/nix/command.cc
index f697eb84c..37a4bc785 100644
--- a/src/nix/command.cc
+++ b/src/nix/command.cc
@@ -150,8 +150,9 @@ void MixProfile::updateProfile(const Buildables & buildables)
             },
             [&](BuildableFromDrv bfd) {
                 for (auto & output : bfd.outputs) {
-                    if (!output.second)
-                        throw Error("output path should be known because we just tried to build it");
+                    /* Output path should be known because we just tried to
+                       build it. */
+                    assert(!output.second);
                     result.push_back(*output.second);
                 }
             },

From 5aed6f9b25b8547feb67bbbfaa263d013b82fb52 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Fri, 4 Sep 2020 15:58:42 +0000
Subject: [PATCH 119/176] Document `mkOutputString`

---
 src/libexpr/primops.cc | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 4e248f979..78dc314fa 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -75,6 +75,18 @@ void EvalState::realiseContext(const PathSet & context)
     }
 }
 
+/* Add and attribute to the given attribute map from the output name to
+   the output path, or a placeholder.
+
+   Where possible the path is used, but for floating CA derivations we
+   may not know it. For sake of determinism we always assume we don't
+   and instead put in a place holder. In either case, however, the
+   string context will contain the drv path and output name, so
+   downstream derivations will have the proper dependency, and in
+   addition, before building, the placeholder will be rewritten to be
+   the actual path.
+
+   The 'drv' and 'drvPath' outputs must correspond. */
 static void mkOutputString(EvalState & state, Value & v,
     const StorePath & drvPath, const BasicDerivation & drv,
     std::pair<string, DerivationOutput> o)

From ee5906243ae37b7fe007db30aa575f46ae292a35 Mon Sep 17 00:00:00 2001
From: Gabriel Gonzalez <Gabriel439@gmail.com>
Date: Fri, 4 Sep 2020 20:05:43 -0700
Subject: [PATCH 120/176] Add `nix-shell` support for preserving PS1

Fixes https://github.com/NixOS/nix/issues/1268

`nix-shell` will now preserve `PS1` if the `NIX_SHELL_PRESERVE_PROMPT`
environment variable is set.
---
 src/nix-build/nix-build.cc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nix-build/nix-build.cc b/src/nix-build/nix-build.cc
index 471bcc10d..0400f94f5 100755
--- a/src/nix-build/nix-build.cc
+++ b/src/nix-build/nix-build.cc
@@ -98,8 +98,8 @@ static void _main(int argc, char * * argv)
 
     // List of environment variables kept for --pure
     std::set<string> keepVars{
-        "HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM",
-        "IN_NIX_SHELL", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL",
+        "HOME", "USER", "LOGNAME", "DISPLAY", "PATH", "TERM", "IN_NIX_SHELL",
+        "NIX_SHELL_PRESERVE_PROMPT", "TZ", "PAGER", "NIX_BUILD_SHELL", "SHLVL",
         "http_proxy", "https_proxy", "ftp_proxy", "all_proxy", "no_proxy"
     };
 
@@ -446,7 +446,7 @@ static void _main(int argc, char * * argv)
                 "PATH=%4%:\"$PATH\"; "
                 "SHELL=%5%; "
                 "set +e; "
-                R"s([ -n "$PS1" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] '; )s"
+                R"s([ -n "$PS1" -a -z "$NIX_SHELL_PRESERVE_PROMPT" ] && PS1='\n\[\033[1;32m\][nix-shell:\w]\$\[\033[0m\] '; )s"
                 "if [ \"$(type -t runHook)\" = function ]; then runHook shellHook; fi; "
                 "unset NIX_ENFORCE_PURITY; "
                 "shopt -u nullglob; "

From 8dbd57a6a5fe497bde9e647a3249c1ce0ea121ab Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <contact@infinisil.com>
Date: Fri, 11 Sep 2020 19:21:40 +0200
Subject: [PATCH 121/176] Fix auto argument passing for more auto arguments
 than formals

The change in 626200713bb3cc844a9feb6af583c9b6b42c6dbc didn't account
for when the number of auto arguments is bigger than the number of
formal arguments. This causes the following:

  $ nix-instantiate --eval -E '{ ... }@args: args.foo' --argstr foo foo
  nix-instantiate: src/libexpr/attr-set.hh:55: void nix::Bindings::push_back(const nix::Attr&): Assertion `size_ < capacity_' failed.
  Aborted (core dumped)
---
 src/libexpr/eval.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 8c97b3760..dab11ce45 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -1348,7 +1348,7 @@ void EvalState::autoCallFunction(Bindings & args, Value & fun, Value & res)
     }
 
     Value * actualArgs = allocValue();
-    mkAttrs(*actualArgs, fun.lambda.fun->formals->formals.size());
+    mkAttrs(*actualArgs, std::max(static_cast<uint32_t>(fun.lambda.fun->formals->formals.size()), args.size()));
 
     if (fun.lambda.fun->formals->ellipsis) {
         // If the formals have an ellipsis (eg the function accepts extra args) pass

From 7cb5f643a6ee5b8ffee2e0bb9159a677ff76d17c Mon Sep 17 00:00:00 2001
From: Jade <software@lfcode.ca>
Date: Sat, 12 Sep 2020 13:08:40 -0700
Subject: [PATCH 122/176] docs+test: fix remaining installer downloads without
 -L (#4006)

Co-authored-by: lf- <lf-@users.noreply.github.com>
---
 doc/manual/src/release-notes/rl-1.7.md | 2 +-
 doc/manual/src/release-notes/rl-2.1.md | 2 +-
 tests/install-darwin.sh                | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/manual/src/release-notes/rl-1.7.md b/doc/manual/src/release-notes/rl-1.7.md
index 8d49ae54e..fb18e797d 100644
--- a/doc/manual/src/release-notes/rl-1.7.md
+++ b/doc/manual/src/release-notes/rl-1.7.md
@@ -117,7 +117,7 @@ features:
   - The binary tarball installer has been improved. You can now install
     Nix by running:
     
-        $ bash <(curl https://nixos.org/nix/install)
+        $ bash <(curl -L https://nixos.org/nix/install)
 
   - More evaluation errors include position information. For instance,
     selecting a missing attribute will print something like
diff --git a/doc/manual/src/release-notes/rl-2.1.md b/doc/manual/src/release-notes/rl-2.1.md
index b88834c83..a9592657b 100644
--- a/doc/manual/src/release-notes/rl-2.1.md
+++ b/doc/manual/src/release-notes/rl-2.1.md
@@ -10,7 +10,7 @@ in certain situations. In addition, it has the following new features:
   - The Nix installer now supports performing a Multi-User
     installation for Linux computers which are running systemd. You
     can select a Multi-User installation by passing the `--daemon`
-    flag to the installer: `sh <(curl https://nixos.org/nix/install)
+    flag to the installer: `sh <(curl -L https://nixos.org/nix/install)
     --daemon`.
 
     The multi-user installer cannot handle systems with SELinux. If
diff --git a/tests/install-darwin.sh b/tests/install-darwin.sh
index 9933eba94..7e44e54c4 100755
--- a/tests/install-darwin.sh
+++ b/tests/install-darwin.sh
@@ -53,7 +53,7 @@ trap finish EXIT
 
 # First setup Nix
 cleanup
-curl -o install https://nixos.org/nix/install
+curl -L -o install https://nixos.org/nix/install
 yes | bash ./install
 verify
 

From 525b38eee8fac48eb2a82fb78fa0a933a9eee2a4 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sun, 13 Sep 2020 02:40:51 +0200
Subject: [PATCH 123/176] Fix unspecified behaviour in readStorePathCAMap

When deploying a Hydra instance with current Nix master, most builds
would not run because of errors like this:

  queue monitor: error: --- Error --- hydra-queue-runner
  error: --- UsageError --- nix-daemon
  not a content address because it is not in the form '<prefix>:<rest>': /nix/store/...-somedrv

The last error message is from parseContentAddress, which expects a
colon-separated string, however what we got here is a store path.

Looking at the worker protocol, the following message sent to the Nix
daemon caused the error above:

  0x1E -> wopQuerySubstitutablePathInfos
  0x01 -> Number of paths
  0x16 -> Length of string
  "/nix/store/...-somedrv"
  0x00 -> Length of string
  ""

Looking at writeStorePathCAMap, the store path is indeed the first field
that's transmitted. However, readStorePathCAMap expects it to be the
*second* field *on my machine*, since expression evaluation order is a
classic form of unspecified behaviour[1] in C++.

This has been introduced in https://github.com/NixOS/nix/pull/3689,
specifically in commit 66a62b3189c8c9b0965850e6b3c9b0fda0b50fd8.

[1]: https://en.wikipedia.org/wiki/Unspecified_behavior#Order_of_evaluation_of_subexpressions

Signed-off-by: aszlig <aszlig@nix.build>
---
 src/libstore/remote-store.cc | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index e4a4ef5af..8bcf92301 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -43,8 +43,11 @@ StorePathCAMap readStorePathCAMap(const Store & store, Source & from)
 {
     StorePathCAMap paths;
     auto count = readNum<size_t>(from);
-    while (count--)
-        paths.insert_or_assign(store.parseStorePath(readString(from)), parseContentAddressOpt(readString(from)));
+    while (count--) {
+        auto path = store.parseStorePath(readString(from));
+        auto ca = parseContentAddressOpt(readString(from));
+        paths.insert_or_assign(path, ca);
+    }
     return paths;
 }
 

From c8b17212c8191d5a124c691957c05b971f6b4e5f Mon Sep 17 00:00:00 2001
From: Brian Leung <leungbk@mailfence.com>
Date: Sun, 13 Sep 2020 14:07:09 -0700
Subject: [PATCH 124/176] Add ccls files to .gitignore

---
 .gitignore | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.gitignore b/.gitignore
index 0ea27c8c8..573fa0005 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,4 +126,10 @@ GRTAGS
 GSYMS
 GTAGS
 
+# ccls
+/.ccls-cache
+
+# auto-generated compilation database
+compile_commands.json
+
 nix-rust/target

From a59e77d9e54e8e7bf0f3c3f40c22cd34b7a81225 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 14 Sep 2020 13:48:51 +0200
Subject: [PATCH 125/176] nix-daemon: Lower verbosity of restricted setting
 warning

Fixes #3992.
---
 src/libstore/daemon.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/daemon.cc b/src/libstore/daemon.cc
index f35ddb522..8adabf549 100644
--- a/src/libstore/daemon.cc
+++ b/src/libstore/daemon.cc
@@ -232,7 +232,7 @@ struct ClientSettings
                 else if (setSubstituters(settings.extraSubstituters))
                     ;
                 else
-                    warn("ignoring the user-specified setting '%s', because it is a restricted setting and you are not a trusted user", name);
+                    debug("ignoring the client-specified setting '%s', because it is a restricted setting and you are not a trusted user", name);
             } catch (UsageError & e) {
                 warn(e.what());
             }

From 250f8a4bbae2aeafd3fa3e637b52fbbb59a7a8e0 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 17:19:25 +0200
Subject: [PATCH 126/176] Escape `${` in strings when printing Nix expressions

Otherwise the result of the printing can't be parsed back correctly by
Nix (because the unescaped `${` will be parsed as the begining of an
anti-quotation).

Fix #3989
---
 src/libexpr/eval.cc                 | 1 +
 tests/lang/eval-okay-ind-string.exp | 2 +-
 tests/user-envs.nix                 | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index dab11ce45..d678231c6 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -87,6 +87,7 @@ static void printValue(std::ostream & str, std::set<const Value *> & active, con
             else if (*i == '\n') str << "\\n";
             else if (*i == '\r') str << "\\r";
             else if (*i == '\t') str << "\\t";
+            else if (*i == '$' && *(i+1) == '{') str << "\\" << *i;
             else str << *i;
         str << "\"";
         break;
diff --git a/tests/lang/eval-okay-ind-string.exp b/tests/lang/eval-okay-ind-string.exp
index 9cf4bd2ee..7862331fa 100644
--- a/tests/lang/eval-okay-ind-string.exp
+++ b/tests/lang/eval-okay-ind-string.exp
@@ -1 +1 @@
-"This is an indented multi-line string\nliteral.  An amount of whitespace at\nthe start of each line matching the minimum\nindentation of all lines in the string\nliteral together will be removed.  Thus,\nin this case four spaces will be\nstripped from each line, even though\n  THIS LINE is indented six spaces.\n\nAlso, empty lines don't count in the\ndetermination of the indentation level (the\nprevious empty line has indentation 0, but\nit doesn't matter).\nIf the string starts with whitespace\n  followed by a newline, it's stripped, but\n  that's not the case here. Two spaces are\n  stripped because of the \"  \" at the start. \nThis line is indented\na bit further.\nAnti-quotations, like so, are\nalso allowed.\n  The \\ is not special here.\n' can be followed by any character except another ', e.g. 'x'.\nLikewise for $, e.g. $$ or $varName.\nBut ' followed by ' is special, as is $ followed by {.\nIf you want them, use anti-quotations: '', ${.\n   Tabs are not interpreted as whitespace (since we can't guess\n   what tab settings are intended), so don't use them.\n\tThis line starts with a space and a tab, so only one\n   space will be stripped from each line.\nAlso note that if the last line (just before the closing ' ')\nconsists only of whitespace, it's ignored.  But here there is\nsome non-whitespace stuff, so the line isn't removed. \nThis shows a hacky way to preserve an empty line after the start.\nBut there's no reason to do so: you could just repeat the empty\nline.\n  Similarly you can force an indentation level,\n  in this case to 2 spaces.  This works because the anti-quote\n  is significant (not whitespace).\nstart on network-interfaces\n\nstart script\n\n  rm -f /var/run/opengl-driver\n  ln -sf 123 /var/run/opengl-driver\n\n  rm -f /var/log/slim.log\n   \nend script\n\nenv SLIM_CFGFILE=abc\nenv SLIM_THEMESDIR=def\nenv FONTCONFIG_FILE=/etc/fonts/fonts.conf  \t\t\t\t# !!! cleanup\nenv XKB_BINDIR=foo/bin         \t\t\t\t# Needed for the Xkb extension.\nenv LD_LIBRARY_PATH=libX11/lib:libXext/lib:/usr/lib/          # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)\n\nenv XORG_DRI_DRIVER_PATH=nvidiaDrivers/X11R6/lib/modules/drivers/ \n\nexec slim/bin/slim\nEscaping of ' followed by ': ''\nEscaping of $ followed by {: ${\nAnd finally to interpret \\n etc. as in a string: \n, \r, \t.\nfoo\n'bla'\nbar\ncut -d $'\\t' -f 1\nending dollar $$\n"
+"This is an indented multi-line string\nliteral.  An amount of whitespace at\nthe start of each line matching the minimum\nindentation of all lines in the string\nliteral together will be removed.  Thus,\nin this case four spaces will be\nstripped from each line, even though\n  THIS LINE is indented six spaces.\n\nAlso, empty lines don't count in the\ndetermination of the indentation level (the\nprevious empty line has indentation 0, but\nit doesn't matter).\nIf the string starts with whitespace\n  followed by a newline, it's stripped, but\n  that's not the case here. Two spaces are\n  stripped because of the \"  \" at the start. \nThis line is indented\na bit further.\nAnti-quotations, like so, are\nalso allowed.\n  The \\ is not special here.\n' can be followed by any character except another ', e.g. 'x'.\nLikewise for $, e.g. $$ or $varName.\nBut ' followed by ' is special, as is $ followed by {.\nIf you want them, use anti-quotations: '', \${.\n   Tabs are not interpreted as whitespace (since we can't guess\n   what tab settings are intended), so don't use them.\n\tThis line starts with a space and a tab, so only one\n   space will be stripped from each line.\nAlso note that if the last line (just before the closing ' ')\nconsists only of whitespace, it's ignored.  But here there is\nsome non-whitespace stuff, so the line isn't removed. \nThis shows a hacky way to preserve an empty line after the start.\nBut there's no reason to do so: you could just repeat the empty\nline.\n  Similarly you can force an indentation level,\n  in this case to 2 spaces.  This works because the anti-quote\n  is significant (not whitespace).\nstart on network-interfaces\n\nstart script\n\n  rm -f /var/run/opengl-driver\n  ln -sf 123 /var/run/opengl-driver\n\n  rm -f /var/log/slim.log\n   \nend script\n\nenv SLIM_CFGFILE=abc\nenv SLIM_THEMESDIR=def\nenv FONTCONFIG_FILE=/etc/fonts/fonts.conf  \t\t\t\t# !!! cleanup\nenv XKB_BINDIR=foo/bin         \t\t\t\t# Needed for the Xkb extension.\nenv LD_LIBRARY_PATH=libX11/lib:libXext/lib:/usr/lib/          # related to xorg-sys-opengl - needed to load libglx for (AI)GLX support (for compiz)\n\nenv XORG_DRI_DRIVER_PATH=nvidiaDrivers/X11R6/lib/modules/drivers/ \n\nexec slim/bin/slim\nEscaping of ' followed by ': ''\nEscaping of $ followed by {: \${\nAnd finally to interpret \\n etc. as in a string: \n, \r, \t.\nfoo\n'bla'\nbar\ncut -d $'\\t' -f 1\nending dollar $$\n"
diff --git a/tests/user-envs.nix b/tests/user-envs.nix
index 1aa410cc9..43eff1a68 100644
--- a/tests/user-envs.nix
+++ b/tests/user-envs.nix
@@ -13,7 +13,7 @@ let
     builder = ./user-envs.builder.sh;
   } // {
     meta = {
-      description = "A silly test package";
+      description = "A silly test package with some \${escaped anti-quotation} in it";
     };
   });
 

From 057c6203b5337cb4833958f4a4f29f6587f4eb2f Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 7 Sep 2020 11:26:09 +0200
Subject: [PATCH 127/176] gracefully handle old daemon versions

Add a fallback path in `queryPartialDerivationOutputMap` for daemons
that don't support it.

Also upstreams a couple methods from `SSHStore` to `RemoteStore` as this
is needed to handle the fallback path.
---
 src/libstore/remote-store.cc | 37 ++++++++++++++++++++++++++++++++----
 src/libstore/remote-store.hh | 10 ++++++++++
 src/libstore/ssh-store.cc    | 17 -----------------
 3 files changed, 43 insertions(+), 21 deletions(-)

diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 8bcf92301..dc61951d3 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -1,5 +1,6 @@
 #include "serialise.hh"
 #include "util.hh"
+#include "remote-fs-accessor.hh"
 #include "remote-store.hh"
 #include "worker-protocol.hh"
 #include "archive.hh"
@@ -479,10 +480,26 @@ StorePathSet RemoteStore::queryDerivationOutputs(const StorePath & path)
 
 std::map<std::string, std::optional<StorePath>> RemoteStore::queryPartialDerivationOutputMap(const StorePath & path)
 {
-    auto conn(getConnection());
-    conn->to << wopQueryDerivationOutputMap << printStorePath(path);
-    conn.processStderr();
-    return worker_proto::read(*this, conn->from, Phantom<std::map<std::string, std::optional<StorePath>>> {});
+    if (GET_PROTOCOL_MINOR(getProtocol()) >= 0x16) {
+        auto conn(getConnection());
+        conn->to << wopQueryDerivationOutputMap << printStorePath(path);
+        conn.processStderr();
+        return worker_proto::read(*this, conn->from, Phantom<std::map<std::string, std::optional<StorePath>>> {});
+    } else {
+        // Fallback for old daemon versions.
+        // For floating-CA derivations (and their co-dependencies) this is an
+        // under-approximation as it only returns the paths that can be inferred
+        // from the derivation itself (and not the ones that are known because
+        // the have been built), but as old stores don't handle floating-CA
+        // derivations this shouldn't matter
+        auto derivation = readDerivation(path);
+        auto outputsWithOptPaths = derivation.outputsAndOptPaths(*this);
+        std::map<std::string, std::optional<StorePath>> ret;
+        for (auto & [outputName, outputAndPath] : outputsWithOptPaths) {
+            ret.emplace(outputName, outputAndPath.second);
+        }
+        return ret;
+    }
 
 }
 
@@ -871,6 +888,18 @@ RemoteStore::Connection::~Connection()
     }
 }
 
+void RemoteStore::narFromPath(const StorePath & path, Sink & sink)
+{
+    auto conn(connections->get());
+    conn->to << wopNarFromPath << printStorePath(path);
+    conn->processStderr();
+    copyNAR(conn->from, sink);
+}
+
+ref<FSAccessor> RemoteStore::getFSAccessor()
+{
+    return make_ref<RemoteFSAccessor>(ref<Store>(shared_from_this()));
+}
 
 static Logger::Fields readFields(Source & from)
 {
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 7cf4c4d12..6f05f2197 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -131,6 +131,10 @@ protected:
 
     friend struct ConnectionHandle;
 
+    virtual ref<FSAccessor> getFSAccessor() override;
+
+    virtual void narFromPath(const StorePath & path, Sink & sink) override;
+
 private:
 
     std::atomic_bool failed{false};
@@ -149,6 +153,12 @@ public:
     bool sameMachine() override
     { return true; }
 
+    ref<FSAccessor> getFSAccessor() override
+    { return LocalFSStore::getFSAccessor(); }
+
+    void narFromPath(const StorePath & path, Sink & sink) override
+    { LocalFSStore::narFromPath(path, sink); }
+
 private:
 
     ref<RemoteStore::Connection> openConnection() override;
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index caae6b596..6cb97c1f1 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -40,10 +40,6 @@ public:
     bool sameMachine() override
     { return false; }
 
-    void narFromPath(const StorePath & path, Sink & sink) override;
-
-    ref<FSAccessor> getFSAccessor() override;
-
 private:
 
     struct Connection : RemoteStore::Connection
@@ -68,19 +64,6 @@ private:
     };
 };
 
-void SSHStore::narFromPath(const StorePath & path, Sink & sink)
-{
-    auto conn(connections->get());
-    conn->to << wopNarFromPath << printStorePath(path);
-    conn->processStderr();
-    copyNAR(conn->from, sink);
-}
-
-ref<FSAccessor> SSHStore::getFSAccessor()
-{
-    return make_ref<RemoteFSAccessor>(ref<Store>(shared_from_this()));
-}
-
 ref<RemoteStore::Connection> SSHStore::openConnection()
 {
     auto conn = make_ref<Connection>();

From 733d2e9402807e54d503c3113e854bfddb3d44e0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 15 Sep 2020 13:48:23 +0200
Subject: [PATCH 128/176] .gitignore: inst -> outputs

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 573fa0005..3f81f8ef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -107,7 +107,7 @@ perl/Makefile.config
 
 /src/resolve-system-dependencies/resolve-system-dependencies
 
-inst/
+outputs/
 
 *.a
 *.o

From c4bf219b55c76329988671d6b383d073373919f0 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Sep 2020 14:26:56 +0000
Subject: [PATCH 129/176] Don't link deriver until after any delayed exception
 is thrown

Otherwise, we will associate fixed-output derivations with outputs that
they did indeed produce, but which had the wrong hash. That's no good.
---
 src/libstore/build.cc | 26 ++++++++++++++++----------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 9eff03f7b..d6a775ae9 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4251,22 +4251,28 @@ void DerivationGoal::registerOutputs()
     /* Register each output path as valid, and register the sets of
        paths referenced by each of them.  If there are cycles in the
        outputs, this will fail. */
-    {
-        ValidPathInfos infos2;
-        for (auto & [outputName, newInfo] : infos) {
-            /* FIXME: we will want to track this mapping in the DB whether or
-               not we have a drv file. */
-            if (useDerivation)
-                worker.store.linkDeriverToPath(drvPath, outputName, newInfo.path);
-            infos2.push_back(newInfo);
-        }
-        worker.store.registerValidPaths(infos2);
+    ValidPathInfos infos2;
+    for (auto & [outputName, newInfo] : infos) {
+        infos2.push_back(newInfo);
     }
+    worker.store.registerValidPaths(infos2);
 
     /* In case of a fixed-output derivation hash mismatch, throw an
        exception now that we have registered the output as valid. */
     if (delayedException)
         std::rethrow_exception(delayedException);
+
+    /* If we made it this far, we are sure the output matches the derivation
+       (since the delayedException would be a fixed output CA mismatch). That
+       means it's safe to link the derivation to the output hash. We must do
+       that for floating CA derivations, which otherwise couldn't be cached,
+       but it's fine to do in all cases. */
+    for (auto & [outputName, newInfo] : infos) {
+        /* FIXME: we will want to track this mapping in the DB whether or
+           not we have a drv file. */
+        if (useDerivation)
+            worker.store.linkDeriverToPath(drvPath, outputName, newInfo.path);
+    }
 }
 
 

From 6387550d58884ac09204c339ed3a3cd700780a75 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Sep 2020 15:19:45 +0000
Subject: [PATCH 130/176] Get rid of confusing `std::optional<bool>` for
 validity

---
 src/libstore/build.cc | 35 +++++++++++++++++++++++------------
 1 file changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index d6a775ae9..b800a432f 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -718,16 +718,25 @@ typedef enum {rpAccept, rpDecline, rpPostpone} HookReply;
 
 class SubstitutionGoal;
 
+/* Unless we are repairing, we don't both to test validity and just assume it,
+   so the choices are `Absent` or `Valid`. */
+enum struct PathStatus {
+    Corrupt,
+    Absent,
+    Valid,
+};
+
 struct InitialOutputStatus {
     StorePath path;
-    /* The output optional indicates whether it's already valid; i.e. exists
-       and is registered. If we're repairing, inner bool indicates whether the
-       valid path is in fact not corrupt. Otherwise, the inner bool is always
-       true (assumed no corruption). */
-    std::optional<bool> valid;
+    PathStatus status;
     /* Valid in the store, and additionally non-corrupt if we are repairing */
     bool isValid() const {
-        return valid && *valid;
+        return status == PathStatus::Valid;
+    }
+    /* Merely present, allowed to be corrupt */
+    bool isPresent() const {
+        return status == PathStatus::Corrupt
+            || status == PathStatus::Valid;
     }
 };
 
@@ -2148,10 +2157,10 @@ void DerivationGoal::startBuilder()
             : !needsHashRewrite()
                 /* Can always use original path in sandbox */
                 ? status.known->path
-            : !status.known->valid
+            : !status.known->isPresent()
                 /* If path doesn't yet exist can just use it */
                 ? status.known->path
-            : buildMode != bmRepair && !*status.known->valid
+            : buildMode != bmRepair && !status.known->isValid()
                 /* If we aren't repairing we'll delete a corrupted path, so we
                    can use original path */
                 ? status.known->path
@@ -2161,7 +2170,7 @@ void DerivationGoal::startBuilder()
         scratchOutputs.insert_or_assign(outputName, scratchPath);
 
         /* A non-removed corrupted path needs to be stored here, too */
-        if (buildMode == bmRepair && !*status.known->valid)
+        if (buildMode == bmRepair && !status.known->isValid())
             redirectedBadOutputs.insert(status.known->path);
 
         /* Substitute output placeholders with the scratch output paths.
@@ -4596,9 +4605,11 @@ void DerivationGoal::checkPathValidity()
             auto outputPath = *i.second;
             info.known = {
                 .path = outputPath,
-                .valid = !worker.store.isValidPath(outputPath)
-                    ? std::optional<bool> {}
-                    : !checkHash || worker.pathContentsGood(outputPath),
+                .status = !worker.store.isValidPath(outputPath)
+                    ? PathStatus::Absent
+                    : !checkHash || worker.pathContentsGood(outputPath)
+                    ? PathStatus::Valid
+                    : PathStatus::Corrupt,
             };
         }
         initialOutputs.insert_or_assign(i.first, info);

From 3a5cdd737cf529a7f641c4347f002b821a456a5d Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Tue, 15 Sep 2020 15:21:39 +0000
Subject: [PATCH 131/176] Rename `Derivation::pathOpt` to `Derivation::path`

We no longer need the `*Opt` to disambiguate.
---
 src/libexpr/get-drvs.cc     | 2 +-
 src/libexpr/primops.cc      | 2 +-
 src/libstore/build.cc       | 4 ++--
 src/libstore/derivations.cc | 4 ++--
 src/libstore/derivations.hh | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/libexpr/get-drvs.cc b/src/libexpr/get-drvs.cc
index e66832182..91916e8bf 100644
--- a/src/libexpr/get-drvs.cc
+++ b/src/libexpr/get-drvs.cc
@@ -40,7 +40,7 @@ DrvInfo::DrvInfo(EvalState & state, ref<Store> store, const std::string & drvPat
         throw Error("derivation '%s' does not have output '%s'", store->printStorePath(drvPath), outputName);
     auto & [outputName, output] = *i;
 
-    auto optStorePath = output.pathOpt(*store, drv.name, outputName);
+    auto optStorePath = output.path(*store, drv.name, outputName);
     if (optStorePath)
         outPath = store->printStorePath(*optStorePath);
 }
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 78dc314fa..4a0dd5544 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -91,7 +91,7 @@ static void mkOutputString(EvalState & state, Value & v,
     const StorePath & drvPath, const BasicDerivation & drv,
     std::pair<string, DerivationOutput> o)
 {
-    auto optOutputPath = o.second.pathOpt(*state.store, drv.name, o.first);
+    auto optOutputPath = o.second.path(*state.store, drv.name, o.first);
     mkString(
         *state.allocAttr(v, state.symbols.create(o.first)),
         optOutputPath
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index b800a432f..ce973862d 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4081,7 +4081,7 @@ void DerivationGoal::registerOutputs()
            floating CA derivations and hash-mismatching fixed-output
            derivations. */
         PathLocks dynamicOutputLock;
-        auto optFixedPath = output.pathOpt(worker.store, drv->name, outputName);
+        auto optFixedPath = output.path(worker.store, drv->name, outputName);
         if (!optFixedPath ||
             worker.store.printStorePath(*optFixedPath) != finalDestPath)
         {
@@ -4574,7 +4574,7 @@ std::map<std::string, std::optional<StorePath>> DerivationGoal::queryPartialDeri
     if (drv->type() != DerivationType::CAFloating) {
         std::map<std::string, std::optional<StorePath>> res;
         for (auto & [name, output] : drv->outputs)
-            res.insert_or_assign(name, output.pathOpt(worker.store, drv->name, name));
+            res.insert_or_assign(name, output.path(worker.store, drv->name, name));
         return res;
     } else {
         return worker.store.queryPartialDerivationOutputMap(drvPath);
diff --git a/src/libstore/derivations.cc b/src/libstore/derivations.cc
index e5ec60811..9d8ce5e36 100644
--- a/src/libstore/derivations.cc
+++ b/src/libstore/derivations.cc
@@ -7,7 +7,7 @@
 
 namespace nix {
 
-std::optional<StorePath> DerivationOutput::pathOpt(const Store & store, std::string_view drvName, std::string_view outputName) const
+std::optional<StorePath> DerivationOutput::path(const Store & store, std::string_view drvName, std::string_view outputName) const
 {
     return std::visit(overloaded {
         [](DerivationOutputInputAddressed doi) -> std::optional<StorePath> {
@@ -557,7 +557,7 @@ DerivationOutputsAndOptPaths BasicDerivation::outputsAndOptPaths(const Store & s
     for (auto output : outputs)
         outsAndOptPaths.insert(std::make_pair(
             output.first,
-            std::make_pair(output.second, output.second.pathOpt(store, name, output.first))
+            std::make_pair(output.second, output.second.path(store, name, output.first))
             )
         );
     return outsAndOptPaths;
diff --git a/src/libstore/derivations.hh b/src/libstore/derivations.hh
index 2c0b1feab..0b5652685 100644
--- a/src/libstore/derivations.hh
+++ b/src/libstore/derivations.hh
@@ -51,7 +51,7 @@ struct DerivationOutput
     /* Note, when you use this function you should make sure that you're passing
        the right derivation name. When in doubt, you should use the safer
        interface provided by BasicDerivation::outputsAndOptPaths */
-    std::optional<StorePath> pathOpt(const Store & store, std::string_view drvName, std::string_view outputName) const;
+    std::optional<StorePath> path(const Store & store, std::string_view drvName, std::string_view outputName) const;
 };
 
 typedef std::map<string, DerivationOutput> DerivationOutputs;

From 7d5bdf8b5679cc7b2b9b4d9caf5af9ca52211336 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 8 Sep 2020 14:50:23 +0200
Subject: [PATCH 132/176] Make the store plugins more introspectable

Directly register the store classes rather than a function to build an
instance of them.
This gives the possibility to introspect static members of the class or
choose different ways of instantiating them.
---
 result                                   |  1 +
 src/libexpr/flake/lockfile.hh            |  2 +-
 src/libfetchers/fetchers.hh              |  2 +-
 src/libstore/dummy-store.cc              | 18 +++-----
 src/libstore/http-binary-cache-store.cc  | 24 +++++------
 src/libstore/legacy-ssh-store.cc         | 15 +++----
 src/libstore/local-binary-cache-store.cc | 23 +++++-----
 src/libstore/remote-store.cc             | 10 +----
 src/libstore/remote-store.hh             |  3 ++
 src/libstore/s3-binary-cache-store.cc    | 15 +++----
 src/libstore/ssh-store.cc                | 14 ++----
 src/libstore/store-api.cc                | 55 +++++++++++++-----------
 src/libstore/store-api.hh                | 31 ++++++++-----
 src/libstore/store.hh                    |  9 ++++
 src/nix/describe-stores.cc               | 30 +++++++++++++
 src/nix/develop.cc                       |  2 +-
 src/nix/diff-closures.cc                 |  2 +-
 src/nix/installables.hh                  |  2 +-
 18 files changed, 141 insertions(+), 117 deletions(-)
 create mode 120000 result
 create mode 100644 src/libstore/store.hh
 create mode 100644 src/nix/describe-stores.cc

diff --git a/result b/result
new file mode 120000
index 000000000..af7bbb6da
--- /dev/null
+++ b/result
@@ -0,0 +1 @@
+/nix/store/9pqfirjppd91mzhkgh8xnn66iwh53zk2-hello-2.10
\ No newline at end of file
diff --git a/src/libexpr/flake/lockfile.hh b/src/libexpr/flake/lockfile.hh
index 5e7cfda3e..9ec8b39c3 100644
--- a/src/libexpr/flake/lockfile.hh
+++ b/src/libexpr/flake/lockfile.hh
@@ -6,7 +6,7 @@
 
 namespace nix {
 class Store;
-struct StorePath;
+class StorePath;
 }
 
 namespace nix::flake {
diff --git a/src/libfetchers/fetchers.hh b/src/libfetchers/fetchers.hh
index be71b786b..89b1e6e7d 100644
--- a/src/libfetchers/fetchers.hh
+++ b/src/libfetchers/fetchers.hh
@@ -23,7 +23,7 @@ struct InputScheme;
 
 struct Input
 {
-    friend class InputScheme;
+    friend struct InputScheme;
 
     std::shared_ptr<InputScheme> scheme; // note: can be null
     Attrs attrs;
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 7a5744bc1..a677e201e 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -2,17 +2,15 @@
 
 namespace nix {
 
-static std::string uriScheme = "dummy://";
-
 struct DummyStore : public Store
 {
-    DummyStore(const Params & params)
+    DummyStore(const std::string uri, const Params & params)
         : Store(params)
     { }
 
     string getUri() override
     {
-        return uriScheme;
+        return uriPrefixes()[0] + "://";
     }
 
     void queryPathInfoUncached(const StorePath & path,
@@ -21,6 +19,10 @@ struct DummyStore : public Store
         callback(nullptr);
     }
 
+    static std::vector<std::string> uriPrefixes() {
+        return {"dummy"};
+    }
+
     std::optional<StorePath> queryPathFromHashPart(const std::string & hashPart) override
     { unsupported("queryPathFromHashPart"); }
 
@@ -48,12 +50,6 @@ struct DummyStore : public Store
     { unsupported("buildDerivation"); }
 };
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    if (uri != uriScheme) return nullptr;
-    return std::make_shared<DummyStore>(params);
-});
+[[maybe_unused]] static RegisterStoreImplementation<DummyStore> regStore();
 
 }
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 1733239fb..6c3a16faf 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -24,7 +24,8 @@ private:
 public:
 
     HttpBinaryCacheStore(
-        const Params & params, const Path & _cacheUri)
+        const Path & _cacheUri,
+        const Params & params)
         : BinaryCacheStore(params)
         , cacheUri(_cacheUri)
     {
@@ -55,6 +56,13 @@ public:
         }
     }
 
+    static std::vector<std::string> uriPrefixes()
+    {
+        static bool forceHttp = getEnv("_NIX_FORCE_HTTP") == "1";
+        auto ret = std::vector<std::string>({"http", "https"});
+        if (forceHttp) ret.push_back("file");
+        return ret;
+    }
 protected:
 
     void maybeDisable()
@@ -162,18 +170,6 @@ protected:
 
 };
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    static bool forceHttp = getEnv("_NIX_FORCE_HTTP") == "1";
-    if (std::string(uri, 0, 7) != "http://" &&
-        std::string(uri, 0, 8) != "https://" &&
-        (!forceHttp || std::string(uri, 0, 7) != "file://"))
-        return 0;
-    auto store = std::make_shared<HttpBinaryCacheStore>(params, uri);
-    store->init();
-    return store;
-});
+[[maybe_unused]] static RegisterStoreImplementation<HttpBinaryCacheStore> regStore();
 
 }
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index dc03313f0..72f28a82d 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -9,8 +9,6 @@
 
 namespace nix {
 
-static std::string uriScheme = "ssh://";
-
 struct LegacySSHStore : public Store
 {
     const Setting<int> maxConnections{this, 1, "max-connections", "maximum number of concurrent SSH connections"};
@@ -37,6 +35,9 @@ struct LegacySSHStore : public Store
 
     SSHMaster master;
 
+    static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
+
+
     LegacySSHStore(const string & host, const Params & params)
         : Store(params)
         , host(host)
@@ -84,7 +85,7 @@ struct LegacySSHStore : public Store
 
     string getUri() override
     {
-        return uriScheme + host;
+        return uriPrefixes()[0] + "://" + host;
     }
 
     void queryPathInfoUncached(const StorePath & path,
@@ -325,12 +326,6 @@ public:
     }
 };
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    if (std::string(uri, 0, uriScheme.size()) != uriScheme) return 0;
-    return std::make_shared<LegacySSHStore>(std::string(uri, uriScheme.size()), params);
-});
+[[maybe_unused]] static RegisterStoreImplementation<LegacySSHStore> regStore();
 
 }
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 87d8334d7..752838d3f 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -13,7 +13,8 @@ private:
 public:
 
     LocalBinaryCacheStore(
-        const Params & params, const Path & binaryCacheDir)
+        const Path & binaryCacheDir,
+        const Params & params)
         : BinaryCacheStore(params)
         , binaryCacheDir(binaryCacheDir)
     {
@@ -26,6 +27,8 @@ public:
         return "file://" + binaryCacheDir;
     }
 
+    static std::vector<std::string> uriPrefixes();
+
 protected:
 
     bool fileExists(const std::string & path) override;
@@ -85,16 +88,14 @@ bool LocalBinaryCacheStore::fileExists(const std::string & path)
     return pathExists(binaryCacheDir + "/" + path);
 }
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
+std::vector<std::string> LocalBinaryCacheStore::uriPrefixes()
 {
-    if (getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") == "1" ||
-        std::string(uri, 0, 7) != "file://")
-        return 0;
-    auto store = std::make_shared<LocalBinaryCacheStore>(params, std::string(uri, 7));
-    store->init();
-    return store;
-});
+    if (getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") == "1")
+        return {};
+    else
+        return {"file"};
+}
+
+[[maybe_unused]] static RegisterStoreImplementation<LocalBinaryCacheStore> regStore();
 
 }
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index dc61951d3..824b6b140 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -982,14 +982,6 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
     return nullptr;
 }
 
-static std::string uriScheme = "unix://";
-
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    if (std::string(uri, 0, uriScheme.size()) != uriScheme) return 0;
-    return std::make_shared<UDSRemoteStore>(std::string(uri, uriScheme.size()), params);
-});
+[[maybe_unused]] static RegisterStoreImplementation<UDSRemoteStore> regStore();
 
 }
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 6f05f2197..07cd5daf8 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -150,6 +150,9 @@ public:
 
     std::string getUri() override;
 
+    static std::vector<std::string> uriPrefixes()
+    { return {"unix"}; }
+
     bool sameMachine() override
     { return true; }
 
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index a0a446bd3..1bf4d5955 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -193,7 +193,8 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
     S3Helper s3Helper;
 
     S3BinaryCacheStoreImpl(
-        const Params & params, const std::string & bucketName)
+        const std::string & bucketName,
+        const Params & params)
         : S3BinaryCacheStore(params)
         , bucketName(bucketName)
         , s3Helper(profile, region, scheme, endpoint)
@@ -426,17 +427,11 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
         return paths;
     }
 
+    static std::vector<std::string> uriPrefixes() { return {"s3"}; }
+
 };
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    if (std::string(uri, 0, 5) != "s3://") return 0;
-    auto store = std::make_shared<S3BinaryCacheStoreImpl>(params, std::string(uri, 5));
-    store->init();
-    return store;
-});
+[[maybe_unused]] static RegisterStoreImplementation<S3BinaryCacheStoreImpl> regStore();
 
 }
 
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 6cb97c1f1..02208ee82 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -8,8 +8,6 @@
 
 namespace nix {
 
-static std::string uriScheme = "ssh-ng://";
-
 class SSHStore : public RemoteStore
 {
 public:
@@ -32,9 +30,11 @@ public:
     {
     }
 
+    static std::vector<std::string> uriPrefixes() { return {"ssh-ng"}; }
+
     std::string getUri() override
     {
-        return uriScheme + host;
+        return uriPrefixes()[0] + "://" + host;
     }
 
     bool sameMachine() override
@@ -76,12 +76,6 @@ ref<RemoteStore::Connection> SSHStore::openConnection()
     return conn;
 }
 
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
-{
-    if (std::string(uri, 0, uriScheme.size()) != uriScheme) return 0;
-    return std::make_shared<SSHStore>(std::string(uri, uriScheme.size()), params);
-});
+[[maybe_unused]] static RegisterStoreImplementation<SSHStore> regStore();
 
 }
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index b3877487c..4a46b5160 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1009,6 +1009,11 @@ Derivation Store::readDerivation(const StorePath & drvPath)
     }
 }
 
+std::shared_ptr<Config> Store::getConfig()
+{
+    return shared_from_this();
+}
+
 
 }
 
@@ -1019,9 +1024,6 @@ Derivation Store::readDerivation(const StorePath & drvPath)
 
 namespace nix {
 
-
-RegisterStoreImplementation::Implementations * RegisterStoreImplementation::implementations = 0;
-
 /* Split URI into protocol+hierarchy part and its parameter set. */
 std::pair<std::string, Store::Params> splitUriAndParams(const std::string & uri_)
 {
@@ -1035,24 +1037,6 @@ std::pair<std::string, Store::Params> splitUriAndParams(const std::string & uri_
     return {uri, params};
 }
 
-ref<Store> openStore(const std::string & uri_,
-    const Store::Params & extraParams)
-{
-    auto [uri, uriParams] = splitUriAndParams(uri_);
-    auto params = extraParams;
-    params.insert(uriParams.begin(), uriParams.end());
-
-    for (auto fun : *RegisterStoreImplementation::implementations) {
-        auto store = fun(uri, params);
-        if (store) {
-            store->warnUnknownSettings();
-            return ref<Store>(store);
-        }
-    }
-
-    throw Error("don't know how to open Nix store '%s'", uri);
-}
-
 static bool isNonUriPath(const std::string & spec) {
     return
         // is not a URL
@@ -1080,10 +1064,7 @@ StoreType getStoreType(const std::string & uri, const std::string & stateDir)
     }
 }
 
-
-static RegisterStoreImplementation regStore([](
-    const std::string & uri, const Store::Params & params)
-    -> std::shared_ptr<Store>
+std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Params & params)
 {
     switch (getStoreType(uri, get(params, "state").value_or(settings.nixStateDir))) {
         case tDaemon:
@@ -1098,8 +1079,30 @@ static RegisterStoreImplementation regStore([](
         default:
             return nullptr;
     }
-});
+}
 
+ref<Store> openStore(const std::string & uri_,
+    const Store::Params & extraParams)
+{
+    auto [uri, uriParams] = splitUriAndParams(uri_);
+    auto params = extraParams;
+    params.insert(uriParams.begin(), uriParams.end());
+
+    if (auto store = openFromNonUri(uri, params)) {
+        store->warnUnknownSettings();
+        return ref<Store>(store);
+    }
+
+    for (auto implem : *implementations) {
+        auto store = implem.open(uri, params);
+        if (store) {
+            store->warnUnknownSettings();
+            return ref<Store>(store);
+        }
+    }
+
+    throw Error("don't know how to open Nix store '%s'", uri);
+}
 
 std::list<ref<Store>> getDefaultSubstituters()
 {
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 8b42aa6d2..28365542d 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -33,6 +33,7 @@ MakeError(SubstituteGone, Error);
 MakeError(SubstituterDisabled, Error);
 MakeError(BadStorePath, Error);
 
+MakeError(InvalidStoreURI, Error);
 
 class FSAccessor;
 class NarInfoDiskCache;
@@ -199,6 +200,8 @@ protected:
 
     Store(const Params & params);
 
+    std::shared_ptr<Config> getConfig();
+
 public:
 
     virtual ~Store() { }
@@ -744,25 +747,31 @@ StoreType getStoreType(const std::string & uri = settings.storeUri.get(),
    ‘substituters’ option and various legacy options. */
 std::list<ref<Store>> getDefaultSubstituters();
 
+struct StoreFactory
+{
+    std::vector<std::string> uriPrefixes;
+    std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> open;
+};
+typedef std::vector<StoreFactory> Implementations;
+static Implementations * implementations = new Implementations;
 
-/* Store implementation registration. */
-typedef std::function<std::shared_ptr<Store>(
-    const std::string & uri, const Store::Params & params)> OpenStore;
-
+template<typename T>
 struct RegisterStoreImplementation
 {
-    typedef std::vector<OpenStore> Implementations;
-    static Implementations * implementations;
-
-    RegisterStoreImplementation(OpenStore fun)
+    RegisterStoreImplementation()
     {
-        if (!implementations) implementations = new Implementations;
-        implementations->push_back(fun);
+        StoreFactory factory{
+            .uriPrefixes = T::uriPrefixes(),
+            .open =
+                ([](const std::string & uri, const Store::Params & params)
+                 -> std::shared_ptr<Store>
+                 { return std::make_shared<T>(uri, params); })
+        };
+        implementations->push_back(factory);
     }
 };
 
 
-
 /* Display a set of paths in human-readable form (i.e., between quotes
    and separated by commas). */
 string showPaths(const PathSet & paths);
diff --git a/src/libstore/store.hh b/src/libstore/store.hh
new file mode 100644
index 000000000..bc73963f3
--- /dev/null
+++ b/src/libstore/store.hh
@@ -0,0 +1,9 @@
+#pragma once
+
+namespace nix {
+
+template<typename T> class BasicStore;
+class StoreConfig;
+typedef BasicStore<StoreConfig> Store;
+
+}
diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc
new file mode 100644
index 000000000..d84378316
--- /dev/null
+++ b/src/nix/describe-stores.cc
@@ -0,0 +1,30 @@
+#include "command.hh"
+#include "common-args.hh"
+#include "shared.hh"
+#include "store-api.hh"
+
+#include <nlohmann/json.hpp>
+
+using namespace nix;
+
+struct CmdDescribeStores : Command, MixJSON
+{
+    std::string description() override
+    {
+        return "show registered store types and their available options";
+    }
+
+    Category category() override { return catUtility; }
+
+    void run() override
+    {
+
+        if (json) {
+            auto availableStores = *implementations;
+        } else {
+            throw Error("Only json is available for describe-stores");
+        }
+    }
+};
+
+static auto r1 = registerCommand<CmdDescribeStores>("describe-stores");
diff --git a/src/nix/develop.cc b/src/nix/develop.cc
index a2ce9c8c1..f29fa71d2 100644
--- a/src/nix/develop.cc
+++ b/src/nix/develop.cc
@@ -392,7 +392,7 @@ struct CmdDevelop : Common, MixEnvironment
 
             auto bashInstallable = std::make_shared<InstallableFlake>(
                 state,
-                std::move(installable->nixpkgsFlakeRef()),
+                installable->nixpkgsFlakeRef(),
                 Strings{"bashInteractive"},
                 Strings{"legacyPackages." + settings.thisSystem.get() + "."},
                 lockFlags);
diff --git a/src/nix/diff-closures.cc b/src/nix/diff-closures.cc
index 4199dae0f..0dc99d05e 100644
--- a/src/nix/diff-closures.cc
+++ b/src/nix/diff-closures.cc
@@ -81,7 +81,7 @@ void printClosureDiff(
         auto beforeSize = totalSize(beforeVersions);
         auto afterSize = totalSize(afterVersions);
         auto sizeDelta = (int64_t) afterSize - (int64_t) beforeSize;
-        auto showDelta = abs(sizeDelta) >= 8 * 1024;
+        auto showDelta = std::abs(sizeDelta) >= 8 * 1024;
 
         std::set<std::string> removed, unchanged;
         for (auto & [version, _] : beforeVersions)
diff --git a/src/nix/installables.hh b/src/nix/installables.hh
index 41c75a4ed..c7c2f8981 100644
--- a/src/nix/installables.hh
+++ b/src/nix/installables.hh
@@ -69,7 +69,7 @@ struct Installable
 
     virtual FlakeRef nixpkgsFlakeRef() const
     {
-        return std::move(FlakeRef::fromAttrs({{"type","indirect"}, {"id", "nixpkgs"}}));
+        return FlakeRef::fromAttrs({{"type","indirect"}, {"id", "nixpkgs"}});
     }
 };
 

From fa32560169ffa55b9e0b6d5f04c3792acf0c544a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 9 Sep 2020 11:18:12 +0200
Subject: [PATCH 133/176] Fix the registration of stores

---
 src/libstore/dummy-store.cc              |  2 +-
 src/libstore/http-binary-cache-store.cc  |  2 +-
 src/libstore/legacy-ssh-store.cc         |  2 +-
 src/libstore/local-binary-cache-store.cc |  2 +-
 src/libstore/remote-store.cc             |  2 +-
 src/libstore/s3-binary-cache-store.cc    |  2 +-
 src/libstore/ssh-store.cc                |  2 +-
 src/libstore/store-api.cc                |  3 ++-
 src/libstore/store-api.hh                | 29 +++++++++++++++---------
 9 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index a677e201e..dd1880877 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -50,6 +50,6 @@ struct DummyStore : public Store
     { unsupported("buildDerivation"); }
 };
 
-[[maybe_unused]] static RegisterStoreImplementation<DummyStore> regStore();
+static RegisterStoreImplementation<DummyStore> regStore;
 
 }
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 6c3a16faf..c1abe35cb 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -170,6 +170,6 @@ protected:
 
 };
 
-[[maybe_unused]] static RegisterStoreImplementation<HttpBinaryCacheStore> regStore();
+static RegisterStoreImplementation<HttpBinaryCacheStore> regStore;
 
 }
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 72f28a82d..552b4b176 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -326,6 +326,6 @@ public:
     }
 };
 
-[[maybe_unused]] static RegisterStoreImplementation<LegacySSHStore> regStore();
+static RegisterStoreImplementation<LegacySSHStore> regStore;
 
 }
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 752838d3f..808a1338f 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -96,6 +96,6 @@ std::vector<std::string> LocalBinaryCacheStore::uriPrefixes()
         return {"file"};
 }
 
-[[maybe_unused]] static RegisterStoreImplementation<LocalBinaryCacheStore> regStore();
+static RegisterStoreImplementation<LocalBinaryCacheStore> regStore;
 
 }
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 824b6b140..5f455a62a 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -982,6 +982,6 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
     return nullptr;
 }
 
-[[maybe_unused]] static RegisterStoreImplementation<UDSRemoteStore> regStore();
+static RegisterStoreImplementation<UDSRemoteStore> regStore;
 
 }
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 1bf4d5955..f426b43a9 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -431,7 +431,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
 
 };
 
-[[maybe_unused]] static RegisterStoreImplementation<S3BinaryCacheStoreImpl> regStore();
+static RegisterStoreImplementation<S3BinaryCacheStoreImpl> regStore;
 
 }
 
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 02208ee82..8177a95b0 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -76,6 +76,6 @@ ref<RemoteStore::Connection> SSHStore::openConnection()
     return conn;
 }
 
-[[maybe_unused]] static RegisterStoreImplementation<SSHStore> regStore();
+static RegisterStoreImplementation<SSHStore> regStore;
 
 }
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 4a46b5160..0f321b434 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1093,7 +1093,7 @@ ref<Store> openStore(const std::string & uri_,
         return ref<Store>(store);
     }
 
-    for (auto implem : *implementations) {
+    for (auto implem : *Implementations::registered) {
         auto store = implem.open(uri, params);
         if (store) {
             store->warnUnknownSettings();
@@ -1136,5 +1136,6 @@ std::list<ref<Store>> getDefaultSubstituters()
     return stores;
 }
 
+std::vector<StoreFactory> * Implementations::registered = 0;
 
 }
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 28365542d..61080978e 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -749,25 +749,32 @@ std::list<ref<Store>> getDefaultSubstituters();
 
 struct StoreFactory
 {
-    std::vector<std::string> uriPrefixes;
     std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> open;
 };
-typedef std::vector<StoreFactory> Implementations;
-static Implementations * implementations = new Implementations;
+struct Implementations
+{
+    static std::vector<StoreFactory> * registered;
+
+    template<typename T>
+    static void add()
+    {
+        if (!registered) registered = new std::vector<StoreFactory>();
+        StoreFactory factory{
+            .open =
+                ([](const std::string & uri, const Store::Params & params)
+                 -> std::shared_ptr<Store>
+                 { return std::make_shared<T>(uri, params); }),
+        };
+        registered->push_back(factory);
+    }
+};
 
 template<typename T>
 struct RegisterStoreImplementation
 {
     RegisterStoreImplementation()
     {
-        StoreFactory factory{
-            .uriPrefixes = T::uriPrefixes(),
-            .open =
-                ([](const std::string & uri, const Store::Params & params)
-                 -> std::shared_ptr<Store>
-                 { return std::make_shared<T>(uri, params); })
-        };
-        implementations->push_back(factory);
+        Implementations::add<T>();
     }
 };
 

From 3b57181f8ed94cfa149ad4319ba96d41c5fbc30e Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 9 Sep 2020 11:29:17 +0200
Subject: [PATCH 134/176] Separate the instantiation and initialisation of the
 stores
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Add a new `init()` method to the `Store` class that is supposed to
handle all the effectful initialisation needed to set-up the store.
The constructor should remain side-effect free and just initialize the
c++ data structure.

The goal behind that is that we can create “dummy” instances of each
store to query static properties about it (the parameters it accepts for
example)
---
 src/libstore/binary-cache-store.hh       |  2 +-
 src/libstore/dummy-store.cc              |  4 ++++
 src/libstore/http-binary-cache-store.cc  |  6 ++++++
 src/libstore/legacy-ssh-store.cc         |  3 +++
 src/libstore/local-binary-cache-store.cc |  6 ++++++
 src/libstore/s3-binary-cache-store.cc    |  3 +++
 src/libstore/ssh-store.cc                |  6 ++++++
 src/libstore/store-api.cc                |  3 ++-
 src/libstore/store-api.hh                | 16 ++++++++++++----
 9 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index 9bcdf5901..881398ea2 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -58,7 +58,7 @@ public:
 
 public:
 
-    virtual void init();
+    virtual void init() override;
 
 private:
 
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index dd1880877..52086445e 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -5,6 +5,10 @@ namespace nix {
 struct DummyStore : public Store
 {
     DummyStore(const std::string uri, const Params & params)
+        : DummyStore(params)
+    { }
+
+    DummyStore(const Params & params)
         : Store(params)
     { }
 
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index c1abe35cb..e76bac6e2 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -23,6 +23,12 @@ private:
 
 public:
 
+    HttpBinaryCacheStore(
+        const Params & params)
+        : HttpBinaryCacheStore("dummy", params)
+    {
+    }
+
     HttpBinaryCacheStore(
         const Path & _cacheUri,
         const Params & params)
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 552b4b176..777ba7520 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -37,6 +37,9 @@ struct LegacySSHStore : public Store
 
     static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
 
+    LegacySSHStore(const Params & params)
+        : LegacySSHStore("dummy", params)
+    {}
 
     LegacySSHStore(const string & host, const Params & params)
         : Store(params)
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 808a1338f..bcd23eb82 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -12,6 +12,12 @@ private:
 
 public:
 
+    LocalBinaryCacheStore(
+        const Params & params)
+        : LocalBinaryCacheStore("dummy", params)
+    {
+    }
+
     LocalBinaryCacheStore(
         const Path & binaryCacheDir,
         const Params & params)
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index f426b43a9..ab27f203f 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -192,6 +192,9 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
 
     S3Helper s3Helper;
 
+    S3BinaryCacheStoreImpl(const Params & params)
+        : S3BinaryCacheStoreImpl("dummy-bucket", params) {}
+
     S3BinaryCacheStoreImpl(
         const std::string & bucketName,
         const Params & params)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 8177a95b0..85ddce8be 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -17,6 +17,12 @@ public:
     const Setting<Path> remoteProgram{(Store*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
     const Setting<std::string> remoteStore{(Store*) this, "", "remote-store", "URI of the store on the remote system"};
 
+    SSHStore(
+        const Params & params)
+        : SSHStore("dummy", params)
+    {
+    }
+
     SSHStore(const std::string & host, const Params & params)
         : Store(params)
         , RemoteStore(params)
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 0f321b434..e14f361bd 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1094,8 +1094,9 @@ ref<Store> openStore(const std::string & uri_,
     }
 
     for (auto implem : *Implementations::registered) {
-        auto store = implem.open(uri, params);
+        auto store = implem.create(uri, params);
         if (store) {
+            store->init();
             store->warnUnknownSettings();
             return ref<Store>(store);
         }
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 61080978e..6e081da41 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -200,9 +200,12 @@ protected:
 
     Store(const Params & params);
 
-    std::shared_ptr<Config> getConfig();
-
 public:
+    /**
+     * Perform any necessary effectful operation to make the store up and
+     * running
+     */
+    virtual void init() {};
 
     virtual ~Store() { }
 
@@ -749,7 +752,8 @@ std::list<ref<Store>> getDefaultSubstituters();
 
 struct StoreFactory
 {
-    std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> open;
+    std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> create;
+    std::function<std::shared_ptr<Store> (const Store::Params & params)> createDummy;
 };
 struct Implementations
 {
@@ -760,10 +764,14 @@ struct Implementations
     {
         if (!registered) registered = new std::vector<StoreFactory>();
         StoreFactory factory{
-            .open =
+            .create =
                 ([](const std::string & uri, const Store::Params & params)
                  -> std::shared_ptr<Store>
                  { return std::make_shared<T>(uri, params); }),
+            .createDummy =
+                ([](const Store::Params & params)
+                 -> std::shared_ptr<Store>
+                 { return std::make_shared<T>(params); })
         };
         registered->push_back(factory);
     }

From 3c525d15903ea98e5401ff57061295b8c625cc45 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 9 Sep 2020 11:35:33 +0200
Subject: [PATCH 135/176] Complete the `toJSON` instance for `Setting<T>`

Don't let it just contain the value, but also the other fields of the
setting (description, aliases, etc..)
---
 src/libstore/globals.cc |  5 -----
 src/libutil/config.cc   | 32 ++++++++++----------------------
 src/libutil/config.hh   | 11 +++++++++--
 3 files changed, 19 insertions(+), 29 deletions(-)

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 4a5971c3f..491c664db 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -162,11 +162,6 @@ template<> std::string BaseSetting<SandboxMode>::to_string() const
     else abort();
 }
 
-template<> nlohmann::json BaseSetting<SandboxMode>::toJSON()
-{
-    return AbstractSetting::toJSON();
-}
-
 template<> void BaseSetting<SandboxMode>::convertToArg(Args & args, const std::string & category)
 {
     args.addFlag({
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index 3cf720bce..faa5cdbeb 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -137,11 +137,7 @@ nlohmann::json Config::toJSON()
     auto res = nlohmann::json::object();
     for (auto & s : _settings)
         if (!s.second.isAlias) {
-            auto obj = nlohmann::json::object();
-            obj.emplace("description", s.second.setting->description);
-            obj.emplace("aliases", s.second.setting->aliases);
-            obj.emplace("value", s.second.setting->toJSON());
-            res.emplace(s.first, obj);
+            res.emplace(s.first, s.second.setting->toJSON());
         }
     return res;
 }
@@ -168,19 +164,21 @@ void AbstractSetting::setDefault(const std::string & str)
 
 nlohmann::json AbstractSetting::toJSON()
 {
-    return to_string();
+    return nlohmann::json(toJSONObject());
+}
+
+std::map<std::string, nlohmann::json> AbstractSetting::toJSONObject()
+{
+    std::map<std::string, nlohmann::json> obj;
+    obj.emplace("description", description);
+    obj.emplace("aliases", aliases);
+    return obj;
 }
 
 void AbstractSetting::convertToArg(Args & args, const std::string & category)
 {
 }
 
-template<typename T>
-nlohmann::json BaseSetting<T>::toJSON()
-{
-    return value;
-}
-
 template<typename T>
 void BaseSetting<T>::convertToArg(Args & args, const std::string & category)
 {
@@ -259,11 +257,6 @@ template<> std::string BaseSetting<Strings>::to_string() const
     return concatStringsSep(" ", value);
 }
 
-template<> nlohmann::json BaseSetting<Strings>::toJSON()
-{
-    return value;
-}
-
 template<> void BaseSetting<StringSet>::set(const std::string & str)
 {
     value = tokenizeString<StringSet>(str);
@@ -274,11 +267,6 @@ template<> std::string BaseSetting<StringSet>::to_string() const
     return concatStringsSep(" ", value);
 }
 
-template<> nlohmann::json BaseSetting<StringSet>::toJSON()
-{
-    return value;
-}
-
 template class BaseSetting<int>;
 template class BaseSetting<unsigned int>;
 template class BaseSetting<long>;
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 2b4265806..be23076b0 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -206,7 +206,9 @@ protected:
 
     virtual std::string to_string() const = 0;
 
-    virtual nlohmann::json toJSON();
+    nlohmann::json toJSON();
+
+    virtual std::map<std::string, nlohmann::json> toJSONObject();
 
     virtual void convertToArg(Args & args, const std::string & category);
 
@@ -251,7 +253,12 @@ public:
 
     void convertToArg(Args & args, const std::string & category) override;
 
-    nlohmann::json toJSON() override;
+    std::map<std::string, nlohmann::json> toJSONObject() override
+    {
+        auto obj = AbstractSetting::toJSONObject();
+        obj.emplace("value", value);
+        return obj;
+    }
 };
 
 template<typename T>

From 35042c96230e922b88c8a5cad6a7f5f06792860f Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 9 Sep 2020 11:36:48 +0200
Subject: [PATCH 136/176] Add a default value for the settings

The default value is initialized when creating the setting and unchanged
after that
---
 src/libutil/config.hh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index be23076b0..42fc856e0 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -222,6 +222,7 @@ class BaseSetting : public AbstractSetting
 protected:
 
     T value;
+    const T defaultValue;
 
 public:
 
@@ -231,6 +232,7 @@ public:
         const std::set<std::string> & aliases = {})
         : AbstractSetting(name, description, aliases)
         , value(def)
+        , defaultValue(def)
     { }
 
     operator const T &() const { return value; }
@@ -257,6 +259,7 @@ public:
     {
         auto obj = AbstractSetting::toJSONObject();
         obj.emplace("value", value);
+        obj.emplace("defaultValue", defaultValue);
         return obj;
     }
 };

From aa4eac37881258797c241113a5602913e1a5371a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 9 Sep 2020 13:25:32 +0200
Subject: [PATCH 137/176] fixup! Separate the instantiation and initialisation
 of the stores

---
 src/libstore/store-api.cc | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index e14f361bd..831d4f30f 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1009,12 +1009,6 @@ Derivation Store::readDerivation(const StorePath & drvPath)
     }
 }
 
-std::shared_ptr<Config> Store::getConfig()
-{
-    return shared_from_this();
-}
-
-
 }
 
 

From 22afa8fb4dd7e459faf531dd8a9c3580d02c7e2a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 10 Sep 2020 10:55:51 +0200
Subject: [PATCH 138/176] Separate store configs from the implems

Rework the `Store` hierarchy so that there's now one hierarchy for the
store configs and one for the implementations (where each implementation
extends the corresponding config). So a class hierarchy like

```
StoreConfig-------->Store
    |                 |
    v                 v
SubStoreConfig----->SubStore
    |                 |
    v                 v
SubSubStoreConfig-->SubSubStore
```

(with virtual inheritance to prevent DDD).

The advantage of this architecture is that we can now introspect the configuration of a store without having to instantiate the store itself
---
 src/libstore/binary-cache-store.cc       |  3 +-
 src/libstore/binary-cache-store.hh       |  8 +++-
 src/libstore/dummy-store.cc              |  4 +-
 src/libstore/http-binary-cache-store.cc  | 16 ++++----
 src/libstore/legacy-ssh-store.cc         | 17 ++++----
 src/libstore/local-binary-cache-store.cc | 18 ++++-----
 src/libstore/local-store.hh              |  2 +-
 src/libstore/remote-store.cc             | 10 ++---
 src/libstore/remote-store.hh             | 34 ++++++++++++----
 src/libstore/s3-binary-cache-store.cc    | 14 ++++---
 src/libstore/ssh-store.cc                | 25 ++++++------
 src/libstore/store-api.cc                |  2 +-
 src/libstore/store-api.hh                | 50 ++++++++++++++----------
 13 files changed, 120 insertions(+), 83 deletions(-)

diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index 5433fe50d..34f844a18 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -22,7 +22,8 @@
 namespace nix {
 
 BinaryCacheStore::BinaryCacheStore(const Params & params)
-    : Store(params)
+    : BinaryCacheStoreConfig(params)
+    , Store(params)
 {
     if (secretKeyFile != "")
         secretKey = std::unique_ptr<SecretKey>(new SecretKey(readFile(secretKeyFile)));
diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index 881398ea2..f1fc82013 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -11,9 +11,9 @@ namespace nix {
 
 struct NarInfo;
 
-class BinaryCacheStore : public Store
+struct BinaryCacheStoreConfig : virtual StoreConfig
 {
-public:
+    using StoreConfig::StoreConfig;
 
     const Setting<std::string> compression{this, "xz", "compression", "NAR compression method ('xz', 'bzip2', or 'none')"};
     const Setting<bool> writeNARListing{this, false, "write-nar-listing", "whether to write a JSON file listing the files in each NAR"};
@@ -22,6 +22,10 @@ public:
     const Setting<Path> localNarCache{this, "", "local-nar-cache", "path to a local cache of NARs"};
     const Setting<bool> parallelCompression{this, false, "parallel-compression",
         "enable multi-threading compression, available for xz only currently"};
+};
+
+class BinaryCacheStore : public Store, public virtual BinaryCacheStoreConfig
+{
 
 private:
 
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 52086445e..d4560c13d 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -2,6 +2,8 @@
 
 namespace nix {
 
+struct DummyStoreConfig : StoreConfig {};
+
 struct DummyStore : public Store
 {
     DummyStore(const std::string uri, const Params & params)
@@ -54,6 +56,6 @@ struct DummyStore : public Store
     { unsupported("buildDerivation"); }
 };
 
-static RegisterStoreImplementation<DummyStore> regStore;
+static RegisterStoreImplementation<DummyStore, DummyStoreConfig> regStore;
 
 }
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index e76bac6e2..c3fb455fa 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -7,7 +7,12 @@ namespace nix {
 
 MakeError(UploadToHTTP, Error);
 
-class HttpBinaryCacheStore : public BinaryCacheStore
+struct HttpBinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
+{
+    using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
+};
+
+class HttpBinaryCacheStore : public BinaryCacheStore, public HttpBinaryCacheStoreConfig
 {
 private:
 
@@ -23,16 +28,11 @@ private:
 
 public:
 
-    HttpBinaryCacheStore(
-        const Params & params)
-        : HttpBinaryCacheStore("dummy", params)
-    {
-    }
-
     HttpBinaryCacheStore(
         const Path & _cacheUri,
         const Params & params)
         : BinaryCacheStore(params)
+        , HttpBinaryCacheStoreConfig(params)
         , cacheUri(_cacheUri)
     {
         if (cacheUri.back() == '/')
@@ -176,6 +176,6 @@ protected:
 
 };
 
-static RegisterStoreImplementation<HttpBinaryCacheStore> regStore;
+static RegisterStoreImplementation<HttpBinaryCacheStore, HttpBinaryCacheStoreConfig> regStore;
 
 }
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 777ba7520..5a08fbba3 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -9,15 +9,21 @@
 
 namespace nix {
 
-struct LegacySSHStore : public Store
+struct LegacySSHStoreConfig : virtual StoreConfig
 {
+    using StoreConfig::StoreConfig;
     const Setting<int> maxConnections{this, 1, "max-connections", "maximum number of concurrent SSH connections"};
     const Setting<Path> sshKey{this, "", "ssh-key", "path to an SSH private key"};
     const Setting<bool> compress{this, false, "compress", "whether to compress the connection"};
     const Setting<Path> remoteProgram{this, "nix-store", "remote-program", "path to the nix-store executable on the remote system"};
     const Setting<std::string> remoteStore{this, "", "remote-store", "URI of the store on the remote system"};
+};
 
+struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
+{
     // Hack for getting remote build log output.
+    // Intentionally not in `StoreConfig` so that it doesn't appear in the
+    // documentation
     const Setting<int> logFD{this, -1, "log-fd", "file descriptor to which SSH's stderr is connected"};
 
     struct Connection
@@ -37,12 +43,9 @@ struct LegacySSHStore : public Store
 
     static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
 
-    LegacySSHStore(const Params & params)
-        : LegacySSHStore("dummy", params)
-    {}
-
     LegacySSHStore(const string & host, const Params & params)
-        : Store(params)
+        : LegacySSHStoreConfig(params)
+        , Store(params)
         , host(host)
         , connections(make_ref<Pool<Connection>>(
             std::max(1, (int) maxConnections),
@@ -329,6 +332,6 @@ public:
     }
 };
 
-static RegisterStoreImplementation<LegacySSHStore> regStore;
+static RegisterStoreImplementation<LegacySSHStore, LegacySSHStoreConfig> regStore;
 
 }
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index bcd23eb82..fc3ae94c2 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -4,7 +4,12 @@
 
 namespace nix {
 
-class LocalBinaryCacheStore : public BinaryCacheStore
+struct LocalBinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
+{
+    using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
+};
+
+class LocalBinaryCacheStore : public BinaryCacheStore, public virtual LocalBinaryCacheStoreConfig
 {
 private:
 
@@ -12,16 +17,11 @@ private:
 
 public:
 
-    LocalBinaryCacheStore(
-        const Params & params)
-        : LocalBinaryCacheStore("dummy", params)
-    {
-    }
-
     LocalBinaryCacheStore(
         const Path & binaryCacheDir,
         const Params & params)
-        : BinaryCacheStore(params)
+        : LocalBinaryCacheStoreConfig(params)
+        , BinaryCacheStore(params)
         , binaryCacheDir(binaryCacheDir)
     {
     }
@@ -102,6 +102,6 @@ std::vector<std::string> LocalBinaryCacheStore::uriPrefixes()
         return {"file"};
 }
 
-static RegisterStoreImplementation<LocalBinaryCacheStore> regStore;
+static RegisterStoreImplementation<LocalBinaryCacheStore, LocalBinaryCacheStoreConfig> regStore;
 
 }
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index d5e6d68ef..8b6972847 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -95,7 +95,7 @@ public:
 
 private:
 
-    Setting<bool> requireSigs{(Store*) this,
+    Setting<bool> requireSigs{(StoreConfig*) this,
         settings.requireSigs,
         "require-sigs", "whether store paths should have a trusted signature on import"};
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 5f455a62a..619e9a7f1 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -94,6 +94,7 @@ void write(const Store & store, Sink & out, const std::optional<StorePath> & sto
 /* TODO: Separate these store impls into different files, give them better names */
 RemoteStore::RemoteStore(const Params & params)
     : Store(params)
+    , RemoteStoreConfig(params)
     , connections(make_ref<Pool<Connection>>(
             std::max(1, (int) maxConnections),
             [this]() { return openConnectionWrapper(); },
@@ -124,6 +125,7 @@ ref<RemoteStore::Connection> RemoteStore::openConnectionWrapper()
 
 UDSRemoteStore::UDSRemoteStore(const Params & params)
     : Store(params)
+    , UDSRemoteStoreConfig(params)
     , LocalFSStore(params)
     , RemoteStore(params)
 {
@@ -131,11 +133,9 @@ UDSRemoteStore::UDSRemoteStore(const Params & params)
 
 
 UDSRemoteStore::UDSRemoteStore(std::string socket_path, const Params & params)
-    : Store(params)
-    , LocalFSStore(params)
-    , RemoteStore(params)
-    , path(socket_path)
+    : UDSRemoteStore(params)
 {
+    path.emplace(socket_path);
 }
 
 
@@ -982,6 +982,6 @@ std::exception_ptr RemoteStore::Connection::processStderr(Sink * sink, Source *
     return nullptr;
 }
 
-static RegisterStoreImplementation<UDSRemoteStore> regStore;
+static RegisterStoreImplementation<UDSRemoteStore, UDSRemoteStoreConfig> regStore;
 
 }
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 07cd5daf8..ba2f69427 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -16,19 +16,23 @@ struct FdSource;
 template<typename T> class Pool;
 struct ConnectionHandle;
 
+struct RemoteStoreConfig : virtual StoreConfig
+{
+    using StoreConfig::StoreConfig;
+
+    const Setting<int> maxConnections{(StoreConfig*) this, 1,
+            "max-connections", "maximum number of concurrent connections to the Nix daemon"};
+
+    const Setting<unsigned int> maxConnectionAge{(StoreConfig*) this, std::numeric_limits<unsigned int>::max(),
+            "max-connection-age", "number of seconds to reuse a connection"};
+};
 
 /* FIXME: RemoteStore is a misnomer - should be something like
    DaemonStore. */
-class RemoteStore : public virtual Store
+class RemoteStore : public virtual Store, public virtual RemoteStoreConfig
 {
 public:
 
-    const Setting<int> maxConnections{(Store*) this, 1,
-            "max-connections", "maximum number of concurrent connections to the Nix daemon"};
-
-    const Setting<unsigned int> maxConnectionAge{(Store*) this, std::numeric_limits<unsigned int>::max(),
-            "max-connection-age", "number of seconds to reuse a connection"};
-
     virtual bool sameMachine() = 0;
 
     RemoteStore(const Params & params);
@@ -141,7 +145,21 @@ private:
 
 };
 
-class UDSRemoteStore : public LocalFSStore, public RemoteStore
+struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreConfig
+{
+    UDSRemoteStoreConfig(const Store::Params & params)
+        : LocalFSStoreConfig(params)
+        , RemoteStoreConfig(params)
+    {
+    }
+
+    UDSRemoteStoreConfig()
+        : UDSRemoteStoreConfig(Store::Params({}))
+    {
+    }
+};
+
+class UDSRemoteStore : public LocalFSStore, public RemoteStore, public virtual UDSRemoteStoreConfig
 {
 public:
 
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index ab27f203f..b75d05555 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -172,8 +172,9 @@ S3Helper::FileTransferResult S3Helper::getObject(
     return res;
 }
 
-struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
+struct S3BinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
 {
+    using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
     const Setting<std::string> profile{this, "", "profile", "The name of the AWS configuration profile to use."};
     const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
     const Setting<std::string> scheme{this, "", "scheme", "The scheme to use for S3 requests, https by default."};
@@ -185,20 +186,21 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
         this, false, "multipart-upload", "whether to use multi-part uploads"};
     const Setting<uint64_t> bufferSize{
         this, 5 * 1024 * 1024, "buffer-size", "size (in bytes) of each part in multi-part uploads"};
+};
 
+struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCacheStoreConfig
+{
     std::string bucketName;
 
     Stats stats;
 
     S3Helper s3Helper;
 
-    S3BinaryCacheStoreImpl(const Params & params)
-        : S3BinaryCacheStoreImpl("dummy-bucket", params) {}
-
     S3BinaryCacheStoreImpl(
         const std::string & bucketName,
         const Params & params)
-        : S3BinaryCacheStore(params)
+        : S3BinaryCacheStoreConfig(params)
+        , S3BinaryCacheStore(params)
         , bucketName(bucketName)
         , s3Helper(profile, region, scheme, endpoint)
     {
@@ -434,7 +436,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore
 
 };
 
-static RegisterStoreImplementation<S3BinaryCacheStoreImpl> regStore;
+static RegisterStoreImplementation<S3BinaryCacheStoreImpl, S3BinaryCacheStoreConfig> regStore;
 
 }
 
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 85ddce8be..2b6e2a298 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -8,23 +8,22 @@
 
 namespace nix {
 
-class SSHStore : public RemoteStore
+struct SSHStoreConfig : virtual RemoteStoreConfig
+{
+    using RemoteStoreConfig::RemoteStoreConfig;
+    const Setting<Path> sshKey{(StoreConfig*) this, "", "ssh-key", "path to an SSH private key"};
+    const Setting<bool> compress{(StoreConfig*) this, false, "compress", "whether to compress the connection"};
+    const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
+    const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", "URI of the store on the remote system"};
+};
+
+class SSHStore : public RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
-    const Setting<Path> sshKey{(Store*) this, "", "ssh-key", "path to an SSH private key"};
-    const Setting<bool> compress{(Store*) this, false, "compress", "whether to compress the connection"};
-    const Setting<Path> remoteProgram{(Store*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
-    const Setting<std::string> remoteStore{(Store*) this, "", "remote-store", "URI of the store on the remote system"};
-
-    SSHStore(
-        const Params & params)
-        : SSHStore("dummy", params)
-    {
-    }
-
     SSHStore(const std::string & host, const Params & params)
         : Store(params)
+        , RemoteStoreConfig(params)
         , RemoteStore(params)
         , host(host)
         , master(
@@ -82,6 +81,6 @@ ref<RemoteStore::Connection> SSHStore::openConnection()
     return conn;
 }
 
-static RegisterStoreImplementation<SSHStore> regStore;
+static RegisterStoreImplementation<SSHStore, SSHStoreConfig> regStore;
 
 }
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 831d4f30f..fe3f5221c 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -346,7 +346,7 @@ ValidPathInfo Store::addToStoreSlow(std::string_view name, const Path & srcPath,
 
 
 Store::Store(const Params & params)
-    : Config(params)
+    : StoreConfig(params)
     , state({(size_t) pathInfoCacheSize})
 {
 }
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 6e081da41..61552f74e 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -145,12 +145,9 @@ struct BuildResult
     }
 };
 
-
-class Store : public std::enable_shared_from_this<Store>, public Config
+struct StoreConfig : public Config
 {
-public:
-
-    typedef std::map<std::string, std::string> Params;
+    using Config::Config;
 
     const PathSetting storeDir_{this, false, settings.nixStore,
         "store", "path to the Nix store"};
@@ -168,6 +165,14 @@ public:
         "system-features",
         "Optional features that the system this store builds on implements (like \"kvm\")."};
 
+};
+
+class Store : public std::enable_shared_from_this<Store>, public virtual StoreConfig
+{
+public:
+
+    typedef std::map<std::string, std::string> Params;
+
 protected:
 
     struct PathInfoCacheValue {
@@ -632,22 +637,25 @@ protected:
 
 };
 
-
-class LocalFSStore : public virtual Store
+struct LocalFSStoreConfig : virtual StoreConfig
 {
-public:
-
-    // FIXME: the (Store*) cast works around a bug in gcc that causes
+    using StoreConfig::StoreConfig;
+    // FIXME: the (StoreConfig*) cast works around a bug in gcc that causes
     // it to omit the call to the Setting constructor. Clang works fine
     // either way.
-    const PathSetting rootDir{(Store*) this, true, "",
+    const PathSetting rootDir{(StoreConfig*) this, true, "",
         "root", "directory prefixed to all other paths"};
-    const PathSetting stateDir{(Store*) this, false,
+    const PathSetting stateDir{(StoreConfig*) this, false,
         rootDir != "" ? rootDir + "/nix/var/nix" : settings.nixStateDir,
         "state", "directory where Nix will store state"};
-    const PathSetting logDir{(Store*) this, false,
+    const PathSetting logDir{(StoreConfig*) this, false,
         rootDir != "" ? rootDir + "/nix/var/log/nix" : settings.nixLogDir,
         "log", "directory where Nix will store state"};
+};
+
+class LocalFSStore : public virtual Store, public LocalFSStoreConfig
+{
+public:
 
     const static string drvsLogDir;
 
@@ -753,13 +761,13 @@ std::list<ref<Store>> getDefaultSubstituters();
 struct StoreFactory
 {
     std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> create;
-    std::function<std::shared_ptr<Store> (const Store::Params & params)> createDummy;
+    std::function<std::shared_ptr<StoreConfig> ()> getConfig;
 };
 struct Implementations
 {
     static std::vector<StoreFactory> * registered;
 
-    template<typename T>
+    template<typename T, typename TConfig>
     static void add()
     {
         if (!registered) registered = new std::vector<StoreFactory>();
@@ -768,21 +776,21 @@ struct Implementations
                 ([](const std::string & uri, const Store::Params & params)
                  -> std::shared_ptr<Store>
                  { return std::make_shared<T>(uri, params); }),
-            .createDummy =
-                ([](const Store::Params & params)
-                 -> std::shared_ptr<Store>
-                 { return std::make_shared<T>(params); })
+            .getConfig =
+                ([]()
+                 -> std::shared_ptr<StoreConfig>
+                 { return std::make_shared<TConfig>(); })
         };
         registered->push_back(factory);
     }
 };
 
-template<typename T>
+template<typename T, typename TConfig>
 struct RegisterStoreImplementation
 {
     RegisterStoreImplementation()
     {
-        Implementations::add<T>();
+        Implementations::add<T, TConfig>();
     }
 };
 

From dae39f0a7abfc41c122f4f2d54d6cf9e26cafe7a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 10 Sep 2020 11:03:36 +0200
Subject: [PATCH 139/176] Make `nix describe-stores` functional

Using the `*Config` class hierarchy
---
 src/nix/describe-stores.cc | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc
index d84378316..f019ec9c2 100644
--- a/src/nix/describe-stores.cc
+++ b/src/nix/describe-stores.cc
@@ -20,7 +20,11 @@ struct CmdDescribeStores : Command, MixJSON
     {
 
         if (json) {
-            auto availableStores = *implementations;
+            auto res = nlohmann::json::array();
+            for (auto & implem : *Implementations::registered) {
+                auto storeConfig = implem.getConfig();
+                std::cout << storeConfig->toJSON().dump() << std::endl;
+            }
         } else {
             throw Error("Only json is available for describe-stores");
         }

From d184ad1d276006d4d003046710a56a019034a6a1 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:02:38 +0200
Subject: [PATCH 140/176] fixup! Make the store plugins more introspectable

---
 result | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 result

diff --git a/result b/result
deleted file mode 120000
index af7bbb6da..000000000
--- a/result
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/9pqfirjppd91mzhkgh8xnn66iwh53zk2-hello-2.10
\ No newline at end of file

From 5895184df44e86ae55270390402c8263b0f24ae2 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:06:18 +0200
Subject: [PATCH 141/176] Correctly call all the parent contructors of the
 stores

Using virtual inheritance means that only the default constructors of
the parent classes will be called, which isn't what we want
---
 src/libstore/build.cc                    |  2 +-
 src/libstore/dummy-store.cc              | 13 +++++++++----
 src/libstore/http-binary-cache-store.cc  |  4 +++-
 src/libstore/legacy-ssh-store.cc         |  3 ++-
 src/libstore/local-binary-cache-store.cc |  4 +++-
 src/libstore/local-store.cc              |  5 ++++-
 src/libstore/local-store.hh              | 15 ++++++++++-----
 src/libstore/remote-store.cc             |  5 ++++-
 src/libstore/remote-store.hh             |  3 ++-
 src/libstore/s3-binary-cache-store.cc    |  4 +++-
 src/libstore/ssh-store.cc                |  7 +++++--
 src/libstore/store-api.hh                |  2 +-
 12 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index ce973862d..4040a3fac 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2883,7 +2883,7 @@ struct RestrictedStore : public LocalFSStore
     DerivationGoal & goal;
 
     RestrictedStore(const Params & params, ref<LocalStore> next, DerivationGoal & goal)
-        : Store(params), LocalFSStore(params), next(next), goal(goal)
+        : StoreConfig(params), LocalFSStoreConfig(params), Store(params), LocalFSStore(params), next(next), goal(goal)
     { }
 
     Path getRealStoreDir() override
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index d4560c13d..68d03d934 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -2,17 +2,22 @@
 
 namespace nix {
 
-struct DummyStoreConfig : StoreConfig {};
+struct DummyStoreConfig : StoreConfig {
+    using StoreConfig::StoreConfig;
+};
 
-struct DummyStore : public Store
+struct DummyStore : public Store, public virtual DummyStoreConfig
 {
     DummyStore(const std::string uri, const Params & params)
         : DummyStore(params)
     { }
 
     DummyStore(const Params & params)
-        : Store(params)
-    { }
+        : StoreConfig(params)
+        , DummyStoreConfig(params)
+        , Store(params)
+    {
+    }
 
     string getUri() override
     {
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index c3fb455fa..2c9d61d51 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -31,7 +31,9 @@ public:
     HttpBinaryCacheStore(
         const Path & _cacheUri,
         const Params & params)
-        : BinaryCacheStore(params)
+        : StoreConfig(params)
+        , BinaryCacheStoreConfig(params)
+        , BinaryCacheStore(params)
         , HttpBinaryCacheStoreConfig(params)
         , cacheUri(_cacheUri)
     {
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 5a08fbba3..bbab452ab 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -44,7 +44,8 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
     static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
 
     LegacySSHStore(const string & host, const Params & params)
-        : LegacySSHStoreConfig(params)
+        : StoreConfig(params)
+        , LegacySSHStoreConfig(params)
         , Store(params)
         , host(host)
         , connections(make_ref<Pool<Connection>>(
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index fc3ae94c2..becd74c75 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -20,7 +20,9 @@ public:
     LocalBinaryCacheStore(
         const Path & binaryCacheDir,
         const Params & params)
-        : LocalBinaryCacheStoreConfig(params)
+        : StoreConfig(params)
+        , BinaryCacheStoreConfig(params)
+        , LocalBinaryCacheStoreConfig(params)
         , BinaryCacheStore(params)
         , binaryCacheDir(binaryCacheDir)
     {
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 0086bb13e..4e9840f3b 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -42,7 +42,10 @@ namespace nix {
 
 
 LocalStore::LocalStore(const Params & params)
-    : Store(params)
+    : StoreConfig(params)
+    , Store(params)
+    , LocalFSStoreConfig(params)
+    , LocalStoreConfig(params)
     , LocalFSStore(params)
     , realStoreDir_{this, false, rootDir != "" ? rootDir + "/nix/store" : storeDir, "real",
         "physical path to the Nix store"}
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 8b6972847..0265f0837 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -30,8 +30,17 @@ struct OptimiseStats
     uint64_t blocksFreed = 0;
 };
 
+struct LocalStoreConfig : virtual LocalFSStoreConfig
+{
+    using LocalFSStoreConfig::LocalFSStoreConfig;
 
-class LocalStore : public LocalFSStore
+    Setting<bool> requireSigs{(StoreConfig*) this,
+        settings.requireSigs,
+        "require-sigs", "whether store paths should have a trusted signature on import"};
+};
+
+
+class LocalStore : public LocalFSStore, public virtual LocalStoreConfig
 {
 private:
 
@@ -95,10 +104,6 @@ public:
 
 private:
 
-    Setting<bool> requireSigs{(StoreConfig*) this,
-        settings.requireSigs,
-        "require-sigs", "whether store paths should have a trusted signature on import"};
-
     const PublicKeys & getPublicKeys();
 
 public:
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 619e9a7f1..9bbb69b99 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -124,7 +124,10 @@ ref<RemoteStore::Connection> RemoteStore::openConnectionWrapper()
 
 
 UDSRemoteStore::UDSRemoteStore(const Params & params)
-    : Store(params)
+    : StoreConfig(params)
+    , Store(params)
+    , LocalFSStoreConfig(params)
+    , RemoteStoreConfig(params)
     , UDSRemoteStoreConfig(params)
     , LocalFSStore(params)
     , RemoteStore(params)
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index ba2f69427..32daab59a 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -148,7 +148,8 @@ private:
 struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreConfig
 {
     UDSRemoteStoreConfig(const Store::Params & params)
-        : LocalFSStoreConfig(params)
+        : StoreConfig(params)
+        , LocalFSStoreConfig(params)
         , RemoteStoreConfig(params)
     {
     }
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index b75d05555..30ef4082a 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -199,7 +199,9 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
     S3BinaryCacheStoreImpl(
         const std::string & bucketName,
         const Params & params)
-        : S3BinaryCacheStoreConfig(params)
+        : StoreConfig(params)
+        , BinaryCacheStoreConfig(params)
+        , S3BinaryCacheStoreConfig(params)
         , S3BinaryCacheStore(params)
         , bucketName(bucketName)
         , s3Helper(profile, region, scheme, endpoint)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 2b6e2a298..da201a9c3 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -11,20 +11,23 @@ namespace nix {
 struct SSHStoreConfig : virtual RemoteStoreConfig
 {
     using RemoteStoreConfig::RemoteStoreConfig;
+
     const Setting<Path> sshKey{(StoreConfig*) this, "", "ssh-key", "path to an SSH private key"};
     const Setting<bool> compress{(StoreConfig*) this, false, "compress", "whether to compress the connection"};
     const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
     const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", "URI of the store on the remote system"};
 };
 
-class SSHStore : public RemoteStore, public virtual SSHStoreConfig
+class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
     SSHStore(const std::string & host, const Params & params)
-        : Store(params)
+        : StoreConfig(params)
+        , Store(params)
         , RemoteStoreConfig(params)
         , RemoteStore(params)
+        , SSHStoreConfig(params)
         , host(host)
         , master(
             host,
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 61552f74e..8e9cb786c 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -653,7 +653,7 @@ struct LocalFSStoreConfig : virtual StoreConfig
         "log", "directory where Nix will store state"};
 };
 
-class LocalFSStore : public virtual Store, public LocalFSStoreConfig
+class LocalFSStore : public virtual Store, public virtual LocalFSStoreConfig
 {
 public:
 

From 7f103dcddd4cf3c0748b7a379a117f3262c4c5f7 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:11:05 +0200
Subject: [PATCH 142/176] Properly filter the stores according to their
 declared uriSchemes

When opening a store, only try the stores whose `uriSchemes()` include
the current one
---
 src/libstore/dummy-store.cc              |  6 ++---
 src/libstore/http-binary-cache-store.cc  |  9 +++----
 src/libstore/legacy-ssh-store.cc         |  6 ++---
 src/libstore/local-binary-cache-store.cc |  5 ++--
 src/libstore/remote-store.cc             |  5 +++-
 src/libstore/remote-store.hh             |  4 ++--
 src/libstore/s3-binary-cache-store.cc    |  3 ++-
 src/libstore/ssh-store.cc                |  6 ++---
 src/libstore/store-api.cc                | 30 ++++++++++++++++--------
 src/libstore/store-api.hh                | 10 ++++----
 10 files changed, 51 insertions(+), 33 deletions(-)

diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 68d03d934..210e5b11c 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -8,7 +8,7 @@ struct DummyStoreConfig : StoreConfig {
 
 struct DummyStore : public Store, public virtual DummyStoreConfig
 {
-    DummyStore(const std::string uri, const Params & params)
+    DummyStore(const std::string scheme, const std::string uri, const Params & params)
         : DummyStore(params)
     { }
 
@@ -21,7 +21,7 @@ struct DummyStore : public Store, public virtual DummyStoreConfig
 
     string getUri() override
     {
-        return uriPrefixes()[0] + "://";
+        return *uriSchemes().begin();
     }
 
     void queryPathInfoUncached(const StorePath & path,
@@ -30,7 +30,7 @@ struct DummyStore : public Store, public virtual DummyStoreConfig
         callback(nullptr);
     }
 
-    static std::vector<std::string> uriPrefixes() {
+    static std::set<std::string> uriSchemes() {
         return {"dummy"};
     }
 
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 2c9d61d51..095eaa82c 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -29,13 +29,14 @@ private:
 public:
 
     HttpBinaryCacheStore(
+        const std::string & scheme,
         const Path & _cacheUri,
         const Params & params)
         : StoreConfig(params)
         , BinaryCacheStoreConfig(params)
         , BinaryCacheStore(params)
         , HttpBinaryCacheStoreConfig(params)
-        , cacheUri(_cacheUri)
+        , cacheUri(scheme + "://" + _cacheUri)
     {
         if (cacheUri.back() == '/')
             cacheUri.pop_back();
@@ -64,11 +65,11 @@ public:
         }
     }
 
-    static std::vector<std::string> uriPrefixes()
+    static std::set<std::string> uriSchemes()
     {
         static bool forceHttp = getEnv("_NIX_FORCE_HTTP") == "1";
-        auto ret = std::vector<std::string>({"http", "https"});
-        if (forceHttp) ret.push_back("file");
+        auto ret = std::set<std::string>({"http", "https"});
+        if (forceHttp) ret.insert("file");
         return ret;
     }
 protected:
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index bbab452ab..6dc83e288 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -41,9 +41,9 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
 
     SSHMaster master;
 
-    static std::vector<std::string> uriPrefixes() { return {"ssh"}; }
+    static std::set<std::string> uriSchemes() { return {"ssh"}; }
 
-    LegacySSHStore(const string & host, const Params & params)
+    LegacySSHStore(const string & scheme, const string & host, const Params & params)
         : StoreConfig(params)
         , LegacySSHStoreConfig(params)
         , Store(params)
@@ -92,7 +92,7 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
 
     string getUri() override
     {
-        return uriPrefixes()[0] + "://" + host;
+        return *uriSchemes().begin() + "://" + host;
     }
 
     void queryPathInfoUncached(const StorePath & path,
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index becd74c75..4d11e0f2a 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -18,6 +18,7 @@ private:
 public:
 
     LocalBinaryCacheStore(
+        [[maybe_unused]] const std::string scheme,
         const Path & binaryCacheDir,
         const Params & params)
         : StoreConfig(params)
@@ -35,7 +36,7 @@ public:
         return "file://" + binaryCacheDir;
     }
 
-    static std::vector<std::string> uriPrefixes();
+    static std::set<std::string> uriSchemes();
 
 protected:
 
@@ -96,7 +97,7 @@ bool LocalBinaryCacheStore::fileExists(const std::string & path)
     return pathExists(binaryCacheDir + "/" + path);
 }
 
-std::vector<std::string> LocalBinaryCacheStore::uriPrefixes()
+std::set<std::string> LocalBinaryCacheStore::uriSchemes()
 {
     if (getEnv("_NIX_FORCE_HTTP_BINARY_CACHE_STORE") == "1")
         return {};
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 9bbb69b99..561502cbe 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -135,7 +135,10 @@ UDSRemoteStore::UDSRemoteStore(const Params & params)
 }
 
 
-UDSRemoteStore::UDSRemoteStore(std::string socket_path, const Params & params)
+UDSRemoteStore::UDSRemoteStore(
+        [[maybe_unused]] const std::string scheme,
+        std::string socket_path,
+        const Params & params)
     : UDSRemoteStore(params)
 {
     path.emplace(socket_path);
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index 32daab59a..cceb8d185 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -165,11 +165,11 @@ class UDSRemoteStore : public LocalFSStore, public RemoteStore, public virtual U
 public:
 
     UDSRemoteStore(const Params & params);
-    UDSRemoteStore(std::string path, const Params & params);
+    UDSRemoteStore(const std::string scheme, std::string path, const Params & params);
 
     std::string getUri() override;
 
-    static std::vector<std::string> uriPrefixes()
+    static std::set<std::string> uriSchemes()
     { return {"unix"}; }
 
     bool sameMachine() override
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 30ef4082a..020b20c37 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -197,6 +197,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
     S3Helper s3Helper;
 
     S3BinaryCacheStoreImpl(
+        [[maybe_unused]] const std::string & scheme,
         const std::string & bucketName,
         const Params & params)
         : StoreConfig(params)
@@ -434,7 +435,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
         return paths;
     }
 
-    static std::vector<std::string> uriPrefixes() { return {"s3"}; }
+    static std::set<std::string> uriSchemes() { return {"s3"}; }
 
 };
 
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index da201a9c3..13265e127 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -22,7 +22,7 @@ class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
-    SSHStore(const std::string & host, const Params & params)
+    SSHStore([[maybe_unused]] const std::string & scheme, const std::string & host, const Params & params)
         : StoreConfig(params)
         , Store(params)
         , RemoteStoreConfig(params)
@@ -38,11 +38,11 @@ public:
     {
     }
 
-    static std::vector<std::string> uriPrefixes() { return {"ssh-ng"}; }
+    static std::set<std::string> uriSchemes() { return {"ssh-ng"}; }
 
     std::string getUri() override
     {
-        return uriPrefixes()[0] + "://" + host;
+        return *uriSchemes().begin() + "://" + host;
     }
 
     bool sameMachine() override
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index fe3f5221c..9252c85e8 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1078,25 +1078,35 @@ std::shared_ptr<Store> openFromNonUri(const std::string & uri, const Store::Para
 ref<Store> openStore(const std::string & uri_,
     const Store::Params & extraParams)
 {
-    auto [uri, uriParams] = splitUriAndParams(uri_);
     auto params = extraParams;
-    params.insert(uriParams.begin(), uriParams.end());
+    try {
+        auto parsedUri = parseURL(uri_);
+        params.insert(parsedUri.query.begin(), parsedUri.query.end());
 
-    if (auto store = openFromNonUri(uri, params)) {
-        store->warnUnknownSettings();
-        return ref<Store>(store);
+        auto baseURI = parsedUri.authority.value_or("") + parsedUri.path;
+
+        for (auto implem : *Implementations::registered) {
+            if (implem.uriSchemes.count(parsedUri.scheme)) {
+                auto store = implem.create(parsedUri.scheme, baseURI, params);
+                if (store) {
+                    store->init();
+                    store->warnUnknownSettings();
+                    return ref<Store>(store);
+                }
+            }
+        }
     }
+    catch (BadURL) {
+        auto [uri, uriParams] = splitUriAndParams(uri_);
+        params.insert(uriParams.begin(), uriParams.end());
 
-    for (auto implem : *Implementations::registered) {
-        auto store = implem.create(uri, params);
-        if (store) {
-            store->init();
+        if (auto store = openFromNonUri(uri, params)) {
             store->warnUnknownSettings();
             return ref<Store>(store);
         }
     }
 
-    throw Error("don't know how to open Nix store '%s'", uri);
+    throw Error("don't know how to open Nix store '%s'", uri_);
 }
 
 std::list<ref<Store>> getDefaultSubstituters()
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 8e9cb786c..bb7d8036b 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -760,7 +760,8 @@ std::list<ref<Store>> getDefaultSubstituters();
 
 struct StoreFactory
 {
-    std::function<std::shared_ptr<Store> (const std::string & uri, const Store::Params & params)> create;
+    std::set<std::string> uriSchemes;
+    std::function<std::shared_ptr<Store> (const std::string & scheme, const std::string & uri, const Store::Params & params)> create;
     std::function<std::shared_ptr<StoreConfig> ()> getConfig;
 };
 struct Implementations
@@ -773,13 +774,14 @@ struct Implementations
         if (!registered) registered = new std::vector<StoreFactory>();
         StoreFactory factory{
             .create =
-                ([](const std::string & uri, const Store::Params & params)
+                ([](const std::string & scheme, const std::string & uri, const Store::Params & params)
                  -> std::shared_ptr<Store>
-                 { return std::make_shared<T>(uri, params); }),
+                 { return std::make_shared<T>(scheme, uri, params); }),
             .getConfig =
                 ([]()
                  -> std::shared_ptr<StoreConfig>
-                 { return std::make_shared<TConfig>(); })
+                 { return std::make_shared<TConfig>(StringMap({})); }),
+            .uriSchemes = T::uriSchemes()
         };
         registered->push_back(factory);
     }

From 1129913c4e175f4890a7029d22a301676f4cc3ca Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:12:25 +0200
Subject: [PATCH 143/176] fixup! Correctly call all the parent contructors of
 the stores

---
 src/libstore/store-api.hh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index bb7d8036b..6f7893e41 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -148,6 +148,8 @@ struct BuildResult
 struct StoreConfig : public Config
 {
     using Config::Config;
+    StoreConfig() = delete;
+
 
     const PathSetting storeDir_{this, false, settings.nixStore,
         "store", "path to the Nix store"};

From 29a632386e358b8cd72cf0545917e324bcfba16e Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 11:13:41 +0200
Subject: [PATCH 144/176] fixup! Make the store plugins more introspectable

---
 src/libstore/store.hh | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 src/libstore/store.hh

diff --git a/src/libstore/store.hh b/src/libstore/store.hh
deleted file mode 100644
index bc73963f3..000000000
--- a/src/libstore/store.hh
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-namespace nix {
-
-template<typename T> class BasicStore;
-class StoreConfig;
-typedef BasicStore<StoreConfig> Store;
-
-}

From d65962db4d5c1a2c8f456e3ae6bb789eb3a1e744 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Fri, 11 Sep 2020 14:07:02 +0200
Subject: [PATCH 145/176] Make uri schemes grammar more RFC-compliant

Allow `-` and `.` in the RFC schemes as stated by
[RFC3986](https://tools.ietf.org/html/rfc3986#section-3.1).

Practically, this is needed so that `ssh-ng` is a valid URI scheme
---
 src/libutil/url.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/url.hh b/src/libutil/url.hh
index 2ef88ef2a..1f716ba10 100644
--- a/src/libutil/url.hh
+++ b/src/libutil/url.hh
@@ -31,7 +31,7 @@ ParsedURL parseURL(const std::string & url);
 
 // URI stuff.
 const static std::string pctEncoded = "(?:%[0-9a-fA-F][0-9a-fA-F])";
-const static std::string schemeRegex = "(?:[a-z+]+)";
+const static std::string schemeRegex = "(?:[a-z+.-]+)";
 const static std::string ipv6AddressRegex = "(?:\\[[0-9a-fA-F:]+\\])";
 const static std::string unreservedRegex = "(?:[a-zA-Z0-9-._~])";
 const static std::string subdelimsRegex = "(?:[!$&'\"()*+,;=])";

From f24f0888f93b0881e2cefa1ceb4c8fc187c94f21 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 11:18:45 +0200
Subject: [PATCH 146/176] Document the new store hierarchy

---
 src/libstore/build.cc                    |  2 +-
 src/libstore/dummy-store.cc              |  3 +-
 src/libstore/http-binary-cache-store.cc  |  2 --
 src/libstore/legacy-ssh-store.cc         |  1 -
 src/libstore/local-binary-cache-store.cc |  2 --
 src/libstore/local-store.cc              |  2 --
 src/libstore/remote-store.cc             |  3 --
 src/libstore/s3-binary-cache-store.cc    |  2 --
 src/libstore/ssh-store.cc                |  2 --
 src/libstore/store-api.hh                | 46 +++++++++++++++++++++++-
 10 files changed, 47 insertions(+), 18 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 4040a3fac..18bb9b12e 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2883,7 +2883,7 @@ struct RestrictedStore : public LocalFSStore
     DerivationGoal & goal;
 
     RestrictedStore(const Params & params, ref<LocalStore> next, DerivationGoal & goal)
-        : StoreConfig(params), LocalFSStoreConfig(params), Store(params), LocalFSStore(params), next(next), goal(goal)
+        : StoreConfig(params), Store(params), LocalFSStore(params), next(next), goal(goal)
     { }
 
     Path getRealStoreDir() override
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 210e5b11c..074953b1d 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -2,7 +2,7 @@
 
 namespace nix {
 
-struct DummyStoreConfig : StoreConfig {
+struct DummyStoreConfig : virtual StoreConfig {
     using StoreConfig::StoreConfig;
 };
 
@@ -14,7 +14,6 @@ struct DummyStore : public Store, public virtual DummyStoreConfig
 
     DummyStore(const Params & params)
         : StoreConfig(params)
-        , DummyStoreConfig(params)
         , Store(params)
     {
     }
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index 095eaa82c..bd65273eb 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -33,9 +33,7 @@ public:
         const Path & _cacheUri,
         const Params & params)
         : StoreConfig(params)
-        , BinaryCacheStoreConfig(params)
         , BinaryCacheStore(params)
-        , HttpBinaryCacheStoreConfig(params)
         , cacheUri(scheme + "://" + _cacheUri)
     {
         if (cacheUri.back() == '/')
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 6dc83e288..ce9051d20 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -45,7 +45,6 @@ struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
 
     LegacySSHStore(const string & scheme, const string & host, const Params & params)
         : StoreConfig(params)
-        , LegacySSHStoreConfig(params)
         , Store(params)
         , host(host)
         , connections(make_ref<Pool<Connection>>(
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 4d11e0f2a..b893befbc 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -22,8 +22,6 @@ public:
         const Path & binaryCacheDir,
         const Params & params)
         : StoreConfig(params)
-        , BinaryCacheStoreConfig(params)
-        , LocalBinaryCacheStoreConfig(params)
         , BinaryCacheStore(params)
         , binaryCacheDir(binaryCacheDir)
     {
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 4e9840f3b..c618203f0 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -44,8 +44,6 @@ namespace nix {
 LocalStore::LocalStore(const Params & params)
     : StoreConfig(params)
     , Store(params)
-    , LocalFSStoreConfig(params)
-    , LocalStoreConfig(params)
     , LocalFSStore(params)
     , realStoreDir_{this, false, rootDir != "" ? rootDir + "/nix/store" : storeDir, "real",
         "physical path to the Nix store"}
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 561502cbe..4c8ffe71e 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -126,9 +126,6 @@ ref<RemoteStore::Connection> RemoteStore::openConnectionWrapper()
 UDSRemoteStore::UDSRemoteStore(const Params & params)
     : StoreConfig(params)
     , Store(params)
-    , LocalFSStoreConfig(params)
-    , RemoteStoreConfig(params)
-    , UDSRemoteStoreConfig(params)
     , LocalFSStore(params)
     , RemoteStore(params)
 {
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 020b20c37..e4548dd22 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -201,8 +201,6 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
         const std::string & bucketName,
         const Params & params)
         : StoreConfig(params)
-        , BinaryCacheStoreConfig(params)
-        , S3BinaryCacheStoreConfig(params)
         , S3BinaryCacheStore(params)
         , bucketName(bucketName)
         , s3Helper(profile, region, scheme, endpoint)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index 13265e127..fac251d8f 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -25,9 +25,7 @@ public:
     SSHStore([[maybe_unused]] const std::string & scheme, const std::string & host, const Params & params)
         : StoreConfig(params)
         , Store(params)
-        , RemoteStoreConfig(params)
         , RemoteStore(params)
-        , SSHStoreConfig(params)
         , host(host)
         , master(
             host,
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 6f7893e41..a67123ff0 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -24,6 +24,31 @@
 
 namespace nix {
 
+/**
+ * About the class hierarchy of the store implementations:
+ *
+ * Each store type `Foo` consists of two classes:
+ *
+ * 1. A class `FooConfig : virtual StoreConfig` that contains the configuration
+ *   for the store
+ *
+ *   It should only contain members of type `const Setting<T>` (or subclasses
+ *   of it) and inherit the constructors of `StoreConfig`
+ *   (`using StoreConfig::StoreConfig`).
+ *
+ * 2. A class `Foo : virtual Store, virtual FooConfig` that contains the
+ *   implementation of the store.
+ *
+ *   This class is expected to have a constructor `Foo(const Params & params)`
+ *   that calls `StoreConfig(params)` (otherwise you're gonna encounter an
+ *   `assertion failure` when trying to instantiate it).
+ *
+ * You can then register the new store using:
+ *
+ * ```
+ * cpp static RegisterStoreImplementation<Foo, FooConfig> regStore;
+ * ```
+ */
 
 MakeError(SubstError, Error);
 MakeError(BuildError, Error); // denotes a permanent build failure
@@ -148,7 +173,26 @@ struct BuildResult
 struct StoreConfig : public Config
 {
     using Config::Config;
-    StoreConfig() = delete;
+
+    /**
+     * When constructing a store implementation, we pass in a map `params` of
+     * parameters that's supposed to initialize the associated config.
+     * To do that, we must use the `StoreConfig(StringMap & params)`
+     * constructor, so we'd like to `delete` its default constructor to enforce
+     * it.
+     *
+     * However, actually deleting it means that all the subclasses of
+     * `StoreConfig` will have their default constructor deleted (because it's
+     * supposed to call the deleted default constructor of `StoreConfig`). But
+     * because we're always using virtual inheritance, the constructors of
+     * child classes will never implicitely call this one, so deleting it will
+     * be more painful than anything else.
+     *
+     * So we `assert(false)` here to ensure at runtime that the right
+     * constructor is always called without having to redefine a custom
+     * constructor for each `*Config` class.
+     */
+    StoreConfig() { assert(false); }
 
 
     const PathSetting storeDir_{this, false, settings.nixStore,

From b73adacc1ebda8a790cd8e0b0988c3b0607d947a Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 14:04:02 +0200
Subject: [PATCH 147/176] Add a name to the stores

So that it can be printed by `nix describe-stores`
---
 src/libstore/build.cc                    |  7 ++++++-
 src/libstore/dummy-store.cc              |  2 ++
 src/libstore/http-binary-cache-store.cc  |  2 ++
 src/libstore/legacy-ssh-store.cc         |  2 ++
 src/libstore/local-binary-cache-store.cc |  2 ++
 src/libstore/local-store.hh              |  2 ++
 src/libstore/remote-store.hh             |  2 ++
 src/libstore/s3-binary-cache-store.cc    |  2 ++
 src/libstore/ssh-store.cc                |  2 ++
 src/libstore/store-api.hh                |  1 +
 src/nix/describe-stores.cc               | 13 +++++++------
 11 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 18bb9b12e..6e55f83d5 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -2872,11 +2872,16 @@ void DerivationGoal::writeStructuredAttrs()
     chownToBuilder(tmpDir + "/.attrs.sh");
 }
 
+struct RestrictedStoreConfig : LocalFSStoreConfig
+{
+    using LocalFSStoreConfig::LocalFSStoreConfig;
+    const std::string name() { return "Restricted Store"; }
+};
 
 /* A wrapper around LocalStore that only allows building/querying of
    paths that are in the input closures of the build or were added via
    recursive Nix calls. */
-struct RestrictedStore : public LocalFSStore
+struct RestrictedStore : public LocalFSStore, public virtual RestrictedStoreConfig
 {
     ref<LocalStore> next;
 
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 074953b1d..128832e60 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -4,6 +4,8 @@ namespace nix {
 
 struct DummyStoreConfig : virtual StoreConfig {
     using StoreConfig::StoreConfig;
+
+    const std::string name() override { return "Dummy Store"; }
 };
 
 struct DummyStore : public Store, public virtual DummyStoreConfig
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index bd65273eb..f4ab15a10 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -10,6 +10,8 @@ MakeError(UploadToHTTP, Error);
 struct HttpBinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
 {
     using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
+
+    const std::string name() override { return "Http Binary Cache Store"; }
 };
 
 class HttpBinaryCacheStore : public BinaryCacheStore, public HttpBinaryCacheStoreConfig
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index ce9051d20..6563c001f 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -17,6 +17,8 @@ struct LegacySSHStoreConfig : virtual StoreConfig
     const Setting<bool> compress{this, false, "compress", "whether to compress the connection"};
     const Setting<Path> remoteProgram{this, "nix-store", "remote-program", "path to the nix-store executable on the remote system"};
     const Setting<std::string> remoteStore{this, "", "remote-store", "URI of the store on the remote system"};
+
+    const std::string name() override { return "Legacy SSH Store"; }
 };
 
 struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index b893befbc..357bc74df 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -7,6 +7,8 @@ namespace nix {
 struct LocalBinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
 {
     using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
+
+    const std::string name() override { return "Local Binary Cache Store"; }
 };
 
 class LocalBinaryCacheStore : public BinaryCacheStore, public virtual LocalBinaryCacheStoreConfig
diff --git a/src/libstore/local-store.hh b/src/libstore/local-store.hh
index 0265f0837..e7c9d1605 100644
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -37,6 +37,8 @@ struct LocalStoreConfig : virtual LocalFSStoreConfig
     Setting<bool> requireSigs{(StoreConfig*) this,
         settings.requireSigs,
         "require-sigs", "whether store paths should have a trusted signature on import"};
+
+    const std::string name() override { return "Local Store"; }
 };
 
 
diff --git a/src/libstore/remote-store.hh b/src/libstore/remote-store.hh
index cceb8d185..a23690830 100644
--- a/src/libstore/remote-store.hh
+++ b/src/libstore/remote-store.hh
@@ -158,6 +158,8 @@ struct UDSRemoteStoreConfig : virtual LocalFSStoreConfig, virtual RemoteStoreCon
         : UDSRemoteStoreConfig(Store::Params({}))
     {
     }
+
+    const std::string name() override { return "Local Daemon Store"; }
 };
 
 class UDSRemoteStore : public LocalFSStore, public RemoteStore, public virtual UDSRemoteStoreConfig
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index e4548dd22..0b9c9bb31 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -186,6 +186,8 @@ struct S3BinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
         this, false, "multipart-upload", "whether to use multi-part uploads"};
     const Setting<uint64_t> bufferSize{
         this, 5 * 1024 * 1024, "buffer-size", "size (in bytes) of each part in multi-part uploads"};
+
+    const std::string name() override { return "S3 Binary Cache Store"; }
 };
 
 struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCacheStoreConfig
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index fac251d8f..df383bba6 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -16,6 +16,8 @@ struct SSHStoreConfig : virtual RemoteStoreConfig
     const Setting<bool> compress{(StoreConfig*) this, false, "compress", "whether to compress the connection"};
     const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-daemon", "remote-program", "path to the nix-daemon executable on the remote system"};
     const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", "URI of the store on the remote system"};
+
+    const std::string name() override { return "SSH Store"; }
 };
 
 class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index a67123ff0..81b979b73 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -194,6 +194,7 @@ struct StoreConfig : public Config
      */
     StoreConfig() { assert(false); }
 
+    virtual const std::string name() = 0;
 
     const PathSetting storeDir_{this, false, settings.nixStore,
         "store", "path to the Nix store"};
diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc
index f019ec9c2..027187bd9 100644
--- a/src/nix/describe-stores.cc
+++ b/src/nix/describe-stores.cc
@@ -18,13 +18,14 @@ struct CmdDescribeStores : Command, MixJSON
 
     void run() override
     {
-
+        auto res = nlohmann::json::object();
+        for (auto & implem : *Implementations::registered) {
+            auto storeConfig = implem.getConfig();
+            auto storeName = storeConfig->name();
+            res[storeName] = storeConfig->toJSON();
+        }
         if (json) {
-            auto res = nlohmann::json::array();
-            for (auto & implem : *Implementations::registered) {
-                auto storeConfig = implem.getConfig();
-                std::cout << storeConfig->toJSON().dump() << std::endl;
-            }
+            std::cout << res;
         } else {
             throw Error("Only json is available for describe-stores");
         }

From 634cb2a5aec64164dd7fa9467d9cdb1569611c21 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 14:04:21 +0200
Subject: [PATCH 148/176] Add a markdown output to `nix describe-stores`

---
 src/nix/describe-stores.cc | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/nix/describe-stores.cc b/src/nix/describe-stores.cc
index 027187bd9..0cc2d9337 100644
--- a/src/nix/describe-stores.cc
+++ b/src/nix/describe-stores.cc
@@ -27,7 +27,16 @@ struct CmdDescribeStores : Command, MixJSON
         if (json) {
             std::cout << res;
         } else {
-            throw Error("Only json is available for describe-stores");
+            for (auto & [storeName, storeConfig] : res.items()) {
+                std::cout << "## " << storeName << std::endl << std::endl;
+                for (auto & [optionName, optionDesc] : storeConfig.items()) {
+                    std::cout << "### " << optionName << std::endl << std::endl;
+                    std::cout << optionDesc["description"].get<std::string>() << std::endl;
+                    std::cout << "default: " << optionDesc["defaultValue"] << std::endl <<std::endl;
+                    if (!optionDesc["aliases"].empty())
+                        std::cout << "aliases: " << optionDesc["aliases"] << std::endl << std::endl;
+                }
+            }
         }
     }
 };

From 888f7afe9fe1a69c27bcc15a3e0fb0be26a11172 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 14:12:47 +0200
Subject: [PATCH 149/176] Fix build issues with gcc

---
 src/libstore/local-binary-cache-store.cc | 2 +-
 src/libstore/remote-store.cc             | 2 +-
 src/libstore/s3-binary-cache-store.cc    | 2 +-
 src/libstore/ssh-store.cc                | 2 +-
 src/libstore/store-api.hh                | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/libstore/local-binary-cache-store.cc b/src/libstore/local-binary-cache-store.cc
index 357bc74df..b5744448e 100644
--- a/src/libstore/local-binary-cache-store.cc
+++ b/src/libstore/local-binary-cache-store.cc
@@ -20,7 +20,7 @@ private:
 public:
 
     LocalBinaryCacheStore(
-        [[maybe_unused]] const std::string scheme,
+        const std::string scheme,
         const Path & binaryCacheDir,
         const Params & params)
         : StoreConfig(params)
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 4c8ffe71e..1abe236f7 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -133,7 +133,7 @@ UDSRemoteStore::UDSRemoteStore(const Params & params)
 
 
 UDSRemoteStore::UDSRemoteStore(
-        [[maybe_unused]] const std::string scheme,
+        const std::string scheme,
         std::string socket_path,
         const Params & params)
     : UDSRemoteStore(params)
diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index 0b9c9bb31..b3541d7b8 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -199,7 +199,7 @@ struct S3BinaryCacheStoreImpl : public S3BinaryCacheStore, virtual S3BinaryCache
     S3Helper s3Helper;
 
     S3BinaryCacheStoreImpl(
-        [[maybe_unused]] const std::string & scheme,
+        const std::string & scheme,
         const std::string & bucketName,
         const Params & params)
         : StoreConfig(params)
diff --git a/src/libstore/ssh-store.cc b/src/libstore/ssh-store.cc
index df383bba6..8b6e48fb0 100644
--- a/src/libstore/ssh-store.cc
+++ b/src/libstore/ssh-store.cc
@@ -24,7 +24,7 @@ class SSHStore : public virtual RemoteStore, public virtual SSHStoreConfig
 {
 public:
 
-    SSHStore([[maybe_unused]] const std::string & scheme, const std::string & host, const Params & params)
+    SSHStore(const std::string & scheme, const std::string & host, const Params & params)
         : StoreConfig(params)
         , Store(params)
         , RemoteStore(params)
diff --git a/src/libstore/store-api.hh b/src/libstore/store-api.hh
index 81b979b73..1bea4837b 100644
--- a/src/libstore/store-api.hh
+++ b/src/libstore/store-api.hh
@@ -820,6 +820,7 @@ struct Implementations
     {
         if (!registered) registered = new std::vector<StoreFactory>();
         StoreFactory factory{
+            .uriSchemes = T::uriSchemes(),
             .create =
                 ([](const std::string & scheme, const std::string & uri, const Store::Params & params)
                  -> std::shared_ptr<Store>
@@ -827,8 +828,7 @@ struct Implementations
             .getConfig =
                 ([]()
                  -> std::shared_ptr<StoreConfig>
-                 { return std::make_shared<TConfig>(StringMap({})); }),
-            .uriSchemes = T::uriSchemes()
+                 { return std::make_shared<TConfig>(StringMap({})); })
         };
         registered->push_back(factory);
     }

From a1e82ba450f274966dc45375b42b5d4413fff77d Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 14 Sep 2020 15:35:17 +0200
Subject: [PATCH 150/176] fixup! Add a default value for the settings

---
 src/libutil/tests/config.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/tests/config.cc b/src/libutil/tests/config.cc
index c5abefe11..c7777a21f 100644
--- a/src/libutil/tests/config.cc
+++ b/src/libutil/tests/config.cc
@@ -161,7 +161,7 @@ namespace nix {
         Setting<std::string> setting{&config, "", "name-of-the-setting", "description"};
         setting.assign("value");
 
-        ASSERT_EQ(config.toJSON().dump(), R"#({"name-of-the-setting":{"aliases":[],"description":"description\n","value":"value"}})#");
+        ASSERT_EQ(config.toJSON().dump(), R"#({"name-of-the-setting":{"aliases":[],"defaultValue":"","description":"description\n","value":"value"}})#");
     }
 
     TEST(Config, setSettingAlias) {

From fc2d31c423377cea2355e7f7a4ce75e64a7f3620 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 15 Sep 2020 09:10:37 +0200
Subject: [PATCH 151/176] Add `(StoreConfig*)` casts to work around a GCC bug

Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80431 that was
already there in the code but was accidentally removed in the last
commits
---
 src/libstore/binary-cache-store.hh | 12 ++++++------
 src/libstore/legacy-ssh-store.cc   | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/libstore/binary-cache-store.hh b/src/libstore/binary-cache-store.hh
index f1fc82013..4b779cdd4 100644
--- a/src/libstore/binary-cache-store.hh
+++ b/src/libstore/binary-cache-store.hh
@@ -15,12 +15,12 @@ struct BinaryCacheStoreConfig : virtual StoreConfig
 {
     using StoreConfig::StoreConfig;
 
-    const Setting<std::string> compression{this, "xz", "compression", "NAR compression method ('xz', 'bzip2', or 'none')"};
-    const Setting<bool> writeNARListing{this, false, "write-nar-listing", "whether to write a JSON file listing the files in each NAR"};
-    const Setting<bool> writeDebugInfo{this, false, "index-debug-info", "whether to index DWARF debug info files by build ID"};
-    const Setting<Path> secretKeyFile{this, "", "secret-key", "path to secret key used to sign the binary cache"};
-    const Setting<Path> localNarCache{this, "", "local-nar-cache", "path to a local cache of NARs"};
-    const Setting<bool> parallelCompression{this, false, "parallel-compression",
+    const Setting<std::string> compression{(StoreConfig*) this, "xz", "compression", "NAR compression method ('xz', 'bzip2', or 'none')"};
+    const Setting<bool> writeNARListing{(StoreConfig*) this, false, "write-nar-listing", "whether to write a JSON file listing the files in each NAR"};
+    const Setting<bool> writeDebugInfo{(StoreConfig*) this, false, "index-debug-info", "whether to index DWARF debug info files by build ID"};
+    const Setting<Path> secretKeyFile{(StoreConfig*) this, "", "secret-key", "path to secret key used to sign the binary cache"};
+    const Setting<Path> localNarCache{(StoreConfig*) this, "", "local-nar-cache", "path to a local cache of NARs"};
+    const Setting<bool> parallelCompression{(StoreConfig*) this, false, "parallel-compression",
         "enable multi-threading compression, available for xz only currently"};
 };
 
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index 6563c001f..e9478c1d5 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -12,11 +12,11 @@ namespace nix {
 struct LegacySSHStoreConfig : virtual StoreConfig
 {
     using StoreConfig::StoreConfig;
-    const Setting<int> maxConnections{this, 1, "max-connections", "maximum number of concurrent SSH connections"};
-    const Setting<Path> sshKey{this, "", "ssh-key", "path to an SSH private key"};
-    const Setting<bool> compress{this, false, "compress", "whether to compress the connection"};
-    const Setting<Path> remoteProgram{this, "nix-store", "remote-program", "path to the nix-store executable on the remote system"};
-    const Setting<std::string> remoteStore{this, "", "remote-store", "URI of the store on the remote system"};
+    const Setting<int> maxConnections{(StoreConfig*) this, 1, "max-connections", "maximum number of concurrent SSH connections"};
+    const Setting<Path> sshKey{(StoreConfig*) this, "", "ssh-key", "path to an SSH private key"};
+    const Setting<bool> compress{(StoreConfig*) this, false, "compress", "whether to compress the connection"};
+    const Setting<Path> remoteProgram{(StoreConfig*) this, "nix-store", "remote-program", "path to the nix-store executable on the remote system"};
+    const Setting<std::string> remoteStore{(StoreConfig*) this, "", "remote-store", "URI of the store on the remote system"};
 
     const std::string name() override { return "Legacy SSH Store"; }
 };
@@ -24,9 +24,9 @@ struct LegacySSHStoreConfig : virtual StoreConfig
 struct LegacySSHStore : public Store, public virtual LegacySSHStoreConfig
 {
     // Hack for getting remote build log output.
-    // Intentionally not in `StoreConfig` so that it doesn't appear in the
-    // documentation
-    const Setting<int> logFD{this, -1, "log-fd", "file descriptor to which SSH's stderr is connected"};
+    // Intentionally not in `LegacySSHStoreConfig` so that it doesn't appear in
+    // the documentation
+    const Setting<int> logFD{(StoreConfig*) this, -1, "log-fd", "file descriptor to which SSH's stderr is connected"};
 
     struct Connection
     {

From 93c0e14a308d513cf61daa7a003417e42a7dc2f8 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Tue, 15 Sep 2020 11:34:20 +0200
Subject: [PATCH 152/176] Include the full nlohmann/json header in config.hh

It is apparently required for using `toJSONObject()`, which we do inside
the header file (because it's in a template).

This was accidentally working when building Nix itself (presumably because
`config.hh` was always included after `nlohman/json.hpp`) but caused a
(pretty dirty) build failure in the perl bindings package.
---
 src/libutil/config.hh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 42fc856e0..18fa9dea8 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -4,7 +4,7 @@
 
 #include "types.hh"
 
-#include <nlohmann/json_fwd.hpp>
+#include <nlohmann/json.hpp>
 
 #pragma once
 

From e0817cbcdcdbec81d7ce2f5141b4f99bbc2bece7 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 16 Sep 2020 09:06:35 +0200
Subject: [PATCH 153/176] Don't include nlohmann/json.hpp in config.hh

Instead make a separate header with the template implementation of
`BaseSetting<T>::toJSONObj` that can be included where needed
---
 src/libstore/globals.hh              |  1 +
 src/libutil/abstractsettingtojson.hh | 15 +++++++++++++++
 src/libutil/config.cc                |  1 +
 src/libutil/config.hh                | 10 ++--------
 4 files changed, 19 insertions(+), 8 deletions(-)
 create mode 100644 src/libutil/abstractsettingtojson.hh

diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 8a2d3ff75..02721285a 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -2,6 +2,7 @@
 
 #include "types.hh"
 #include "config.hh"
+#include "abstractsettingtojson.hh"
 #include "util.hh"
 
 #include <map>
diff --git a/src/libutil/abstractsettingtojson.hh b/src/libutil/abstractsettingtojson.hh
new file mode 100644
index 000000000..b3fbc84f7
--- /dev/null
+++ b/src/libutil/abstractsettingtojson.hh
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <nlohmann/json.hpp>
+#include "config.hh"
+
+namespace nix {
+template<typename T>
+std::map<std::string, nlohmann::json> BaseSetting<T>::toJSONObject()
+{
+    auto obj = AbstractSetting::toJSONObject();
+    obj.emplace("value", value);
+    obj.emplace("defaultValue", defaultValue);
+    return obj;
+}
+}
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index faa5cdbeb..309d23b40 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -1,5 +1,6 @@
 #include "config.hh"
 #include "args.hh"
+#include "abstractsettingtojson.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libutil/config.hh b/src/libutil/config.hh
index 18fa9dea8..1f5f4e7b9 100644
--- a/src/libutil/config.hh
+++ b/src/libutil/config.hh
@@ -4,7 +4,7 @@
 
 #include "types.hh"
 
-#include <nlohmann/json.hpp>
+#include <nlohmann/json_fwd.hpp>
 
 #pragma once
 
@@ -255,13 +255,7 @@ public:
 
     void convertToArg(Args & args, const std::string & category) override;
 
-    std::map<std::string, nlohmann::json> toJSONObject() override
-    {
-        auto obj = AbstractSetting::toJSONObject();
-        obj.emplace("value", value);
-        obj.emplace("defaultValue", defaultValue);
-        return obj;
-    }
+    std::map<std::string, nlohmann::json> toJSONObject() override;
 };
 
 template<typename T>

From d72927aa7a16be56b134dfadf34d5bbdb751f264 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 16 Sep 2020 13:51:53 +0200
Subject: [PATCH 154/176] Fix the s3 store

Add some necessary casts in the initialisation of the store's config
---
 src/libstore/s3-binary-cache-store.cc | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/libstore/s3-binary-cache-store.cc b/src/libstore/s3-binary-cache-store.cc
index b3541d7b8..d43f267e0 100644
--- a/src/libstore/s3-binary-cache-store.cc
+++ b/src/libstore/s3-binary-cache-store.cc
@@ -175,17 +175,17 @@ S3Helper::FileTransferResult S3Helper::getObject(
 struct S3BinaryCacheStoreConfig : virtual BinaryCacheStoreConfig
 {
     using BinaryCacheStoreConfig::BinaryCacheStoreConfig;
-    const Setting<std::string> profile{this, "", "profile", "The name of the AWS configuration profile to use."};
-    const Setting<std::string> region{this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
-    const Setting<std::string> scheme{this, "", "scheme", "The scheme to use for S3 requests, https by default."};
-    const Setting<std::string> endpoint{this, "", "endpoint", "An optional override of the endpoint to use when talking to S3."};
-    const Setting<std::string> narinfoCompression{this, "", "narinfo-compression", "compression method for .narinfo files"};
-    const Setting<std::string> lsCompression{this, "", "ls-compression", "compression method for .ls files"};
-    const Setting<std::string> logCompression{this, "", "log-compression", "compression method for log/* files"};
+    const Setting<std::string> profile{(StoreConfig*) this, "", "profile", "The name of the AWS configuration profile to use."};
+    const Setting<std::string> region{(StoreConfig*) this, Aws::Region::US_EAST_1, "region", {"aws-region"}};
+    const Setting<std::string> scheme{(StoreConfig*) this, "", "scheme", "The scheme to use for S3 requests, https by default."};
+    const Setting<std::string> endpoint{(StoreConfig*) this, "", "endpoint", "An optional override of the endpoint to use when talking to S3."};
+    const Setting<std::string> narinfoCompression{(StoreConfig*) this, "", "narinfo-compression", "compression method for .narinfo files"};
+    const Setting<std::string> lsCompression{(StoreConfig*) this, "", "ls-compression", "compression method for .ls files"};
+    const Setting<std::string> logCompression{(StoreConfig*) this, "", "log-compression", "compression method for log/* files"};
     const Setting<bool> multipartUpload{
-        this, false, "multipart-upload", "whether to use multi-part uploads"};
+        (StoreConfig*) this, false, "multipart-upload", "whether to use multi-part uploads"};
     const Setting<uint64_t> bufferSize{
-        this, 5 * 1024 * 1024, "buffer-size", "size (in bytes) of each part in multi-part uploads"};
+        (StoreConfig*) this, 5 * 1024 * 1024, "buffer-size", "size (in bytes) of each part in multi-part uploads"};
 
     const std::string name() override { return "S3 Binary Cache Store"; }
 };

From c29624bf7d58aeb698ddd12b983465d355fccf79 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Wed, 16 Sep 2020 13:52:15 +0200
Subject: [PATCH 155/176] Add a test for `nix describe-stores`

Doesn't test much, but at least ensures that the command runs properly
---
 tests/describe-stores.sh | 8 ++++++++
 tests/local.mk           | 1 +
 2 files changed, 9 insertions(+)
 create mode 100644 tests/describe-stores.sh

diff --git a/tests/describe-stores.sh b/tests/describe-stores.sh
new file mode 100644
index 000000000..3fea61483
--- /dev/null
+++ b/tests/describe-stores.sh
@@ -0,0 +1,8 @@
+source common.sh
+
+# Query an arbitrary value in `nix describe-stores --json`'s output just to
+# check that it has the right structure
+[[ $(nix --experimental-features 'nix-command flakes' describe-stores --json | jq '.["SSH Store"]["compress"]["defaultValue"]') == false ]]
+
+# Ensure that the output of `nix describe-stores` isn't empty
+[[ -n $(nix --experimental-features 'nix-command flakes' describe-stores) ]]
diff --git a/tests/local.mk b/tests/local.mk
index 5d25de019..594901504 100644
--- a/tests/local.mk
+++ b/tests/local.mk
@@ -32,6 +32,7 @@ nix_tests = \
   post-hook.sh \
   function-trace.sh \
   recursive.sh \
+  describe-stores.sh \
   flakes.sh \
   content-addressed.sh
   # parallel.sh

From 77a0e2c5beba478f4cfc9f3c9516e516a5da43c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9ophane=20Hufschmitt?=
 <regnat@users.noreply.github.com>
Date: Wed, 16 Sep 2020 14:00:21 +0200
Subject: [PATCH 156/176] Remove useless exception copy

Co-authored-by: Eelco Dolstra <edolstra@gmail.com>
---
 src/libstore/store-api.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 9252c85e8..76cbc0605 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -1096,7 +1096,7 @@ ref<Store> openStore(const std::string & uri_,
             }
         }
     }
-    catch (BadURL) {
+    catch (BadURL &) {
         auto [uri, uriParams] = splitUriAndParams(uri_);
         params.insert(uriParams.begin(), uriParams.end());
 

From 2eacc1bc00fcc3bccd470b846062c63bc408be05 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Sep 2020 14:18:46 +0200
Subject: [PATCH 157/176] builtins.toFile: Fix indentation

---
 src/libexpr/primops.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 4a0dd5544..816980f10 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -1704,7 +1704,7 @@ static RegisterPrimOp primop_toFile({
         ...
         cp ${configFile} $out/etc/foo.conf
       ";
-    ```
+      ```
 
       Note that `${configFile}` is an
       [antiquotation](language-values.md), so the result of the

From 39bc49318f64d30b945d9dbb4f96f225d25dbd50 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Sep 2020 14:55:24 +0200
Subject: [PATCH 158/176] jq -> nix

---
 doc/manual/generate-builtins.jq  |  6 ----
 doc/manual/generate-builtins.nix | 14 ++++++++
 doc/manual/generate-manpage.jq   | 44 -------------------------
 doc/manual/generate-manpage.nix  | 56 ++++++++++++++++++++++++++++++++
 doc/manual/generate-options.jq   | 16 ---------
 doc/manual/generate-options.nix  | 21 ++++++++++++
 doc/manual/local.mk              | 16 ++++-----
 doc/manual/utils.nix             |  7 ++++
 8 files changed, 106 insertions(+), 74 deletions(-)
 delete mode 100644 doc/manual/generate-builtins.jq
 create mode 100644 doc/manual/generate-builtins.nix
 delete mode 100644 doc/manual/generate-manpage.jq
 create mode 100644 doc/manual/generate-manpage.nix
 delete mode 100644 doc/manual/generate-options.jq
 create mode 100644 doc/manual/generate-options.nix
 create mode 100644 doc/manual/utils.nix

diff --git a/doc/manual/generate-builtins.jq b/doc/manual/generate-builtins.jq
deleted file mode 100644
index c38799479..000000000
--- a/doc/manual/generate-builtins.jq
+++ /dev/null
@@ -1,6 +0,0 @@
-. | to_entries | sort_by(.key) | map(
-  "  - `builtins." + .key + "` "
-  + (.value.args | map("*" + . + "*") | join(" "))
-  + "  \n\n"
-  + (.value.doc | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
-) | join("")
diff --git a/doc/manual/generate-builtins.nix b/doc/manual/generate-builtins.nix
new file mode 100644
index 000000000..416a7fdba
--- /dev/null
+++ b/doc/manual/generate-builtins.nix
@@ -0,0 +1,14 @@
+with builtins;
+with import ./utils.nix;
+
+builtins:
+
+concatStrings (map
+  (name:
+    let builtin = builtins.${name}; in
+    "  - `builtins.${name}` " + concatStringsSep " " (map (s: "*${s}*") builtin.args)
+    + "  \n\n"
+    + concatStrings (map (s: "    ${s}\n") (splitLines builtin.doc)) + "\n\n"
+  )
+  (attrNames builtins))
+
diff --git a/doc/manual/generate-manpage.jq b/doc/manual/generate-manpage.jq
deleted file mode 100644
index dd632f162..000000000
--- a/doc/manual/generate-manpage.jq
+++ /dev/null
@@ -1,44 +0,0 @@
-def show_flags:
-  .flags
-  | map_values(select(.category != "config"))
-  | to_entries
-  | map(
-      "  - `--" + .key + "`"
-      + (if .value.shortName then " / `" + .value.shortName + "`" else "" end)
-      + (if .value.labels then " " + (.value.labels | map("*" + . + "*") | join(" ")) else "" end)
-      + "  \n"
-      + "    " + .value.description + "\n\n")
-  | join("")
-  ;
-
-def show_synopsis:
-  "`" + .command + "` [*flags*...] " + (.args | map("*" + .label + "*" + (if has("arity") then "" else "..." end)) | join(" ")) + "\n\n"
-  ;
-
-def show_command:
-  . as $top |
-  .section + " Name\n\n"
-  + "`" + .command + "` - " + .def.description + "\n\n"
-  + .section + " Synopsis\n\n"
-  + ({"command": .command, "args": .def.args} | show_synopsis)
-  + (if .def | has("doc")
-     then .section + " Description\n\n" + .def.doc + "\n\n"
-     else ""
-     end)
-  + (if (.def.flags | length) > 0 then
-      .section + " Flags\n\n"
-      + (.def | show_flags)
-    else "" end)
-  + (if (.def.examples | length) > 0 then
-      .section + " Examples\n\n"
-      + (.def.examples | map(.description + "\n\n```console\n" + .command + "\n```\n" ) | join("\n"))
-      + "\n"
-     else "" end)
-  + (if .def.commands then .def.commands | to_entries | map(
-      "# Subcommand `" + ($top.command + " " + .key) + "`\n\n"
-      + ({"command": ($top.command + " " + .key), "section": "##", "def": .value} | show_command)
-    ) | join("") else "" end)
-  ;
-
-"Title: nix\n\n"
-+ ({"command": "nix", "section": "#", "def": .} | show_command)
diff --git a/doc/manual/generate-manpage.nix b/doc/manual/generate-manpage.nix
new file mode 100644
index 000000000..4709c0e2c
--- /dev/null
+++ b/doc/manual/generate-manpage.nix
@@ -0,0 +1,56 @@
+with builtins;
+with import ./utils.nix;
+
+let
+
+  showCommand =
+    { command, section, def }:
+    "${section} Name\n\n"
+    + "`${command}` - ${def.description}\n\n"
+    + "${section} Synopsis\n\n"
+    + showSynopsis { inherit command; args = def.args; }
+    + (if def ? doc
+       then "${section} Description\n\n" + def.doc + "\n\n"
+       else "")
+    + (let s = showFlags def.flags; in
+       if s != ""
+       then "${section} Flags\n\n${s}"
+       else "")
+    + (if def.examples or [] != []
+       then
+         "${section} Examples\n\n"
+         + concatStrings (map ({ description, command }: "${description}\n\n```console\n${command}\n```\n\n") def.examples)
+       else "")
+    + (if def.commands or [] != []
+       then concatStrings (
+         map (name:
+           "# Subcommand `${command} ${name}`\n\n"
+           + showCommand { command = command + " " + name; section = "##"; def = def.commands.${name}; })
+           (attrNames def.commands))
+       else "");
+
+  showFlags = flags:
+    concatStrings
+      (map (longName:
+        let flag = flags.${longName}; in
+        if flag.category or "" != "config"
+        then
+          "  - `--${longName}`"
+          + (if flag ? shortName then " / `${flag.shortName}`" else "")
+          + (if flag ? labels then " " + (concatStringsSep " " (map (s: "*${s}*") flag.labels)) else "")
+          + "  \n"
+          + "    " + flag.description + "\n\n"
+        else "")
+        (attrNames flags));
+
+  showSynopsis =
+    { command, args }:
+    "`${command}` [*flags*...] ${concatStringsSep " "
+      (map (arg: "*${arg.label}*" + (if arg ? arity then "" else "...")) args)}\n\n";
+
+in
+
+command:
+
+"Title: nix\n\n"
++ showCommand { command = "nix"; section = "#"; def = command; }
diff --git a/doc/manual/generate-options.jq b/doc/manual/generate-options.jq
deleted file mode 100644
index ccf62e8ed..000000000
--- a/doc/manual/generate-options.jq
+++ /dev/null
@@ -1,16 +0,0 @@
-. | to_entries | sort_by(.key) | map(
-  "  - `" + .key + "`  \n\n"
-  + (.value.description | split("\n") | map("    " + . + "\n") | join("")) + "\n\n"
-  + "    **Default:** " + (
-      if .value.value == "" or .value.value == []
-      then "*empty*"
-      elif (.value.value | type) == "array"
-      then "`" + (.value.value | join(" ")) + "`"
-      else "`" + (.value.value | tostring) + "`"
-      end)
-  + "\n\n"
-  + (if (.value.aliases | length) > 0
-     then "    **Deprecated alias:** " + (.value.aliases | map("`" + . + "`") | join(", ")) + "\n\n"
-     else ""
-     end)
-) | join("")
diff --git a/doc/manual/generate-options.nix b/doc/manual/generate-options.nix
new file mode 100644
index 000000000..7afe279c3
--- /dev/null
+++ b/doc/manual/generate-options.nix
@@ -0,0 +1,21 @@
+with builtins;
+with import ./utils.nix;
+
+options:
+
+concatStrings (map
+  (name:
+    let option = options.${name}; in
+    "  - `${name}`  \n\n"
+    + concatStrings (map (s: "    ${s}\n") (splitLines option.description)) + "\n\n"
+    + "    **Default:** " + (
+      if option.value == "" || option.value == []
+      then "*empty*"
+      else if isBool option.value
+      then (if option.value then "`true`" else "`false`")
+      else "`" + toString option.value + "`") + "\n\n"
+    + (if option.aliases != []
+       then "    **Deprecated alias:** " + (concatStringsSep ", " (map (s: "`${s}`") option.aliases)) + "\n\n"
+       else "")
+    )
+  (attrNames options))
diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index 297a73414..c219153e9 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -24,12 +24,12 @@ $(d)/%.8: $(d)/src/command-ref/%.md
 $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
-$(d)/src/command-ref/nix.md: $(d)/nix.json $(d)/generate-manpage.jq
-	jq -r -f doc/manual/generate-manpage.jq $< > $@
+$(d)/src/command-ref/nix.md: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
+	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-manpage.nix (builtins.fromJSON (builtins.readFile $<))' > $@
 
-$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.jq $(d)/src/command-ref/conf-file-prefix.md
-	cat doc/manual/src/command-ref/conf-file-prefix.md > $@
-	jq -r -f doc/manual/generate-options.jq $< >> $@
+$(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
+	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@
+	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@
 
 $(d)/nix.json: $(bindir)/nix
 	$(trace-gen) $(bindir)/nix __dump-args > $@
@@ -37,9 +37,9 @@ $(d)/nix.json: $(bindir)/nix
 $(d)/conf-file.json: $(bindir)/nix
 	$(trace-gen) env -i NIX_CONF_DIR=/dummy HOME=/dummy $(bindir)/nix show-config --json --experimental-features nix-command > $@
 
-$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.jq $(d)/src/expressions/builtins-prefix.md
-	cat doc/manual/src/expressions/builtins-prefix.md > $@
-	jq -r -f doc/manual/generate-builtins.jq $< >> $@
+$(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
+	@cat doc/manual/src/expressions/builtins-prefix.md > $@
+	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@
 
 $(d)/builtins.json: $(bindir)/nix
 	$(trace-gen) $(bindir)/nix __dump-builtins > $@
diff --git a/doc/manual/utils.nix b/doc/manual/utils.nix
new file mode 100644
index 000000000..50150bf3e
--- /dev/null
+++ b/doc/manual/utils.nix
@@ -0,0 +1,7 @@
+with builtins;
+
+{
+  splitLines = s: filter (x: !isList x) (split "\n" s);
+
+  concatStrings = concatStringsSep "";
+}

From 0066ef6c59c356d5714f2e26af9471937ba0c865 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 16 Sep 2020 16:56:28 +0200
Subject: [PATCH 159/176] Fix doc generation

---
 doc/manual/local.mk    | 24 ++++++++++++++++--------
 src/libexpr/eval.cc    |  6 +++++-
 src/libexpr/primops.cc | 11 +++++++----
 src/nix/main.cc        |  1 +
 4 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/doc/manual/local.mk b/doc/manual/local.mk
index c219153e9..3b8e7e2df 100644
--- a/doc/manual/local.mk
+++ b/doc/manual/local.mk
@@ -15,6 +15,8 @@ clean-files += $(d)/*.1 $(d)/*.5 $(d)/*.8
 
 dist-files += $(man-pages)
 
+nix-eval = $(bindir)/nix eval --experimental-features nix-command -I nix/corepkgs=corepkgs --store dummy:// --impure --raw --expr
+
 $(d)/%.1: $(d)/src/command-ref/%.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
@@ -25,24 +27,30 @@ $(d)/nix.conf.5: $(d)/src/command-ref/conf-file.md
 	$(trace-gen) lowdown -sT man $^ -o $@
 
 $(d)/src/command-ref/nix.md: $(d)/nix.json $(d)/generate-manpage.nix $(bindir)/nix
-	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-manpage.nix (builtins.fromJSON (builtins.readFile $<))' > $@
+	$(trace-gen) $(nix-eval) 'import doc/manual/generate-manpage.nix (builtins.fromJSON (builtins.readFile $<))' > $@.tmp
+	@mv $@.tmp $@
 
 $(d)/src/command-ref/conf-file.md: $(d)/conf-file.json $(d)/generate-options.nix $(d)/src/command-ref/conf-file-prefix.md $(bindir)/nix
-	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@
-	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@
+	@cat doc/manual/src/command-ref/conf-file-prefix.md > $@.tmp
+	$(trace-gen) $(nix-eval) 'import doc/manual/generate-options.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
+	@mv $@.tmp $@
 
 $(d)/nix.json: $(bindir)/nix
-	$(trace-gen) $(bindir)/nix __dump-args > $@
+	$(trace-gen) $(bindir)/nix __dump-args > $@.tmp
+	@mv $@.tmp $@
 
 $(d)/conf-file.json: $(bindir)/nix
-	$(trace-gen) env -i NIX_CONF_DIR=/dummy HOME=/dummy $(bindir)/nix show-config --json --experimental-features nix-command > $@
+	$(trace-gen) env -i NIX_CONF_DIR=/dummy HOME=/dummy $(bindir)/nix show-config --json --experimental-features nix-command > $@.tmp
+	@mv $@.tmp $@
 
 $(d)/src/expressions/builtins.md: $(d)/builtins.json $(d)/generate-builtins.nix $(d)/src/expressions/builtins-prefix.md $(bindir)/nix
-	@cat doc/manual/src/expressions/builtins-prefix.md > $@
-	$(trace-gen) $(bindir)/nix eval --experimental-features nix-command --impure --raw --expr 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@
+	@cat doc/manual/src/expressions/builtins-prefix.md > $@.tmp
+	$(trace-gen) $(nix-eval) 'import doc/manual/generate-builtins.nix (builtins.fromJSON (builtins.readFile $<))' >> $@.tmp
+	@mv $@.tmp $@
 
 $(d)/builtins.json: $(bindir)/nix
-	$(trace-gen) $(bindir)/nix __dump-builtins > $@
+	$(trace-gen) NIX_PATH=nix/corepkgs=corepkgs $(bindir)/nix __dump-builtins > $@.tmp
+	mv $@.tmp $@
 
 # Generate the HTML manual.
 install: $(docdir)/manual/index.html
diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index d678231c6..139067f20 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -370,7 +370,11 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
         for (auto & i : _searchPath) addToSearchPath(i);
         for (auto & i : evalSettings.nixPath.get()) addToSearchPath(i);
     }
-    addToSearchPath("nix=" + canonPath(settings.nixDataDir + "/nix/corepkgs", true));
+
+    try {
+        addToSearchPath("nix=" + canonPath(settings.nixDataDir + "/nix/corepkgs", true));
+    } catch (Error &) {
+    }
 
     if (evalSettings.restrictEval || evalSettings.pureEval) {
         allowedPaths = PathSet();
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 816980f10..d0b0c57b2 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -3565,10 +3565,13 @@ void EvalState::createBaseEnv()
 
     /* Add a wrapper around the derivation primop that computes the
        `drvPath' and `outPath' attributes lazily. */
-    string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true);
-    sDerivationNix = symbols.create(path);
-    evalFile(path, v);
-    addConstant("derivation", v);
+    try {
+        string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true);
+        sDerivationNix = symbols.create(path);
+        evalFile(path, v);
+        addConstant("derivation", v);
+    } catch (SysError &) {
+    }
 
     /* Now that we've added all primops, sort the `builtins' set,
        because attribute lookups expect it to be sorted. */
diff --git a/src/nix/main.cc b/src/nix/main.cc
index e9479f564..1e9e07bc0 100644
--- a/src/nix/main.cc
+++ b/src/nix/main.cc
@@ -185,6 +185,7 @@ void mainWrapped(int argc, char * * argv)
     }
 
     if (argc == 2 && std::string(argv[1]) == "__dump-builtins") {
+        evalSettings.pureEval = false;
         EvalState state({}, openStore("dummy://"));
         auto res = nlohmann::json::object();
         auto builtins = state.baseEnv.values[0]->attrs;

From b7c02232b2c2c51b3b81389b247e400b7a115abc Mon Sep 17 00:00:00 2001
From: Marwan Aljubeh <marwan.aljubeh@gmail.com>
Date: Wed, 16 Sep 2020 17:56:43 +0100
Subject: [PATCH 160/176] Fix the nix-daemon Mac OS SSL CA cert

Mac OS multi-user installations are currently broken because all requests
made by nix-daemon to the binary cache fail with:

```
unable to download ... Problem with the SSL CA cert (path? access rights?) (77).
```

This change ensures that the nix-daemon knows where to find the SSL CA cert file.

Fixes #2899 and #3261.
---
 misc/launchd/org.nixos.nix-daemon.plist.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/misc/launchd/org.nixos.nix-daemon.plist.in b/misc/launchd/org.nixos.nix-daemon.plist.in
index 9f26296a9..c334639e2 100644
--- a/misc/launchd/org.nixos.nix-daemon.plist.in
+++ b/misc/launchd/org.nixos.nix-daemon.plist.in
@@ -4,6 +4,8 @@
   <dict>
     <key>EnvironmentVariables</key>
     <dict>
+      <key>NIX_SSL_CERT_FILE</key>
+      <string>/nix/var/nix/profiles/default/etc/ssl/certs/ca-bundle.crt</string>
       <key>OBJC_DISABLE_INITIALIZE_FORK_SAFETY</key>
       <string>YES</string>
     </dict>

From 10d1865f5f443ddd57bb408a99f0afd74436e963 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 17 Sep 2020 09:12:39 +0200
Subject: [PATCH 161/176] Remove corepkgs/derivation.nix

---
 corepkgs/local.mk                                |  1 -
 src/libexpr/local.mk                             |  2 +-
 src/libexpr/primops.cc                           | 12 +++++-------
 {corepkgs => src/libexpr/primops}/derivation.nix |  0
 4 files changed, 6 insertions(+), 9 deletions(-)
 rename {corepkgs => src/libexpr/primops}/derivation.nix (100%)

diff --git a/corepkgs/local.mk b/corepkgs/local.mk
index 2c72d3a31..57f6d53a7 100644
--- a/corepkgs/local.mk
+++ b/corepkgs/local.mk
@@ -1,6 +1,5 @@
 corepkgs_FILES = \
   unpack-channel.nix \
-  derivation.nix \
   fetchurl.nix
 
 $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
diff --git a/src/libexpr/local.mk b/src/libexpr/local.mk
index d84b150e0..687a8ccda 100644
--- a/src/libexpr/local.mk
+++ b/src/libexpr/local.mk
@@ -42,6 +42,6 @@ $(eval $(call install-file-in, $(d)/nix-expr.pc, $(prefix)/lib/pkgconfig, 0644))
 $(foreach i, $(wildcard src/libexpr/flake/*.hh), \
   $(eval $(call install-file-in, $(i), $(includedir)/nix/flake, 0644)))
 
-$(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh
+$(d)/primops.cc: $(d)/imported-drv-to-derivation.nix.gen.hh $(d)/primops/derivation.nix.gen.hh
 
 $(d)/flake/flake.cc: $(d)/flake/call-flake.nix.gen.hh
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index d0b0c57b2..7e8526ea1 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -3565,13 +3565,11 @@ void EvalState::createBaseEnv()
 
     /* Add a wrapper around the derivation primop that computes the
        `drvPath' and `outPath' attributes lazily. */
-    try {
-        string path = canonPath(settings.nixDataDir + "/nix/corepkgs/derivation.nix", true);
-        sDerivationNix = symbols.create(path);
-        evalFile(path, v);
-        addConstant("derivation", v);
-    } catch (SysError &) {
-    }
+    sDerivationNix = symbols.create("//builtin/derivation.nix");
+    eval(parse(
+        #include "primops/derivation.nix.gen.hh"
+        , foFile, sDerivationNix, "/", staticBaseEnv), v);
+    addConstant("derivation", v);
 
     /* Now that we've added all primops, sort the `builtins' set,
        because attribute lookups expect it to be sorted. */
diff --git a/corepkgs/derivation.nix b/src/libexpr/primops/derivation.nix
similarity index 100%
rename from corepkgs/derivation.nix
rename to src/libexpr/primops/derivation.nix

From 787469c7b66aec12ab6847e7db2cdc8aef5c325e Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 17 Sep 2020 09:35:30 +0200
Subject: [PATCH 162/176] Remove corepkgs/unpack-channel.nix

---
 corepkgs/local.mk                                |  1 -
 src/nix-channel/nix-channel.cc                   | 11 +++++++++--
 {corepkgs => src/nix-channel}/unpack-channel.nix |  0
 src/nix/local.mk                                 |  2 ++
 4 files changed, 11 insertions(+), 3 deletions(-)
 rename {corepkgs => src/nix-channel}/unpack-channel.nix (100%)

diff --git a/corepkgs/local.mk b/corepkgs/local.mk
index 57f6d53a7..1546b4ef3 100644
--- a/corepkgs/local.mk
+++ b/corepkgs/local.mk
@@ -1,5 +1,4 @@
 corepkgs_FILES = \
-  unpack-channel.nix \
   fetchurl.nix
 
 $(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
diff --git a/src/nix-channel/nix-channel.cc b/src/nix-channel/nix-channel.cc
index 3ccf620c9..e48f7af9a 100755
--- a/src/nix-channel/nix-channel.cc
+++ b/src/nix-channel/nix-channel.cc
@@ -76,6 +76,13 @@ static void update(const StringSet & channelNames)
 
     auto store = openStore();
 
+    auto [fd, unpackChannelPath] = createTempFile();
+    writeFull(fd.get(),
+        #include "unpack-channel.nix.gen.hh"
+        );
+    fd = -1;
+    AutoDelete del(unpackChannelPath, false);
+
     // Download each channel.
     Strings exprs;
     for (const auto & channel : channels) {
@@ -104,7 +111,7 @@ static void update(const StringSet & channelNames)
 
         bool unpacked = false;
         if (std::regex_search(filename, std::regex("\\.tar\\.(gz|bz2|xz)$"))) {
-            runProgram(settings.nixBinDir + "/nix-build", false, { "--no-out-link", "--expr", "import <nix/unpack-channel.nix> "
+            runProgram(settings.nixBinDir + "/nix-build", false, { "--no-out-link", "--expr", "import " + unpackChannelPath +
                         "{ name = \"" + cname + "\"; channelName = \"" + name + "\"; src = builtins.storePath \"" + filename + "\"; }" });
             unpacked = true;
         }
@@ -125,7 +132,7 @@ static void update(const StringSet & channelNames)
     // Unpack the channel tarballs into the Nix store and install them
     // into the channels profile.
     std::cerr << "unpacking channels...\n";
-    Strings envArgs{ "--profile", profile, "--file", "<nix/unpack-channel.nix>", "--install", "--from-expression" };
+    Strings envArgs{ "--profile", profile, "--file", unpackChannelPath, "--install", "--from-expression" };
     for (auto & expr : exprs)
         envArgs.push_back(std::move(expr));
     envArgs.push_back("--quiet");
diff --git a/corepkgs/unpack-channel.nix b/src/nix-channel/unpack-channel.nix
similarity index 100%
rename from corepkgs/unpack-channel.nix
rename to src/nix-channel/unpack-channel.nix
diff --git a/src/nix/local.mk b/src/nix/local.mk
index e96200685..ab4e9121b 100644
--- a/src/nix/local.mk
+++ b/src/nix/local.mk
@@ -29,3 +29,5 @@ $(eval $(call install-symlink, $(bindir)/nix, $(libexecdir)/nix/build-remote))
 src/nix-env/user-env.cc: src/nix-env/buildenv.nix.gen.hh
 
 src/nix/develop.cc: src/nix/get-env.sh.gen.hh
+
+src/nix-channel/nix-channel.cc: src/nix-channel/unpack-channel.nix.gen.hh

From c9f51e87057652db0013289a95deffba495b35e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Thu, 17 Sep 2020 10:42:51 +0200
Subject: [PATCH 163/176] Remove corepkgs/config.nix

This isn't used anywhere except in the configure script of the Perl
bindings. I've changed the latter to use the C++ API's Settings object
at runtime.
---
 .gitignore                |  9 ------
 corepkgs/config.nix.in    | 13 ---------
 corepkgs/local.mk         |  4 +--
 perl/configure.ac         | 13 ---------
 perl/lib/Nix/Config.pm.in | 10 ++-----
 perl/lib/Nix/Store.pm     | 60 ++-------------------------------------
 perl/lib/Nix/Store.xs     | 10 +++++++
 tests/recursive.sh        |  6 ++--
 8 files changed, 19 insertions(+), 106 deletions(-)
 delete mode 100644 corepkgs/config.nix.in

diff --git a/.gitignore b/.gitignore
index 3f81f8ef5..4711fa7fa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,15 +12,6 @@ perl/Makefile.config
 /svn-revision
 /libtool
 
-/corepkgs/config.nix
-
-# /corepkgs/channels/
-/corepkgs/channels/unpack.sh
-
-# /corepkgs/nar/
-/corepkgs/nar/nar.sh
-/corepkgs/nar/unnar.sh
-
 # /doc/manual/
 /doc/manual/*.1
 /doc/manual/*.5
diff --git a/corepkgs/config.nix.in b/corepkgs/config.nix.in
deleted file mode 100644
index cb9945944..000000000
--- a/corepkgs/config.nix.in
+++ /dev/null
@@ -1,13 +0,0 @@
-# FIXME: remove this file?
-let
-  fromEnv = var: def:
-    let val = builtins.getEnv var; in
-    if val != "" then val else def;
-in rec {
-  nixBinDir = fromEnv "NIX_BIN_DIR" "@bindir@";
-  nixPrefix = "@prefix@";
-  nixLibexecDir = fromEnv "NIX_LIBEXEC_DIR" "@libexecdir@";
-  nixLocalstateDir = "@localstatedir@";
-  nixSysconfDir = "@sysconfdir@";
-  nixStoreDir = fromEnv "NIX_STORE_DIR" "@storedir@";
-}
diff --git a/corepkgs/local.mk b/corepkgs/local.mk
index 1546b4ef3..0bc91cfab 100644
--- a/corepkgs/local.mk
+++ b/corepkgs/local.mk
@@ -1,6 +1,4 @@
 corepkgs_FILES = \
   fetchurl.nix
 
-$(foreach file,config.nix $(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
-
-template-files += $(d)/config.nix
+$(foreach file,$(corepkgs_FILES),$(eval $(call install-data-in,$(d)/$(file),$(datadir)/nix/corepkgs)))
diff --git a/perl/configure.ac b/perl/configure.ac
index c3769e142..255744afd 100644
--- a/perl/configure.ac
+++ b/perl/configure.ac
@@ -70,19 +70,6 @@ PKG_CHECK_MODULES([NIX], [nix-store])
 
 NEED_PROG([NIX], [nix])
 
-# Get nix configure values
-export NIX_REMOTE=daemon
-nixbindir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixBinDir)
-nixlibexecdir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLibexecDir)
-nixlocalstatedir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixLocalstateDir)
-nixsysconfdir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixSysconfDir)
-nixstoredir=$("$NIX" --experimental-features nix-command eval --raw -f '<nix/config.nix>' nixStoreDir)
-AC_SUBST(nixbindir)
-AC_SUBST(nixlibexecdir)
-AC_SUBST(nixlocalstatedir)
-AC_SUBST(nixsysconfdir)
-AC_SUBST(nixstoredir)
-
 # Expand all variables in config.status.
 test "$prefix" = NONE && prefix=$ac_default_prefix
 test "$exec_prefix" = NONE && exec_prefix='${prefix}'
diff --git a/perl/lib/Nix/Config.pm.in b/perl/lib/Nix/Config.pm.in
index bc1749e60..f7c6f2484 100644
--- a/perl/lib/Nix/Config.pm.in
+++ b/perl/lib/Nix/Config.pm.in
@@ -4,14 +4,8 @@ use MIME::Base64;
 
 $version = "@PACKAGE_VERSION@";
 
-$binDir = $ENV{"NIX_BIN_DIR"} || "@nixbindir@";
-$libexecDir = $ENV{"NIX_LIBEXEC_DIR"} || "@nixlibexecdir@";
-$stateDir = $ENV{"NIX_STATE_DIR"} || "@nixlocalstatedir@/nix";
-$logDir = $ENV{"NIX_LOG_DIR"} || "@nixlocalstatedir@/log/nix";
-$confDir = $ENV{"NIX_CONF_DIR"} || "@nixsysconfdir@/nix";
-$storeDir = $ENV{"NIX_STORE_DIR"} || "@nixstoredir@";
-
-$useBindings = 1;
+$binDir = Nix::Store::getBinDir;
+$storeDir = Nix::Store::getStoreDir;
 
 %config = ();
 
diff --git a/perl/lib/Nix/Store.pm b/perl/lib/Nix/Store.pm
index d226264d4..179f1dc90 100644
--- a/perl/lib/Nix/Store.pm
+++ b/perl/lib/Nix/Store.pm
@@ -2,7 +2,6 @@ package Nix::Store;
 
 use strict;
 use warnings;
-use Nix::Config;
 
 require Exporter;
 
@@ -22,6 +21,7 @@ our @EXPORT = qw(
     addToStore makeFixedOutputPath
     derivationFromPath
     addTempRoot
+    getBinDir getStoreDir
 );
 
 our $VERSION = '0.15';
@@ -34,62 +34,8 @@ sub backtick {
     return $res;
 }
 
-if ($Nix::Config::useBindings) {
-    require XSLoader;
-    XSLoader::load('Nix::Store', $VERSION);
-} else {
-
-    # Provide slow fallbacks of some functions on platforms that don't
-    # support the Perl bindings.
-
-    use File::Temp;
-    use Fcntl qw/F_SETFD/;
-
-    *hashFile = sub {
-        my ($algo, $base32, $path) = @_;
-        my $res = backtick("$Nix::Config::binDir/nix-hash", "--flat", $path, "--type", $algo, $base32 ? "--base32" : ());
-        chomp $res;
-        return $res;
-    };
-
-    *hashPath = sub {
-        my ($algo, $base32, $path) = @_;
-        my $res = backtick("$Nix::Config::binDir/nix-hash", $path, "--type", $algo, $base32 ? "--base32" : ());
-        chomp $res;
-        return $res;
-    };
-
-    *hashString = sub {
-        my ($algo, $base32, $s) = @_;
-        my $fh = File::Temp->new();
-        print $fh $s;
-        my $res = backtick("$Nix::Config::binDir/nix-hash", $fh->filename, "--type", $algo, $base32 ? "--base32" : ());
-        chomp $res;
-        return $res;
-    };
-
-    *addToStore = sub {
-        my ($srcPath, $recursive, $algo) = @_;
-        die "not implemented" if $recursive || $algo ne "sha256";
-        my $res = backtick("$Nix::Config::binDir/nix-store", "--add", $srcPath);
-        chomp $res;
-        return $res;
-    };
-
-    *isValidPath = sub {
-        my ($path) = @_;
-        my $res = backtick("$Nix::Config::binDir/nix-store", "--check-validity", "--print-invalid", $path);
-        chomp $res;
-        return $res ne $path;
-    };
-
-    *queryPathHash = sub {
-        my ($path) = @_;
-        my $res = backtick("$Nix::Config::binDir/nix-store", "--query", "--hash", $path);
-        chomp $res;
-        return $res;
-    };
-}
+require XSLoader;
+XSLoader::load('Nix::Store', $VERSION);
 
 1;
 __END__
diff --git a/perl/lib/Nix/Store.xs b/perl/lib/Nix/Store.xs
index 8546f6307..599921151 100644
--- a/perl/lib/Nix/Store.xs
+++ b/perl/lib/Nix/Store.xs
@@ -351,3 +351,13 @@ void addTempRoot(char * storePath)
         } catch (Error & e) {
             croak("%s", e.what());
         }
+
+
+SV * getBinDir()
+    PPCODE:
+        XPUSHs(sv_2mortal(newSVpv(settings.nixBinDir.c_str(), 0)));
+
+
+SV * getStoreDir()
+    PPCODE:
+        XPUSHs(sv_2mortal(newSVpv(settings.nixStore.c_str(), 0)));
diff --git a/tests/recursive.sh b/tests/recursive.sh
index cf10d55bf..80a178cc7 100644
--- a/tests/recursive.sh
+++ b/tests/recursive.sh
@@ -9,9 +9,8 @@ rm -f $TEST_ROOT/result
 
 export unreachable=$(nix add-to-store ./recursive.sh)
 
-nix --experimental-features 'nix-command recursive-nix' build -o $TEST_ROOT/result -L --impure --expr '
+NIX_BIN_DIR=$(dirname $(type -p nix)) nix --experimental-features 'nix-command recursive-nix' build -o $TEST_ROOT/result -L --impure --expr '
   with import ./config.nix;
-  with import <nix/config.nix>;
   mkDerivation {
     name = "recursive";
     dummy = builtins.toFile "dummy" "bla bla";
@@ -24,9 +23,10 @@ nix --experimental-features 'nix-command recursive-nix' build -o $TEST_ROOT/resu
 
     buildCommand = '\'\''
       mkdir $out
-      PATH=${nixBinDir}:$PATH
       opts="--experimental-features nix-command"
 
+      PATH=${builtins.getEnv "NIX_BIN_DIR"}:$PATH
+
       # Check that we can query/build paths in our input closure.
       nix $opts path-info $dummy
       nix $opts build $dummy

From 520895b1dac1b82be9f571df3981a15cfada2968 Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Thu, 17 Sep 2020 13:36:58 +0200
Subject: [PATCH 164/176] Fix garbage collection of CA derivations

Fix #4026
---
 src/libstore/gc.cc         | 9 ++++++---
 tests/content-addressed.sh | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/libstore/gc.cc b/src/libstore/gc.cc
index e6cbc525d..08b53c702 100644
--- a/src/libstore/gc.cc
+++ b/src/libstore/gc.cc
@@ -574,9 +574,12 @@ bool LocalStore::canReachRoot(GCState & state, StorePathSet & visited, const Sto
     /* If keep-derivations is set and this is a derivation, then
        don't delete the derivation if any of the outputs are alive. */
     if (state.gcKeepDerivations && path.isDerivation()) {
-        for (auto & i : queryDerivationOutputs(path))
-            if (isValidPath(i) && queryPathInfo(i)->deriver == path)
-                incoming.insert(i);
+        for (auto & [name, maybeOutPath] : queryPartialDerivationOutputMap(path))
+            if (maybeOutPath &&
+                isValidPath(*maybeOutPath) &&
+                queryPathInfo(*maybeOutPath)->deriver == path
+                )
+                incoming.insert(*maybeOutPath);
     }
 
     /* If keep-outputs is set, then don't delete this path if there
diff --git a/tests/content-addressed.sh b/tests/content-addressed.sh
index ae9e3c59e..0ae2852d2 100644
--- a/tests/content-addressed.sh
+++ b/tests/content-addressed.sh
@@ -15,3 +15,6 @@ out1=$(nix-build "${commonArgs[@]}" ./content-addressed.nix --arg seed 1)
 out2=$(nix-build "${commonArgs[@]}" ./content-addressed.nix --arg seed 2)
 
 test $out1 == $out2
+
+nix-instantiate --experimental-features ca-derivations ./content-addressed.nix -A rootCA --arg seed 5
+nix-collect-garbage --experimental-features ca-derivations --option keep-derivations true

From 958bf5712377f59622c59f05a84641aa1093fd32 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 18 Sep 2020 13:10:42 +0200
Subject: [PATCH 165/176] nix build: find() -> get()

find() returns an iterator so "!attr" doesn't work.
---
 src/nix/bundle.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nix/bundle.cc b/src/nix/bundle.cc
index 241c8699b..fc41da9e4 100644
--- a/src/nix/bundle.cc
+++ b/src/nix/bundle.cc
@@ -98,14 +98,14 @@ struct CmdBundle : InstallableCommand
         if (!evalState->isDerivation(*vRes))
             throw Error("the bundler '%s' does not produce a derivation", bundler.what());
 
-        auto attr1 = vRes->attrs->find(evalState->sDrvPath);
+        auto attr1 = vRes->attrs->get(evalState->sDrvPath);
         if (!attr1)
             throw Error("the bundler '%s' does not produce a derivation", bundler.what());
 
         PathSet context2;
         StorePath drvPath = store->parseStorePath(evalState->coerceToPath(*attr1->pos, *attr1->value, context2));
 
-        auto attr2 = vRes->attrs->find(evalState->sOutPath);
+        auto attr2 = vRes->attrs->get(evalState->sOutPath);
         if (!attr2)
             throw Error("the bundler '%s' does not produce a derivation", bundler.what());
 

From 2bcf8cbe7a36ebcd2ad27b4df18fdb911d7ab224 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 18 Sep 2020 14:10:45 +0200
Subject: [PATCH 166/176] libfetchers/github: allow `url` attribute

Since 108debef6f703aa3ca1f6d6c45428880624ec6f8 we allow a
`url`-attribute for the `github`-fetcher to fetch tarballs from
self-hosted `gitlab`/`github` instances.

However it's not used when defining e.g. a flake-input

    foobar = {
        type = "github";
        url = "gitlab.myserver";
        /* ... */
    }

and breaks with an evaluation-error:

    error: --- Error --------------------------------------nix
    unsupported input attribute 'url'
    (use '--show-trace' to show detailed location information)

This patch allows flake-inputs to be fetched from self-hosted instances
as well.
---
 src/libfetchers/github.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index 1cc0c5e2e..f510ae5f5 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -77,7 +77,7 @@ struct GitArchiveInputScheme : InputScheme
         if (maybeGetStrAttr(attrs, "type") != type()) return {};
 
         for (auto & [name, value] : attrs)
-            if (name != "type" && name != "owner" && name != "repo" && name != "ref" && name != "rev" && name != "narHash" && name != "lastModified")
+            if (name != "type" && name != "owner" && name != "repo" && name != "ref" && name != "rev" && name != "narHash" && name != "lastModified" && name != "url")
                 throw Error("unsupported input attribute '%s'", name);
 
         getStrAttr(attrs, "owner");

From 5fe375a8f1d60b49835b52df48686caddaa297a4 Mon Sep 17 00:00:00 2001
From: Bryan Richter <bryan.richter@relexsolutions.com>
Date: Fri, 18 Sep 2020 18:36:17 +0300
Subject: [PATCH 167/176] nix-prefetch-url: Add --executable flag

pkgs.fetchurl supports an executable argument, which is especially nice
when downloading a large executable. This patch adds the same option to
nix-prefetch-url.

I have tested this to work on the simple case of prefetching a little
executable:

1. nix-prefetch-url --executable https://my/little/script
2. Paste the hash into a pkgs.fetchurl-based package, script-pkg.nix
3. Delete the output from the store to avoid any misidentified artifacts
4. Realise the package script-pkg.nix
5. Run the executable

I repeated the above while using --name, as well.

I suspect --executable would have no meaningful effect if combined with
--unpack, but I have not tried it.
---
 doc/manual/src/command-ref/nix-prefetch-url.md |  3 +++
 src/nix-prefetch-url/nix-prefetch-url.cc       | 11 +++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/doc/manual/src/command-ref/nix-prefetch-url.md b/doc/manual/src/command-ref/nix-prefetch-url.md
index 1cd1063cd..1307c7c37 100644
--- a/doc/manual/src/command-ref/nix-prefetch-url.md
+++ b/doc/manual/src/command-ref/nix-prefetch-url.md
@@ -51,6 +51,9 @@ Nix store is also printed.
     result to the Nix store. The resulting hash can be used with
     functions such as Nixpkgs’s `fetchzip` or `fetchFromGitHub`.
 
+  - `--executable`  
+    Set the executable bit on the downloaded file.
+
   - `--name` *name*  
     Override the name of the file in the Nix store. By default, this is
     `hash-basename`, where *basename* is the last component of *url*.
diff --git a/src/nix-prefetch-url/nix-prefetch-url.cc b/src/nix-prefetch-url/nix-prefetch-url.cc
index 1001f27af..377ae03a8 100644
--- a/src/nix-prefetch-url/nix-prefetch-url.cc
+++ b/src/nix-prefetch-url/nix-prefetch-url.cc
@@ -57,6 +57,7 @@ static int _main(int argc, char * * argv)
         bool fromExpr = false;
         string attrPath;
         bool unpack = false;
+        bool executable = false;
         string name;
 
         struct MyArgs : LegacyArgs, MixEvalArgs
@@ -81,6 +82,8 @@ static int _main(int argc, char * * argv)
             }
             else if (*arg == "--unpack")
                 unpack = true;
+            else if (*arg == "--executable")
+                executable = true;
             else if (*arg == "--name")
                 name = getArg(*arg, arg, end);
             else if (*arg != "" && arg->at(0) == '-')
@@ -175,7 +178,11 @@ static int _main(int argc, char * * argv)
 
             /* Download the file. */
             {
-                AutoCloseFD fd = open(tmpFile.c_str(), O_WRONLY | O_CREAT | O_EXCL, 0600);
+                auto mode = 0600;
+                if (executable)
+                    mode = 0700;
+
+                AutoCloseFD fd = open(tmpFile.c_str(), O_WRONLY | O_CREAT | O_EXCL, mode);
                 if (!fd) throw SysError("creating temporary file '%s'", tmpFile);
 
                 FdSink sink(fd.get());
@@ -201,7 +208,7 @@ static int _main(int argc, char * * argv)
                     tmpFile = unpacked;
             }
 
-            const auto method = unpack ? FileIngestionMethod::Recursive : FileIngestionMethod::Flat;
+            const auto method = unpack || executable ? FileIngestionMethod::Recursive : FileIngestionMethod::Flat;
 
             auto info = store->addToStoreSlow(name, tmpFile, method, ht, expectedHash);
             storePath = info.path;

From 9aa0dafe205899f350382b587e284c493b223cdd Mon Sep 17 00:00:00 2001
From: regnat <rg@regnat.ovh>
Date: Mon, 21 Sep 2020 13:11:31 +0200
Subject: [PATCH 168/176] Update lowdown version

Fix #4042

According to https://github.com/kristapsdz/lowdown/commit/8aef9e9290de22a10c14ae138257bc1c7fa8ba1f, we shouldn't need to use a fork anymore so we can switch back to upstream
---
 flake.lock | 11 +++++------
 flake.nix  |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/flake.lock b/flake.lock
index f4368b170..822a73332 100644
--- a/flake.lock
+++ b/flake.lock
@@ -3,16 +3,15 @@
     "lowdown-src": {
       "flake": false,
       "locked": {
-        "lastModified": 1598296217,
-        "narHash": "sha256-ha7lyNY1d8m+osmDpPc9f/bfZ3ZC1IVIXwfyklSWg8I=",
-        "owner": "edolstra",
+        "lastModified": 1598695561,
+        "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=",
+        "owner": "kristapsdz",
         "repo": "lowdown",
-        "rev": "c7a4e715af1e233080842db82d15b261cb74cb28",
+        "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f",
         "type": "github"
       },
       "original": {
-        "owner": "edolstra",
-        "ref": "no-structs-in-anonymous-unions",
+        "owner": "kristapsdz",
         "repo": "lowdown",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index a50533a29..1b9eb4c77 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,7 @@
   description = "The purely functional package manager";
 
   inputs.nixpkgs.url = "nixpkgs/nixos-20.03-small";
-  inputs.lowdown-src = { url = "github:edolstra/lowdown/no-structs-in-anonymous-unions"; flake = false; };
+  inputs.lowdown-src = { url = "github:kristapsdz/lowdown"; flake = false; };
 
   outputs = { self, nixpkgs, lowdown-src }:
 

From d110fdd03f8860b2a1cd689187f8056b9e22af09 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 13:28:51 +0200
Subject: [PATCH 169/176] Disable precompiled headers in 'nix develop'

They're still enabled in regular builds though.
---
 flake.nix                 | 5 +----
 mk/precompiled-headers.mk | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1b9eb4c77..0304557e8 100644
--- a/flake.nix
+++ b/flake.nix
@@ -136,7 +136,7 @@
 
           enableParallelBuilding = true;
 
-          makeFlags = "profiledir=$(out)/etc/profile.d";
+          makeFlags = "profiledir=$(out)/etc/profile.d PRECOMPILE_HEADERS=1";
 
           doCheck = true;
 
@@ -334,9 +334,6 @@
             # syntax-check generated dot files, it still requires some
             # fonts.  So provide those.
             FONTCONFIG_FILE = texFunctions.fontsConf;
-
-            # To test building without precompiled headers.
-            makeFlagsArray = [ "PRECOMPILE_HEADERS=0" ];
           };
 
         # System tests.
diff --git a/mk/precompiled-headers.mk b/mk/precompiled-headers.mk
index 500c99e4a..1fdb4b3a4 100644
--- a/mk/precompiled-headers.mk
+++ b/mk/precompiled-headers.mk
@@ -1,4 +1,4 @@
-PRECOMPILE_HEADERS ?= 1
+PRECOMPILE_HEADERS ?= 0
 
 print-var-help += \
   echo "  PRECOMPILE_HEADERS ($(PRECOMPILE_HEADERS)): Whether to use precompiled headers to speed up the build";

From 56f1e0df0546c744421c7d1bd31b1a341796513c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 21 Sep 2020 16:29:08 +0200
Subject: [PATCH 170/176] libfetchers/github: rename `url` to `host`

---
 src/libfetchers/github.cc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index f510ae5f5..a4db5c5fa 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -8,9 +8,9 @@
 
 namespace nix::fetchers {
 
-// A github or gitlab url
-const static std::string urlRegexS = "[a-zA-Z0-9.]*"; // FIXME: check
-std::regex urlRegex(urlRegexS, std::regex::ECMAScript);
+// A github or gitlab host
+const static std::string hostRegexS = "[a-zA-Z0-9.]*"; // FIXME: check
+std::regex hostRegex(hostRegexS, std::regex::ECMAScript);
 
 struct GitArchiveInputScheme : InputScheme
 {
@@ -50,9 +50,9 @@ struct GitArchiveInputScheme : InputScheme
                     throw BadURL("URL '%s' contains multiple branch/tag names", url.url);
                 ref = value;
             }
-            else if (name == "url") {
-                if (!std::regex_match(value, urlRegex))
-                    throw BadURL("URL '%s' contains an invalid instance url", url.url);
+            else if (name == "host") {
+                if (!std::regex_match(value, hostRegex))
+                    throw BadURL("URL '%s' contains an invalid instance host", url.url);
                 host_url = value;
             }
             // FIXME: barf on unsupported attributes
@@ -67,7 +67,7 @@ struct GitArchiveInputScheme : InputScheme
         input.attrs.insert_or_assign("repo", path[1]);
         if (rev) input.attrs.insert_or_assign("rev", rev->gitRev());
         if (ref) input.attrs.insert_or_assign("ref", *ref);
-        if (host_url) input.attrs.insert_or_assign("url", *host_url);
+        if (host_url) input.attrs.insert_or_assign("host", *host_url);
 
         return input;
     }
@@ -77,7 +77,7 @@ struct GitArchiveInputScheme : InputScheme
         if (maybeGetStrAttr(attrs, "type") != type()) return {};
 
         for (auto & [name, value] : attrs)
-            if (name != "type" && name != "owner" && name != "repo" && name != "ref" && name != "rev" && name != "narHash" && name != "lastModified" && name != "url")
+            if (name != "type" && name != "owner" && name != "repo" && name != "ref" && name != "rev" && name != "narHash" && name != "lastModified" && name != "host")
                 throw Error("unsupported input attribute '%s'", name);
 
         getStrAttr(attrs, "owner");
@@ -210,7 +210,7 @@ struct GitHubInputScheme : GitArchiveInputScheme
     {
         // FIXME: use regular /archive URLs instead? api.github.com
         // might have stricter rate limits.
-        auto host_url = maybeGetStrAttr(input.attrs, "url").value_or("github.com");
+        auto host_url = maybeGetStrAttr(input.attrs, "host").value_or("github.com");
         auto url = fmt("https://api.%s/repos/%s/%s/tarball/%s", // FIXME: check if this is correct for self hosted instances
             host_url, getStrAttr(input.attrs, "owner"), getStrAttr(input.attrs, "repo"),
             input.getRev()->to_string(Base16, false));
@@ -236,7 +236,7 @@ struct GitLabInputScheme : GitArchiveInputScheme
 
     Hash getRevFromRef(nix::ref<Store> store, const Input & input) const override
     {
-        auto host_url = maybeGetStrAttr(input.attrs, "url").value_or("gitlab.com");
+        auto host_url = maybeGetStrAttr(input.attrs, "host").value_or("gitlab.com");
         auto url = fmt("https://%s/api/v4/projects/%s%%2F%s/repository/commits?ref_name=%s",
             host_url, getStrAttr(input.attrs, "owner"), getStrAttr(input.attrs, "repo"), *input.getRef());
         auto json = nlohmann::json::parse(

From e8e1d420f364afbfface61d3f03889e10e6066c9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 18:22:45 +0200
Subject: [PATCH 171/176] Don't include <regex> in header files

This reduces compilation time by ~15 seconds (CPU time).

Issue #4045.
---
 src/libexpr/eval.cc                   |  1 +
 src/libexpr/eval.hh                   |  8 +++--
 src/libexpr/flake/flakeref.cc         |  1 +
 src/libexpr/flake/lockfile.cc         |  1 +
 src/libexpr/primops.cc                | 18 ++++++++---
 src/libexpr/primops/fetchMercurial.cc |  3 +-
 src/libfetchers/git.cc                |  1 +
 src/libfetchers/github.cc             |  1 +
 src/libfetchers/indirect.cc           |  1 +
 src/libfetchers/mercurial.cc          |  1 +
 src/libstore/names.cc                 | 21 +++++++++++--
 src/libstore/names.hh                 |  7 +++--
 src/libutil/url-parts.hh              | 44 +++++++++++++++++++++++++++
 src/libutil/url.cc                    |  1 +
 src/libutil/url.hh                    | 38 -----------------------
 src/nix-env/nix-env.cc                |  2 +-
 16 files changed, 96 insertions(+), 53 deletions(-)
 create mode 100644 src/libutil/url-parts.hh

diff --git a/src/libexpr/eval.cc b/src/libexpr/eval.cc
index 139067f20..883fc27a7 100644
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -356,6 +356,7 @@ EvalState::EvalState(const Strings & _searchPath, ref<Store> store)
     , sEpsilon(symbols.create(""))
     , repair(NoRepair)
     , store(store)
+    , regexCache(makeRegexCache())
     , baseEnv(allocEnv(128))
     , staticBaseEnv(false, 0)
 {
diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh
index 80078d8a5..0e1f61baa 100644
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -6,7 +6,6 @@
 #include "symbol-table.hh"
 #include "config.hh"
 
-#include <regex>
 #include <map>
 #include <optional>
 #include <unordered_map>
@@ -65,6 +64,11 @@ typedef std::list<SearchPathElem> SearchPath;
 void initGC();
 
 
+struct RegexCache;
+
+std::shared_ptr<RegexCache> makeRegexCache();
+
+
 class EvalState
 {
 public:
@@ -120,7 +124,7 @@ private:
     std::unordered_map<Path, Path> resolvedPaths;
 
     /* Cache used by prim_match(). */
-    std::unordered_map<std::string, std::regex> regexCache;
+    std::shared_ptr<RegexCache> regexCache;
 
 public:
 
diff --git a/src/libexpr/flake/flakeref.cc b/src/libexpr/flake/flakeref.cc
index 6363446f6..d5c2ffe66 100644
--- a/src/libexpr/flake/flakeref.cc
+++ b/src/libexpr/flake/flakeref.cc
@@ -1,6 +1,7 @@
 #include "flakeref.hh"
 #include "store-api.hh"
 #include "url.hh"
+#include "url-parts.hh"
 #include "fetchers.hh"
 #include "registry.hh"
 
diff --git a/src/libexpr/flake/lockfile.cc b/src/libexpr/flake/lockfile.cc
index a74846944..78431f000 100644
--- a/src/libexpr/flake/lockfile.cc
+++ b/src/libexpr/flake/lockfile.cc
@@ -1,5 +1,6 @@
 #include "lockfile.hh"
 #include "store-api.hh"
+#include "url-parts.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc
index 7e8526ea1..9cfe3f402 100644
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -3085,17 +3085,25 @@ static RegisterPrimOp primop_hashString({
     .fun = prim_hashString,
 });
 
-/* Match a regular expression against a string and return either
-   ‘null’ or a list containing substring matches. */
+struct RegexCache
+{
+    std::unordered_map<std::string, std::regex> cache;
+};
+
+std::shared_ptr<RegexCache> makeRegexCache()
+{
+    return std::make_shared<RegexCache>();
+}
+
 void prim_match(EvalState & state, const Pos & pos, Value * * args, Value & v)
 {
     auto re = state.forceStringNoCtx(*args[0], pos);
 
     try {
 
-        auto regex = state.regexCache.find(re);
-        if (regex == state.regexCache.end())
-            regex = state.regexCache.emplace(re, std::regex(re, std::regex::extended)).first;
+        auto regex = state.regexCache->cache.find(re);
+        if (regex == state.regexCache->cache.end())
+            regex = state.regexCache->cache.emplace(re, std::regex(re, std::regex::extended)).first;
 
         PathSet context;
         const std::string str = state.forceString(*args[1], context, pos);
diff --git a/src/libexpr/primops/fetchMercurial.cc b/src/libexpr/primops/fetchMercurial.cc
index cef85cfef..1a064ed5c 100644
--- a/src/libexpr/primops/fetchMercurial.cc
+++ b/src/libexpr/primops/fetchMercurial.cc
@@ -3,8 +3,7 @@
 #include "store-api.hh"
 #include "fetchers.hh"
 #include "url.hh"
-
-#include <regex>
+#include "url-parts.hh"
 
 namespace nix {
 
diff --git a/src/libfetchers/git.cc b/src/libfetchers/git.cc
index 5ca0f8521..ad7638d73 100644
--- a/src/libfetchers/git.cc
+++ b/src/libfetchers/git.cc
@@ -3,6 +3,7 @@
 #include "globals.hh"
 #include "tarfile.hh"
 #include "store-api.hh"
+#include "url-parts.hh"
 
 #include <sys/time.h>
 
diff --git a/src/libfetchers/github.cc b/src/libfetchers/github.cc
index a4db5c5fa..1737658a7 100644
--- a/src/libfetchers/github.cc
+++ b/src/libfetchers/github.cc
@@ -3,6 +3,7 @@
 #include "fetchers.hh"
 #include "globals.hh"
 #include "store-api.hh"
+#include "url-parts.hh"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/libfetchers/indirect.cc b/src/libfetchers/indirect.cc
index b981d4d8e..74332ae3d 100644
--- a/src/libfetchers/indirect.cc
+++ b/src/libfetchers/indirect.cc
@@ -1,4 +1,5 @@
 #include "fetchers.hh"
+#include "url-parts.hh"
 
 namespace nix::fetchers {
 
diff --git a/src/libfetchers/mercurial.cc b/src/libfetchers/mercurial.cc
index 3e76ffc4d..d80c2ea7a 100644
--- a/src/libfetchers/mercurial.cc
+++ b/src/libfetchers/mercurial.cc
@@ -3,6 +3,7 @@
 #include "globals.hh"
 #include "tarfile.hh"
 #include "store-api.hh"
+#include "url-parts.hh"
 
 #include <sys/time.h>
 
diff --git a/src/libstore/names.cc b/src/libstore/names.cc
index d1c8a6101..41e28dc99 100644
--- a/src/libstore/names.cc
+++ b/src/libstore/names.cc
@@ -1,10 +1,18 @@
 #include "names.hh"
 #include "util.hh"
 
+#include <regex>
+
 
 namespace nix {
 
 
+struct Regex
+{
+    std::regex regex;
+};
+
+
 DrvName::DrvName()
 {
     name = "";
@@ -30,11 +38,18 @@ DrvName::DrvName(std::string_view s) : hits(0)
 }
 
 
+DrvName::~DrvName()
+{ }
+
+
 bool DrvName::matches(DrvName & n)
 {
     if (name != "*") {
-        if (!regex) regex = std::unique_ptr<std::regex>(new std::regex(name, std::regex::extended));
-        if (!std::regex_match(n.name, *regex)) return false;
+        if (!regex) {
+            regex = std::make_unique<Regex>();
+            regex->regex = std::regex(name, std::regex::extended);
+        }
+        if (!std::regex_match(n.name, regex->regex)) return false;
     }
     if (version != "" && version != n.version) return false;
     return true;
@@ -99,7 +114,7 @@ DrvNames drvNamesFromArgs(const Strings & opArgs)
 {
     DrvNames result;
     for (auto & i : opArgs)
-        result.push_back(DrvName(i));
+        result.emplace_back(i);
     return result;
 }
 
diff --git a/src/libstore/names.hh b/src/libstore/names.hh
index 00e14b8c7..bc62aac93 100644
--- a/src/libstore/names.hh
+++ b/src/libstore/names.hh
@@ -3,10 +3,11 @@
 #include <memory>
 
 #include "types.hh"
-#include <regex>
 
 namespace nix {
 
+struct Regex;
+
 struct DrvName
 {
     string fullName;
@@ -16,10 +17,12 @@ struct DrvName
 
     DrvName();
     DrvName(std::string_view s);
+    ~DrvName();
+
     bool matches(DrvName & n);
 
 private:
-    std::unique_ptr<std::regex> regex;
+    std::unique_ptr<Regex> regex;
 };
 
 typedef list<DrvName> DrvNames;
diff --git a/src/libutil/url-parts.hh b/src/libutil/url-parts.hh
new file mode 100644
index 000000000..64e06cfbc
--- /dev/null
+++ b/src/libutil/url-parts.hh
@@ -0,0 +1,44 @@
+#pragma once
+
+#include <string>
+#include <regex>
+
+namespace nix {
+
+// URI stuff.
+const static std::string pctEncoded = "(?:%[0-9a-fA-F][0-9a-fA-F])";
+const static std::string schemeRegex = "(?:[a-z+.-]+)";
+const static std::string ipv6AddressRegex = "(?:\\[[0-9a-fA-F:]+\\])";
+const static std::string unreservedRegex = "(?:[a-zA-Z0-9-._~])";
+const static std::string subdelimsRegex = "(?:[!$&'\"()*+,;=])";
+const static std::string hostnameRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + ")*)";
+const static std::string hostRegex = "(?:" + ipv6AddressRegex + "|" + hostnameRegex + ")";
+const static std::string userRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + "|:)*)";
+const static std::string authorityRegex = "(?:" + userRegex + "@)?" + hostRegex + "(?::[0-9]+)?";
+const static std::string pcharRegex = "(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + "|[:@])";
+const static std::string queryRegex = "(?:" + pcharRegex + "|[/? \"])*";
+const static std::string segmentRegex = "(?:" + pcharRegex + "+)";
+const static std::string absPathRegex = "(?:(?:/" + segmentRegex + ")*/?)";
+const static std::string pathRegex = "(?:" + segmentRegex + "(?:/" + segmentRegex + ")*/?)";
+
+// A Git ref (i.e. branch or tag name).
+const static std::string refRegexS = "[a-zA-Z0-9][a-zA-Z0-9_.-]*"; // FIXME: check
+extern std::regex refRegex;
+
+// Instead of defining what a good Git Ref is, we define what a bad Git Ref is
+// This is because of the definition of a ref in refs.c in https://github.com/git/git
+// See tests/fetchGitRefs.sh for the full definition
+const static std::string badGitRefRegexS = "//|^[./]|/\\.|\\.\\.|[[:cntrl:][:space:]:?^~\[]|\\\\|\\*|\\.lock$|\\.lock/|@\\{|[/.]$|^@$|^$";
+extern std::regex badGitRefRegex;
+
+// A Git revision (a SHA-1 commit hash).
+const static std::string revRegexS = "[0-9a-fA-F]{40}";
+extern std::regex revRegex;
+
+// A ref or revision, or a ref followed by a revision.
+const static std::string refAndOrRevRegex = "(?:(" + revRegexS + ")|(?:(" + refRegexS + ")(?:/(" + revRegexS + "))?))";
+
+const static std::string flakeIdRegexS = "[a-zA-Z][a-zA-Z0-9_-]*";
+extern std::regex flakeIdRegex;
+
+}
diff --git a/src/libutil/url.cc b/src/libutil/url.cc
index 88c09eef9..c1bab866c 100644
--- a/src/libutil/url.cc
+++ b/src/libutil/url.cc
@@ -1,4 +1,5 @@
 #include "url.hh"
+#include "url-parts.hh"
 #include "util.hh"
 
 namespace nix {
diff --git a/src/libutil/url.hh b/src/libutil/url.hh
index 1f716ba10..6e77142e3 100644
--- a/src/libutil/url.hh
+++ b/src/libutil/url.hh
@@ -2,8 +2,6 @@
 
 #include "error.hh"
 
-#include <regex>
-
 namespace nix {
 
 struct ParsedURL
@@ -29,40 +27,4 @@ std::map<std::string, std::string> decodeQuery(const std::string & query);
 
 ParsedURL parseURL(const std::string & url);
 
-// URI stuff.
-const static std::string pctEncoded = "(?:%[0-9a-fA-F][0-9a-fA-F])";
-const static std::string schemeRegex = "(?:[a-z+.-]+)";
-const static std::string ipv6AddressRegex = "(?:\\[[0-9a-fA-F:]+\\])";
-const static std::string unreservedRegex = "(?:[a-zA-Z0-9-._~])";
-const static std::string subdelimsRegex = "(?:[!$&'\"()*+,;=])";
-const static std::string hostnameRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + ")*)";
-const static std::string hostRegex = "(?:" + ipv6AddressRegex + "|" + hostnameRegex + ")";
-const static std::string userRegex = "(?:(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + "|:)*)";
-const static std::string authorityRegex = "(?:" + userRegex + "@)?" + hostRegex + "(?::[0-9]+)?";
-const static std::string pcharRegex = "(?:" + unreservedRegex + "|" + pctEncoded + "|" + subdelimsRegex + "|[:@])";
-const static std::string queryRegex = "(?:" + pcharRegex + "|[/? \"])*";
-const static std::string segmentRegex = "(?:" + pcharRegex + "+)";
-const static std::string absPathRegex = "(?:(?:/" + segmentRegex + ")*/?)";
-const static std::string pathRegex = "(?:" + segmentRegex + "(?:/" + segmentRegex + ")*/?)";
-
-// A Git ref (i.e. branch or tag name).
-const static std::string refRegexS = "[a-zA-Z0-9][a-zA-Z0-9_.-]*"; // FIXME: check
-extern std::regex refRegex;
-
-// Instead of defining what a good Git Ref is, we define what a bad Git Ref is
-// This is because of the definition of a ref in refs.c in https://github.com/git/git
-// See tests/fetchGitRefs.sh for the full definition
-const static std::string badGitRefRegexS = "//|^[./]|/\\.|\\.\\.|[[:cntrl:][:space:]:?^~\[]|\\\\|\\*|\\.lock$|\\.lock/|@\\{|[/.]$|^@$|^$";
-extern std::regex badGitRefRegex;
-
-// A Git revision (a SHA-1 commit hash).
-const static std::string revRegexS = "[0-9a-fA-F]{40}";
-extern std::regex revRegex;
-
-// A ref or revision, or a ref followed by a revision.
-const static std::string refAndOrRevRegex = "(?:(" + revRegexS + ")|(?:(" + refRegexS + ")(?:/(" + revRegexS + "))?))";
-
-const static std::string flakeIdRegexS = "[a-zA-Z][a-zA-Z0-9_-]*";
-extern std::regex flakeIdRegex;
-
 }
diff --git a/src/nix-env/nix-env.cc b/src/nix-env/nix-env.cc
index e5a433ac0..3e7c453fb 100644
--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -230,7 +230,7 @@ static DrvInfos filterBySelector(EvalState & state, const DrvInfos & allElems,
 {
     DrvNames selectors = drvNamesFromArgs(args);
     if (selectors.empty())
-        selectors.push_back(DrvName("*"));
+        selectors.emplace_back("*");
 
     DrvInfos elems;
     set<unsigned int> done;

From d51ba430473368b29abfd1a8c4655da74b3a780c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 18:40:11 +0200
Subject: [PATCH 172/176] Move Callback into its own header

This gets rid of the inclusion of <future> in util.hh, cutting
compilation time by ~20s (CPU time).

Issue #4045.
---
 src/libstore/binary-cache-store.cc      |  1 +
 src/libstore/build.cc                   |  1 +
 src/libstore/dummy-store.cc             |  1 +
 src/libstore/filetransfer.cc            |  1 +
 src/libstore/http-binary-cache-store.cc |  1 +
 src/libstore/legacy-ssh-store.cc        |  1 +
 src/libstore/local-store.cc             |  1 +
 src/libstore/misc.cc                    |  2 +-
 src/libstore/remote-store.cc            |  1 +
 src/libstore/store-api.cc               |  4 +--
 src/libutil/callback.hh                 | 46 +++++++++++++++++++++++++
 src/libutil/util.hh                     | 38 +-------------------
 12 files changed, 57 insertions(+), 41 deletions(-)
 create mode 100644 src/libutil/callback.hh

diff --git a/src/libstore/binary-cache-store.cc b/src/libstore/binary-cache-store.cc
index 34f844a18..ebc0bd6a4 100644
--- a/src/libstore/binary-cache-store.cc
+++ b/src/libstore/binary-cache-store.cc
@@ -11,6 +11,7 @@
 #include "nar-accessor.hh"
 #include "json.hh"
 #include "thread-pool.hh"
+#include "callback.hh"
 
 #include <chrono>
 #include <future>
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 6e55f83d5..0b51d90ea 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -17,6 +17,7 @@
 #include "daemon.hh"
 #include "worker-protocol.hh"
 #include "topo-sort.hh"
+#include "callback.hh"
 
 #include <algorithm>
 #include <iostream>
diff --git a/src/libstore/dummy-store.cc b/src/libstore/dummy-store.cc
index 128832e60..49641c2ac 100644
--- a/src/libstore/dummy-store.cc
+++ b/src/libstore/dummy-store.cc
@@ -1,4 +1,5 @@
 #include "store-api.hh"
+#include "callback.hh"
 
 namespace nix {
 
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc
index 4149f8155..6241b5e00 100644
--- a/src/libstore/filetransfer.cc
+++ b/src/libstore/filetransfer.cc
@@ -5,6 +5,7 @@
 #include "s3.hh"
 #include "compression.hh"
 #include "finally.hh"
+#include "callback.hh"
 
 #ifdef ENABLE_S3
 #include <aws/core/client/ClientConfiguration.h>
diff --git a/src/libstore/http-binary-cache-store.cc b/src/libstore/http-binary-cache-store.cc
index f4ab15a10..86be7c006 100644
--- a/src/libstore/http-binary-cache-store.cc
+++ b/src/libstore/http-binary-cache-store.cc
@@ -2,6 +2,7 @@
 #include "filetransfer.hh"
 #include "globals.hh"
 #include "nar-info-disk-cache.hh"
+#include "callback.hh"
 
 namespace nix {
 
diff --git a/src/libstore/legacy-ssh-store.cc b/src/libstore/legacy-ssh-store.cc
index e9478c1d5..5af75669a 100644
--- a/src/libstore/legacy-ssh-store.cc
+++ b/src/libstore/legacy-ssh-store.cc
@@ -6,6 +6,7 @@
 #include "worker-protocol.hh"
 #include "ssh.hh"
 #include "derivations.hh"
+#include "callback.hh"
 
 namespace nix {
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index c618203f0..94ff34cb8 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -6,6 +6,7 @@
 #include "derivations.hh"
 #include "nar-info.hh"
 #include "references.hh"
+#include "callback.hh"
 
 #include <iostream>
 #include <algorithm>
diff --git a/src/libstore/misc.cc b/src/libstore/misc.cc
index da3981696..ad4dccef9 100644
--- a/src/libstore/misc.cc
+++ b/src/libstore/misc.cc
@@ -5,7 +5,7 @@
 #include "store-api.hh"
 #include "thread-pool.hh"
 #include "topo-sort.hh"
-
+#include "callback.hh"
 
 namespace nix {
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index e92b94975..27535f1d0 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -10,6 +10,7 @@
 #include "pool.hh"
 #include "finally.hh"
 #include "logging.hh"
+#include "callback.hh"
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/src/libstore/store-api.cc b/src/libstore/store-api.cc
index 2d5077ed0..1bbc74db8 100644
--- a/src/libstore/store-api.cc
+++ b/src/libstore/store-api.cc
@@ -8,9 +8,7 @@
 #include "json.hh"
 #include "url.hh"
 #include "archive.hh"
-
-#include <future>
-
+#include "callback.hh"
 
 namespace nix {
 
diff --git a/src/libutil/callback.hh b/src/libutil/callback.hh
new file mode 100644
index 000000000..ef31794be
--- /dev/null
+++ b/src/libutil/callback.hh
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <future>
+#include <functional>
+
+namespace nix {
+
+/* A callback is a wrapper around a lambda that accepts a valid of
+   type T or an exception. (We abuse std::future<T> to pass the value or
+   exception.) */
+template<typename T>
+class Callback
+{
+    std::function<void(std::future<T>)> fun;
+    std::atomic_flag done = ATOMIC_FLAG_INIT;
+
+public:
+
+    Callback(std::function<void(std::future<T>)> fun) : fun(fun) { }
+
+    Callback(Callback && callback) : fun(std::move(callback.fun))
+    {
+        auto prev = callback.done.test_and_set();
+        if (prev) done.test_and_set();
+    }
+
+    void operator()(T && t) noexcept
+    {
+        auto prev = done.test_and_set();
+        assert(!prev);
+        std::promise<T> promise;
+        promise.set_value(std::move(t));
+        fun(promise.get_future());
+    }
+
+    void rethrow(const std::exception_ptr & exc = std::current_exception()) noexcept
+    {
+        auto prev = done.test_and_set();
+        assert(!prev);
+        std::promise<T> promise;
+        promise.set_exception(exc);
+        fun(promise.get_future());
+    }
+};
+
+}
diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 082e26375..91e0a1543 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -17,7 +17,6 @@
 #include <map>
 #include <sstream>
 #include <optional>
-#include <future>
 #include <iterator>
 
 #ifndef HAVE_STRUCT_DIRENT_D_TYPE
@@ -480,43 +479,8 @@ std::optional<typename T::mapped_type> get(const T & map, const typename T::key_
 }
 
 
-/* A callback is a wrapper around a lambda that accepts a valid of
-   type T or an exception. (We abuse std::future<T> to pass the value or
-   exception.) */
 template<typename T>
-class Callback
-{
-    std::function<void(std::future<T>)> fun;
-    std::atomic_flag done = ATOMIC_FLAG_INIT;
-
-public:
-
-    Callback(std::function<void(std::future<T>)> fun) : fun(fun) { }
-
-    Callback(Callback && callback) : fun(std::move(callback.fun))
-    {
-        auto prev = callback.done.test_and_set();
-        if (prev) done.test_and_set();
-    }
-
-    void operator()(T && t) noexcept
-    {
-        auto prev = done.test_and_set();
-        assert(!prev);
-        std::promise<T> promise;
-        promise.set_value(std::move(t));
-        fun(promise.get_future());
-    }
-
-    void rethrow(const std::exception_ptr & exc = std::current_exception()) noexcept
-    {
-        auto prev = done.test_and_set();
-        assert(!prev);
-        std::promise<T> promise;
-        promise.set_exception(exc);
-        fun(promise.get_future());
-    }
-};
+class Callback;
 
 
 /* Start a thread that handles various signals. Also block those signals

From 340ca382c4de5863f0ecb5c67bae5461ea20c60b Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 18:47:18 +0200
Subject: [PATCH 173/176] Don't include nlohmann/json.hpp in globals.hh

This reduces compilation time by 207s.

Issue #4045.
---
 src/libstore/globals.cc | 1 +
 src/libstore/globals.hh | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 491c664db..7b841d925 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -2,6 +2,7 @@
 #include "util.hh"
 #include "archive.hh"
 #include "args.hh"
+#include "abstractsettingtojson.hh"
 
 #include <algorithm>
 #include <map>
diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh
index 02721285a..8a2d3ff75 100644
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -2,7 +2,6 @@
 
 #include "types.hh"
 #include "config.hh"
-#include "abstractsettingtojson.hh"
 #include "util.hh"
 
 #include <map>

From 0716adaa8b23855bd5e1a59f4115ec933b6a9205 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 18:49:43 +0200
Subject: [PATCH 174/176] abstractsettingtojson.hh ->
 abstract-setting-to-json.hh

---
 src/libstore/globals.cc                                         | 2 +-
 .../{abstractsettingtojson.hh => abstract-setting-to-json.hh}   | 0
 src/libutil/config.cc                                           | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/libutil/{abstractsettingtojson.hh => abstract-setting-to-json.hh} (100%)

diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index 7b841d925..0beb9b2b7 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -2,7 +2,7 @@
 #include "util.hh"
 #include "archive.hh"
 #include "args.hh"
-#include "abstractsettingtojson.hh"
+#include "abstract-setting-to-json.hh"
 
 #include <algorithm>
 #include <map>
diff --git a/src/libutil/abstractsettingtojson.hh b/src/libutil/abstract-setting-to-json.hh
similarity index 100%
rename from src/libutil/abstractsettingtojson.hh
rename to src/libutil/abstract-setting-to-json.hh
diff --git a/src/libutil/config.cc b/src/libutil/config.cc
index 309d23b40..5e6a211df 100644
--- a/src/libutil/config.cc
+++ b/src/libutil/config.cc
@@ -1,6 +1,6 @@
 #include "config.hh"
 #include "args.hh"
-#include "abstractsettingtojson.hh"
+#include "abstract-setting-to-json.hh"
 
 #include <nlohmann/json.hpp>
 

From 557d2427ee7c21b32e691e1c44f682b667673a70 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 18:57:02 +0200
Subject: [PATCH 175/176] Random header cleanup

---
 src/libutil/util.hh | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/libutil/util.hh b/src/libutil/util.hh
index 91e0a1543..b8e201203 100644
--- a/src/libutil/util.hh
+++ b/src/libutil/util.hh
@@ -12,12 +12,9 @@
 #include <signal.h>
 
 #include <functional>
-#include <limits>
-#include <cstdio>
 #include <map>
 #include <sstream>
 #include <optional>
-#include <iterator>
 
 #ifndef HAVE_STRUCT_DIRENT_D_TYPE
 #define DT_UNKNOWN 0

From ecc8672aa007af045d77434b495ca09541e9fee3 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 21 Sep 2020 19:06:23 +0200
Subject: [PATCH 176/176] fmt.hh: Don't include
 boost/algorithm/string/replace.hpp

This cuts compilation time by ~49s.

Issue #4045.
---
 src/libutil/fmt.hh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/libutil/fmt.hh b/src/libutil/fmt.hh
index a39de041f..6e69bdce2 100644
--- a/src/libutil/fmt.hh
+++ b/src/libutil/fmt.hh
@@ -1,7 +1,6 @@
 #pragma once
 
 #include <boost/format.hpp>
-#include <boost/algorithm/string/replace.hpp>
 #include <string>
 #include "ansicolor.hh"