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.

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

nixos/nix-direnv: respect configured nix package #275591

Merged
merged 1 commit into from
Dec 21, 2023

Conversation

Mic92
Copy link
Member

@Mic92 Mic92 commented Dec 20, 2023

Rebuilds should be reasonably fast since it's a shell script and we don't end up with different versions of nix in the store.

Description of changes

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.05 Release Notes (or backporting 23.05 and 23.11 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.

@r-vdp
Copy link
Contributor

r-vdp commented Dec 20, 2023

Should we not instead make this the default of the nix-direnv.package option, so that it can still be overridden if needed?

@szlend
Copy link
Member

szlend commented Dec 20, 2023

Should we not instead make this the default of the nix-direnv.package option, so that it can still be overridden if needed?

That's a good point, though then you need to remember to override nix if you for example take nix-direnv from unstable. But if nix-community/nix-direnv#451 is resolved and we prefer to pick up nix from PATH, then this is not a big issue I suppose.

Copy link
Member

@donovanglover donovanglover left a comment

Choose a reason for hiding this comment

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

Ran into this issue today since NixOS/nix#5759 (fixed in NixOS/nix#6614) is in Nix 2.19 but not 2.18.

Rebuilds should be reasonably fast since it's a shell script
and we don't end up with different versions of nix in the store.
@Mic92 Mic92 merged commit 3fcdbd3 into NixOS:master Dec 21, 2023
6 of 7 checks passed
@Mic92 Mic92 deleted the nix-direnv-nixos branch December 21, 2023 10:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants