Skip to content

shell.nix: Enable e.g. --arg nixpkgs ./.#330823

Merged
infinisil merged 1 commit intoNixOS:masterfrom
hercules-ci:shell-nix-arg-nixpkgs
Aug 29, 2024
Merged

shell.nix: Enable e.g. --arg nixpkgs ./.#330823
infinisil merged 1 commit intoNixOS:masterfrom
hercules-ci:shell-nix-arg-nixpkgs

Conversation

@roberth
Copy link
Member

@roberth roberth commented Jul 29, 2024

Description of changes

This allows shell.nix to be run with the latest tools instead of the pinned ones when desired, which is probably not very often, but useful nonetheless.

The diff is a bit weird looking. It's easier to think of it as moving the pinnedNixpkgs binding outside the function.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

This allows shell.nix to be run with the latest tools instead of
the pinned ones when desired, which is probably not very often,
but useful nonetheless.
@roberth roberth requested review from a team and infinisil as code owners July 29, 2024 08:39
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jul 29, 2024
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Not entirely sure what the use case is, but this looks fine :)

@infinisil infinisil merged commit a3060fd into NixOS:master Aug 29, 2024
@infinisil infinisil deleted the shell-nix-arg-nixpkgs branch August 29, 2024 20:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants