lheckemann/binary-cache
0
0
Fork 0
forked from yu-re-ka/binary-cache
Code Pull requests Activity

feat(tvix): update

Browse source
This commit is contained in:
sinavir 2024-07-19 10:49:02 +02:00
parent e810527d5e
commit e2f7711bbb
4 changed files with 113 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/nar-bridge-go/default.nix
View file

@ -3,7 +3,7 @@ buildGoModule rec {
pname = "nar-bridge-go";
version = "0.1.0";
src = tvix-src;
sourceRoot = "${src.name}/nar-bridge-go";
sourceRoot = "${src.name}/tvix/nar-bridge-go";
vendorHash = "sha256-7jugbC5sEGhppjiZgnoLP5A6kQSaHK9vE6cXVZBG22s=";
meta.mainProgram = "nar-bridge-http";
}

6
pkgs/tvix-src.nix
View file

@ -1,7 +1,7 @@
{ fetchgit }:
fetchgit {
name = "tvix";
url = "https://code.tvl.fyi/depot.git:workspace=views/tvix.git";
rev = "6ae6c37fac42e10a34d020a5fd7e71640f3ffe68";
hash = "sha256-AmGCRGsGMQVnPMm+g1qZEE4tRxejZgHfqDSmsxwaRcw=";
url = "https://code.tvl.fyi/depot.git";
rev = "f0b0a6572ff7908c890963f6462af27dcef80bd7";
hash = "sha256-7l/UHq19oyF4743olRgAk0ikc92VUqKrxcfj17GAgt0=";
}

114
pkgs/tvix/Cargo.lock generated
View file

