From 03fec0b3934004d743397347f6fb2a1322b4c46c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Sat, 7 Oct 2023 06:40:24 +0300
Subject: refactor(tvix,views/tvix): move shell into separate file

So far, we provided a custom `default.nix` in the root of the tvix josh
workspace, which re-defined the shell attribute from `tvix/default.nix`.
Some of the recent fixes, e.g. the MacOS-specific additions to the list
of dependencies however didn't get ported over to this file, and in
general, it's quite annoying to have two different places for these
things.

Initially I explored the idea of moving this default.nix file to a
default-depot.nix file in the josh worktree only, and then "polyfill"
some of the dependencies, or set up readTree in the josh workspace too,
but it turned out to pull in too many dependencies to be worth
the effort (nix.sparseTree, tools.depotfmt, crate2nix overlay,
third_party.gitignoreSource).

I now took a different approach - moving the definition of the `shell`
attribute from `tvix/default.nix` to its own `shell.nix` file, which is
imported from `tvix/default.nix` in regular depot usecases.

Josh workspace consumers only see the `shell.nix`, which can be used
in a self-contained fashion, the other `default.nix` is gone entirely,
and we update the workspace file to also not show `tvix/default.nix` at
the root either, so running `nix-shell` and then `cargo build` should
still work.

Change-Id: I6cb54d45d150c597612530ba44bc578f9d7f9120
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9556
Tested-by: BuildkiteCI
Reviewed-by: Connor Brewster <cbrewster@hey.com>
Autosubmit: flokli <flokli@flokli.de>
---
 views/tvix/default.nix    | 26 --------------------------
 views/tvix/workspace.josh |  5 ++++-
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 views/tvix/default.nix

(limited to 'views/tvix')

diff --git a/views/tvix/default.nix b/views/tvix/default.nix
deleted file mode 100644
index feee0f222240..000000000000
--- a/views/tvix/default.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-# Externally importable TVL depot stack. This is intended to be called
-# with a supplied package set, otherwise the package set currently in
-# use by the TVL depot will be used.
-#
-{ pkgs ? (import ./nixpkgs {
-    depotOverlays = false;
-    depot.third_party.sources = import ./sources { };
-  })
-, ...
-}:
-
-pkgs.mkShell {
-  name = "tvix-rust-dev-env";
-  packages = with pkgs; [
-    buf-language-server
-    cargo
-    clippy
-    evans
-    fuse
-    pkg-config
-    protobuf
-    rust-analyzer
-    rustc
-    rustfmt
-  ];
-}
diff --git a/views/tvix/workspace.josh b/views/tvix/workspace.josh
index e0b15c7f30b5..b4f6e3ce5be3 100644
--- a/views/tvix/workspace.josh
+++ b/views/tvix/workspace.josh
@@ -2,4 +2,7 @@
     ::nixpkgs/
     ::sources/
 ]
-:/tvix
+
+::tvix:exclude[
+  ::tvix/default.nix
+]:/tvix
-- 
cgit 1.4.1