diff options
| author | Waffle Lapkin <waffle.lapkin@gmail.com> | 2024-12-10 00:09:40 +0100 |
|---|---|---|
| committer | Waffle Lapkin <waffle.lapkin@gmail.com> | 2024-12-10 00:11:27 +0100 |
| commit | 6058cdcccc4fcfa3c2ae2ce878cf229dae776041 (patch) | |
| tree | 7b005961194a9617bdff52ad7e564a4f1fc7756f /src/tools/nix-dev-shell | |
| parent | 5f99e96fbb7964c94f465897ebb59964db76628e (diff) | |
| download | rust-6058cdcccc4fcfa3c2ae2ce878cf229dae776041.tar.gz rust-6058cdcccc4fcfa3c2ae2ce878cf229dae776041.zip | |
remove instructions to git exclude files in `src/nix-dev-shell/envrc-*`
this is no longer needed as `.gitignore` contains both `/.envrc` and `flake.lock` (and also `/.direnv/`)
Diffstat (limited to 'src/tools/nix-dev-shell')
| -rw-r--r-- | src/tools/nix-dev-shell/envrc-flake | 2 | ||||
| -rw-r--r-- | src/tools/nix-dev-shell/envrc-shell | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/nix-dev-shell/envrc-flake b/src/tools/nix-dev-shell/envrc-flake index 9def420f05c..849ed1f4fc5 100644 --- a/src/tools/nix-dev-shell/envrc-flake +++ b/src/tools/nix-dev-shell/envrc-flake @@ -1,7 +1,7 @@ # If you want to use this as an .envrc file to create a shell with necessery components # to develop rustc, use the following command in the root of the rusr checkout: # -# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && nix flake update --flake ./src/tools/nix-dev-shell && echo .envrc >> .git/info/exclude +# ln -s ./src/tools/nix-dev-shell/envrc-flake ./.envrc && nix flake update --flake ./src/tools/nix-dev-shell if nix flake show path:./src/tools/nix-dev-shell &> /dev/null; then use flake path:./src/tools/nix-dev-shell diff --git a/src/tools/nix-dev-shell/envrc-shell b/src/tools/nix-dev-shell/envrc-shell index fb7231a6c30..d8f900fe86a 100644 --- a/src/tools/nix-dev-shell/envrc-shell +++ b/src/tools/nix-dev-shell/envrc-shell @@ -1,7 +1,7 @@ # If you want to use this as an .envrc file to create a shell with necessery components # to develop rustc, use the following command in the root of the rusr checkout: # -# ln -s ./src/tools/nix-dev-shell/envrc-shell ./.envrc && echo .envrc >> .git/info/exclude +# ln -s ./src/tools/nix-dev-shell/envrc-shell ./.envrc use nix ./src/tools/nix-dev-shell/shell.nix |