diff options
author | Eelco Dolstra | 2004-04-08 13:50:29 +0000 |
---|---|---|
committer | Eelco Dolstra | 2004-04-08 13:50:29 +0000 |
commit | f1d1900a92f26df0682a5816e8b6b69503a84d25 (patch) | |
tree | 8d2ebcc55f4da981c66fdfb6697b25bc933eb1d9 /pkgs/misc | |
parent | a1c5ff3fb6b707c7781435a06bb74bd2c27cba4d (diff) |
* Upgraded Nix to the latest version.
svn path=/nixpkgs/trunk/; revision=929
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/nix/builder.sh | 2 | ||||
-rw-r--r-- | pkgs/misc/nix/default.nix | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/misc/nix/builder.sh b/pkgs/misc/nix/builder.sh index 28e22f3bbf7d..432034fac375 100644 --- a/pkgs/misc/nix/builder.sh +++ b/pkgs/misc/nix/builder.sh @@ -1,7 +1,7 @@ . $stdenv/setup configureFlags="\ - --with-store-dir=/nix/store --localstatedir=/nix/var \ + --with-store-dir=$storeDir --localstatedir=$stateDir \ --with-aterm=$aterm --with-bdb=$bdb" genericBuild diff --git a/pkgs/misc/nix/default.nix b/pkgs/misc/nix/default.nix index 15ea7b6bfca5..1bf71fcf5073 100644 --- a/pkgs/misc/nix/default.nix +++ b/pkgs/misc/nix/default.nix @@ -8,11 +8,11 @@ assert aterm != null && bdb != null && perl != null; # assert aterm.version >= 2.0 stdenv.mkDerivation { - name = "nix-0.5pre881"; + name = "nix-0.5pre927"; builder = ./builder.sh; src = fetchurl { - url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre881/nix-0.5pre881.tar.bz2; - md5 = "427a4add7b374ea392ec81a3494cfb23"; + url = http://catamaran.labs.cs.uu.nl/dist/nix/nix-0.5pre927/nix-0.5pre927.tar.bz2; + md5 = "57d71f86718ba8e75a5ed16a302fcf39"; }; buildInputs = [aterm bdb perl]; inherit storeDir stateDir aterm bdb; |