public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixUnstable: 2.1pre6338_45bcf541 -> 2.1pre6377_954d1f4d

This commit is contained in:
Eelco Dolstra 2018-08-22 12:50:25 +02:00
parent 42545f5288
commit c26c7f931a
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkgs/tools/package-management/nix/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchurl, fetchFromGitHub, perl, curl, bzip2, sqlite, openssl ? null, xz { lib, stdenv, fetchurl, fetchFromGitHub, fetchpatch, perl, curl, bzip2, sqlite, openssl ? null, xz
, pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost , pkgconfig, boehmgc, perlPackages, libsodium, aws-sdk-cpp, brotli, boost
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns , autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook_xsl_ns
, busybox-sandbox-shell , busybox-sandbox-shell
@ -33,10 +33,15 @@ let
++ lib.optionals is20 [ brotli ] # Since 1.12 ++ lib.optionals is20 [ brotli ] # Since 1.12
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20) ++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
(aws-sdk-cpp.override { ((aws-sdk-cpp.override {
apis = ["s3" "transfer"]; apis = ["s3" "transfer"];
customMemoryManagement = false; customMemoryManagement = false;
}) }).overrideDerivation (args: {
patches = args.patches or [] ++ [(fetchpatch {
url = https://github.com/edolstra/aws-sdk-cpp/commit/7d58e303159b2fb343af9a1ec4512238efa147c7.patch;
sha256 = "103phn6kyvs1yc7fibyin3lgxz699qakhw671kl207484im55id1";
})];
}))
++ lib.optional fromGit boost; ++ lib.optional fromGit boost;
propagatedBuildInputs = [ boehmgc ]; propagatedBuildInputs = [ boehmgc ];
@ -144,12 +149,12 @@ in rec {
nixUnstable = (lib.lowPrio (common rec { nixUnstable = (lib.lowPrio (common rec {
name = "nix-2.1${suffix}"; name = "nix-2.1${suffix}";
suffix = "pre6338_45bcf541"; suffix = "pre6377_954d1f4d";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "45bcf5416a0ce53361fd37c6b27ba4ef6a34ce96"; rev = "954d1f4d0a35063ff431b258beebadf753cb9efe";
sha256 = "0ps45n78wnczz99dd9fs54ydxwh2cjq73zbvmak0y49nhc3p0vvv"; sha256 = "0wnljxljvcwmniydgxlsjqmbgghmljs75m6083y2nkjql7dnrm7g";
}; };
fromGit = true; fromGit = true;
})) // { perl-bindings = perl-bindings { })) // { perl-bindings = perl-bindings {