[24.05] .gitignore: ignore .direnv #326663
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add a rule to .gitignore to exclude .direnv, the name of the temporary directory created by direnv, from the source tree. Commit f0160ba (".envrc: init for new shell.nix") is introduced to the "master" branch, invoking an official .envrc direnv configuration when a developer enters the Nixpkgs source directory. When checking out the stable-release branches, the rule to exclude the temporary directory .direnv got lost from .gitignore, and the temporary directory became visible to source control, creating a risk of polluting the source tree. This patch backports the .gitignore rule against .direnv to the stable release branch and eliminates such risk of pollution. Even though the necessity of .envrc inside the source tree is under debate, the opinions from both sides support the non-negligible use of direct as a developer tool by Nixpkgs contributors, and it would be beneficial to have a .gitignore rule to exclude the corresponding temporary files whether we have an official .envrc or not. Partially backport f0160ba
ShamrockLee
changed the title
getchoo
approved these changes
Jul 12, 2024
getchoo
added
the
12.approvals: 1
ofborg
bot
added
10.rebuild-darwin: 0
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description of changes
Add a rule to .gitignore to exclude .direnv, the name of the temporary directory created by direnv, from the source tree.
#322650 is introduced to the "master" branch, invoking an official .envrc direnv configuration when a developer enters the Nixpkgs source directory.
When checking out the stable-release branches, the rule to exclude the temporary directory .direnv got lost from .gitignore, and the temporary directory became visible to source control, creating a risk of polluting the source tree.
This patch backports the .gitignore rule against .direnv to the stable release branch and eliminates such risk of pollution.
Even though the necessity of .envrc inside the source tree is under debate, the opinions from both sides support the non-negligible use of direct as a developer tool by Nixpkgs contributors, and it would be beneficial to have a .gitignore rule to exclude the corresponding temporary files whether we have an official .envrc or not.
Partially backport #322650
Cc: @infinisil @toastal
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)Add a 👍 reaction to pull requests you find important.