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

nixVersions.latest: set to nix 2.25 (#357056)

Browse Source
This commit is contained in:
Jörg Thalheim 2024-11-23 09:45:13 +01:00 committed by GitHub
commit 1fb3496b1e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/tools/package-management/nix/common.nix
View File

@ -21,6 +21,7 @@ let
atLeast220 = lib.versionAtLeast version "2.20pre"; atLeast220 = lib.versionAtLeast version "2.20pre";
atLeast221 = lib.versionAtLeast version "2.21pre"; atLeast221 = lib.versionAtLeast version "2.21pre";
atLeast224 = lib.versionAtLeast version "2.24pre"; atLeast224 = lib.versionAtLeast version "2.24pre";
atLeast225 = lib.versionAtLeast version "2.25pre";
# Major.minor versions unaffected by CVE-2024-27297 # Major.minor versions unaffected by CVE-2024-27297
unaffectedByFodSandboxEscape = [ unaffectedByFodSandboxEscape = [
"2.3" "2.3"
@ -69,9 +70,9 @@ in
, mdbook-linkcheck , mdbook-linkcheck
, nlohmann_json , nlohmann_json
, nixosTests , nixosTests
, nixVersions
, openssl , openssl
, perl , perl
, python3
, pkg-config , pkg-config
, rapidcheck , rapidcheck
, Security , Security
@ -151,6 +152,8 @@ self = stdenv.mkDerivation {
libgit2 libgit2
] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [ ] ++ lib.optionals (atLeast224 || lib.versionAtLeast version "pre20240626") [
toml11 toml11
] ++ lib.optionals (atLeast225 && enableDocumentation) [
python3
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ] ++ lib.optionals stdenv.hostPlatform.isDarwin [
Security Security
] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [ ] ++ lib.optionals (stdenv.hostPlatform.isx86_64) [
@ -174,10 +177,9 @@ self = stdenv.mkDerivation {
(darwinMinVersionHook "10.13") (darwinMinVersionHook "10.13")
]; ];
propagatedBuildInputs = [ propagatedBuildInputs = [
boehmgc boehmgc
] ++ lib.optionals (atLeast27) [ ] ++ lib.optionals atLeast27 [
nlohmann_json nlohmann_json
]; ];

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

@ -233,7 +233,7 @@ in lib.makeExtensible (self: ({
self_attribute_name = "git"; self_attribute_name = "git";
}; };
latest = self.nix_2_24; latest = self.nix_2_25;
# The minimum Nix version supported by Nixpkgs # The minimum Nix version supported by Nixpkgs
# Note that some functionality *might* have been backported into this Nix version, # Note that some functionality *might* have been backported into this Nix version,