swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

nixUnstable: 1.12pre5873_b76e282d -> 2.0pre5889_c287d731

Browse source
This commit is contained in:
Eelco Dolstra 2018-01-31 21:55:11 +01:00
parent ef351646ba
commit 75a20284f4
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,7 @@ let
inherit name src;
version = lib.getVersion name;
is112 = lib.versionAtLeast version "1.12pre";
is20 = lib.versionAtLeast version "2.0pre";
VERSION_SUFFIX = lib.optionalString fromGit suffix;
@ -34,14 +34,14 @@ let
nativeBuildInputs =
[ pkgconfig ]
++ lib.optionals (!is112) [ perl ]
++ lib.optionals (!is20) [ perl ]
++ lib.optionals fromGit [ autoreconfHook autoconf-archive bison flex libxml2 libxslt docbook5 docbook5_xsl ];
buildInputs = [ curl openssl sqlite xz ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals fromGit [ brotli ] # Since 1.12
++ lib.optional stdenv.isLinux libseccomp
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is112)
++ lib.optional ((stdenv.isLinux || stdenv.isDarwin) && is20)
(aws-sdk-cpp.override {
apis = ["s3"];
customMemoryManagement = false;
@ -65,11 +65,11 @@ let
"--disable-init-state"
"--enable-gc"
]
++ lib.optionals (!is112) [
++ lib.optionals (!is20) [
"--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
"--with-dbd-sqlite=${perlPackages.DBDSQLite}/${perl.libPrefix}"
"--with-www-curl=${perlPackages.WWWCurl}/${perl.libPrefix}"
] ++ lib.optionals (is112 && stdenv.isLinux) [
] ++ lib.optionals (is20 && stdenv.isLinux) [
"--with-sandbox-shell=${sh}/bin/busybox"
];
@ -160,13 +160,13 @@ in rec {
}) // { perl-bindings = nixStable; };
nixUnstable = (lib.lowPrio (common rec {
name = "nix-1.12${suffix}";
suffix = "pre5873_b76e282d";
name = "nix-2.0${suffix}";
suffix = "pre5889_c287d731";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "b76e282da8824b679368370e43c994e588994a9a";
sha256 = "11clfc8fh8q8s3k4canmn36xhh3zcl2zd8wwddp4pdvdal16b5n6";
rev = "c287d7312103bae5e154c0c4dd493371a22ea207";
sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4";
};
fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; };