diff --git a/pkgs/misc/nix-unstable/default.nix b/pkgs/misc/nix-unstable/default.nix index 36c5ac41d27..428d9bb5d24 100644 --- a/pkgs/misc/nix-unstable/default.nix +++ b/pkgs/misc/nix-unstable/default.nix @@ -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; } diff --git a/pkgs/misc/nix-unstable/nix-profile-0.9.2.patch b/pkgs/misc/nix-unstable/nix-profile-0.9.2.patch deleted file mode 100644 index 9acc802a2a8..00000000000 --- a/pkgs/misc/nix-unstable/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