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

Merge pull request #331720 from Mic92/nix-2.24.1

Browse Source
This commit is contained in:
Philip Taron 2024-08-05 19:20:55 -07:00 committed by GitHub
commit fb8fb78e1c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/tools/language-servers/nil/default.nix
View File

@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec {
cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";
nativeBuildInputs = [
(lib.getBin nixVersions.latest)
(lib.getBin nixVersions.nix_2_23)
];
env.CFG_RELEASE = version;

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

@ -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}";
@ -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,