* update nixUnstable to nix-0.10pre5529

* remove patch for 0.9.2, because it is ancient history!

svn path=/nixpkgs/trunk/; revision=5605
This commit is contained in:
Armijn Hemel 2006-07-06 10:15:25 +00:00
parent e410c935a1
commit febd8ffe69
2 changed files with 3 additions and 16 deletions

View file

@ -8,13 +8,12 @@ assert aterm != null && bdb != null && perl != null;
# assert aterm.version >= 2.0
stdenv.mkDerivation {
name = "nix-0.10pre5429";
name = "nix-0.10pre5529";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre5479/nix-0.10pre5479.tar.bz2;
md5 = "20055c95996a694235d09a47aefa24c1";
url = http://nix.cs.uu.nl/dist/nix/nix-0.10pre5529/nix-0.10pre5529.tar.bz2;
md5 = "583a92e4df47a20d237d2a89bdad9296";
};
buildInputs = [aterm bdb perl curl];
#patches = [./nix-profile-0.9.2.patch];
inherit storeDir stateDir aterm bdb;
}

View file

@ -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