summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-10 12:16:50 +0100
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-12-10 15:25:48 +0100
commit2de76b275366a700f7f79709bf30d67358f2838a (patch)
tree1a8b4dbfac9243e18615e5cedecab64fc1033bc1 /pkgs/tools/package-management
parentb4b5047cacc669c254deef5ec3660acf7ebc01ce (diff)
downloadnixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar.gz
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar.bz2
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar.lz
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar.xz
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.tar.zst
nixpkgs-2de76b275366a700f7f79709bf30d67358f2838a.zip
nixUnstable: 1.11pre4273_71039be -> 1.11pre4334_7431932
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/nix/default.nix12
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 1d8c5d86b23..7f134c18844 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null
+{ lib, stdenv, fetchurl, perl, curl, bzip2, sqlite, openssl ? null, xz
 , pkgconfig, boehmgc, perlPackages, libsodium
 , storeDir ? "/nix/store"
 , stateDir ? "/nix/var"
@@ -13,8 +13,8 @@ let
 
     nativeBuildInputs = [ perl pkgconfig ];
 
-    buildInputs = [ curl openssl sqlite ] ++
-      lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
+    buildInputs = [ curl openssl sqlite xz ]
+      ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium;
 
     propagatedBuildInputs = [ boehmgc ];
 
@@ -97,10 +97,10 @@ in rec {
    };
 
    nixUnstable = lib.lowPrio (common rec {
-     name = "nix-1.11pre4273_71039be";
+     name = "nix-1.11pre4334_7431932";
      src = fetchurl {
-       url = "http://hydra.nixos.org/build/27061065/download/4/${name}.tar.xz";
-       sha256 = "4a1bc541868c317708fc8b532e22f5ead8d9759eee6a2680719584841cf897af";
+       url = "http://hydra.nixos.org/build/28747184/download/4/${name}.tar.xz";
+       sha256 = "ccb0c5be03b9af1bf89e79758868b0cd62c79fd7a0f0791cdb99df86e4240fc4";
      };
    });