From 3bf6612a70bc3478a439dee32017b7b42e3839a5 Mon Sep 17 00:00:00 2001 From: sterni Date: Sun, 23 Feb 2025 18:18:44 +0100 Subject: [PATCH] chore(3p/sources): Bump channels & overlays (2025-03-02) * //tvix/*-go: regenerate protobuf files * //tvix/boot: - Explicitly set compression method of mkBinaryCache which has made this configurable and (at the same time) changed the default. - Adjust to change of extension of the nar files from .nar.xz to plain .xz. Change-Id: Ie79ea8e0ac8fe04ae01f5558bffca93e9314f56d Reviewed-on: https://cl.tvl.fyi/c/depot/+/13174 Autosubmit: sterni Tested-by: BuildkiteCI Reviewed-by: flokli --- third_party/sources/sources.json | 30 ++++++++++++++--------------- tvix/boot/tests/default.nix | 12 ++++++++++-- tvix/build-go/build.pb.go | 2 +- tvix/build-go/rpc_build.pb.go | 2 +- tvix/castore-go/castore.pb.go | 2 +- tvix/castore-go/rpc_blobstore.pb.go | 2 +- tvix/castore-go/rpc_directory.pb.go | 2 +- tvix/store-go/pathinfo.pb.go | 2 +- tvix/store-go/rpc_pathinfo.pb.go | 2 +- 9 files changed, 32 insertions(+), 24 deletions(-) diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json index 0234514d4..a9ad22240 100644 --- a/third_party/sources/sources.json +++ b/third_party/sources/sources.json @@ -43,10 +43,10 @@ "homepage": "https://nix-community.github.io/home-manager/", "owner": "nix-community", "repo": "home-manager", - "rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292", - "sha256": "0x15vxlsmf6c421252ww9nmqapfyxar6xjqmpf38y1fkbw6m4iyi", + "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", + "sha256": "172sb8wdqm5fcx85gwzbf0b3l846s4b3ldfrpdhq5lf27lb20w81", "type": "tarball", - "url": "https://github.com/nix-community/home-manager/archive/6d3163aea47fdb1fe19744e91306a2ea4f602292.tar.gz", + "url": "https://github.com/nix-community/home-manager/archive/fcac3d6d88302a5e64f6cb8014ac785e08874c8d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "impermanence": { @@ -67,10 +67,10 @@ "homepage": "", "owner": "nmattia", "repo": "naersk", - "rev": "0621e47bd95542b8e1ce2ee2d65d6a1f887a13ce", - "sha256": "0qn8a0ippbmcwbg3f6nbaq8pj8ha12iw08241dyj15cm3f8iw0q7", + "rev": "e5130d37369bfa600144c2424270c96f0ef0e11d", + "sha256": "0n4rg5cl0v8s7z31pjbdf814x9868b7y90h2vq3b6m0nql46phvx", "type": "tarball", - "url": "https://github.com/nmattia/naersk/archive/0621e47bd95542b8e1ce2ee2d65d6a1f887a13ce.tar.gz", + "url": "https://github.com/nmattia/naersk/archive/e5130d37369bfa600144c2424270c96f0ef0e11d.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "napalm": { @@ -92,10 +92,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2ff53fe64443980e139eaa286017f53f88336dd0", - "sha256": "0ms5nbr2vmvhbr531bxvyi10nz9iwh5cry12pl416gyvf0mxixpv", + "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "sha256": "0qzxhnipsp48z9vx5xkdh74m6yny8k4ah6f47r1axk6lxhiwfdkj", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/2ff53fe64443980e139eaa286017f53f88336dd0.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/303bd8071377433a2d8f76e684ec773d70c5b642.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs-stable": { @@ -118,10 +118,10 @@ "homepage": "", "owner": "oxalica", "repo": "rust-overlay", - "rev": "cd3e0a87bf9edadb0f311ba1eb677bbae7a08b81", - "sha256": "02qcjw78pkxfi9s43gvx0z36yc9b7ldmm5jpja864grclcr5cb3q", + "rev": "f4d5a693c18b389f0d58f55b6f7be6ef85af186f", + "sha256": "1yw2xbmkh8klzn8j7cm5dn6ilm3qbz1rl6rjiqy9vqla2ldvqbsl", "type": "tarball", - "url": "https://github.com/oxalica/rust-overlay/archive/cd3e0a87bf9edadb0f311ba1eb677bbae7a08b81.tar.gz", + "url": "https://github.com/oxalica/rust-overlay/archive/f4d5a693c18b389f0d58f55b6f7be6ef85af186f.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": "ddccfe8aced779f7b54d27bbe7e122ecb1dda33a", - "sha256": "0rzj0ld39anp05asf1v45i6sz3jgggmmj6qs110n718kv1zpb92j", + "rev": "2e25d9665f10de885c81a9fb9d51a289f625b05f", + "sha256": "14zcd5apyyb8s2xf3h4wbhhq5zrpg0hcawq5dz4k0l2wdqmdcv0h", "type": "tarball", - "url": "https://github.com/RustSec/advisory-db/archive/ddccfe8aced779f7b54d27bbe7e122ecb1dda33a.tar.gz", + "url": "https://github.com/RustSec/advisory-db/archive/2e25d9665f10de885c81a9fb9d51a289f625b05f.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 d4ddddbd6..b3a680f9f 100644 --- a/tvix/boot/tests/default.nix +++ b/tvix/boot/tests/default.nix @@ -98,14 +98,22 @@ let # Upload. We can't use nix copy --to http://…, as it wants access to the nix db. # However, we can use mkBinaryCache to assemble .narinfo and .nar.xz to upload, # and then drive a HTTP client ourselves. - to_upload=${pkgs.mkBinaryCache { rootPaths = [path];}} + to_upload=${ + pkgs.mkBinaryCache { + rootPaths = [ path ]; + # Needs to be set explicitly now: https://github.com/NixOS/nixpkgs/pull/376365#issuecomment-2692701604 + compression = "xz"; + } + } # Upload all NAR files (with some parallelism). # As mkBinaryCache produces them xz-compressed, unpack them on the fly. # nar-bridge doesn't care about the path we upload *to*, but a # subsequent .narinfo upload need to refer to its contents (by narhash). echo -e "Uploading NARs… " - ls -d $to_upload/nar/*.nar.xz | rush -n1 'nar_hash=$(xz -d < {} | nix-hash --base32 --type sha256 --flat /dev/stdin);xz -d < {} | curl -s --fail-with-body -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/nar/''${nar_hash}.nar' + # TODO(flokli): extension of the nar files where changed from .nar.xz to .xz + # https://github.com/NixOS/nixpkgs/pull/376365 + ls -d $to_upload/nar/*.xz | rush -n1 'nar_hash=$(xz -d < {} | nix-hash --base32 --type sha256 --flat /dev/stdin);xz -d < {} | curl -s --fail-with-body -T - --unix-socket $PWD/nar-bridge.sock http://localhost:9000/nar/''${nar_hash}.nar' echo "Done." # Upload all NARInfo files. diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go index a8d2b6ae6..46bc268d2 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/build/protos/build.proto diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go index 0e1653e8d..7a7b10b48 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/build/protos/rpc_build.proto diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go index f76b9c9ee..2bef1b3b0 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/castore/protos/castore.proto diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go index c93fe20e4..560f78658 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/castore/protos/rpc_blobstore.proto diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go index d323bbdd6..856efb27b 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/castore/protos/rpc_directory.proto diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go index bc0ddafde..85390c9fb 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/store/protos/pathinfo.proto diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go index 2b8f1d843..933a3950c 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.4 +// protoc-gen-go v1.36.5 // protoc (unknown) // source: tvix/store/protos/rpc_pathinfo.proto