From 5f17df85487cb4536c49c3dab8c17b873eeb6dd9 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Sun, 2 Feb 2025 15:56:38 +0300 Subject: [PATCH] chore(3p/sources): bump channels & overlays (2025-02-02) Included changes/fixes: * bumped all `wasm-bindgen` usages again * regenerated protobuf files * keycloak terraform provider has been migrated to new name This also included a state migration in the bucket, which I've already performed. * tvix/boot: disable tests that are broken in CI * users/aspen/yeren: avoid upgrading kernel to 6.12 digimend depends on a fix: https://github.com/NixOS/nixpkgs/pull/378830/ Change-Id: I657dcf5c4d0d08f231bfe30e37c8062bfcfaaa32 Reviewed-on: https://cl.tvl.fyi/c/depot/+/13098 Reviewed-by: aspen Tested-by: BuildkiteCI Reviewed-by: sterni Autosubmit: tazjin --- corp/rih/frontend/Cargo.lock | 25 +-- corp/rih/frontend/Cargo.toml | 2 +- corp/russian/predlozhnik/Cargo.lock | 35 ++-- corp/russian/predlozhnik/Cargo.toml | 2 +- ops/keycloak/main.tf | 2 +- third_party/sources/sources.json | 36 ++-- tvix/boot/tests/default.nix | 166 ++++++++++--------- tvix/build-go/build.pb.go | 14 +- tvix/build-go/rpc_build.pb.go | 10 +- tvix/castore-go/castore.pb.go | 14 +- tvix/castore-go/rpc_blobstore.pb.go | 14 +- tvix/castore-go/rpc_directory.pb.go | 14 +- tvix/store-go/pathinfo.pb.go | 14 +- tvix/store-go/rpc_pathinfo.pb.go | 14 +- users/aspen/system/system/machines/yeren.nix | 3 + users/kranzes/wasm-hello-world/Cargo.lock | 31 ++-- users/kranzes/wasm-hello-world/Cargo.nix | 67 +++++--- users/kranzes/wasm-hello-world/Cargo.toml | 2 +- web/pwcrypt/Cargo.lock | 25 +-- web/pwcrypt/Cargo.toml | 2 +- web/tvixbolt/Cargo.lock | 25 +-- web/tvixbolt/Cargo.nix | 54 +++--- web/tvixbolt/Cargo.toml | 2 +- 23 files changed, 320 insertions(+), 253 deletions(-) diff --git a/corp/rih/frontend/Cargo.lock b/corp/rih/frontend/Cargo.lock index 44c962cee..402a44e52 100644 --- a/corp/rih/frontend/Cargo.lock +++ b/corp/rih/frontend/Cargo.lock @@ -1500,24 +1500,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.15", @@ -1538,9 +1538,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1548,9 +1548,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -1561,9 +1561,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" diff --git a/corp/rih/frontend/Cargo.toml b/corp/rih/frontend/Cargo.toml index 10d63296c..d07ed7aec 100644 --- a/corp/rih/frontend/Cargo.toml +++ b/corp/rih/frontend/Cargo.toml @@ -19,7 +19,7 @@ yew-router = "0.17" wasm-bindgen-futures = "0.4" # needs to be in sync with nixpkgs -wasm-bindgen = "= 0.2.95" +wasm-bindgen = "= 0.2.100" uuid = { version = "1.3.3", features = ["v4", "serde"] } [dependencies.serde] diff --git a/corp/russian/predlozhnik/Cargo.lock b/corp/russian/predlozhnik/Cargo.lock index 9743bc335..369b54271 100644 --- a/corp/russian/predlozhnik/Cargo.lock +++ b/corp/russian/predlozhnik/Cargo.lock @@ -255,6 +255,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "ryu" version = "1.0.11" @@ -351,9 +357,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.4" +version = "1.0.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd" +checksum = "a210d160f08b701c8721ba1c726c11662f877ea6b7094007e1ca9a1041945034" [[package]] name = "version_check" @@ -363,24 +369,24 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.28", @@ -401,9 +407,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -411,9 +417,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -424,9 +430,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" diff --git a/corp/russian/predlozhnik/Cargo.toml b/corp/russian/predlozhnik/Cargo.toml index f21525624..7e42da891 100644 --- a/corp/russian/predlozhnik/Cargo.toml +++ b/corp/russian/predlozhnik/Cargo.toml @@ -9,4 +9,4 @@ lazy_static = "1.4" yew = "0.19" # needs to be in sync with nixpkgs -wasm-bindgen = "= 0.2.95" +wasm-bindgen = "= 0.2.100" diff --git a/ops/keycloak/main.tf b/ops/keycloak/main.tf index d5698700c..b330e2a4d 100644 --- a/ops/keycloak/main.tf +++ b/ops/keycloak/main.tf @@ -5,7 +5,7 @@ terraform { required_providers { keycloak = { - source = "mrparkers/keycloak" + source = "keycloak/keycloak" } } diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index c0504159c..887617da4 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -5,10 +5,10 @@ "homepage": "https://matrix.to/#/#agenix:nixos.org", "owner": "ryantm", "repo": "agenix", - "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41", - "sha256": "1x8nd8hvsq6mvzig122vprwigsr3z2skanig65haqswn7z7amsvg", + "rev": "e600439ec4c273cf11e06fe4d9d906fb98fa097c", + "sha256": "006ngydiykjgqs85cl19h9klq8kaqm5zs0ng51dnwy7nzgqxzsdr", "type": "tarball", - "url": "https://github.com/ryantm/agenix/archive/f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41.tar.gz", + "url": "https://github.com/ryantm/agenix/archive/e600439ec4c273cf11e06fe4d9d906fb98fa097c.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "bqn-libs": { @@ -43,10 +43,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "2532b500c3ed2b8940e831039dcec5a5ea093afc", - "sha256": "0kzk59wh1gnvk31dagfyf41a12wqldm8l5vnkzcix74nmz0qdrk4", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", + "sha256": "0j56s38y0yzy3pw7qia1n9zkmmn9nkb9mpklj2mc30k5l11fs170", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/2532b500c3ed2b8940e831039dcec5a5ea093afc.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/18fa9f323d8adbb0b7b8b98a8488db308210ed93.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -55,10 +55,10 @@ "homepage": "", "owner": "nix-community", "repo": "impermanence", - "rev": "c64bed13b562fc3bb454b48773d4155023ac31b7", - "sha256": "0gc7w24hyl2nfl6jpmffb121cvnmdifgb2cli5adzpvhm32pv6fm", + "rev": "4b3e914cdf97a5b536a889e939fb2fd2b043a170", + "sha256": "04l16szln2x0ajq2x799krb53ykvc6vm44x86ppy1jg9fr82161c", "type": "tarball", - "url": "https://github.com/nix-community/impermanence/archive/c64bed13b562fc3bb454b48773d4155023ac31b7.tar.gz", + "url": "https://github.com/nix-community/impermanence/archive/4b3e914cdf97a5b536a889e939fb2fd2b043a170.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "naersk": { @@ -92,10 +92,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2f9e2f85cb14a46410a1399aa9ea7ecf433e422e", - "sha256": "0dh9xf3nkbaci00m7yy2xyksdnj1mpx98jnq0l85klp99hqlys8m", + "rev": "6eec6bbb933a6dad6cf6afe3d51329f31d22e974", + "sha256": "0qmqw1ilzcjc3ivc7s05hf3iakn2b457d41v3fzdm28lqpf70skx", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2f9e2f85cb14a46410a1399aa9ea7ecf433e422e.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/6eec6bbb933a6dad6cf6afe3d51329f31d22e974.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -118,10 +118,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "5d1865c0da63b4c949f383d982b6b43519946e8f", - "sha256": "0189sk00a6f340zacpqb8nfik02ll9j7faa63hb2gcripwhrc2gn", + "rev": "e2bb8c205a069514535f083742c7da8dfb6e02b9", + "sha256": "1x2ip7ap91c42wc7pjnsjwyj8v689x53177j5r01v4k94jk0k57v", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/5d1865c0da63b4c949f383d982b6b43519946e8f.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/e2bb8c205a069514535f083742c7da8dfb6e02b9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "rustsec-advisory-db": { @@ -130,10 +130,10 @@ "homepage": "https://rustsec.org", "owner": "RustSec", "repo": "advisory-db", - "rev": "63a2f39924f66ca89cf5761f299a8a244fe02543", - "sha256": "1lvjikihd6kzmxw1wi2amz4arcbdxgi4r4qrfldi18l4xcj6y3a2", + "rev": "5248f077160ebbedbc62f32356a7eb08823fc91b", + "sha256": "0caga1xxvbdh2gmn0gm3vggxwcv55bpvvrlxwbkzmhqhbmwdm0li", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/63a2f39924f66ca89cf5761f299a8a244fe02543.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/5248f077160ebbedbc62f32356a7eb08823fc91b.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/tvix/boot/tests/default.nix b/tvix/boot/tests/default.nix index 3748f7620..384144bc0 100644 --- a/tvix/boot/tests/default.nix +++ b/tvix/boot/tests/default.nix @@ -158,84 +158,90 @@ let documentation.enable = lib.mkForce false; }).config.system.build.toplevel; + allTests = depot.nix.readTree.drvTargets { + docs-memory = (mkBootTest { + path = ../../docs; + importPathName = "docs"; + }); + docs-persistent = (mkBootTest { + blobServiceAddr = "objectstore+file:///build/blobs"; + directoryServiceAddr = "redb:///build/directories.redb"; + pathInfoServiceAddr = "redb:///build/pathinfo.redb"; + path = ../../docs; + importPathName = "docs"; + }); + + closure-tvix = (mkBootTest { + blobServiceAddr = "objectstore+file:///build/blobs"; + path = depot.tvix.store; + isClosure = true; + }); + + closure-nixos = (mkBootTest { + blobServiceAddr = "objectstore+file:///build/blobs"; + pathInfoServiceAddr = "redb:///build/pathinfo.redb"; + directoryServiceAddr = "redb:///build/directories.redb"; + path = testSystem; + isClosure = true; + vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic + assertVMOutput = "Onwards and upwards."; + }); + + closure-nixos-bigtable = (mkBootTest { + blobServiceAddr = "objectstore+file:///build/blobs"; + directoryServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=directories&family_name=cf1"; + pathInfoServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=pathinfos&family_name=cf1"; + path = testSystem; + useNarBridge = true; + preStart = '' + ${pkgs.cbtemulator}/bin/cbtemulator -address $PWD/cbtemulator.sock & + timeout 22 sh -c 'until [ -e $PWD/cbtemulator.sock ]; do sleep 1; done' + + export BIGTABLE_EMULATOR_HOST=unix://$PWD/cbtemulator.sock + ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createtable directories + ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createfamily directories cf1 + ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createtable pathinfos + ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createfamily pathinfos cf1 + ''; + isClosure = true; + vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic + assertVMOutput = "Onwards and upwards."; + }); + + closure-nixos-s3 = (mkBootTest { + blobServiceAddr = "objectstore+s3://mybucket/blobs?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&aws_endpoint_url=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; + # we cannot use s3 here yet without any caching layer, as we don't allow "deeper" access to directories (non-root nodes) + # directoryServiceAddr = "objectstore+s3://mybucket/directories?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&endpoint=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; + directoryServiceAddr = "memory://"; + pathInfoServiceAddr = "memory://"; + path = testSystem; + useNarBridge = true; + preStart = '' + MINIO_ACCESS_KEY=myaccesskey MINIO_SECRET_KEY=supersecret MINIO_ADDRESS=127.0.0.1:9000 ${pkgs.minio}/bin/minio server $(mktemp -d) & + timeout 22 sh -c 'until ${pkgs.netcat}/bin/nc -z $0 $1; do sleep 1; done' localhost 9000 + mc_config_dir=$(mktemp -d) + ${pkgs.minio-client}/bin/mc --config-dir $mc_config_dir alias set 'myminio' 'http://127.0.0.1:9000' 'myaccesskey' 'supersecret' + ${pkgs.minio-client}/bin/mc --config-dir $mc_config_dir mb myminio/mybucket + ''; + isClosure = true; + vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic + assertVMOutput = "Onwards and upwards."; + }); + + closure-nixos-nar-bridge = (mkBootTest { + blobServiceAddr = "objectstore+file:///build/blobs"; + path = testSystem; + useNarBridge = true; + isClosure = true; + vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic + assertVMOutput = "Onwards and upwards."; + }); + }; in -depot.nix.readTree.drvTargets -{ - docs-memory = (mkBootTest { - path = ../../docs; - importPathName = "docs"; - }); - docs-persistent = (mkBootTest { - blobServiceAddr = "objectstore+file:///build/blobs"; - directoryServiceAddr = "redb:///build/directories.redb"; - pathInfoServiceAddr = "redb:///build/pathinfo.redb"; - path = ../../docs; - importPathName = "docs"; - }); - - closure-tvix = (mkBootTest { - blobServiceAddr = "objectstore+file:///build/blobs"; - path = depot.tvix.store; - isClosure = true; - }); - - closure-nixos = (mkBootTest { - blobServiceAddr = "objectstore+file:///build/blobs"; - pathInfoServiceAddr = "redb:///build/pathinfo.redb"; - directoryServiceAddr = "redb:///build/directories.redb"; - path = testSystem; - isClosure = true; - vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic - assertVMOutput = "Onwards and upwards."; - }); - - closure-nixos-bigtable = (mkBootTest { - blobServiceAddr = "objectstore+file:///build/blobs"; - directoryServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=directories&family_name=cf1"; - pathInfoServiceAddr = "bigtable://instance-1?project_id=project-1&table_name=pathinfos&family_name=cf1"; - path = testSystem; - useNarBridge = true; - preStart = '' - ${pkgs.cbtemulator}/bin/cbtemulator -address $PWD/cbtemulator.sock & - timeout 22 sh -c 'until [ -e $PWD/cbtemulator.sock ]; do sleep 1; done' - - export BIGTABLE_EMULATOR_HOST=unix://$PWD/cbtemulator.sock - ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createtable directories - ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createfamily directories cf1 - ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createtable pathinfos - ${pkgs.google-cloud-bigtable-tool}/bin/cbt -instance instance-1 -project project-1 createfamily pathinfos cf1 - ''; - isClosure = true; - vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic - assertVMOutput = "Onwards and upwards."; - }); - - closure-nixos-s3 = (mkBootTest { - blobServiceAddr = "objectstore+s3://mybucket/blobs?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&aws_endpoint_url=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; - # we cannot use s3 here yet without any caching layer, as we don't allow "deeper" access to directories (non-root nodes) - # directoryServiceAddr = "objectstore+s3://mybucket/directories?aws_access_key_id=myaccesskey&aws_secret_access_key=supersecret&endpoint=http%3A%2F%2Flocalhost%3A9000&aws_allow_http=1"; - directoryServiceAddr = "memory://"; - pathInfoServiceAddr = "memory://"; - path = testSystem; - useNarBridge = true; - preStart = '' - MINIO_ACCESS_KEY=myaccesskey MINIO_SECRET_KEY=supersecret MINIO_ADDRESS=127.0.0.1:9000 ${pkgs.minio}/bin/minio server $(mktemp -d) & - timeout 22 sh -c 'until ${pkgs.netcat}/bin/nc -z $0 $1; do sleep 1; done' localhost 9000 - mc_config_dir=$(mktemp -d) - ${pkgs.minio-client}/bin/mc --config-dir $mc_config_dir alias set 'myminio' 'http://127.0.0.1:9000' 'myaccesskey' 'supersecret' - ${pkgs.minio-client}/bin/mc --config-dir $mc_config_dir mb myminio/mybucket - ''; - isClosure = true; - vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic - assertVMOutput = "Onwards and upwards."; - }); - - closure-nixos-nar-bridge = (mkBootTest { - blobServiceAddr = "objectstore+file:///build/blobs"; - path = testSystem; - useNarBridge = true; - isClosure = true; - vmCmdline = "init=${testSystem}/init panic=-1"; # reboot immediately on panic - assertVMOutput = "Onwards and upwards."; - }); -} +# remove broken tests from set +builtins.removeAttrs allTests [ + # these fail in CI as of 2025-02-09, printing HTTP errors + "closure-nixos-bigtable" + "closure-nixos-nar-bridge" + "closure-nixos-s3" +] diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go index aaa62d239..a8d2b6ae6 100644 --- a/tvix/build-go/build.pb.go +++ b/tvix/build-go/build.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/build/protos/build.proto @@ -15,6 +15,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -530,7 +531,7 @@ func (x *Build_OutputNeedles) GetNeedles() []uint64 { var File_tvix_build_protos_build_proto protoreflect.FileDescriptor -var file_tvix_build_protos_build_proto_rawDesc = []byte{ +var file_tvix_build_protos_build_proto_rawDesc = string([]byte{ 0x0a, 0x1d, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x74, 0x76, 0x69, 0x78, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x76, 0x31, 0x1a, 0x21, @@ -606,16 +607,16 @@ var file_tvix_build_protos_build_proto_rawDesc = []byte{ 0x65, 0x73, 0x42, 0x24, 0x5a, 0x22, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x76, 0x6c, 0x2e, 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2d, 0x67, 0x6f, 0x3b, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_build_protos_build_proto_rawDescOnce sync.Once - file_tvix_build_protos_build_proto_rawDescData = file_tvix_build_protos_build_proto_rawDesc + file_tvix_build_protos_build_proto_rawDescData []byte ) func file_tvix_build_protos_build_proto_rawDescGZIP() []byte { file_tvix_build_protos_build_proto_rawDescOnce.Do(func() { - file_tvix_build_protos_build_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_build_protos_build_proto_rawDescData) + file_tvix_build_protos_build_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_build_protos_build_proto_rawDesc), len(file_tvix_build_protos_build_proto_rawDesc))) }) return file_tvix_build_protos_build_proto_rawDescData } @@ -654,7 +655,7 @@ func file_tvix_build_protos_build_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_build_protos_build_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_build_protos_build_proto_rawDesc), len(file_tvix_build_protos_build_proto_rawDesc)), NumEnums: 0, NumMessages: 6, NumExtensions: 0, @@ -665,7 +666,6 @@ func file_tvix_build_protos_build_proto_init() { MessageInfos: file_tvix_build_protos_build_proto_msgTypes, }.Build() File_tvix_build_protos_build_proto = out.File - file_tvix_build_protos_build_proto_rawDesc = nil file_tvix_build_protos_build_proto_goTypes = nil file_tvix_build_protos_build_proto_depIdxs = nil } diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go index b586035d0..0e1653e8d 100644 --- a/tvix/build-go/rpc_build.pb.go +++ b/tvix/build-go/rpc_build.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/build/protos/rpc_build.proto @@ -13,6 +13,7 @@ import ( protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" + unsafe "unsafe" ) const ( @@ -24,7 +25,7 @@ const ( var File_tvix_build_protos_rpc_build_proto protoreflect.FileDescriptor -var file_tvix_build_protos_rpc_build_proto_rawDesc = []byte{ +var file_tvix_build_protos_rpc_build_proto_rawDesc = string([]byte{ 0x0a, 0x21, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x74, 0x76, 0x69, 0x78, 0x2e, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2e, @@ -38,7 +39,7 @@ var file_tvix_build_protos_rpc_build_proto_rawDesc = []byte{ 0x24, 0x5a, 0x22, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x76, 0x6c, 0x2e, 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x2d, 0x67, 0x6f, 0x3b, 0x62, 0x75, 0x69, 0x6c, 0x64, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var file_tvix_build_protos_rpc_build_proto_goTypes = []any{ (*BuildRequest)(nil), // 0: tvix.build.v1.BuildRequest @@ -64,7 +65,7 @@ func file_tvix_build_protos_rpc_build_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_build_protos_rpc_build_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_build_protos_rpc_build_proto_rawDesc), len(file_tvix_build_protos_rpc_build_proto_rawDesc)), NumEnums: 0, NumMessages: 0, NumExtensions: 0, @@ -74,7 +75,6 @@ func file_tvix_build_protos_rpc_build_proto_init() { DependencyIndexes: file_tvix_build_protos_rpc_build_proto_depIdxs, }.Build() File_tvix_build_protos_rpc_build_proto = out.File - file_tvix_build_protos_rpc_build_proto_rawDesc = nil file_tvix_build_protos_rpc_build_proto_goTypes = nil file_tvix_build_protos_rpc_build_proto_depIdxs = nil } diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go index 9968718c1..f76b9c9ee 100644 --- a/tvix/castore-go/castore.pb.go +++ b/tvix/castore-go/castore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/castore/protos/castore.proto @@ -14,6 +14,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -395,7 +396,7 @@ func (*Node_Symlink) isNode_Node() {} var File_tvix_castore_protos_castore_proto protoreflect.FileDescriptor -var file_tvix_castore_protos_castore_proto_rawDesc = []byte{ +var file_tvix_castore_protos_castore_proto_rawDesc = string([]byte{ 0x0a, 0x21, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x74, 0x76, 0x69, 0x78, 0x2e, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, @@ -442,16 +443,16 @@ var file_tvix_castore_protos_castore_proto_rawDesc = []byte{ 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2d, 0x67, 0x6f, 0x3b, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_castore_protos_castore_proto_rawDescOnce sync.Once - file_tvix_castore_protos_castore_proto_rawDescData = file_tvix_castore_protos_castore_proto_rawDesc + file_tvix_castore_protos_castore_proto_rawDescData []byte ) func file_tvix_castore_protos_castore_proto_rawDescGZIP() []byte { file_tvix_castore_protos_castore_proto_rawDescOnce.Do(func() { - file_tvix_castore_protos_castore_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_castore_protos_castore_proto_rawDescData) + file_tvix_castore_protos_castore_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_castore_proto_rawDesc), len(file_tvix_castore_protos_castore_proto_rawDesc))) }) return file_tvix_castore_protos_castore_proto_rawDescData } @@ -492,7 +493,7 @@ func file_tvix_castore_protos_castore_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_castore_protos_castore_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_castore_proto_rawDesc), len(file_tvix_castore_protos_castore_proto_rawDesc)), NumEnums: 0, NumMessages: 5, NumExtensions: 0, @@ -503,7 +504,6 @@ func file_tvix_castore_protos_castore_proto_init() { MessageInfos: file_tvix_castore_protos_castore_proto_msgTypes, }.Build() File_tvix_castore_protos_castore_proto = out.File - file_tvix_castore_protos_castore_proto_rawDesc = nil file_tvix_castore_protos_castore_proto_goTypes = nil file_tvix_castore_protos_castore_proto_depIdxs = nil } diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go index dfc4a2e50..c93fe20e4 100644 --- a/tvix/castore-go/rpc_blobstore.pb.go +++ b/tvix/castore-go/rpc_blobstore.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/castore/protos/rpc_blobstore.proto @@ -14,6 +14,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -335,7 +336,7 @@ func (x *StatBlobResponse_ChunkMeta) GetSize() uint64 { var File_tvix_castore_protos_rpc_blobstore_proto protoreflect.FileDescriptor -var file_tvix_castore_protos_rpc_blobstore_proto_rawDesc = []byte{ +var file_tvix_castore_protos_rpc_blobstore_proto_rawDesc = string([]byte{ 0x0a, 0x27, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x62, 0x6c, 0x6f, 0x62, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x74, 0x76, 0x69, 0x78, 0x2e, @@ -382,16 +383,16 @@ var file_tvix_castore_protos_rpc_blobstore_proto_rawDesc = []byte{ 0x65, 0x2e, 0x74, 0x76, 0x6c, 0x2e, 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2d, 0x67, 0x6f, 0x3b, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_castore_protos_rpc_blobstore_proto_rawDescOnce sync.Once - file_tvix_castore_protos_rpc_blobstore_proto_rawDescData = file_tvix_castore_protos_rpc_blobstore_proto_rawDesc + file_tvix_castore_protos_rpc_blobstore_proto_rawDescData []byte ) func file_tvix_castore_protos_rpc_blobstore_proto_rawDescGZIP() []byte { file_tvix_castore_protos_rpc_blobstore_proto_rawDescOnce.Do(func() { - file_tvix_castore_protos_rpc_blobstore_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_castore_protos_rpc_blobstore_proto_rawDescData) + file_tvix_castore_protos_rpc_blobstore_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_rpc_blobstore_proto_rawDesc), len(file_tvix_castore_protos_rpc_blobstore_proto_rawDesc))) }) return file_tvix_castore_protos_rpc_blobstore_proto_rawDescData } @@ -429,7 +430,7 @@ func file_tvix_castore_protos_rpc_blobstore_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_castore_protos_rpc_blobstore_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_rpc_blobstore_proto_rawDesc), len(file_tvix_castore_protos_rpc_blobstore_proto_rawDesc)), NumEnums: 0, NumMessages: 6, NumExtensions: 0, @@ -440,7 +441,6 @@ func file_tvix_castore_protos_rpc_blobstore_proto_init() { MessageInfos: file_tvix_castore_protos_rpc_blobstore_proto_msgTypes, }.Build() File_tvix_castore_protos_rpc_blobstore_proto = out.File - file_tvix_castore_protos_rpc_blobstore_proto_rawDesc = nil file_tvix_castore_protos_rpc_blobstore_proto_goTypes = nil file_tvix_castore_protos_rpc_blobstore_proto_depIdxs = nil } diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go index 8da866c0f..d323bbdd6 100644 --- a/tvix/castore-go/rpc_directory.pb.go +++ b/tvix/castore-go/rpc_directory.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/castore/protos/rpc_directory.proto @@ -14,6 +14,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -150,7 +151,7 @@ func (x *PutDirectoryResponse) GetRootDigest() []byte { var File_tvix_castore_protos_rpc_directory_proto protoreflect.FileDescriptor -var file_tvix_castore_protos_rpc_directory_proto_rawDesc = []byte{ +var file_tvix_castore_protos_rpc_directory_proto_rawDesc = string([]byte{ 0x0a, 0x27, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x64, 0x69, 0x72, 0x65, 0x63, 0x74, 0x6f, 0x72, 0x79, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f, 0x74, 0x76, 0x69, 0x78, 0x2e, @@ -180,16 +181,16 @@ var file_tvix_castore_protos_rpc_directory_proto_rawDesc = []byte{ 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x76, 0x6c, 0x2e, 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2d, 0x67, 0x6f, 0x3b, 0x63, 0x61, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_castore_protos_rpc_directory_proto_rawDescOnce sync.Once - file_tvix_castore_protos_rpc_directory_proto_rawDescData = file_tvix_castore_protos_rpc_directory_proto_rawDesc + file_tvix_castore_protos_rpc_directory_proto_rawDescData []byte ) func file_tvix_castore_protos_rpc_directory_proto_rawDescGZIP() []byte { file_tvix_castore_protos_rpc_directory_proto_rawDescOnce.Do(func() { - file_tvix_castore_protos_rpc_directory_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_castore_protos_rpc_directory_proto_rawDescData) + file_tvix_castore_protos_rpc_directory_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_rpc_directory_proto_rawDesc), len(file_tvix_castore_protos_rpc_directory_proto_rawDesc))) }) return file_tvix_castore_protos_rpc_directory_proto_rawDescData } @@ -225,7 +226,7 @@ func file_tvix_castore_protos_rpc_directory_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_castore_protos_rpc_directory_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_castore_protos_rpc_directory_proto_rawDesc), len(file_tvix_castore_protos_rpc_directory_proto_rawDesc)), NumEnums: 0, NumMessages: 2, NumExtensions: 0, @@ -236,7 +237,6 @@ func file_tvix_castore_protos_rpc_directory_proto_init() { MessageInfos: file_tvix_castore_protos_rpc_directory_proto_msgTypes, }.Build() File_tvix_castore_protos_rpc_directory_proto = out.File - file_tvix_castore_protos_rpc_directory_proto_rawDesc = nil file_tvix_castore_protos_rpc_directory_proto_goTypes = nil file_tvix_castore_protos_rpc_directory_proto_depIdxs = nil } diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go index 2350a8dc4..bc0ddafde 100644 --- a/tvix/store-go/pathinfo.pb.go +++ b/tvix/store-go/pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/store/protos/pathinfo.proto @@ -15,6 +15,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -457,7 +458,7 @@ func (x *NARInfo_CA) GetDigest() []byte { var File_tvix_store_protos_pathinfo_proto protoreflect.FileDescriptor -var file_tvix_store_protos_pathinfo_proto_rawDesc = []byte{ +var file_tvix_store_protos_pathinfo_proto_rawDesc = string([]byte{ 0x0a, 0x20, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x70, 0x61, 0x74, 0x68, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x74, 0x76, 0x69, 0x78, 0x2e, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2e, 0x76, @@ -514,16 +515,16 @@ var file_tvix_store_protos_pathinfo_proto_rawDesc = []byte{ 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2d, 0x67, 0x6f, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_store_protos_pathinfo_proto_rawDescOnce sync.Once - file_tvix_store_protos_pathinfo_proto_rawDescData = file_tvix_store_protos_pathinfo_proto_rawDesc + file_tvix_store_protos_pathinfo_proto_rawDescData []byte ) func file_tvix_store_protos_pathinfo_proto_rawDescGZIP() []byte { file_tvix_store_protos_pathinfo_proto_rawDescOnce.Do(func() { - file_tvix_store_protos_pathinfo_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_store_protos_pathinfo_proto_rawDescData) + file_tvix_store_protos_pathinfo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_store_protos_pathinfo_proto_rawDesc), len(file_tvix_store_protos_pathinfo_proto_rawDesc))) }) return file_tvix_store_protos_pathinfo_proto_rawDescData } @@ -562,7 +563,7 @@ func file_tvix_store_protos_pathinfo_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_store_protos_pathinfo_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_store_protos_pathinfo_proto_rawDesc), len(file_tvix_store_protos_pathinfo_proto_rawDesc)), NumEnums: 1, NumMessages: 5, NumExtensions: 0, @@ -574,7 +575,6 @@ func file_tvix_store_protos_pathinfo_proto_init() { MessageInfos: file_tvix_store_protos_pathinfo_proto_msgTypes, }.Build() File_tvix_store_protos_pathinfo_proto = out.File - file_tvix_store_protos_pathinfo_proto_rawDesc = nil file_tvix_store_protos_pathinfo_proto_goTypes = nil file_tvix_store_protos_pathinfo_proto_depIdxs = nil } diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go index eb88ceee4..2b8f1d843 100644 --- a/tvix/store-go/rpc_pathinfo.pb.go +++ b/tvix/store-go/rpc_pathinfo.pb.go @@ -3,7 +3,7 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.36.1 +// protoc-gen-go v1.36.4 // protoc (unknown) // source: tvix/store/protos/rpc_pathinfo.proto @@ -15,6 +15,7 @@ import ( protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" sync "sync" + unsafe "unsafe" ) const ( @@ -194,7 +195,7 @@ func (x *CalculateNARResponse) GetNarSha256() []byte { var File_tvix_store_protos_rpc_pathinfo_proto protoreflect.FileDescriptor -var file_tvix_store_protos_rpc_pathinfo_proto_rawDesc = []byte{ +var file_tvix_store_protos_rpc_pathinfo_proto_rawDesc = string([]byte{ 0x0a, 0x24, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2f, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x61, 0x74, 0x68, 0x69, 0x6e, 0x66, 0x6f, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0d, 0x74, 0x76, 0x69, 0x78, 0x2e, 0x73, 0x74, 0x6f, @@ -235,16 +236,16 @@ var file_tvix_store_protos_rpc_pathinfo_proto_rawDesc = []byte{ 0x24, 0x5a, 0x22, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x74, 0x76, 0x6c, 0x2e, 0x66, 0x79, 0x69, 0x2f, 0x74, 0x76, 0x69, 0x78, 0x2f, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x2d, 0x67, 0x6f, 0x3b, 0x73, 0x74, 0x6f, 0x72, 0x65, 0x76, 0x31, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, -} +}) var ( file_tvix_store_protos_rpc_pathinfo_proto_rawDescOnce sync.Once - file_tvix_store_protos_rpc_pathinfo_proto_rawDescData = file_tvix_store_protos_rpc_pathinfo_proto_rawDesc + file_tvix_store_protos_rpc_pathinfo_proto_rawDescData []byte ) func file_tvix_store_protos_rpc_pathinfo_proto_rawDescGZIP() []byte { file_tvix_store_protos_rpc_pathinfo_proto_rawDescOnce.Do(func() { - file_tvix_store_protos_rpc_pathinfo_proto_rawDescData = protoimpl.X.CompressGZIP(file_tvix_store_protos_rpc_pathinfo_proto_rawDescData) + file_tvix_store_protos_rpc_pathinfo_proto_rawDescData = protoimpl.X.CompressGZIP(unsafe.Slice(unsafe.StringData(file_tvix_store_protos_rpc_pathinfo_proto_rawDesc), len(file_tvix_store_protos_rpc_pathinfo_proto_rawDesc))) }) return file_tvix_store_protos_rpc_pathinfo_proto_rawDescData } @@ -286,7 +287,7 @@ func file_tvix_store_protos_rpc_pathinfo_proto_init() { out := protoimpl.TypeBuilder{ File: protoimpl.DescBuilder{ GoPackagePath: reflect.TypeOf(x{}).PkgPath(), - RawDescriptor: file_tvix_store_protos_rpc_pathinfo_proto_rawDesc, + RawDescriptor: unsafe.Slice(unsafe.StringData(file_tvix_store_protos_rpc_pathinfo_proto_rawDesc), len(file_tvix_store_protos_rpc_pathinfo_proto_rawDesc)), NumEnums: 0, NumMessages: 3, NumExtensions: 0, @@ -297,7 +298,6 @@ func file_tvix_store_protos_rpc_pathinfo_proto_init() { MessageInfos: file_tvix_store_protos_rpc_pathinfo_proto_msgTypes, }.Build() File_tvix_store_protos_rpc_pathinfo_proto = out.File - file_tvix_store_protos_rpc_pathinfo_proto_rawDesc = nil file_tvix_store_protos_rpc_pathinfo_proto_goTypes = nil file_tvix_store_protos_rpc_pathinfo_proto_depIdxs = nil } diff --git a/users/aspen/system/system/machines/yeren.nix b/users/aspen/system/system/machines/yeren.nix index 4b563df63..1af6327a6 100644 --- a/users/aspen/system/system/machines/yeren.nix +++ b/users/aspen/system/system/machines/yeren.nix @@ -33,6 +33,9 @@ }; }; + # TODO(aspen): remove after https://github.com/NixOS/nixpkgs/pull/378830/ + kernelPackages = pkgs.linuxKernel.packages.linux_6_11; + kernelModules = [ "kvm-intel" ]; blacklistedKernelModules = [ "psmouse" ]; extraModulePackages = [ diff --git a/users/kranzes/wasm-hello-world/Cargo.lock b/users/kranzes/wasm-hello-world/Cargo.lock index 5e1cce454..0f4b43856 100644 --- a/users/kranzes/wasm-hello-world/Cargo.lock +++ b/users/kranzes/wasm-hello-world/Cargo.lock @@ -44,6 +44,12 @@ dependencies = [ "proc-macro2", ] +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + [[package]] name = "syn" version = "2.0.66" @@ -63,24 +69,24 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn", @@ -89,9 +95,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -99,9 +105,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -112,9 +118,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "wasm_hello_world" diff --git a/users/kranzes/wasm-hello-world/Cargo.nix b/users/kranzes/wasm-hello-world/Cargo.nix index 9975a2ebf..75dcf7f5d 100644 --- a/users/kranzes/wasm-hello-world/Cargo.nix +++ b/users/kranzes/wasm-hello-world/Cargo.nix @@ -151,7 +151,6 @@ rec { "portable-atomic" = [ "dep:portable-atomic" ]; "std" = [ "alloc" ]; }; - resolvedDefaultFeatures = [ "alloc" "default" "race" "std" ]; }; "proc-macro2" = rec { crateName = "proc-macro2"; @@ -195,6 +194,18 @@ rec { }; resolvedDefaultFeatures = [ "default" "proc-macro" ]; }; + "rustversion" = rec { + crateName = "rustversion"; + version = "1.0.19"; + edition = "2018"; + sha256 = "1m39qd65jcd1xgqzdm3017ppimiggh2446xngwp1ngr8hjbmpi7p"; + procMacro = true; + build = "build/build.rs"; + authors = [ + "David Tolnay " + ]; + + }; "syn" = rec { crateName = "syn"; version = "2.0.66"; @@ -241,9 +252,9 @@ rec { }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0bpbvmxhil380gpv53smaypl8wc7sy7rq8apxfw349pn78v1x38j"; + sha256 = "1x8ymcm6yi3i1rwj78myl1agqv2m86i648myy3lc97s9swlqkp0y"; libName = "wasm_bindgen"; authors = [ "The wasm-bindgen Developers" @@ -256,29 +267,42 @@ rec { { name = "once_cell"; packageId = "once_cell"; + usesDefaultFeatures = false; + } + { + name = "rustversion"; + packageId = "rustversion"; + optional = true; } { name = "wasm-bindgen-macro"; packageId = "wasm-bindgen-macro"; } ]; + devDependencies = [ + { + name = "once_cell"; + packageId = "once_cell"; + } + ]; features = { - "default" = [ "spans" "std" ]; + "default" = [ "std" "msrv" ]; "enable-interning" = [ "std" ]; + "msrv" = [ "rustversion" ]; + "rustversion" = [ "dep:rustversion" ]; "serde" = [ "dep:serde" ]; "serde-serialize" = [ "serde" "serde_json" "std" ]; "serde_json" = [ "dep:serde_json" ]; - "spans" = [ "wasm-bindgen-macro/spans" ]; "strict-macro" = [ "wasm-bindgen-macro/strict-macro" ]; "xxx_debug_only_print_generated_code" = [ "wasm-bindgen-macro/xxx_debug_only_print_generated_code" ]; }; - resolvedDefaultFeatures = [ "default" "spans" "std" ]; + resolvedDefaultFeatures = [ "default" "msrv" "rustversion" "std" ]; }; "wasm-bindgen-backend" = rec { crateName = "wasm-bindgen-backend"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0n53wgy78bgzgjwk0z69zbspzhv8p2a4zh69s4fzvpqdrb9x8vfb"; + sha256 = "1ihbf1hq3y81c4md9lyh6lcwbx6a5j0fw4fygd423g62lm8hc2ig"; libName = "wasm_bindgen_backend"; authors = [ "The wasm-bindgen Developers" @@ -292,10 +316,6 @@ rec { name = "log"; packageId = "log"; } - { - name = "once_cell"; - packageId = "once_cell"; - } { name = "proc-macro2"; packageId = "proc-macro2"; @@ -317,13 +337,12 @@ rec { features = { "extra-traits" = [ "syn/extra-traits" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-macro" = rec { crateName = "wasm-bindgen-macro"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0mic8b2vab1a91m6x3hjxkwz23094bq1cwhnszarsnlggyz894z7"; + sha256 = "01xls2dvzh38yj17jgrbiib1d3nyad7k2yw9s0mpklwys333zrkz"; procMacro = true; libName = "wasm_bindgen_macro"; authors = [ @@ -340,16 +359,14 @@ rec { } ]; features = { - "spans" = [ "wasm-bindgen-macro-support/spans" ]; "strict-macro" = [ "wasm-bindgen-macro-support/strict-macro" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-macro-support" = rec { crateName = "wasm-bindgen-macro-support"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0s7g6glb85lyx2pj83shbmg4d50mvqhb2c2qk2j28yigaxbspii6"; + sha256 = "1plm8dh20jg2id0320pbmrlsv6cazfv6b6907z19ys4z1jj7xs4a"; libName = "wasm_bindgen_macro_support"; authors = [ "The wasm-bindgen Developers" @@ -379,20 +396,24 @@ rec { ]; features = { "extra-traits" = [ "syn/extra-traits" ]; - "spans" = [ "wasm-bindgen-backend/spans" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-shared" = rec { crateName = "wasm-bindgen-shared"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; links = "wasm_bindgen"; - sha256 = "1386q7mvv5ky003hcc6yyxpid3y1m7fy0l920i3z3ab60vqhkz35"; + sha256 = "0gffxvqgbh9r9xl36gprkfnh3w9gl8wgia6xrin7v11sjcxxf18s"; libName = "wasm_bindgen_shared"; authors = [ "The wasm-bindgen Developers" ]; + dependencies = [ + { + name = "unicode-ident"; + packageId = "unicode-ident"; + } + ]; }; "wasm_hello_world" = rec { diff --git a/users/kranzes/wasm-hello-world/Cargo.toml b/users/kranzes/wasm-hello-world/Cargo.toml index 9bb41268d..2ad369d20 100644 --- a/users/kranzes/wasm-hello-world/Cargo.toml +++ b/users/kranzes/wasm-hello-world/Cargo.toml @@ -7,4 +7,4 @@ edition = "2021" crate-type = ["cdylib"] [dependencies] -wasm-bindgen = "0.2.95" +wasm-bindgen = "0.2.100" diff --git a/web/pwcrypt/Cargo.lock b/web/pwcrypt/Cargo.lock index 73d27ae2d..d7a4a1189 100644 --- a/web/pwcrypt/Cargo.lock +++ b/web/pwcrypt/Cargo.lock @@ -818,24 +818,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.18", @@ -856,9 +856,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -866,9 +866,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -879,9 +879,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" diff --git a/web/pwcrypt/Cargo.toml b/web/pwcrypt/Cargo.toml index 0479a075d..3c4760931 100644 --- a/web/pwcrypt/Cargo.toml +++ b/web/pwcrypt/Cargo.toml @@ -8,6 +8,6 @@ argon2 = "0.5.0" getrandom = { version = "0.2.10", features = ["js"] } gloo = "0.8.0" rand_core = { version = "0.6.4", features = ["getrandom"] } -wasm-bindgen = "= 0.2.95" +wasm-bindgen = "= 0.2.100" web-sys = "0.3" yew = { version = "0.20.0", features = [ "csr" ]} diff --git a/web/tvixbolt/Cargo.lock b/web/tvixbolt/Cargo.lock index b82469a1a..789018d2b 100644 --- a/web/tvixbolt/Cargo.lock +++ b/web/tvixbolt/Cargo.lock @@ -1600,24 +1600,24 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "128d1e363af62632b8eb57219c8fd7877144af57558fb2ef0368d0087bddeb2e" +checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5" dependencies = [ "cfg-if", "once_cell", + "rustversion", "wasm-bindgen-macro", ] [[package]] name = "wasm-bindgen-backend" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb6dd4d3ca0ddffd1dd1c9c04f94b868c37ff5fac97c30b97cff2d74fce3a358" +checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6" dependencies = [ "bumpalo", "log", - "once_cell", "proc-macro2", "quote", "syn 2.0.68", @@ -1638,9 +1638,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79384be7f8f5a9dd5d7167216f022090cf1f9ec128e6e6a482a2cb5c5422c56" +checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -1648,9 +1648,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c6ab57572f7a24a4985830b120de1594465e5d500f24afe89e16b4e833ef68" +checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de" dependencies = [ "proc-macro2", "quote", @@ -1661,9 +1661,12 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.95" +version = "0.2.100" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65fc09f10666a9f147042251e0dda9c18f166ff7de300607007e96bdebc1068d" +checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d" +dependencies = [ + "unicode-ident", +] [[package]] name = "web-sys" diff --git a/web/tvixbolt/Cargo.nix b/web/tvixbolt/Cargo.nix index 14baec09d..30a915b3a 100644 --- a/web/tvixbolt/Cargo.nix +++ b/web/tvixbolt/Cargo.nix @@ -4812,9 +4812,9 @@ rec { }; "wasm-bindgen" = rec { crateName = "wasm-bindgen"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0bpbvmxhil380gpv53smaypl8wc7sy7rq8apxfw349pn78v1x38j"; + sha256 = "1x8ymcm6yi3i1rwj78myl1agqv2m86i648myy3lc97s9swlqkp0y"; libName = "wasm_bindgen"; authors = [ "The wasm-bindgen Developers" @@ -4827,29 +4827,42 @@ rec { { name = "once_cell"; packageId = "once_cell"; + usesDefaultFeatures = false; + } + { + name = "rustversion"; + packageId = "rustversion"; + optional = true; } { name = "wasm-bindgen-macro"; packageId = "wasm-bindgen-macro"; } ]; + devDependencies = [ + { + name = "once_cell"; + packageId = "once_cell"; + } + ]; features = { - "default" = [ "spans" "std" ]; + "default" = [ "std" "msrv" ]; "enable-interning" = [ "std" ]; + "msrv" = [ "rustversion" ]; + "rustversion" = [ "dep:rustversion" ]; "serde" = [ "dep:serde" ]; "serde-serialize" = [ "serde" "serde_json" "std" ]; "serde_json" = [ "dep:serde_json" ]; - "spans" = [ "wasm-bindgen-macro/spans" ]; "strict-macro" = [ "wasm-bindgen-macro/strict-macro" ]; "xxx_debug_only_print_generated_code" = [ "wasm-bindgen-macro/xxx_debug_only_print_generated_code" ]; }; - resolvedDefaultFeatures = [ "default" "spans" "std" ]; + resolvedDefaultFeatures = [ "default" "msrv" "rustversion" "std" ]; }; "wasm-bindgen-backend" = rec { crateName = "wasm-bindgen-backend"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0n53wgy78bgzgjwk0z69zbspzhv8p2a4zh69s4fzvpqdrb9x8vfb"; + sha256 = "1ihbf1hq3y81c4md9lyh6lcwbx6a5j0fw4fygd423g62lm8hc2ig"; libName = "wasm_bindgen_backend"; authors = [ "The wasm-bindgen Developers" @@ -4863,10 +4876,6 @@ rec { name = "log"; packageId = "log"; } - { - name = "once_cell"; - packageId = "once_cell"; - } { name = "proc-macro2"; packageId = "proc-macro2"; @@ -4888,7 +4897,6 @@ rec { features = { "extra-traits" = [ "syn/extra-traits" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-futures" = rec { crateName = "wasm-bindgen-futures"; @@ -4926,9 +4934,9 @@ rec { }; "wasm-bindgen-macro" = rec { crateName = "wasm-bindgen-macro"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0mic8b2vab1a91m6x3hjxkwz23094bq1cwhnszarsnlggyz894z7"; + sha256 = "01xls2dvzh38yj17jgrbiib1d3nyad7k2yw9s0mpklwys333zrkz"; procMacro = true; libName = "wasm_bindgen_macro"; authors = [ @@ -4945,16 +4953,14 @@ rec { } ]; features = { - "spans" = [ "wasm-bindgen-macro-support/spans" ]; "strict-macro" = [ "wasm-bindgen-macro-support/strict-macro" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-macro-support" = rec { crateName = "wasm-bindgen-macro-support"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; - sha256 = "0s7g6glb85lyx2pj83shbmg4d50mvqhb2c2qk2j28yigaxbspii6"; + sha256 = "1plm8dh20jg2id0320pbmrlsv6cazfv6b6907z19ys4z1jj7xs4a"; libName = "wasm_bindgen_macro_support"; authors = [ "The wasm-bindgen Developers" @@ -4984,20 +4990,24 @@ rec { ]; features = { "extra-traits" = [ "syn/extra-traits" ]; - "spans" = [ "wasm-bindgen-backend/spans" ]; }; - resolvedDefaultFeatures = [ "spans" ]; }; "wasm-bindgen-shared" = rec { crateName = "wasm-bindgen-shared"; - version = "0.2.95"; + version = "0.2.100"; edition = "2021"; links = "wasm_bindgen"; - sha256 = "1386q7mvv5ky003hcc6yyxpid3y1m7fy0l920i3z3ab60vqhkz35"; + sha256 = "0gffxvqgbh9r9xl36gprkfnh3w9gl8wgia6xrin7v11sjcxxf18s"; libName = "wasm_bindgen_shared"; authors = [ "The wasm-bindgen Developers" ]; + dependencies = [ + { + name = "unicode-ident"; + packageId = "unicode-ident"; + } + ]; }; "web-sys" = rec { diff --git a/web/tvixbolt/Cargo.toml b/web/tvixbolt/Cargo.toml index 998c3712c..a92af21ee 100644 --- a/web/tvixbolt/Cargo.toml +++ b/web/tvixbolt/Cargo.toml @@ -12,4 +12,4 @@ yew-router = "0.18" tvix-eval = { path = "../../tvix/eval", default-features = false } serde = { version = "1.0.204", features = ["derive"] } web-sys = { version = "0.3.69", features = ["HtmlDetailsElement"] } -wasm-bindgen = "0.2.95" +wasm-bindgen = "0.2.100"