From 7eb70148219f902fa1df6b361b87c37efa17a332 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Tue, 8 Nov 2022 22:26:12 +0000 Subject: feat(tvix/eval): move shell.nix and .envrc to //tvix 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 Reviewed-by: sterni Reviewed-by: grfn Tested-by: BuildkiteCI --- tvix/eval/.envrc | 7 ------- tvix/eval/shell.nix | 14 -------------- 2 files changed, 21 deletions(-) delete mode 100644 tvix/eval/.envrc delete mode 100644 tvix/eval/shell.nix (limited to 'tvix/eval') diff --git a/tvix/eval/.envrc b/tvix/eval/.envrc deleted file mode 100644 index 777b522575..0000000000 --- a/tvix/eval/.envrc +++ /dev/null @@ -1,7 +0,0 @@ -if command -v lorri >/dev/null; then - eval "$(lorri direnv)" -else - use nix -fi - -source_up diff --git a/tvix/eval/shell.nix b/tvix/eval/shell.nix deleted file mode 100644 index 482ccb591e..0000000000 --- a/tvix/eval/shell.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ depot ? import ../../. { } -, pkgs ? depot.third_party.nixpkgs -}: - -pkgs.mkShell { - name = "tvix-eval-dev-env"; - packages = [ - pkgs.cargo - pkgs.clippy - pkgs.rust-analyzer - pkgs.rustc - pkgs.rustfmt - ]; -} -- cgit 1.4.1