From b3cc4c8c2c25008699323491ee2456bd317efeac Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 18 Sep 2022 17:37:29 +0300 Subject: chore(tvix/eval): bump rnix-parser to latest HEAD This bumps rnix-parser to a commit that should be unaffected by the Nix >= 2.4 bug that prevents it from cloning repositories with filters. Change-Id: Ie01da95245ec6740fa889eb710819e512202f665 Reviewed-on: https://cl.tvl.fyi/c/depot/+/6634 Tested-by: BuildkiteCI Reviewed-by: sterni --- corp/tvixbolt/Cargo.lock | 2 +- corp/tvixbolt/Cargo.toml | 2 +- corp/tvixbolt/default.nix | 2 +- tvix/eval/Cargo.lock | 2 +- tvix/eval/Cargo.toml | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/corp/tvixbolt/Cargo.lock b/corp/tvixbolt/Cargo.lock index 60b20eb43d..2c20a413a0 100644 --- a/corp/tvixbolt/Cargo.lock +++ b/corp/tvixbolt/Cargo.lock @@ -363,7 +363,7 @@ dependencies = [ [[package]] name = "rnix" version = "0.11.0-dev" -source = "git+https://github.com/nix-community/rnix-parser.git?rev=97b438e34be5211a4b48aeed9cc3ded489b4d6da#97b438e34be5211a4b48aeed9cc3ded489b4d6da" +source = "git+https://github.com/nix-community/rnix-parser.git?rev=7d0d929c22ad27bdcc0779afe445b541d3ce9631#7d0d929c22ad27bdcc0779afe445b541d3ce9631" dependencies = [ "rowan", ] diff --git a/corp/tvixbolt/Cargo.toml b/corp/tvixbolt/Cargo.toml index 2e6c793209..7d259c20b2 100644 --- a/corp/tvixbolt/Cargo.toml +++ b/corp/tvixbolt/Cargo.toml @@ -15,7 +15,7 @@ wasm-bindgen = "= 0.2.82" [dependencies.rnix] git = "https://github.com/nix-community/rnix-parser.git" -rev = "97b438e34be5211a4b48aeed9cc3ded489b4d6da" +rev = "7d0d929c22ad27bdcc0779afe445b541d3ce9631" [dependencies.tvix-eval] path = "../../tvix/eval" diff --git a/corp/tvixbolt/default.nix b/corp/tvixbolt/default.nix index a55b249b5f..f210a52040 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:1dd8gf2v4v6451r3n9iaks7bqk55izgblkqzymx77advpqwlpymq"; + "rnix-0.11.0-dev" = "sha256:1vvpnv0jbyr96z8cb1r6k613zqsryan9awi53f901q3qjc856iz0"; }; patches = [ diff --git a/tvix/eval/Cargo.lock b/tvix/eval/Cargo.lock index 7fec8dac05..2804e7f129 100644 --- a/tvix/eval/Cargo.lock +++ b/tvix/eval/Cargo.lock @@ -801,7 +801,7 @@ dependencies = [ [[package]] name = "rnix" version = "0.11.0-dev" -source = "git+https://github.com/nix-community/rnix-parser.git?rev=97b438e34be5211a4b48aeed9cc3ded489b4d6da#97b438e34be5211a4b48aeed9cc3ded489b4d6da" +source = "git+https://github.com/nix-community/rnix-parser.git?rev=7d0d929c22ad27bdcc0779afe445b541d3ce9631#7d0d929c22ad27bdcc0779afe445b541d3ce9631" dependencies = [ "rowan", ] diff --git a/tvix/eval/Cargo.toml b/tvix/eval/Cargo.toml index a8d93ca0ec..1c56f31716 100644 --- a/tvix/eval/Cargo.toml +++ b/tvix/eval/Cargo.toml @@ -24,11 +24,11 @@ codemap-diagnostic = "0.1.1" proptest = { version = "1.0.0", default_features = false, features = ["std", "alloc", "break-dead-code", "tempfile"], optional = true } test-strategy = { version = "0.2.1", optional = true } -# rnix has not been released in a while (as of 2022-09-01), we will +# rnix has not been released in a while (as of 2022-09-18), we will # use it from git. [dependencies.rnix] git = "https://github.com/nix-community/rnix-parser.git" -rev = "97b438e34be5211a4b48aeed9cc3ded489b4d6da" +rev = "7d0d929c22ad27bdcc0779afe445b541d3ce9631" [dev-dependencies] criterion = "0.3.6" -- cgit 1.4.1