From 9000150a784d05a76455886b1ad8a95e0cff2115 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 3 Jan 2017 16:41:34 +0100 Subject: Drop a few more references to all-packages.nix And also don't refer to f-spot, which apparently no longer exists. Issue #1170. --- doc/manual/command-ref/nix-env.xml | 14 ++++---------- doc/manual/command-ref/opt-common.xml | 5 ++--- 2 files changed, 6 insertions(+), 13 deletions(-) (limited to 'doc') diff --git a/doc/manual/command-ref/nix-env.xml b/doc/manual/command-ref/nix-env.xml index 2ed4a5d9f666..85f10e0760bc 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: -$ 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 - ... -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 ... diff --git a/doc/manual/command-ref/opt-common.xml b/doc/manual/command-ref/opt-common.xml index 14353122fde6..2a076877a1b4 100644 --- a/doc/manual/command-ref/opt-common.xml +++ b/doc/manual/command-ref/opt-common.xml @@ -235,9 +235,8 @@ named name, it will call it with value value. - For instance, the file - pkgs/top-level/all-packages.nix in Nixpkgs is - actually a function: + 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. -- cgit 1.4.1