From b7ea3d7b326f4d193092fc64f9bb97f7a013298c Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 3 Nov 2023 11:01:56 +0200
Subject: fix(tvix): fix `cargo test` for `nix_oracle`

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>
---
 tvix/shell.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'tvix')

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
-- 
cgit 1.4.1