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

[Backport release-24.05] nixVersions: backport 2.24.3 as nixVersions.latest #336108

Merged
merged 6 commits into from
Aug 21, 2024
Merged

[Backport release-24.05] nixVersions: backport 2.24.3 as nixVersions.latest #336108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
42d23be
nixVersions.nix_2_24: init at 2.24.1
Mic92 Aug 2, 2024
53bd080
nixVersions.git: 2.24.0pre20240723 -> 2.25.0pre20240807
trofi Aug 8, 2024
b32e0ff
nixVersions.nix_2_24: 2.24.1 -> 2.24.2
trofi Aug 11, 2024
cd908a6
nil: pin to nix 2.23 to fix build
JohnRTitor Aug 5, 2024
523a7ff
nil: 2023-08-09 -> 2024-08-06
oxalica Aug 6, 2024
95cbb2f
nixVersions.nix_2_24: 2.24.2 -> 2.24.3
philiptaron Aug 20, 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: 3 additions & 3 deletions pkgs/development/tools/language-servers/nil/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@

rustPlatform.buildRustPackage rec {
pname = "nil";
version = "2023-08-09";
version = "2024-08-06";

src = fetchFromGitHub {
owner = "oxalica";
repo = pname;
rev = version;
hash = "sha256-fZ8KfBMcIFO/R7xaWtB85SFeuUjb9SCH8fxYBnY8068=";
hash = "sha256-DqsN/VkYVr4M0PVRQKXPPOTaind5miYZURIYqM4MxYM=";
};

cargoHash = "sha256-lyKPmzuZB9rCBI9JxhxlyDtNHLia8FXGnSgV+D/dwgo=";
cargoHash = "sha256-E4wmVunaX5SeBlXaLEpzMZ+IY0YVeJ1NORPo9msHr6M=";

nativeBuildInputs = [
(lib.getBin nixVersions.latest)
Expand Down
25 changes: 20 additions & 5 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,14 +184,29 @@ in lib.makeExtensible (self: ({
self_attribute_name = "nix_2_23";
};

nix_2_24 = (common {
version = "2.24.3";
hash = "sha256-aBuGXm0UwDekCYLl7xDyw+BAJOg7728i57TbSXzPacc=";
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 = "pre20240709_${lib.substring 0 8 src.rev}";
version = "2.25.0";
suffix = "pre20240807_${lib.substring 0 8 src.rev}";
src = fetchFromGitHub {
owner = "NixOS";
repo = "nix";
rev = "142e566adbce587a5ed97d1648a26352f0608ec5";
hash = "sha256-fYZGuB/4LOBoMSUNj/yRU1mWm9lhdTzXF0P+zmac0hw=";
rev = "cfe66dbec325d5dcb601b642bd9c149ae1353147";
hash = "sha256-1hqjl4br3MRK1pkzDrhBSxKUhdfQ/P4b5KbLfGua64g=";
};
self_attribute_name = "git";
}).override (lib.optionalAttrs (stdenv.isDarwin && stdenv.isx86_64) {
Expand All @@ -205,7 +220,7 @@ in lib.makeExtensible (self: ({
stdenv = overrideSDK stdenv { darwinMinVersion = "10.13"; };
});

latest = self.nix_2_22;
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