diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:29:08 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 17:37:11 +0200 |
| commit | 2cd7c1f19888ae73bf7ef0f41a45680cfb86334a (patch) | |
| tree | 1d153e8744e4fb693b78f5a7c1ac445201b610a2 /nixos/doc/manual/configuration | |
| parent | 91e71725d49c185401f459f58062b02bcbf1651e (diff) | |
| download | nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar.gz nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar.bz2 nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar.lz nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar.xz nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.tar.zst nixlib-2cd7c1f19888ae73bf7ef0f41a45680cfb86334a.zip | |
Unify NixOS and Nixpkgs channel structure
This is primarily to ensure that -I nixpkgs=https://nixos.org/channels/nixos-unstable/nixexprs.tar.xz and -I nixpkgs=https://github.com/NixOS/nixpkgs-channels/archive/nixos-unstable.tar.gz and -I nixpkgs=https://nixos.org/channels/nixpkgs-unstable/nixexprs.tar.xz behave consistently. It also allows installing packages via "nix-env -iA nixos.<pkg>" rather than "nixos.pkgs.<pkg>". It would be even better to allow "nixpkgs.<pkg>", but that requires a change to nix-channel. Fixes #7659.
Diffstat (limited to 'nixos/doc/manual/configuration')
| -rw-r--r-- | nixos/doc/manual/configuration/ad-hoc-packages.xml | 2 | ||||
| -rw-r--r-- | nixos/doc/manual/configuration/declarative-packages.xml | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml index e237e20c4fff..a147291c4f3d 100644 --- a/nixos/doc/manual/configuration/ad-hoc-packages.xml +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -11,7 +11,7 @@ uninstall packages from the command line. For instance, to install Mozilla Thunderbird: <screen> -$ nix-env -iA nixos.pkgs.thunderbird</screen> +$ nix-env -iA nixos.thunderbird</screen> If you invoke this as root, the package is installed in the Nix profile <filename>/nix/var/nix/profiles/default</filename> and visible diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml index 6de38b452e24..dc2fa715097c 100644 --- a/nixos/doc/manual/configuration/declarative-packages.xml +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -23,13 +23,13 @@ Nixpkgs will be built or downloaded as part of the system when you run <para>You can get a list of the available packages as follows: <screen> $ nix-env -qaP '*' --description -nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded +nixos.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded <replaceable>...</replaceable> </screen> The first column in the output is the <emphasis>attribute name</emphasis>, such as -<literal>nixos.pkgs.thunderbird</literal>. (The +<literal>nixos.thunderbird</literal>. (The <literal>nixos</literal> prefix allows distinguishing between different channels that you might have.)</para> |