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

fix(tvix/eval): use rnix-parser from crates.io

Browse source 
A few weeks ago, oberblastmeister did a release to crates.io so we can
stop importing it via GitHub.

Change-Id: I9d5fa5cd281685779c71b12fed45ed201a1db17e
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7532
Tested-by: BuildkiteCI
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-12-06 16:31:09 +03:00 committed by tazjin
parent 17e0a74e7b
commit f282984c25
5 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
corp/tvixbolt/Cargo.lock generated
View file

@ -433,8 +433,9 @@ checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
[[package]] [[package]]
name = "rnix" name = "rnix"
version = "0.11.0-dev" version = "0.11.0"
source = "git+https://github.com/nix-community/rnix-parser.git?rev=85a045afd33e073a3eab4c0ea2f515b6bed557ab#85a045afd33e073a3eab4c0ea2f515b6bed557ab" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb35cedbeb70e0ccabef2a31bcff0aebd114f19566086300b8f42c725fc2cb5f"
dependencies = [ dependencies = [
"rowan", "rowan",
] ]
@ -619,6 +620,16 @@ dependencies = [
"serde_json", "serde_json",
"smol_str", "smol_str",
"tabwriter", "tabwriter",
"tvix-eval-builtin-macros",
]
[[package]]
name = "tvix-eval-builtin-macros"
version = "0.0.1"
dependencies = [
"proc-macro2",
"quote",
"syn",
] ]
[[package]] [[package]]

5
corp/tvixbolt/Cargo.toml
View file

@ -10,14 +10,11 @@ yew = "0.19.3"
yew-router = "0.16" yew-router = "0.16"
codemap = "0.1.3" codemap = "0.1.3"
serde_urlencoded = "*" # pinned by yew serde_urlencoded = "*" # pinned by yew
rnix = "0.11.0"
# needs to be in sync with nixpkgs # needs to be in sync with nixpkgs
wasm-bindgen = "= 0.2.83" wasm-bindgen = "= 0.2.83"
[dependencies.rnix]
git = "https://github.com/nix-community/rnix-parser.git"
rev = "85a045afd33e073a3eab4c0ea2f515b6bed557ab"
[dependencies.tvix-eval] [dependencies.tvix-eval]
path = "../../tvix/eval" path = "../../tvix/eval"
default-features = false default-features = false

12
corp/tvixbolt/default.nix
View file

@ -38,18 +38,19 @@ let
# tvix-eval. # tvix-eval.
cargoTomlPatch = pkgs.writeText "tvix-eval-src.patch" '' cargoTomlPatch = pkgs.writeText "tvix-eval-src.patch" ''
diff --git a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
index 2e6c793..67280e7 100644 index 75006bec18..6ca244bbb2 100644
--- a/Cargo.toml --- a/Cargo.toml
+++ b/Cargo.toml +++ b/Cargo.toml
@@ -18,5 +18,5 @@ git = "https://github.com/nix-community/rnix-parser.git" @@ -16,7 +16,7 @@ rnix = "0.11.0"
rev = "97b438e34be5211a4b48aeed9cc3ded489b4d6da" wasm-bindgen = "= 0.2.83"
[dependencies.tvix-eval] [dependencies.tvix-eval]
-path = "../../tvix/eval" -path = "../../tvix/eval"
+path = "${depot.tvix.eval.src}" +path = "${depot.tvix.eval.src}"
default-features = false default-features = false
'';
[dependencies.serde]
'';
in in
pkgs.rustPlatform.buildRustPackage rec { pkgs.rustPlatform.buildRustPackage rec {
pname = "tvixbolt"; pname = "tvixbolt";
@ -57,9 +58,6 @@ pkgs.rustPlatform.buildRustPackage rec {
src = lib.cleanSource ./.; src = lib.cleanSource ./.;
cargoLock.lockFile = ./Cargo.lock; cargoLock.lockFile = ./Cargo.lock;
cargoLock.outputHashes = {
"rnix-0.11.0-dev" = "sha256:01c3fdsfyp8iwr36nv2mvr2xw33ci3vcx6pw8a9qrc8pjr6q22f8";
};
patches = [ patches = [
cargoTomlPatch cargoTomlPatch

5
tvix/eval/Cargo.lock generated
View file

@ -984,8 +984,9 @@ dependencies = [
[[package]] [[package]]
name = "rnix" name = "rnix"
version = "0.11.0-dev" version = "0.11.0"
source = "git+https://github.com/nix-community/rnix-parser.git?rev=85a045afd33e073a3eab4c0ea2f515b6bed557ab#85a045afd33e073a3eab4c0ea2f515b6bed557ab" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb35cedbeb70e0ccabef2a31bcff0aebd114f19566086300b8f42c725fc2cb5f"
dependencies = [ dependencies = [
"rowan", "rowan",
] ]

7
tvix/eval/Cargo.toml
View file

@ -29,12 +29,7 @@ serde_json = "1.0"
regex = "1.6.0" regex = "1.6.0"
builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" } builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" }
backtrace-on-stack-overflow = { version = "0.2.0", optional = true } backtrace-on-stack-overflow = { version = "0.2.0", optional = true }
rnix = "0.11.0"
# rnix has not been released in a while (as of 2022-09-23), we will
# use it from git.
[dependencies.rnix]
git = "https://github.com/nix-community/rnix-parser.git"
rev = "85a045afd33e073a3eab4c0ea2f515b6bed557ab"
[dev-dependencies] [dev-dependencies]
criterion = "0.3.6" criterion = "0.3.6"