about summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/sqlite.nix6
-rw-r--r--pkgs/tools/package-management/nix/unstable.nix12
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/tools/package-management/nix/sqlite.nix b/pkgs/tools/package-management/nix/sqlite.nix
index 793fc57350a3..0a69564c539f 100644
--- a/pkgs/tools/package-management/nix/sqlite.nix
+++ b/pkgs/tools/package-management/nix/sqlite.nix
@@ -5,11 +5,11 @@
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre24749";
+  name = "nix-1.0pre25036";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/757682/download/4/${name}.tar.bz2";
-    sha256 = "ab2bda296eb91a600d01a22ed4096acdf9b5d613f1155f98433d87e273a58970";
+    url = "http://hydra.nixos.org/build/787041/download/4/${name}.tar.bz2";
+    sha256 = "ccba5f44b75801187b766d4b98a53bccf335df35cde32aeab71630bfca7882f6";
   };
 
   buildInputs = [ perl curl openssl pkgconfig boehmgc ];
diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix
index b5e56464eecb..2dac26dd1b1d 100644
--- a/pkgs/tools/package-management/nix/unstable.nix
+++ b/pkgs/tools/package-management/nix/unstable.nix
@@ -1,24 +1,26 @@
 { stdenv, fetchurl, perl, curl, bzip2, openssl ? null
+, pkgconfig, boehmgc
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
 }:
 
 stdenv.mkDerivation rec {
-  name = "nix-1.0pre24122";
+  name = "nix-1.0pre24855";
 
   src = fetchurl {
-    url = "http://hydra.nixos.org/build/667798/download/4/${name}.tar.bz2";
-    sha256 = "0rz9radz4452bp3sy9yzcawn9yz5z4nyng43a0zrsa5v72cv695f";
+    url = "http://hydra.nixos.org/build/774404/download/4/${name}.tar.bz2";
+    sha256 = "cd2a75a04fc03dcafbab1d183e6ee485b491e17f1680bb7ee38738a2b1235932";
   };
 
-  buildNativeInputs = [ perl ];
-  buildInputs = [ curl openssl ];
+  buildNativeInputs = [ perl pkgconfig ];
+  buildInputs = [ curl openssl boehmgc ];
 
   configureFlags =
     ''
       --with-store-dir=${storeDir} --localstatedir=${stateDir}
       --with-bzip2=${bzip2}
       --disable-init-state
+      --enable-gc
       CFLAGS=-O3 CXXFLAGS=-O3
     '';