* Updated Nix.

svn path=/nixpkgs/trunk/; revision=21771

3 files changed, 17 insertions, 19 deletions

diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 445008c58585..17cea9bd6f7a 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -1,28 +1,27 @@
-{ stdenv, fetchurl, aterm, perl, curl, bzip2, sqlite, openssl ? null
+{ stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.15pre20563";
+  name = "nix-0.15pre21760";
   
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/322387/download/4/${name}.tar.bz2";
-    sha256 = "20d2d7f231c2c92e68c8d828292ecde4e3858a95965dfc6b7066feb24659541e";
+    url = "http://hydra.nixos.org/build/406130/download/4/${name}.tar.bz2";
+    sha256 = "b382540807400a9aeacdcd9c1618ead1cb6b61e922f64d1e7c29f63c0b678b02";
   };
 
-  buildInputs = [perl curl openssl];
+  buildInputs = [ perl curl openssl ];
 
   configureFlags = ''
     --with-store-dir=${storeDir} --localstatedir=${stateDir}
-    --with-aterm=${aterm} --with-bzip2=${bzip2} --with-sqlite=${sqlite}
+    --with-bzip2=${bzip2} --with-sqlite=${sqlite}
     --disable-init-state
+    CFLAGS=-O3 CXXFLAGS=-O3
   '';
 
   doCheck = true;
 
-  passthru = { inherit aterm; };
-
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index 03386da9a576..7b99a5e480c5 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,14 +1,14 @@
-{ stdenv, fetchurl, aterm, perl, curl, bzip2, openssl ? null
+{ stdenv, fetchurl, perl, curl, bzip2, openssl ? null
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-0.16pre21576";
+  name = "nix-0.16pre21748";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/395008/download/4/${name}.tar.bz2";
-    sha256 = "1axmipk8vp9vwsq5wnhshgb0pcgbhanlxz8z2m3f5vxvixvw3i19";
+    url = http://hydra.nixos.org/build/405917/download/4/nix-0.16pre21741.tar.bz2;
+    sha256 = "048a9d0658906a5f344f27a0ba39c0a4d926666cef9f4e93a35f73607dd0e947";
   };
 
   buildNativeInputs = [ perl ];
@@ -17,14 +17,13 @@ stdenv.mkDerivation rec {
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
-      --with-aterm=${aterm} --with-bzip2=${bzip2}
+      --with-bzip2=${bzip2}
       --disable-init-state
+      CFLAGS=-O3 CXXFLAGS=-O3
     '';
 
   doCheck = true;
 
-  passthru = { inherit aterm; };
-
   meta = {
     description = "The Nix Deployment System";
     homepage = http://nixos.org/;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 95f086c52840..7eb15b903351 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -743,11 +743,11 @@ let
   };
 
   dos2unix = import ../tools/text/dos2unix {
-      inherit fetchurl stdenv;
+    inherit fetchurl stdenv;
   };
 
   unix2dos = import ../tools/text/unix2dos {
-      inherit fetchurl stdenv;
+    inherit fetchurl stdenv;
   };
 
   gawk = useFromStdenv "gawk"
@@ -9465,14 +9465,14 @@ let
   };
 
   nixUnstable = makeOverridable (import ../tools/package-management/nix/unstable.nix) {
-    inherit fetchurl stdenv perl curl bzip2 openssl aterm;
+    inherit fetchurl stdenv perl curl bzip2 openssl;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   };
 
   # The SQLite branch.
   nixSqlite = lowPrio (makeOverridable (import ../tools/package-management/nix/sqlite.nix) {
-    inherit fetchurl stdenv perl curl bzip2 openssl aterm sqlite;
+    inherit fetchurl stdenv perl curl bzip2 openssl sqlite;
     storeDir = getPkgConfig "nix" "storeDir" "/nix/store";
     stateDir = getPkgConfig "nix" "stateDir" "/nix/var";
   });