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

nixUnstable: 2.4pre20210922 -> 2.4pre20211001 

Now depends on lowdown >= 0.9.

(cherry picked from commit 25da0b3bbbeb703285a493c0773dcccf3d46009b)
This commit is contained in:
sternenseemann 2021-09-27 11:12:47 +02:00
parent fe5e97cd74
commit a8dc6be3c8
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,7 +14,7 @@ common =
, pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json , pkg-config, boehmgc, libsodium, brotli, boost, editline, nlohmann_json
, autoreconfHook, autoconf-archive, bison, flex , autoreconfHook, autoconf-archive, bison, flex
, jq, libarchive, libcpuid , jq, libarchive, libcpuid
, lowdown, mdbook , lowdown-0-9, mdbook
# Used by tests # Used by tests
, gtest , gtest
, busybox-sandbox-shell , busybox-sandbox-shell
@ -45,7 +45,7 @@ common =
[ autoreconfHook [ autoreconfHook
autoconf-archive autoconf-archive
bison flex bison flex
(lib.getBin lowdown) mdbook (lib.getBin lowdown-0-9) mdbook
jq jq
]; ];
@ -55,7 +55,7 @@ common =
] ]
++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optionals stdenv.isDarwin [ Security ]
++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
++ lib.optionals is24 [ libarchive gtest lowdown ] ++ lib.optionals is24 [ libarchive gtest lowdown-0-9 ]
++ lib.optional (is24 && stdenv.isx86_64) libcpuid ++ lib.optional (is24 && stdenv.isx86_64) libcpuid
++ lib.optional withLibseccomp libseccomp ++ lib.optional withLibseccomp libseccomp
++ lib.optional withAWS ++ lib.optional withAWS
@ -228,13 +228,13 @@ in rec {
nixUnstable = lib.lowPrio (callPackage common rec { nixUnstable = lib.lowPrio (callPackage common rec {
pname = "nix"; pname = "nix";
version = "2.4${suffix}"; version = "2.4${suffix}";
suffix = "pre20210922_${lib.substring 0 7 src.rev}"; suffix = "pre20211001_${lib.substring 0 7 src.rev}";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "NixOS"; owner = "NixOS";
repo = "nix"; repo = "nix";
rev = "bcd73ebf60bb9ba6cb09f8df4366d5474c16e4a4"; rev = "4f496150eb4e0012914c11f0a3ff4df2412b1d09";
sha256 = "sha256-wRbz8c22tlRn2/va/yOoLJijdJn+JJqLRDPRlifaEEA="; sha256 = "00hxxk66f068588ymv60ygib6vgk7c97s9yia3qd561679rq3nsj";
}; };
boehmgc = boehmgc_nixUnstable; boehmgc = boehmgc_nixUnstable;