From 7eb70148219f902fa1df6b361b87c37efa17a332 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Tue, 8 Nov 2022 22:26:12 +0000
Subject: [PATCH] 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 <flokli@flokli.de>
Reviewed-by: sterni <sternenseemann@systemli.org>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
---
 tvix/{eval => }/.envrc    |  0
 tvix/nix_cli/shell.nix    | 11 -----------
 tvix/{eval => }/shell.nix |  3 ++-
 3 files changed, 2 insertions(+), 12 deletions(-)
 rename tvix/{eval => }/.envrc (100%)
 delete mode 100644 tvix/nix_cli/shell.nix
 rename tvix/{eval => }/shell.nix (85%)

diff --git a/tvix/eval/.envrc b/tvix/.envrc
similarity index 100%
rename from tvix/eval/.envrc
rename to tvix/.envrc
diff --git a/tvix/nix_cli/shell.nix b/tvix/nix_cli/shell.nix
deleted file mode 100644
index f57019cd9..000000000
--- 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
similarity index 85%
rename from tvix/eval/shell.nix
rename to tvix/shell.nix
index 482ccb591..2da5b5f24 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 {