75cc52ddb1
Previously, we were assembling very naively an attribute set composed of context we saw.
But it was forgetting that `"${drv}${drv.drvPath}"` would contain 2 contexts with the same key, but
with different values, one with `outputs = [ "out" ];` and `allOutputs = true;`.
Following this reasoning and comparing with what Nix does, we ought to merge underlying values systematically.
Hence, I bring `itertools` to perform a group by on the key and merge everything on the fly, it's not
beautiful but it's the best I could find, notice that I don't use
`group_by` but I talk about group by, that is, because `group_by` is a
`group_by_consecutive`, see
https://github.com/rust-itertools/itertools/issues/374.
Initially, I tried to do it without a `into_grouping_map_by`, it was akin to assemble the final `NixAttrs` directly,
it was less readable and harder to pull out because we don't have a lot of in-place mutable functions on
our data structures.
Change-Id: I9933c9bd88ffe04de50dda14f21879b60d8b8cd4
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10620
Tested-by: BuildkiteCI
Reviewed-by: tazjin <tazjin@tvl.su>
57 lines
1.5 KiB
TOML
57 lines
1.5 KiB
TOML
[package]
|
|
name = "tvix-eval"
|
|
version = "0.1.0"
|
|
edition = "2021"
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
[lib]
|
|
name = "tvix_eval"
|
|
|
|
[dependencies]
|
|
builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" }
|
|
bytes = "1.4.0"
|
|
codemap = "0.1.3"
|
|
codemap-diagnostic = "0.1.1"
|
|
dirs = "4.0.0"
|
|
genawaiter = { version = "0.99.1", default_features = false }
|
|
imbl = { version = "2.0", features = [ "serde" ] }
|
|
itertools = "0.12.0"
|
|
lazy_static = "1.4.0"
|
|
lexical-core = { version = "0.8.5", features = ["format", "parse-floats"] }
|
|
path-clean = "0.1"
|
|
proptest = { version = "1.3.0", default_features = false, features = ["std", "alloc", "tempfile"], optional = true }
|
|
regex = "1.6.0"
|
|
rnix = "0.11.0"
|
|
rowan = "*" # pinned by rnix
|
|
serde = { version = "1.0", features = [ "rc", "derive" ] }
|
|
serde_json = "1.0"
|
|
smol_str = "0.2.0"
|
|
tabwriter = "1.2"
|
|
test-strategy = { version = "0.2.1", optional = true }
|
|
toml = "0.6.0"
|
|
xml-rs = "0.8.4"
|
|
|
|
[dev-dependencies]
|
|
criterion = "0.5"
|
|
itertools = "0.12.0"
|
|
pretty_assertions = "1.2.1"
|
|
rstest = "0.18.2"
|
|
tempfile = "3.3.0"
|
|
|
|
[features]
|
|
default = ["impure", "arbitrary", "nix_tests"]
|
|
|
|
# Enables running the Nix language test suite from the original C++
|
|
# Nix implementation (at version 2.3) against Tvix.
|
|
nix_tests = []
|
|
|
|
# Enables operations in the VM which depend on the ability to perform I/O
|
|
impure = []
|
|
|
|
# Enables Arbitrary impls for internal types (required to run tests)
|
|
arbitrary = ["proptest", "test-strategy", "imbl/proptest"]
|
|
|
|
[[bench]]
|
|
name = "eval"
|
|
harness = false
|