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

nixUnstable: 2.0pre6137_e3cdcf89 -> 2.1pre6148_a4aac7f

Browse Source
This commit is contained in:
Shea Levy 2018-04-17 07:15:12 -04:00
parent 192221ae3f
commit 48d9754d2b
No known key found for this signature in database
GPG Key ID: 5C0BD6957D86FE27
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,16 +95,19 @@ let
passthru = { inherit fromGit; }; passthru = { inherit fromGit; };
}; };
perl-bindings = { nix }: stdenv.mkDerivation { perl-bindings = { nix, needsBoost ? false }: stdenv.mkDerivation {
name = "nix-perl-" + nix.version; name = "nix-perl-" + nix.version;
inherit (nix) src; inherit (nix) src;
postUnpack = "sourceRoot=$sourceRoot/perl"; postUnpack = "sourceRoot=$sourceRoot/perl";
# This is not cross-compile safe, don't have time to fix right now
# but noting for future travellers.
nativeBuildInputs = nativeBuildInputs =
[ perl pkgconfig curl nix libsodium ] [ perl pkgconfig curl nix libsodium ]
++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]; ++ lib.optionals nix.fromGit [ autoreconfHook autoconf-archive ]
++ lib.optional needsBoost boost;
configureFlags = configureFlags =
[ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}" [ "--with-dbi=${perlPackages.DBI}/${perl.libPrefix}"
@ -137,15 +140,18 @@ in rec {
}) // { perl-bindings = perl-bindings { nix = nixStable; }; }; }) // { perl-bindings = perl-bindings { nix = nixStable; }; };
nixUnstable = (lib.lowPrio (common rec { nixUnstable = (lib.lowPrio (common rec {
name = "nix-2.0${suffix}"; name = "nix-2.1${suffix}";
suffix = "pre6137_e3cdcf89"; suffix = "pre6148_a4aac7f";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "e3cdcf89b0ef42f81c9df5899776ea225f1ecae0"; rev = "a4aac7f88c59c97299027c9668461c637bbc6a72";
sha256 = "1s9w7ixc2qra3x9545f9a634654rvdqsf38jp9b7wr6xx6qqx60s"; sha256 = "1250fg1rgzcd0qy960nhl2bw9hsc1a6pyz11rmxasr0h3j1a2z53";
}; };
fromGit = true; fromGit = true;
})) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; })) // { perl-bindings = perl-bindings {
nix = nixUnstable;
needsBoost = true;
}; };
} }