BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #295127 from Mic92/nix

Browse source 
nixVersions.unstable: 2.20 -> 2.21
This commit is contained in:
Artturi 2024-03-12 04:27:18 +02:00 committed by GitHub
commit 43355e9deb
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/tools/package-management/nix/common.nix
View file

@ -42,6 +42,7 @@ in
, docbook5
, editline
, flex
, git
, gnutar
, gtest
, gzip
@ -54,6 +55,7 @@ in
, libxml2
, libxslt
, lowdown
, man
, mdbook
, mdbook-linkcheck
, nlohmann_json
@ -142,6 +144,11 @@ self = stdenv.mkDerivation {
aws-sdk-cpp
];
installCheckInputs = lib.optionals atLeast221 [
git
man
];
propagatedBuildInputs = [
boehmgc
] ++ lib.optionals (atLeast27) [

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

@ -263,6 +263,11 @@ in lib.makeExtensible (self: ({
hash = "sha256-bfFe38BkoQws7om4gBtBWoNTLkt9piMXdLLoHYl+vBQ=";
};
nix_2_21 = common {
version = "2.21.0";
hash = "sha256-9b9qJ+7rGjLKbIswMf0/2pgUWH/xOlYLk7P4WYNcGDs=";
};
# The minimum Nix version supported by Nixpkgs
# Note that some functionality *might* have been backported into this Nix version,
# making this package an inaccurate representation of what features are available
@ -282,7 +287,7 @@ in lib.makeExtensible (self: ({
stable = addFallbackPathsCheck self.nix_2_18;
unstable = self.nix_2_20;
unstable = self.nix_2_21;
} // lib.optionalAttrs config.allowAliases {
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";