3 files changed, 20 insertions, 18 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index a2685ead6c2..3138c0954e6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.14";
+  name = "nix-0.15";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/281118/download/4/${name}.tar.bz2";
-    sha256 = "7df3dd52a7a42354e845302665c3e1f67af287f9cca2bda67f8abb724e52c519";
+    url = "http://hydra.nixos.org/build/326788/download/4/${name}.tar.bz2";
+    sha256 = "2d125e75dba387075a8bd443926d7fc6752e54cc9a21c2ef32e44fffc445a8ce";
   };
 
   buildInputs = [ perl curl openssl ];
@@ -17,6 +17,7 @@ stdenv.mkDerivation rec {
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
       --with-aterm=${aterm} --with-bzip2=${bzip2}
+      ${stdenv.lib.optionalString (openssl != null) "--with-openssl=${openssl}"}
       --disable-init-state
     '';
 
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 84bae213427..445008c5858 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -4,11 +4,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.15pre20408";
+  name = "nix-0.15pre20563";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/310943/download/4/${name}.tar.bz2";
-    sha256 = "f94d95981db9093604c843225aa9f9dfe82d3352cb1ecba92de03d117d9bb4b9";
+    url = "http://hydra.nixos.org/build/322387/download/4/${name}.tar.bz2";
+    sha256 = "20d2d7f231c2c92e68c8d828292ecde4e3858a95965dfc6b7066feb24659541e";
   };
 
   buildInputs = [perl curl openssl];
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 8687a4af884..574b223ce06 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -4,21 +4,22 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.15pre20427";
-  
+  name = "nix-0.15pre20612";
+
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/311195/download/4/${name}.tar.bz2";
-    sha256 = "844e5878d55a68ae2aac657718a1960dcfc943f6738ebdfb2bc93e8c462d0ad7";
+    url = "http://hydra.nixos.org/build/325045/download/4/${name}.tar.bz2";
+    sha256 = "a0fecb2d9cced473880649d7ee6448688d63416fb2e26bdbadec069e5b619bce";
   };
 
-  buildNativeInputs = [perl];
-  buildInputs = [curl openssl];
+  buildNativeInputs = [ perl ];
+  buildInputs = [ curl openssl ];
 
-  configureFlags = ''
-    --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-aterm=${aterm} --with-bzip2=${bzip2}
-    --disable-init-state
-  '';
+  configureFlags =
+    ''
+      --with-store-dir=${storeDir} --localstatedir=${stateDir}
+      --with-aterm=${aterm} --with-bzip2=${bzip2}
+      --disable-init-state
+    '';
 
   doCheck = true;
 
@@ -27,6 +28,6 @@ stdenv.mkDerivation rec {
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
-    license = "LGPL";
+    license = "LGPLv2+";
   };
 }