Skip to content

Miscellaneous fixes for nix-dev-shell #134102

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

Merged
bors merged 3 commits into from
Dec 10, 2024
Merged

Miscellaneous fixes for nix-dev-shell #134102

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f99e96
only ignore `{flake,default}.nix` and `{.envrc,.direnv/}` in the root
WaffleLapkin Dec 9, 2024
6058cdc
remove instructions to git exclude files in `src/nix-dev-shell/envrc-*`
WaffleLapkin Dec 9, 2024
05d8318
provide `libz.so.1` in the `nix-dev-shell`
WaffleLapkin Dec 9, 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
Next Next commit
only ignore {flake,default}.nix and {.envrc,.direnv/} in the root 
this makes it so files in `src/nix-dev-shell` are *not* ignored, as they
should not be. note that `flake.lock` is still ignored globally.
  • Loading branch information
@WaffleLapkin
WaffleLapkin committed Dec 9, 2024
commit 5f99e96fbb7964c94f465897ebb59964db76628e
8 changes: 4 additions & 4 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,12 @@ package.json
tests/rustdoc-gui/src/**.lock

## direnv
.envrc
.direnv/
/.envrc
/.direnv/

## nix
flake.nix
/flake.nix
flake.lock
default.nix
/default.nix

# Before adding new lines, see the comment at the top.