From fa2ea97ef3c8a2b36edf56ce3dd3ae2145d72a71 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sun, 13 Jul 2025 13:19:52 +0300 Subject: [PATCH] refactor(snix/shell): drop josh functionality Snix is not provided as a josh workspace, this was only the case for Tvix, while still in the TVL repo, so we can drop that entrypoint. Change-Id: Iafc2a6520645e607f26bcf674a3d98b646f5c9f2 Reviewed-on: https://cl.snix.dev/c/snix/+/30601 Reviewed-by: Yureka Tested-by: besadii Autosubmit: Florian Klink --- snix/shell.nix | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/snix/shell.nix b/snix/shell.nix index 3586d0d93..cbcb2b7b2 100644 --- a/snix/shell.nix +++ b/snix/shell.nix @@ -1,17 +1,4 @@ -# This file is shell.nix in the snix josh workspace, -# *and* used to provide the //snix:shell attribute in a full depot checkout. -# Hence, it may not use depot as a toplevel argument. - -{ - # This falls back to the snix josh workspace-provided nixpkgs checkout. - # In the case of depot, it's always set explicitly. - pkgs ? (import ./nixpkgs { - depotOverlays = false; - depot.third_party.sources = import ./sources { }; - }) -, withIntegration ? false -, ... -}: +{ pkgs, ... }: pkgs.mkShell { name = "snix-rust-dev-env"; @@ -40,7 +27,6 @@ pkgs.mkShell { pkgs.protobuf ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [ pkgs.runc - ] ++ pkgs.lib.optionals withIntegration [ pkgs.cbtemulator pkgs.google-cloud-bigtable-tool ];