diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-01 11:30:41 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-01-01 11:30:41 +0000 |
| commit | 5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f (patch) | |
| tree | 5195b27af769f21f556c5f7ffa247c35b56b6998 | |
| parent | 12de73494919dc033d20bd0b311f3dd655a9d4ea (diff) | |
| download | nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar.gz nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar.bz2 nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar.lz nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar.xz nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.tar.zst nixpkgs-5a870b6ea9b2d410fdc8a05f700dd8f4c4bc442f.zip | |
* Nix 0.11.
svn path=/nixpkgs/trunk/; revision=10036
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 55c20a4b837..128bc23dd4b 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2 +{ stdenv, fetchurl, aterm, db4, perl, curl, bzip2, openssl ? null , storeDir ? "/nix/store" , stateDir ? "/nix/var" }: stdenv.mkDerivation { - name = "nix-0.10.1"; + name = "nix-0.11"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/nix/nix-0.10.1/nix-0.10.1.tar.bz2; - md5 = "22dc0c024ca5bb477da0b38ba834dbf2"; + url = http://nix.cs.uu.nl/dist/nix/nix-0.11/nix-0.11.tar.bz2; + md5 = "890c25ac0005ff466683869efc288b67"; }; - buildInputs = [perl curl]; + buildInputs = [perl curl openssl]; configureFlags = " --with-store-dir=${storeDir} --localstatedir=${stateDir} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 065da543d9a..ac7fef880a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4907,9 +4907,9 @@ rec { }; nix = import ../tools/package-management/nix { - inherit fetchurl stdenv perl curl bzip2; + inherit fetchurl stdenv perl curl bzip2 openssl; aterm = aterm242fixes; - db4 = db44; + db4 = db45; }; nixStatic = import ../tools/package-management/nix-static { |