From 0ec1522ba9307e3f158f1f2ed27aee5a8ccac671 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 13 Dec 2024 11:37:27 +0100 Subject: [PATCH 1/2] nix: update packages list Signed-off-by: Giuseppe Scrivano --- nix/nixpkgs.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index dac02ea812..7ec1b4202f 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,10 +1,10 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "75ed009f22af3b8439d2f426a793f26e5cd4cf77", - "date": "2024-10-07T14:46:56+02:00", - "path": "/nix/store/kdqcyq2g9skx5y5vdh08wg5kfqrdgb0a-nixpkgs", - "sha256": "0vnxh80kbkc5lxdndbxr31pnvi0xj8shyyi8s75c58n3c0nfr6bc", - "hash": "sha256-bJnsLGDDosLK0Sh6DzWSHcRtbxi5r2Zbp4XNNQGC3W4=", + "rev": "ae320512e63598cd4b272c86b6875762e28e87da", + "date": "2024-12-13T11:04:07+01:00", + "path": "/nix/store/xr99s9lss6hc484ybvx2pcbml2rpswal-nixpkgs", + "sha256": "1gh14qf23b7lz273zkqrpidq4j39vqzyifsr4hrsrdzxqg6sl5g2", + "hash": "sha256-4hWqzcP9t6wzJFm76D/eaUiCW7wZzz+O+PSsIRwmAb4=", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, From d79334864ca9436affeb2cb917a60a586ba14e41 Mon Sep 17 00:00:00 2001 From: Giuseppe Scrivano Date: Fri, 13 Dec 2024 23:32:06 +0100 Subject: [PATCH 2/2] build-aux: use an init process for the nix container Signed-off-by: Giuseppe Scrivano --- build-aux/release.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-aux/release.sh b/build-aux/release.sh index bdbe7964cb..5cf8ca088d 100755 --- a/build-aux/release.sh +++ b/build-aux/release.sh @@ -46,13 +46,13 @@ mkdir -p /nix NIX_ARGS="--extra-experimental-features nix-command --print-build-logs --option cores $(nproc) --option max-jobs $(nproc)" for ARCH in amd64 arm64 ppc64le riscv64 s390x; do - $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ + $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ nix $NIX_ARGS build --max-jobs auto --file nix/default-${ARCH}.nix cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH} rm -rf result - $RUNTIME run --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ + $RUNTIME run --init --rm $RUNTIME_EXTRA_ARGS --privileged -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} ${NIX_IMAGE} \ nix $NIX_ARGS build --max-jobs auto --file nix/default-${ARCH}.nix --arg enableSystemd false cp ./result/bin/crun $OUTDIR/crun-$VERSION-linux-${ARCH}-disable-systemd