diff options
| author | Florian Klink <flokli@flokli.de> | 2022-11-08T22·26+0000 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2022-11-11T19·55+0000 |
| commit | 7eb70148219f902fa1df6b361b87c37efa17a332 (patch) | |
| tree | 4c948c6d8bc6f3aececc7045e65bf9e7193f46a9 /tvix | |
| parent | d00030128e465c8351412b1aefb4260681d8b497 (diff) | |
feat(tvix/eval): move shell.nix and .envrc to //tvix r/5277
Both //tvix/eval and //tvix/nix_cli have need to for rust tooling available in $PATH. Move this one level up, so it's accessible in all subdirectories. Change-Id: I0763bbe9cefdc962f3a8f86c51e8f67cde8b4b04 Reviewed-on: https://cl.tvl.fyi/c/depot/+/7248 Autosubmit: flokli <flokli@flokli.de> Reviewed-by: sterni <sternenseemann@systemli.org> Reviewed-by: grfn <grfn@gws.fyi> Tested-by: BuildkiteCI
Diffstat (limited to 'tvix')
| -rw-r--r-- | tvix/.envrc (renamed from tvix/eval/.envrc) | 0 | ||||
| -rw-r--r-- | tvix/nix_cli/shell.nix | 11 | ||||
| -rw-r--r-- | tvix/shell.nix (renamed from tvix/eval/shell.nix) | 3 |
3 files changed, 2 insertions, 12 deletions
diff --git a/tvix/eval/.envrc b/tvix/.envrc index 777b522575a7..777b522575a7 100644 --- a/tvix/eval/.envrc +++ b/tvix/.envrc diff --git a/tvix/nix_cli/shell.nix b/tvix/nix_cli/shell.nix deleted file mode 100644 index f57019cd94a4..000000000000 --- a/tvix/nix_cli/shell.nix +++ /dev/null @@ -1,11 +0,0 @@ -let - depot = (import ./.. { }); - pkgs = depot.third_party.nixpkgs; - -in -pkgs.mkShell { - buildInputs = [ - pkgs.rustup - pkgs.rust-analyzer - ]; -} diff --git a/tvix/eval/shell.nix b/tvix/shell.nix index 482ccb591eeb..2da5b5f24fbd 100644 --- a/tvix/eval/shell.nix +++ b/tvix/shell.nix @@ -1,5 +1,6 @@ -{ depot ? import ../../. { } +{ depot ? import ../. { } , pkgs ? depot.third_party.nixpkgs +, ... }: pkgs.mkShell { |