diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2017-04-28 17:55:53 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2017-04-28 17:55:53 +0200 |
| commit | e042db5e415f8b820d91d767fcf6a7c89fcce305 (patch) | |
| tree | d7bac29413b8be611e86cc9539438c63e886be64 | |
| parent | c03d1df5b8556b971654a5bc3abe10c5a6813089 (diff) | |
| download | nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar.gz nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar.bz2 nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar.lz nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar.xz nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.tar.zst nixlib-e042db5e415f8b820d91d767fcf6a7c89fcce305.zip | |
nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522
| -rw-r--r-- | pkgs/tools/package-management/nix/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 4074229ecf71..ffac378eaf71 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz -, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli +, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, readline , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl , storeDir ? "/nix/store" , stateDir ? "/nix/var" @@ -22,7 +22,7 @@ let buildInputs = [ curl openssl sqlite xz ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optional fromGit brotli # Since 1.12 + ++ lib.optionals fromGit [ brotli readline ] # Since 1.12 ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre") (aws-sdk-cpp.override { apis = ["s3"]; @@ -145,12 +145,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-1.12${suffix}"; - suffix = "pre5152_915f62fa"; + suffix = "pre5308_2f21d522"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9"; - sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd"; + rev = "2f21d522c28b1e902bd7f0b5b9e7523975102d81"; + sha256 = "1r3jxz0ydnlxp4b3ggxjgx1q9dv7jyfjm8w1srqjanzn944wnmi9"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; |