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

nixVersions.nix_2_20: init at 2.20.5 #294120

Closed
wants to merge 3 commits into from
Closed

nixVersions.nix_2_20: init at 2.20.5 #294120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7f66630
nix/boehmgc-nix: add patch for nix 2.20
roberth Feb 1, 2024
56bf13f
nixVersions.nix_2_20: init at 2.20.5
SuperSandro2000 Jan 31, 2024
96974ac
nixVersions.unstable: 2.19 -> 2.20
SuperSandro2000 Jan 31, 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
12 changes: 4 additions & 8 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 @@ -15,14 +15,8 @@ let
atLeast210 = lib.versionAtLeast version "2.10pre";
atLeast213 = lib.versionAtLeast version "2.13pre";
atLeast214 = lib.versionAtLeast version "2.14pre";
atLeast220 = lib.versionAtLeast version "2.20pre";
atLeast221 = lib.versionAtLeast version "2.21pre";
# Major.minor versions unaffected by CVE-2024-27297
unaffectedByFodSandboxEscape = [
"2.3"
"2.18"
"2.19"
"2.20"
];
Comment on lines -19 to -25
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we remove this in the original PR, too? I am not sure.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, because then you need to upgrade ALL the other Nix. Not just one.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good, then we leave it as it is in my PR. I just wasn't sure if I missed something or this was a bad rebase.

in
{ stdenv
, autoconf-archive
Expand All @@ -48,6 +42,7 @@ in
, lib
, libarchive
, libcpuid
, libgit2
, libsodium
, libxml2
, libxslt
Expand Down Expand Up @@ -126,6 +121,8 @@ self = stdenv.mkDerivation {
gtest
libarchive
lowdown
] ++ lib.optionals atLeast220 [
libgit2
] ++ lib.optionals stdenv.isDarwin [
Security
] ++ lib.optionals (stdenv.isx86_64) [
Expand Down Expand Up @@ -257,7 +254,6 @@ self = stdenv.mkDerivation {
platforms = platforms.unix;
outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";
mainProgram = "nix";
knownVulnerabilities = lib.optional (!builtins.elem (lib.versions.majorMinor version) unaffectedByFodSandboxEscape && !atLeast221) "CVE-2024-27297";
};
};
in self
22 changes: 19 additions & 3 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 @@ -17,8 +17,19 @@ let
boehmgc-nix_2_3 = boehmgc.override { enableLargeConfig = true; };

boehmgc-nix = boehmgc-nix_2_3.overrideAttrs (drv: {
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
patches = (drv.patches or [ ]) ++ [ ./patches/boehmgc-coroutine-sp-fallback.patch ];
patches = (drv.patches or [ ]) ++ [
# Part of the GC solution in https://github.com/NixOS/nix/pull/4944
./patches/boehmgc-coroutine-sp-fallback.patch

# Required since 2.20, and has always been a valid change
# Awaiting 8.2 patch release of https://github.com/ivmai/bdwgc/commit/d1d4194c010bff2dc9237223319792cae834501c
# or master release of https://github.com/ivmai/bdwgc/commit/86b3bf0c95b66f718c3cb3d35fd7387736c2a4d7
(fetchpatch {
name = "boehmgc-traceable_allocator-public.diff";
url = "https://github.com/NixOS/nix/raw/2.20.0/dep-patches/boehmgc-traceable_allocator-public.diff";
hash = "sha256-FLsHY/JS46neiSyyQkVpbHZEFvWSCzWrFQu1CC71sh4=";
})
];
});

# old nix fails to build with newer aws-sdk-cpp and the patch doesn't apply
Expand Down Expand Up @@ -247,6 +258,11 @@ in lib.makeExtensible (self: ({
];
};

nix_2_20 = common {
version = "2.20.5";
hash = "sha256-bfFe38BkoQws7om4gBtBWoNTLkt9piMXdLLoHYl+vBQ=";
};

# 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
Expand All @@ -266,7 +282,7 @@ in lib.makeExtensible (self: ({

stable = addFallbackPathsCheck self.nix_2_18;

unstable = self.nix_2_19;
unstable = self.nix_2_20;
} // lib.optionalAttrs config.allowAliases {
nix_2_4 = throw "nixVersions.nix_2_4 has been removed";

Expand Down
Loading