Skip to content

Commit

Permalink
nixVersions.nix_2_24: init at 2.24.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Mic92 committed Aug 2, 2024
1 parent f3cc719 commit 5f7514a
Showing 1 changed file with 16 additions and 1 deletion.
17 changes: 16 additions & 1 deletion pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,21 @@ in lib.makeExtensible (self: ({
self_attribute_name = "nix_2_23";
};

nix_2_24 = (common {
version = "2.24.1";
hash = "sha256-3yFEvUDPB7GlCMI9I5VV+HXMVOT38h3lnw01nIXU2F4=";
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:
#
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
#
# Despite the use of the 10.13 deployment target here, the aligned
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
});

git = (common rec {
version = "2.24.0";
suffix = "pre20240723_${lib.substring 0 8 src.rev}";
Expand All @@ -205,7 +220,7 @@ in lib.makeExtensible (self: ({
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
});

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

0 comments on commit 5f7514a

Please sign in to comment.