From 22dbea916126bf6698529056fa6ac3ffdb2fe2a4 Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Sun, 8 Oct 2006 22:04:44 +0000
Subject: [PATCH] upgrade to 0.10

svn path=/nixpkgs/trunk/; revision=6679
---
 pkgs/misc/nix/default.nix             |  7 +++----
 pkgs/misc/nix/nix-profile-0.9.2.patch | 12 ------------
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/misc/nix/nix-profile-0.9.2.patch

diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix
index a77e1c538737..1160dcefe897 100644
--- a/pkgs/misc/nix/default.nix
+++ b/pkgs/misc/nix/default.nix
@@ -8,13 +8,12 @@ assert aterm != null && bdb != null && perl != null;
 # assert aterm.version >= 2.0
 
 stdenv.mkDerivation {
-  name = "nix-0.9.2";
+  name = "nix-0.10";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/nix/nix-0.9.2/nix-0.9.2.tar.bz2;
-    md5 = "fc3a24f72760e357ac29935b2aebce0b";
+    url = http://nix.cs.uu.nl/dist/nix/nix-0.10/nix-0.10.tar.bz2;
+    md5 = "2e5db8be894b28873b5bb1b25194955f";
   };
   buildInputs = [aterm bdb perl curl];
-  patches = [./nix-profile-0.9.2.patch];
   inherit storeDir stateDir aterm bdb;
 }
diff --git a/pkgs/misc/nix/nix-profile-0.9.2.patch b/pkgs/misc/nix/nix-profile-0.9.2.patch
deleted file mode 100644
index 9acc802a2a82..000000000000
--- a/pkgs/misc/nix/nix-profile-0.9.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN nix-0.9.2/scripts/nix-profile.sh.in nix-0.9.2.new/scripts/nix-profile.sh.in
---- nix-0.9.2/scripts/nix-profile.sh.in	2005-09-21 20:29:43.000000000 +0200
-+++ nix-0.9.2.new/scripts/nix-profile.sh.in	2005-10-11 18:44:57.000000000 +0200
-@@ -4,7 +4,7 @@
-     if ! test -L "$NIX_LINK"; then
-         echo "creating $NIX_LINK"
-         _NIX_DEF_LINK=@localstatedir@/nix/profiles/default
--        ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
-+        @coreutils@/ln -s "$_NIX_DEF_LINK" "$NIX_LINK"
-     fi
- 
-     export PATH=$NIX_LINK/bin:@prefix@/bin:$PATH