mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(tvix/eval): use test-generator fork that supports workspaces

Browse source 
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>
This commit is contained in:
Vincent Ambo 2022-12-18 17:23:35 +03:00 committed by tazjin
parent 257c67f204
commit 9d6ee5b6a6
4 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tvix/Cargo.lock generated
View file

@ -1424,8 +1424,7 @@ dependencies = [
[[package]] [[package]]
name = "test-generator" name = "test-generator"
version = "0.3.0" version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41"
checksum = "ea97be90349ab3574f6e74d1566e1c5dd3a4bc74b89f4af4cc10ca010af103c0"
dependencies = [ dependencies = [
"glob", "glob",
"proc-macro2 0.4.30", "proc-macro2 0.4.30",

7
tvix/Cargo.nix
View file

@ -4036,7 +4036,12 @@ rec {
crateName = "test-generator"; crateName = "test-generator";
version = "0.3.0"; version = "0.3.0";
edition = "2018"; edition = "2018";
sha256 = "1h03y4503jhhrks4m7xqfjya9lsx3ip5dlbldr7mgcws6j8bx5za"; workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/JamesGuthrie/test-generator.git";
rev = "82e799979980962aec1aa324ec6e0e4cad781f41";
sha256 = "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y";
};
procMacro = true; procMacro = true;
authors = [ authors = [
"Frank Rehberger <frehberg@gmail.com>" "Frank Rehberger <frehberg@gmail.com>"

3
tvix/crate-hashes.json Normal file
View file

@ -0,0 +1,3 @@
{
"test-generator 0.3.0 (git+https://github.com/JamesGuthrie/test-generator.git?rev=82e799979980962aec1aa324ec6e0e4cad781f41#82e799979980962aec1aa324ec6e0e4cad781f41)": "08brp3qqa55hijc7xby3lam2cc84hvx1zzfqv6lj7smlczh8k32y"
}

7
tvix/eval/Cargo.toml
View file

@ -27,11 +27,16 @@ rnix = "0.11.0"
[dev-dependencies] [dev-dependencies]
criterion = "0.4" criterion = "0.4"
test-generator = "0.3.0"
pretty_assertions = "1.2.1" pretty_assertions = "1.2.1"
itertools = "0.10.3" itertools = "0.10.3"
tempdir = "0.3.7" 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] [features]
default = [ "impure", "arbitrary", "nix_tests", "backtrace_overflow" ] default = [ "impure", "arbitrary", "nix_tests", "backtrace_overflow" ]