diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-24 09:39:19 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-06-24 09:39:19 +0000 |
commit | b81415699faf5cf863af342718f54e73f19c20c0 (patch) | |
tree | f311806cd0f5364f87877433ee3381c3ddb33345 /pkgs/tools/package-management | |
parent | 106c67b9dbe8c3b0ca54f0dd9ea6b6558d1eab22 (diff) | |
download | nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar.gz nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar.bz2 nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar.lz nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar.xz nixlib-b81415699faf5cf863af342718f54e73f19c20c0.tar.zst nixlib-b81415699faf5cf863af342718f54e73f19c20c0.zip |
* Updated nixUnstable to the latest version. This is the first no-bdb
version, so if you use it, it will convert /nix/var/nix/db to the new schema. svn path=/nixpkgs/trunk/; revision=12181
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/package-management/nix/unstable.nix | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 128bc23dd4b8..b7b95031a17d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "nix-0.11"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2; + url = http://nixos.org/releases/nix/nix-0.11/nix-0.11.tar.bz2; md5 = "890c25ac0005ff466683869efc288b67"; }; @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "The Nix Deployment System"; - homepage = http://nix.cs.uu.nl/; + homepage = http://nixos.org/; license = "LGPL"; }; } diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 428f1325bc8b..99c9ffb972fd 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -1,29 +1,31 @@ { stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" +, supportOldDBs ? true }: -let version = "0.12pre11304"; in +let version = "0.12pre12178"; in stdenv.mkDerivation { name = "nix-${version}"; src = fetchurl { - url = "http://nixos.org/releases/nix/nix-${version}-6hxl2ybs/nix-${version}.tar.bz2"; - sha256 = "8f33687ed70d4e1453cf62c0a9c5010cc49ed787794320ef94e9ead740fd042b"; + url = "http://nixos.org/releases/nix/nix-${version}-ncl8zjnw/nix-${version}.tar.bz2"; + sha256 = "7a5cc47272a56035bb949b32a41e7a42cfdee271334a4f12e48c96362ebd7697"; }; buildInputs = [perl curl openssl]; configureFlags = '' --with-store-dir=${storeDir} --localstatedir=${stateDir} - --with-aterm=${aterm} --with-bdb=${db4} --with-bzip2=${bzip2} + --with-aterm=${aterm} --with-bzip2=${bzip2} + ${if supportOldDBs then "--with-bdb=${db4}" else "--disable-old-db-compat"} --disable-init-state ''; meta = { description = "The Nix Deployment System"; - homepage = http://nix.cs.uu.nl/; + homepage = http://nixos.org/; license = "LGPL"; }; } |