From 055608227f5a003825a905b0eb2aea39cba5ca16 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Sep 2007 16:08:24 +0000 Subject: * nix-env: allow ~/.nix-defexpr to be a directory. If it is, then the Nix expressions in that directory are combined into an attribute set {file1 = import file1; file2 = import file2; ...}, i.e. each Nix expression is an attribute with the file name as the attribute name. Also recurses into directories. * nix-env: removed the "--import" (-I) option which set the ~/.nix-defexpr symlink. * nix-channel: don't use "nix-env --import", instead symlink ~/.nix-defexpr/channels. So finally nix-channel --update doesn't override any default Nix expressions but combines with them. This means that you can have (say) a local Nixpkgs SVN tree and use it as a default for nix-env: $ ln -s .../path-to-nixpkgs-tree ~/.nix-defexpr/nixpkgs_svn and be subscribed to channels (including Nixpkgs) at the same time. (If there is any ambiguity, the -A flag can be used to disambiguate, e.g. "nix-env -i -A nixpkgs_svn.pan".) --- scripts/nix-channel.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts/nix-channel.in') diff --git a/scripts/nix-channel.in b/scripts/nix-channel.in index 1efb1a03a128..c023a75398e6 100644 --- a/scripts/nix-channel.in +++ b/scripts/nix-channel.in @@ -18,6 +18,8 @@ $ENV{'NIX_DOWNLOAD_CACHE'} = $channelCache if -W $channelCache; my $home = $ENV{"HOME"}; die '$HOME not set' unless defined $home; my $channelsList = "$home/.nix-channels"; + +my $nixDefExpr = "$home/.nix-defexpr"; my @channels; @@ -136,9 +138,12 @@ sub update { unlink "$rootFile.tmp"; - # Make it the default Nix expression for `nix-env'. - system("@bindir@/nix-env", "--import", "$outPath") == 0 - or die "cannot pull set default Nix expression to `$outPath'"; + # Make the channels appear in nix-env. + unlink $nixDefExpr if -l $nixDefExpr; # old-skool ~/.nix-defexpr + mkdir $nixDefExpr or die "cannot create directory `$nixDefExpr'" if !-e $nixDefExpr; + my $channelLink = "$nixDefExpr/channels"; + unlink $channelLink; # !!! not atomic + symlink($outPath, $channelLink) or die "cannot symlink `$channelLink' to `$outPath'"; } -- cgit 1.4.1