diff options
-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 { |