@ -377,8 +377,9 @@ checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
[[package]]
name = "bigtable_rs"
version = "0.2.9"
source = "git+https://github.com/flokli/bigtable_rs?rev=0af404741dfc40eb9fa99cf4d4140a09c5c20df7#0af404741dfc40eb9fa99cf4d4140a09c5c20df7"
version = "0.2.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "12ccba0acd0a82afb2b1fe89181b0776ff18aef5e355030631fe534c8ae8ec73"
dependencies = [
"gcp_auth",
"http",
@ -893,9 +894,9 @@ dependencies = [
[[package]]
name = "data-encoding"
version = "2.5.0"
version = "2.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
[[package]]
name = "der"
@ -975,6 +976,12 @@ dependencies = [
"winapi",
]
[[package]]
name = "dissimilar"
version = "1.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "59f8e79d1fbf76bdfbde321e902714bf6c49df88a7dda6fc682fc2979226962d"
[[package]]
name = "doc-comment"
version = "0.3.3"
@ -1060,11 +1067,12 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
[[package]]
name = "erased-serde"
version = "0.4.4"
version = "0.4.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2b73807008a3c7f171cc40312f37d95ef0396e048b5848d775f54b1a4dd4a0d3"
checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d"
dependencies = [
"serde",
"typeid",
]
[[package]]
@ -1135,6 +1143,16 @@ dependencies = [
"pin-project-lite",
]
[[package]]
name = "expect-test"
version = "1.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9e0be0a561335815e06dab7c62e50353134c796e7a6155402a64bcff66b6a5e0"
dependencies = [
"dissimilar",
"once_cell",
]
[[package]]
name = "fastcdc"
version = "3.1.0"
@ -1431,8 +1449,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
dependencies = [
"cfg-if",
"js-sys",
"libc",
"wasi",
"wasm-bindgen",
]
[[package]]
@ -1659,9 +1679,9 @@ dependencies = [
[[package]]
name = "imbl"
version = "2.0.3"
version = "3.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "978d142c8028edf52095703af2fad11d6f611af1246685725d6b850634647085"
checksum = "bc3be8d8cd36f33a46b1849f31f837c44d9fa87223baee3b4bd96b8f11df81eb"
dependencies = [
"bitmaps",
"imbl-sized-chunks",
@ -2031,6 +2051,16 @@ version = "0.3.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
[[package]]
name = "mime_guess"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
dependencies = [
"mime",
"unicase",
]
[[package]]
name = "minimal-lexical"
version = "0.2.1"
@ -2960,6 +2990,7 @@ dependencies = [
"js-sys",
"log",
"mime",
"mime_guess",
"once_cell",
"percent-encoding",
"pin-project-lite",
@ -2982,6 +3013,39 @@ dependencies = [
"winreg",
]
[[package]]
name = "reqwest-middleware"
version = "0.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216"
dependencies = [
"anyhow",
"async-trait",
"http",
"reqwest",
"serde",
"task-local-extensions",
"thiserror",
]
[[package]]
name = "reqwest-tracing"
version = "0.4.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683"
dependencies = [
"anyhow",
"async-trait",
"getrandom",
"matchit",
"opentelemetry",
"reqwest",
"reqwest-middleware",
"task-local-extensions",
"tracing",
"tracing-opentelemetry",
]
[[package]]
name = "ring"
version = "0.17.7"
@ -3357,6 +3421,16 @@ dependencies = [
"serde",
]
[[package]]
name = "serde_tagged"
version = "0.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "76cd248df2ce32924bfc2273e1af035ff3092b73253fe0567230b5c4154a99e9"
dependencies = [
"erased-serde",
"serde",
]
[[package]]
name = "serde_urlencoded"
version = "0.7.1"
@ -3641,6 +3715,15 @@ dependencies = [
"unicode-width",
]
[[package]]
name = "task-local-extensions"
version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba323866e5d033818e3240feeb9f7db2c4296674e4d9e16b97b7bf8f490434e8"
dependencies = [
"pin-utils",
]
[[package]]
name = "tempfile"
version = "3.9.0"
@ -3830,6 +3913,7 @@ version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4134661e12ec11c6276be73544a43144a357b08dfab5c41fd226e15b5bc9a6b2"
dependencies = [
"clap",
"document-features",
"futures-core",
"futures-util",
@ -4256,6 +4340,7 @@ dependencies = [
"bytes",
"data-encoding",
"digest",
"erased-serde",
"fastcdc",
"fuse-backend-rs",
"futures",
@ -4271,7 +4356,9 @@ dependencies = [
"rstest",
"rstest_reuse",
"serde",
"serde_json",
"serde_qs",
"serde_tagged",
"serde_with",
"sled",
"tempfile",
@ -4308,9 +4395,12 @@ dependencies = [
"bytes",
"clap",
"dirs",
"expect-test",
"nix-compat",
"rnix",
"rowan",
"rustyline",
"smol_str",
"thiserror",
"tikv-jemallocator",
"tokio",
@ -4448,6 +4538,7 @@ dependencies = [
"prost",
"prost-build",
"reqwest",
"reqwest-middleware",
"rstest",
"rstest_reuse",
"serde",
@ -4487,6 +4578,7 @@ dependencies = [
"opentelemetry-http",
"opentelemetry-otlp",
"opentelemetry_sdk",
"reqwest-tracing",
"thiserror",
"tokio",
"tonic",
@ -4497,6 +4589,12 @@ dependencies = [
"tracing-tracy",
]
[[package]]
name = "typeid"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
[[package]]
name = "typenum"
version = "1.17.0"

6
pkgs/tvix/default.nix
View file

@ -12,21 +12,21 @@ rustPlatform.buildRustPackage rec {
src = tvix-src;
sourceRoot = "${src.name}/tvix";
doCheck = false;
cargoBuildFlags = builtins.concatStringsSep " " (builtins.map (v: "-p ${v}") packages);
nativeBuildInputs = [ protobuf ];
PROTO_ROOT = "/build";
PROTO_ROOT = "/build/${src.name}";
cargoLock = {
lockFile = ./Cargo.lock;
outputHashes = {
"bigtable_rs-0.2.9" = "sha256-lPatDrsEtEdEP4dtBz5+su4ADFKPBqJOtbSLTkNVUto=";
"wu-manber-0.1.0" = "sha256-7YIttaQLfFC/32utojh2DyOHVsZiw8ul/z0lvOhAE/4=";
};
};
cargoHash = "sha256-j7+O6KRhUk3cWWoiCdFM0S6f0CMVIfqHshpdKpXsa/g=";
meta = { };
}