MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 23:03:40 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nixUnstable: 1.12pre5152_915f62fa -> 1.12pre5308_2f21d522

Browse source
This commit is contained in:
Eelco Dolstra 2017-04-28 17:55:53 +02:00
parent c03d1df5b8
commit e042db5e41
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/tools/package-management/nix/default.nix
View file

@ -1,5 +1,5 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz { 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 , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
, storeDir ? "/nix/store" , storeDir ? "/nix/store"
, stateDir ? "/nix/var" , stateDir ? "/nix/var"
@ -22,7 +22,7 @@ let
buildInputs = [ curl openssl sqlite xz ] buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ 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") ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && lib.versionAtLeast version "1.12pre")
(aws-sdk-cpp.override { (aws-sdk-cpp.override {
apis = ["s3"]; apis = ["s3"];
@ -145,12 +145,12 @@ in rec {
nixUnstable = (lib.lowPrio (common rec { nixUnstable = (lib.lowPrio (common rec {
name = "nix-1.12${suffix}"; name = "nix-1.12${suffix}";
suffix = "pre5152_915f62fa"; suffix = "pre5308_2f21d522";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "915f62fa19790d8f826aeb4dd3d2bb5bde2f67e9"; rev = "2f21d522c28b1e902bd7f0b5b9e7523975102d81";
sha256 = "0mf7y7hvzw2x5dp482qy8774djr3vzcjaqq58cp82zdil8l7kwjd"; sha256 = "1r3jxz0ydnlxp4b3ggxjgx1q9dv7jyfjm8w1srqjanzn944wnmi9";
}; };
fromGit = true; fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };