diff options
| author | Vincent Ambo <mail@tazj.in> | 2022-09-22T21·31+0300 |
|---|---|---|
| committer | tazjin <tazjin@tvl.su> | 2022-09-22T23·07+0000 |
| commit | c46025d52011632b9e53bc96cc115c1d74bfbf7a (patch) | |
| tree | 7eb87f25117964deec072223cf39c6d85d880799 /corp | |
| parent | ee0b89c4029fe027174018c14dcf7fcff342c8bf (diff) | |
fix(tvix/eval): support string identifiers in inherits r/4958
This updates rnix-parser to a version where inherits provide an iterator over `ast::Attr` instead of `ast::Ident`, which mirrors the behaviour of Nix (inherits can have (statically known) strings as their identifiers). This actually required some fairly significant code reshuffling in the compiler, as there was an implicit assumption in many places that we would have an `ast::Ident` node available when dealing with variable access (which is then explicitly only not true in this case). Change-Id: I12f1e786c0030c85107b1aa409bd49adb5465546 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6747 Tested-by: BuildkiteCI Reviewed-by: sterni <sternenseemann@systemli.org>
Diffstat (limited to 'corp')
| -rw-r--r-- | corp/tvixbolt/Cargo.lock | 2 | ||||
| -rw-r--r-- | corp/tvixbolt/Cargo.toml | 2 | ||||
| -rw-r--r-- | corp/tvixbolt/default.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/corp/tvixbolt/Cargo.lock b/corp/tvixbolt/Cargo.lock index e6572fc03d..05d9a8fb61 100644 --- a/corp/tvixbolt/Cargo.lock +++ b/corp/tvixbolt/Cargo.lock @@ -402,7 +402,7 @@ dependencies = [ [[package]] name = "rnix" version = "0.11.0-dev" -source = "git+https://github.com/nix-community/rnix-parser.git?rev=7d0d929c22ad27bdcc0779afe445b541d3ce9631#7d0d929c22ad27bdcc0779afe445b541d3ce9631" +source = "git+https://github.com/nix-community/rnix-parser.git?rev=85a045afd33e073a3eab4c0ea2f515b6bed557ab#85a045afd33e073a3eab4c0ea2f515b6bed557ab" dependencies = [ "rowan", ] diff --git a/corp/tvixbolt/Cargo.toml b/corp/tvixbolt/Cargo.toml index fc7cedfd58..fa05350db6 100644 --- a/corp/tvixbolt/Cargo.toml +++ b/corp/tvixbolt/Cargo.toml @@ -17,7 +17,7 @@ wasm-bindgen = "= 0.2.82" [dependencies.rnix] git = "https://github.com/nix-community/rnix-parser.git" -rev = "7d0d929c22ad27bdcc0779afe445b541d3ce9631" +rev = "85a045afd33e073a3eab4c0ea2f515b6bed557ab" [dependencies.tvix-eval] path = "../../tvix/eval" diff --git a/corp/tvixbolt/default.nix b/corp/tvixbolt/default.nix index f210a52040..963be66238 100644 --- a/corp/tvixbolt/default.nix +++ b/corp/tvixbolt/default.nix @@ -58,7 +58,7 @@ pkgs.rustPlatform.buildRustPackage rec { cargoLock.lockFile = ./Cargo.lock; cargoLock.outputHashes = { - "rnix-0.11.0-dev" = "sha256:1vvpnv0jbyr96z8cb1r6k613zqsryan9awi53f901q3qjc856iz0"; + "rnix-0.11.0-dev" = "sha256:01c3fdsfyp8iwr36nv2mvr2xw33ci3vcx6pw8a9qrc8pjr6q22f8"; }; patches = [ |