nixUnstable: Reinit at 2.0pre6137_e3cdcf89
This commit is contained in:
parent
216b32f339
commit
0a9f34ad27
|
@ -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, boost
|
||||||
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
|
, autoreconfHook, autoconf-archive, bison, flex, libxml2, libxslt, docbook5, docbook5_xsl
|
||||||
, libseccomp, busybox-sandbox-shell
|
, libseccomp, busybox-sandbox-shell
|
||||||
, hostPlatform, buildPlatform
|
, hostPlatform, buildPlatform
|
||||||
|
@ -35,7 +35,8 @@ let
|
||||||
(aws-sdk-cpp.override {
|
(aws-sdk-cpp.override {
|
||||||
apis = ["s3"];
|
apis = ["s3"];
|
||||||
customMemoryManagement = false;
|
customMemoryManagement = false;
|
||||||
});
|
})
|
||||||
|
++ lib.optional fromGit boost;
|
||||||
|
|
||||||
propagatedBuildInputs = [ boehmgc ];
|
propagatedBuildInputs = [ boehmgc ];
|
||||||
|
|
||||||
|
@ -135,19 +136,16 @@ in rec {
|
||||||
};
|
};
|
||||||
}) // { perl-bindings = perl-bindings { nix = nixStable; }; };
|
}) // { perl-bindings = perl-bindings { nix = nixStable; }; };
|
||||||
|
|
||||||
nixUnstable = nix;
|
|
||||||
/*
|
|
||||||
nixUnstable = (lib.lowPrio (common rec {
|
nixUnstable = (lib.lowPrio (common rec {
|
||||||
name = "nix-2.0${suffix}";
|
name = "nix-2.0${suffix}";
|
||||||
suffix = "pre5968_a6c0b773";
|
suffix = "pre6137_e3cdcf89";
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "NixOS";
|
owner = "NixOS";
|
||||||
repo = "nix";
|
repo = "nix";
|
||||||
rev = "a6c0b773b72d4e30690e01f1f1dcffc28f2d9ea1";
|
rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0";
|
||||||
sha256 = "0i8wcblcjw3291ba6ki4llw3fgm8ylp9q52kajkyr58dih537346";
|
sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s";
|
||||||
};
|
};
|
||||||
fromGit = true;
|
fromGit = true;
|
||||||
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
|
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };
|
||||||
*/
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue