Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-24.05] Nix 2.24.6 + nix git bump #341049

Merged
merged 5 commits into from
Sep 10, 2024
Merged

[release-24.05] Nix 2.24.6 + nix git bump #341049

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d1c50ba
Revert "nixVersions.git: improve error message"
Mic92 Sep 10, 2024
df9a693
Revert "nixVersions.nix_2_24,git: mark vulnerable"
Mic92 Sep 10, 2024
8c187ba
nixVersions.git: 2.25.0pre20240807 -> 2.25.0pre20240910
Mic92 Sep 10, 2024
51a06e3
nixVersions.nix_2_24: 2.24.5 -> 2.24.6
Mic92 Sep 10, 2024
6c55848
nixVersions.git: disable test on aarch64-linux
Mic92 Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkgs/tools/package-management/nix/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -243,6 +243,12 @@ self = stdenv.mkDerivation {
# See https://github.com/NixOS/nix/issues/5687
+ lib.optionalString (atLeast25 && stdenv.isDarwin) ''
echo "exit 99" > tests/gc-non-blocking.sh
'' # TODO: investigate why this broken
+ lib.optionalString (atLeast25 && stdenv.hostPlatform.system == "aarch64-linux") ''
echo "exit 0" > tests/functional/flakes/show.sh
'' + ''
# nixStatic otherwise does not find its man pages in tests.
export MANPATH=$man/share/man:$MANPATH
'';

separateDebugInfo = stdenv.isLinux && (atLeast24 -> !enableStatic);
Expand Down
24 changes: 8 additions & 16 deletions pkgs/tools/package-management/nix/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,9 +184,9 @@ in lib.makeExtensible (self: ({
self_attribute_name = "nix_2_23";
};

nix_2_24 = ((common {
version = "2.24.3";
hash = "sha256-aBuGXm0UwDekCYLl7xDyw+BAJOg7728i57TbSXzPacc=";
nix_2_24 = (common {
version = "2.24.6";
hash = "sha256-kgq3B+olx62bzGD5C6ighdAoDweLq+AebxVHcDnKH4w=";
self_attribute_name = "nix_2_24";
}).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
# Fix the following error with the default x86_64-darwin SDK:
Expand All @@ -197,20 +197,16 @@ in lib.makeExtensible (self: ({
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
})).overrideAttrs (o: {
meta.knownVulnerabilities = [
"Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nix_2_24 to nix_2_23"
];
});

git = ((common rec {
git = (common rec {
version = "2.25.0";
suffix = "pre20240807_${lib.substring 0 8 src.rev}";
suffix = "pre20240910_${lib.substring 0 8 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147";
hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g=";
rev = "b9d3cdfbd2b873cf34600b262247d77109dfd905";
hash = "sha256-7zH8TU5g3Bsg6ES0O8RcTm6JGYOMuDCGlSI3AQKbKy8=";
};
self_attribute_name = "git";
}).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
Expand All @@ -222,13 +218,9 @@ in lib.makeExtensible (self: ({
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
})).overrideAttrs (o: {
meta.knownVulnerabilities = [
"Nix >= 2.24.0 and master have a vulnerability. Please downgrade from nixVersions.git to nixVersions.nix_2_23"
];
});

latest = self.nix_2_23;
latest = self.nix_2_24;

# The minimum Nix version supported by Nixpkgs
# Note that some functionality *might* have been backported into this Nix version,
Expand Down
Loading