about summary refs log tree commit diff
path: root/tvix
diff options
context:
space:
mode:
authorFlorian Klink <flokli@flokli.de>2023-11-03T09·01+0200
committerclbot <clbot@tvl.fyi>2023-11-03T09·15+0000
commitb7ea3d7b326f4d193092fc64f9bb97f7a013298c (patch)
tree64319c0141ca9aac09dc9cd38304e987320c264a /tvix
parentc017e6d51a1757666e3fcfa7754723d8dbe16511 (diff)
fix(tvix): fix `cargo test` for `nix_oracle` r/6929
As described in https://b.tvl.fyi/issues/313, the `nix_oracle` tests
currently fail if run without Nix 2.3 in `$PATH`.

This is not a problem for people running Nix 2.3 on their systems, and
neither is it for the tests running inside Nix derivations itself (as we
hardcode Nix 2.3 there), but for interactive `cargo test` runs, either
using `mg shell //tvix:shell`, or `nix-shell` (from the tvix workspace)
it currently is broken.

Adding Nix 2.3 to the shell fixes that.

Change-Id: Idbe01aa92d63eb1a3dab5797b9be5eba1e8d7f7a
Reviewed-on: https://cl.tvl.fyi/c/depot/+/9907
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
Diffstat (limited to 'tvix')
-rw-r--r--tvix/shell.nix1
1 files changed, 1 insertions, 0 deletions
diff --git a/tvix/shell.nix b/tvix/shell.nix
index ac8f1866c6b0..b2bd16c6da5d 100644
--- a/tvix/shell.nix
+++ b/tvix/shell.nix
@@ -22,6 +22,7 @@ pkgs.mkShell {
     pkgs.evans
     pkgs.fuse
     pkgs.go
+    pkgs.nix_2_3 # b/313
     pkgs.pkg-config
     pkgs.rust-analyzer
     pkgs.rustc