diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 16:41:34 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-01-03 16:42:24 +0100 |
| commit | 9000150a784d05a76455886b1ad8a95e0cff2115 (patch) | |
| tree | 194b633f72d2d613a606df1736787ee50fba91ed | |
| parent | 5d377ace2d74475ef696bce4ac0e61946d5b3769 (diff) | |
Drop a few more references to all-packages.nix
And also don't refer to f-spot, which apparently no longer exists.
Issue #1170.
| -rw-r--r-- | doc/manual/command-ref/nix-env.xml | 14 | ||||
| -rw-r--r-- | doc/manual/command-ref/opt-common.xml | 5 |
2 files changed, 6 insertions, 13 deletions
diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index 2ed4a5d9f..85f10e076 100644 --- a/doc/manual/command-ref/nix-env.xml +++ b/doc/manual/command-ref/nix-env.xml @@ -493,17 +493,11 @@ set returned by calling the function defined in source: <screen> -$ nix-env -f pkgs/top-level/all-packages.nix -i f-spot --dry-run +$ nix-env -f '<nixpkgs>' -iA hello --dry-run (dry run; not doing anything) -installing `f-spot-0.0.10' -the following derivations will be built: - /nix/store/0g63jv9aagwbgci4nnzs2dkxqz84kdja-libgnomeprintui-2.12.1.tar.bz2.drv - /nix/store/0gfarvxq6sannsdw8a1ir40j1ys2mqb4-ORBit2-2.14.2.tar.bz2.drv - /nix/store/0i9gs5zc04668qiy60ga2rc16abkj7g8-sqlite-2.8.17.drv - <replaceable>...</replaceable> -the following paths will be substituted: - /nix/store/8zbipvm4gp9jfqh9nnk1n3bary1a37gs-perl-XML-Parser-2.34 - /nix/store/b8a2bg7gnyvvvjjibp4axg9x1hzkw36c-mono-1.1.4 +installing ‘hello-2.10’ +these paths will be fetched (0.04 MiB download, 0.19 MiB unpacked): + /nix/store/wkhdf9jinag5750mqlax6z2zbwhqb76n-hello-2.10 <replaceable>...</replaceable></screen> </para> diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml index 14353122f..2a076877a 100644 --- a/doc/manual/command-ref/opt-common.xml +++ b/doc/manual/command-ref/opt-common.xml @@ -235,9 +235,8 @@ named <replaceable>name</replaceable>, it will call it with value <replaceable>value</replaceable>.</para> - <para>For instance, the file - <literal>pkgs/top-level/all-packages.nix</literal> in Nixpkgs is - actually a function: + <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. |