maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(3p/sources): Bump channels & overlays (2025-03-02)

Browse source 
* //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 <sternenseemann@systemli.org>
Tested-by: BuildkiteCI
Reviewed-by: flokli <flokli@flokli.de>
This commit is contained in:
sterni 2025-02-23 18:18:44 +01:00 • committed by clbot
parent 1d4626d166
commit 3bf6612a70
9 changed files with 32 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tvix/boot/tests/default.nix
View file

@ -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.