summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-04-13 12:20:58 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-04-13 12:20:58 +0200
commit5075cbe6967324123e7a9fc38fcd35371f2b91df (patch)
treed990c3760e6e1d9efda8b9b99489fce1e25fe2c3 /nixos
parent3a4fd0bfc6fb34a496708ee95891acb1648eedde (diff)
downloadnixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar.gz
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar.bz2
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar.lz
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar.xz
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.tar.zst
nixlib-5075cbe6967324123e7a9fc38fcd35371f2b91df.zip
nixos: Put root's channels to the end of NIX_PATH.
My original reason to put it at the beginning of NIX_PATH was to allow
shipping a particular version <nixpkgs> with a channel. But in order to
do that, we can still let the channel expression ship with a custom
version of nixpkgs by something like <channel/nixpkgs> and the builder
of the channel could also rewrite self-references.

So the inconvenience is now shifted towards the maintainer of the
channel rather than the user (which isn't nice, but better err on the
side of the developer rather than on the user), because as @edolstra
pointed out: Having the channels of root at the beginning of NIX_PATH
could have unintended side-effects if there a channel called nixpkgs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'nixos')
-rw-r--r--nixos/modules/programs/environment.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix
index 1a211b8c84fc..dce757ceb623 100644
--- a/nixos/modules/programs/environment.nix
+++ b/nixos/modules/programs/environment.nix
@@ -25,10 +25,10 @@ in
 
     environment.sessionVariables =
       { NIX_PATH =
-          [ "/nix/var/nix/profiles/per-user/root/channels"
-            "/nix/var/nix/profiles/per-user/root/channels/nixos"
+          [ "/nix/var/nix/profiles/per-user/root/channels/nixos"
             "nixpkgs=/etc/nixos/nixpkgs"
             "nixos-config=/etc/nixos/configuration.nix"
+            "/nix/var/nix/profiles/per-user/root/channels"
           ];
       };