From 9d6ee5b6a69195bc1a3d5543f04998b631584076 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Sun, 18 Dec 2022 17:23:35 +0300
Subject: fix(tvix/eval): use test-generator fork that supports workspaces

This should make no difference in Nix builds, but allows running tests
locally again with `cargo test` for //tvix/eval.

Change-Id: I97d61840143d5c14db61d5862781bf635f9a28e7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7590
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
---
 tvix/Cargo.lock        | 3 +--
 tvix/Cargo.nix         | 7 ++++++-
 tvix/crate-hashes.json | 3 +++
 tvix/eval/Cargo.toml   | 7 ++++++-
 4 files changed, 16 insertions(+), 4 deletions(-)
 create mode 100644 tvix/crate-hashes.json

diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock
index bc683b015c..f5a32107e1 100644
--- a/tvix/Cargo.lock
+++ b/tvix/Cargo.lock
@@ -1424,8 +1424,7 @@ dependencies = [
 [[package]]
 name = "test-generator"
 version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea97be90349ab3574f6e74d1566e1c5dd3a4bc74b89f4af4cc10ca010af103c0"
+source = "git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41"
 dependencies = [
  "glob",
  "proc-macro2 0.4.30",
diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix
index d670bda408..886a39e428 100644
--- a/tvix/Cargo.nix
+++ b/tvix/Cargo.nix
@@ -4036,7 +4036,12 @@ rec {
         crateName = "test-generator";
         version = "0.3.0";
         edition = "2018";
-        sha256 = "1h03y4503jhhrks4m7xqfjya9lsx3ip5dlbldr7mgcws6j8bx5za";
+        workspace_member = null;
+        src = pkgs.fetchgit {
+          url = "https://github.com/JamesGuthrie/test-generator.git";
+          rev = "82e799979980962aec1aa324ec6e0e4cad781f41";
+          sha256 = "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y";
+        };
         procMacro = true;
         authors = [
           "Frank Rehberger <frehberg@gmail.com>"
diff --git a/tvix/crate-hashes.json b/tvix/crate-hashes.json
new file mode 100644
index 0000000000..d312e6bf60
--- /dev/null
+++ b/tvix/crate-hashes.json
@@ -0,0 +1,3 @@
+{
+  "test-generator 0.3.0 (git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41)": "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y"
+}
\ No newline at end of file
diff --git a/tvix/eval/Cargo.toml b/tvix/eval/Cargo.toml
index b08dc139a9..93d45c2166 100644
--- a/tvix/eval/Cargo.toml
+++ b/tvix/eval/Cargo.toml
@@ -27,11 +27,16 @@ rnix = "0.11.0"
 
 [dev-dependencies]
 criterion = "0.4"
-test-generator = "0.3.0"
 pretty_assertions = "1.2.1"
 itertools = "0.10.3"
 tempdir = "0.3.7"
 
+[dev-dependencies.test-generator]
+# This fork of test-generator adds support for cargo workspaces, see
+# also https://github.com/frehberg/test-generator/pull/14
+git = "https://github.com/JamesGuthrie/test-generator.git"
+rev = "82e799979980962aec1aa324ec6e0e4cad781f41"
+
 [features]
 default = [ "impure", "arbitrary", "nix_tests", "backtrace_overflow" ]
 
-- 
cgit 1.4.1