Author: eelco
Date: Wed Apr 18 10:58:33 2012
New Revision: 33823
URL: https://nixos.org/websvn/nix/?rev=33823&sc=1
Log:
* Don't install the "nixpkgs_sys" symlink in ~/.nix-defexpr anymore.
Note that for attribute-based nix-env installations, the NixOS
channel contains Nixpkgs as its "pkgs" attribute, so
$ nix-env -iA nixos.pkgs.foo
will work instead of the old
$ nix-env -iA nixpkgs_sys.foo
* Fix the path to root's channels installed in ~/.nix-defexpr.
Modified:
nixos/trunk/modules/programs/bash/profile.sh
Modified: nixos/trunk/modules/programs/bash/profile.sh
==============================================================================
--- nixos/trunk/modules/programs/bash/profile.sh Wed Apr 18 10:34:39
2012 (r33822)
+++ nixos/trunk/modules/programs/bash/profile.sh Wed Apr 18 10:58:33
2012 (r33823)
@@ -93,13 +93,12 @@
fi
# Set up a default Nix expression from which to install stuff.
-if test ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr; then
+if [ ! -e $HOME/.nix-defexpr -o -L $HOME/.nix-defexpr ]; then
echo "creating $HOME/.nix-defexpr" >&2
rm -f $HOME/.nix-defexpr
mkdir $HOME/.nix-defexpr
- ln -s /etc/nixos/nixpkgs $HOME/.nix-defexpr/nixpkgs_sys
- if test "$USER" != root; then
- ln -s /nix/var/nix/gcroots/per-user/root/channels
$HOME/.nix-defexpr/channels_root
+ if [ "$USER" != root ]; then
+ ln -s /nix/var/nix/profiles/per-user/root/channels
$HOME/.nix-defexpr/channels_root
fi
fi
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
