Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 4 deletions pkgs/by-name/ni/nil/package.nix
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
lib,
rustPlatform,
fetchFromGitHub,
nixVersions,
nix,
nix-update-script,
}:

Expand All @@ -20,9 +20,7 @@ rustPlatform.buildRustPackage rec {
useFetchCargoVendor = true;
cargoHash = "sha256-7TR/xTc66WpPszJDrpisVvHXl2+FGrUOskZAkGyY04Q=";

nativeBuildInputs = [
(lib.getBin nixVersions.latest)
Copy link
Member Author

Choose a reason for hiding this comment

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

@oxalica please confirm we no longer need this with nix 2.24.

Copy link
Member

Choose a reason for hiding this comment

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

Maybe @figsoda would also be able to confirm this?

Copy link
Contributor

Choose a reason for hiding this comment

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

Figsoda is sadly not so active lately.

Copy link
Member

Choose a reason for hiding this comment

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

Ah ok. I hope he's well.

I'm willing to assume the removal is ok, considering that it's a build time dependency, and it builds, but let's wait until Monday to give us an opportunity to handle this issue without potential for a minor(?) regression.

Copy link
Contributor

Choose a reason for hiding this comment

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

@oxalica please confirm we no longer need this with nix 2.24.

Sorry for the late response. As mentioned by @roberth, yes this is a build-time dependency to populate the builtin function list. As long as it builds, it's good.

];
nativeBuildInputs = [ nix ];

env.CFG_RELEASE = version;

Expand Down
2 changes: 1 addition & 1 deletion pkgs/tools/package-management/nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ in lib.makeExtensible (self: ({
self_attribute_name = "git";
};

latest = self.nix_2_25;
latest = self.nix_2_26;

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