diff options
Diffstat (limited to 'tvix/shell.nix')
| -rw-r--r-- | tvix/shell.nix | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/tvix/shell.nix b/tvix/shell.nix index 422f1c8dd40a..7b8e29e9966a 100644 --- a/tvix/shell.nix +++ b/tvix/shell.nix @@ -10,12 +10,18 @@ depot.third_party.sources = import ./sources { }; additionalOverlays = [ (self: super: { - # https://github.com/googleapis/google-cloud-go/pull/9665 - cbtemulator = super.cbtemulator.overrideAttrs (old: { - patches = old.patches or [ ] ++ [ - ./nixpkgs/cbtemulator-uds.patch - ]; - }); + # macFUSE bump containing fix for https://github.com/osxfuse/osxfuse/issues/974 + # https://github.com/NixOS/nixpkgs/pull/320197 + fuse = + if super.stdenv.isDarwin then + super.fuse.overrideAttrs + (old: rec { + version = "4.8.0"; + src = super.fetchurl { + url = "https://github.com/osxfuse/osxfuse/releases/download/macfuse-${version}/macfuse-${version}.dmg"; + hash = "sha256-ucTzO2qdN4QkowMVvC3+4pjEVjbwMsB0xFk+bvQxwtQ="; + }; + }) else super.fuse; }) ]; }) @@ -29,15 +35,17 @@ pkgs.mkShell { pkgs.cargo pkgs.cargo-machete pkgs.cargo-expand - pkgs.cbtemulator + pkgs.cargo-flamegraph pkgs.clippy + pkgs.d2 pkgs.evans pkgs.fuse pkgs.go - pkgs.google-cloud-bigtable-tool pkgs.grpcurl pkgs.hyperfine pkgs.mdbook + pkgs.mdbook-admonish + pkgs.mdbook-d2 pkgs.mdbook-plantuml pkgs.nix_2_3 # b/313 pkgs.pkg-config @@ -46,6 +54,8 @@ pkgs.mkShell { pkgs.rustfmt pkgs.plantuml pkgs.protobuf + ] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [ + pkgs.runc ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ # We need these two dependencies in the ambient environment to be able to # `cargo build` on MacOS. @@ -59,6 +69,7 @@ pkgs.mkShell { # should also benchmark with a more static nixpkgs checkout, so nixpkgs # refactorings are not observed as eval perf changes. shellHook = '' + export TVIX_BUILD_SANDBOX_SHELL=${if pkgs.stdenv.isLinux then pkgs.busybox-sandbox-shell + "/bin/busybox" else "/bin/sh"} export TVIX_BENCH_NIX_PATH=nixpkgs=${pkgs.path} ''; } |