2023-11-03 12:34:37 +01:00
|
|
|
[package]
|
|
|
|
|
name = "tvix-glue"
|
|
|
|
|
version = "0.1.0"
|
|
|
|
|
edition = "2021"
|
|
|
|
|
|
|
|
|
|
[dependencies]
|
feat(tvix/glue): drive builds on IO
That's one possible abstraction to drive builds.
Whenever IO into a store path is requested, we look up the root node,
and in case we don't have it in PathInfoService, but KnownPaths gives us
a Derivation for that output path, trigger a build and await the result.
This recursively might trigger builds for parent paths if they haven't
been built yet.
Another option would be to simply expose a PathInfoService interface for
a builder too, and loop all building into IO via PathInfoService
composition - but let's start with something.
Note tvix-cli doesn't have a configurable BuildService yet, it's plugged
to the DummyBuildService, so whenever it needs to do a build, it'll fail,
but that's how it can be provoked:
```
(builtins.readFile (import <nixpkgs> {}).hello.outPath + "/bin/hello")
[…]
error[E029]: I/O error: /nix/store/cg8a576pz2yfc1wbhxm1zy4x7lrk8pix-hello-2.12.1: builds are not supported with DummyBuildService
--> [code]:1:2
|
1 | (builtins.readFile (import <nixpkgs> {}).hello.outPath + "/bin/hello")
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
```
Note how this fails, while pure output path calculation
(`(import <nixpkgs> {}).hello.outPath + "/bin/hello")`) still succeeds.
Change-Id: Id2075d8a2b18554d0dd608b4b29146a8cd411e7f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10793
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
2024-01-16 20:14:38 +01:00
|
|
|
async-recursion = "1.0.5"
|
feat(tvix/glue/derivationStrict): support __structuredAttrs
This adds support to handle the __structuredAttrs argument, which can be
passed to builtins.derivationStrict.
If __structuredAttrs is passed, and set to true, most of the arguments
passed to builtins.derivationStrict are not simply coerced to a string
and passed down to "environments", but instead kept in a more structured
fashion.
Inside ATerm, which is what's relevant as far as path calculation is
concerned, a virtual `__json` environment variable is present,
containing these structured values.
Inside Builds, these structured values are not made available as an
environment variable, but a JSON file (and source-able bash script).
This will need to be respected once we start emitting BuildRequests,
and for that we can probably just parse the `__json` key in
Derivation.environment again - or keep this additionally in
non-serialized form around during Evaluation.
No matter what, this is left for a followup CL.
The existing handle_derivation_parameters and populate_outputs helper
function were removed, as __structuredAttrs causes quite a change
in behaviour, and so handling both in the same place makes it more
readable.
There's some open questions w.r.t. string contexts for structured attrs
itself. A TODO is left for this, but at least path calculation for
individual structured attrs derivations are correct now.
Part of b/366.
Change-Id: Ic293822266ced6f8c4826d8ef0d2e098a4adccaa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10604
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
2024-01-11 14:44:31 +01:00
|
|
|
bstr = "1.6.0"
|
|
|
|
|
bytes = "1.4.0"
|
2023-12-30 03:01:59 +01:00
|
|
|
data-encoding = "2.3.3"
|
feat(tvix/glue): drive builds on IO
That's one possible abstraction to drive builds.
Whenever IO into a store path is requested, we look up the root node,
and in case we don't have it in PathInfoService, but KnownPaths gives us
a Derivation for that output path, trigger a build and await the result.
This recursively might trigger builds for parent paths if they haven't
been built yet.
Another option would be to simply expose a PathInfoService interface for
a builder too, and loop all building into IO via PathInfoService
composition - but let's start with something.
Note tvix-cli doesn't have a configurable BuildService yet, it's plugged
to the DummyBuildService, so whenever it needs to do a build, it'll fail,
but that's how it can be provoked:
```
(builtins.readFile (import <nixpkgs> {}).hello.outPath + "/bin/hello")
[…]
error[E029]: I/O error: /nix/store/cg8a576pz2yfc1wbhxm1zy4x7lrk8pix-hello-2.12.1: builds are not supported with DummyBuildService
--> [code]:1:2
|
1 | (builtins.readFile (import <nixpkgs> {}).hello.outPath + "/bin/hello")
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
```
Note how this fails, while pure output path calculation
(`(import <nixpkgs> {}).hello.outPath + "/bin/hello")`) still succeeds.
Change-Id: Id2075d8a2b18554d0dd608b4b29146a8cd411e7f
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10793
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Tested-by: BuildkiteCI
2024-01-16 20:14:38 +01:00
|
|
|
futures = "0.3.30"
|
2023-11-03 12:34:37 +01:00
|
|
|
nix-compat = { path = "../nix-compat" }
|
2023-12-09 11:53:17 +01:00
|
|
|
tvix-build = { path = "../build", default-features = false, features = []}
|
2023-11-03 12:34:37 +01:00
|
|
|
tvix-eval = { path = "../eval" }
|
|
|
|
|
tvix-castore = { path = "../castore" }
|
|
|
|
|
tvix-store = { path = "../store", default-features = false, features = []}
|
|
|
|
|
tracing = "0.1.37"
|
|
|
|
|
tokio = "1.28.0"
|
|
|
|
|
thiserror = "1.0.38"
|
feat(tvix/glue/derivationStrict): support __structuredAttrs
This adds support to handle the __structuredAttrs argument, which can be
passed to builtins.derivationStrict.
If __structuredAttrs is passed, and set to true, most of the arguments
passed to builtins.derivationStrict are not simply coerced to a string
and passed down to "environments", but instead kept in a more structured
fashion.
Inside ATerm, which is what's relevant as far as path calculation is
concerned, a virtual `__json` environment variable is present,
containing these structured values.
Inside Builds, these structured values are not made available as an
environment variable, but a JSON file (and source-able bash script).
This will need to be respected once we start emitting BuildRequests,
and for that we can probably just parse the `__json` key in
Derivation.environment again - or keep this additionally in
non-serialized form around during Evaluation.
No matter what, this is left for a followup CL.
The existing handle_derivation_parameters and populate_outputs helper
function were removed, as __structuredAttrs causes quite a change
in behaviour, and so handling both in the same place makes it more
readable.
There's some open questions w.r.t. string contexts for structured attrs
itself. A TODO is left for this, but at least path calculation for
individual structured attrs derivations are correct now.
Part of b/366.
Change-Id: Ic293822266ced6f8c4826d8ef0d2e098a4adccaa
Reviewed-on: https://cl.tvl.fyi/c/depot/+/10604
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
2024-01-11 14:44:31 +01:00
|
|
|
serde = "1.0.195"
|
|
|
|
|
serde_json = "1.0"
|
2024-01-02 13:17:02 +01:00
|
|
|
sha2 = "0.10.8"
|
2023-11-03 12:34:37 +01:00
|
|
|
|
|
|
|
|
[dependencies.wu-manber]
|
|
|
|
|
git = "https://github.com/tvlfyi/wu-manber.git"
|
|
|
|
|
|
|
|
|
|
[dev-dependencies]
|
2023-12-09 17:45:39 +01:00
|
|
|
criterion = { version = "0.5", features = ["html_reports"] }
|
2024-02-17 07:10:13 +01:00
|
|
|
hex-literal = "0.4.1"
|
2023-12-09 11:53:17 +01:00
|
|
|
lazy_static = "1.4.0"
|
2024-01-14 01:41:16 +01:00
|
|
|
pretty_assertions = "1.4.0"
|
|
|
|
|
rstest = "0.18.2"
|
2023-12-13 10:34:17 +01:00
|
|
|
tempfile = "3.8.1"
|
2024-01-05 15:12:35 +01:00
|
|
|
test-case = "3.3.1"
|
2023-12-09 17:45:39 +01:00
|
|
|
|
2024-01-14 01:41:16 +01:00
|
|
|
[features]
|
|
|
|
|
default = ["nix_tests"]
|
|
|
|
|
# Enables running the Nix language test suite from the original C++
|
|
|
|
|
# Nix implementation (at version 2.3) against Tvix.
|
|
|
|
|
nix_tests = []
|
|
|
|
|
|
2023-12-09 17:45:39 +01:00
|
|
|
[[bench]]
|
|
|
|
|
name = "eval"
|
|
|
|
|
harness = false
|
