From 66e94d3275e9a0a549c28b7d0ad5f3f897e2fbf0 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Fri, 6 Feb 2004 10:30:20 +0000
Subject: * Improvements to profiles.  Generations are now per-profile, e.g.,

  default -> default-94-link
  default-82-link -> /nix/store/cc4480...
  default-83-link -> /nix/store/caeec8...
  ...
  default-94-link -> /nix/store/2896ca...
  experimental -> experimental-2-link
  experimental-1-link -> /nix/store/cc4480...
  experimental-2-link -> /nix/store/a3148f...

* `--profile' / `-p' -> `--switch-profile' / `-S'
* `--link' / `-l' -> `--profile' / `-p'
* The default profile is stored in $prefix/var/nix/profiles.
  $prefix/var/nix/links is gone.  Profiles can be stored anywhere.
* The current profile is now referenced from ~/.nix-profile, not
  ~/.nix-userenv.
* The roots to the garbage collector now have extension `.gcroot', not
  `.id'.
---
 scripts/nix-collect-garbage.in | 4 ++--
 scripts/nix-profile.sh.in      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'scripts')

diff --git a/scripts/nix-collect-garbage.in b/scripts/nix-collect-garbage.in
index d0552fd2f6e0..1effc14d6757 100755
--- a/scripts/nix-collect-garbage.in
+++ b/scripts/nix-collect-garbage.in
@@ -3,7 +3,7 @@
 use strict;
 use IPC::Open2;
 
-my $linkdir = "@localstatedir@/nix/links";
+my $linkdir = "@localstatedir@/nix/profiles";
 my $storedir = "@prefix@/store";
 
 my %alive;
@@ -24,7 +24,7 @@ closedir DIR;
 my @roots;
 foreach my $link (@links) {
     $link = $linkdir . "/" . $link;
-    next if (!($link =~ /.id$/));
+    next if (!($link =~ /.gcroot$/));
     open ROOT, "<$link" or die "cannot open $link: $!";
     my $root = <ROOT>;
     chomp $root;
diff --git a/scripts/nix-profile.sh.in b/scripts/nix-profile.sh.in
index 55cff3e62d9c..7f19f801484c 100644
--- a/scripts/nix-profile.sh.in
+++ b/scripts/nix-profile.sh.in
@@ -1,9 +1,9 @@
 if test -n "$HOME"; then
-    NIX_LINK="$HOME/.nix-userenv"
+    NIX_LINK="$HOME/.nix-profile"
 
     if ! test -L "$NIX_LINK"; then
         echo "creating $NIX_LINK"
-        _NIX_DEF_LINK=@localstatedir@/nix/links/current
+        _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
         ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
     fi
 
-- 
cgit 1.4.1