diff options
Diffstat (limited to 'tools/nixery/docs')
| -rw-r--r-- | tools/nixery/docs/default.nix | 8 | ||||
| -rw-r--r-- | tools/nixery/docs/src/nixery.md | 10 |
2 files changed, 7 insertions, 11 deletions
diff --git a/tools/nixery/docs/default.nix b/tools/nixery/docs/default.nix index 876a34dcf152..74409fcfa92f 100644 --- a/tools/nixery/docs/default.nix +++ b/tools/nixery/docs/default.nix @@ -7,7 +7,7 @@ # Some of the documentation is pulled in and included from other # sources. -{ fetchFromGitHub, mdbook, runCommand, rustPlatform }: +{ fetchFromGitHub, mdbook, runCommand, rustPlatform, postamble ? "" }: let nix-1p = fetchFromGitHub { @@ -17,10 +17,14 @@ let sha256 = "1pf9i90gn98vz67h296w5lnwhssk62dc6pij983dff42dbci7lhj"; }; in -runCommand "nixery-book" { } '' +runCommand "nixery-book" +{ + POSTAMBLE = postamble; +} '' mkdir -p $out cp -r ${./.}/* . chmod -R a+w src cp ${nix-1p}/README.md src/nix-1p.md + echo "''${POSTAMBLE}" >> src/nixery.md ${mdbook}/bin/mdbook build -d $out '' diff --git a/tools/nixery/docs/src/nixery.md b/tools/nixery/docs/src/nixery.md index d9ba179010f6..0d55cfb545d9 100644 --- a/tools/nixery/docs/src/nixery.md +++ b/tools/nixery/docs/src/nixery.md @@ -34,7 +34,7 @@ meta-package that automatically expands to several other packages. Meta-packages **must** be the first path component if they are used. Currently there are only two meta-packages: -- `shell`, which provides a `bash`-shell with interactive configuration and +- `shell`, which provides a `bash`-shell with interactive configuration and standard tools like `coreutils`. - `arm64`, which provides ARM64 binaries. @@ -53,14 +53,6 @@ Over [on Github][Nixery]. It is licensed under the Apache 2.0 license. Consult the documentation entries in the sidebar for information on how to set up your own instance of Nixery. -### Which revision of `nixpkgs` is used for the builds? - -The instance at `nixery.dev` tracks a recent NixOS channel, currently NixOS -20.09. The channel is updated several times a day. - -Private registries might be configured to track a different channel (such as -`nixos-unstable`) or even track a git repository with custom packages. - ### Should I depend on `nixery.dev` in production? While we appreciate the enthusiasm, if you would like to use Nixery in your |