diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-10-17 20:47:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-17 20:47:29 +0200 |
| commit | 7a7c31331210b28b2420350753a0b99fc835f73a (patch) | |
| tree | ffd5b3f5c422428309bea89367e55d6c4709bab6 /.gitignore | |
| parent | 86bd45979a964678b40b79156744f0057759d840 (diff) | |
| parent | 002a6b134f910be617722f9d25e0ea8016c2a54e (diff) | |
| download | rust-7a7c31331210b28b2420350753a0b99fc835f73a.tar.gz rust-7a7c31331210b28b2420350753a0b99fc835f73a.zip | |
Rollup merge of #129620 - WaffleLapkin:flake, r=Noratrieb
Provide a more convinient way of developing rustc on NixOS This PR adds envrc files which, once symlinked as `.envrc` will activates a dev shell from `src/tools/nix-dev-shell/flake.nix` or `src/tools/nix-dev-shell/shell.nix`. This is based on - [Current rustc dev guide recommendation for NixOS](https://rustc-dev-guide.rust-lang.org/building/suggested.html?highlight=nix#using-nix-shell) - https://github.com/oxalica/rust-overlay?tab=readme-ov-file#use-in-devshell-for-nix-develop - [Nora's `x` nix package](https://github.com/Noratrieb/nixos/tree/26ea68e1a0aadaab313c1b5a8c1033a9770bd138/custom-pkgs/x) - https://github.com/rust-lang/rustup/pull/2891 - [Direnv: use flake/nix according to availability](https://discourse.nixos.org/t/direnv-use-flake-nix-according-to-availability/29825) This is something that I plan to use personally, but I thought it might be worth upstreaming :) r? Noratrieb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index b170dca88fa..948133cd76e 100644 --- a/.gitignore +++ b/.gitignore @@ -57,6 +57,8 @@ build/ /src/tools/x/target # Created by default with `src/ci/docker/run.sh` /obj/ +# Created by nix dev shell / .envrc +src/tools/nix-dev-shell/flake.lock ## ICE reports rustc-ice-*.txt |