Skip to content

Commit

Permalink
Merge pull request #1624 from giuseppe/update-nix-13-dec-2024
Browse files Browse the repository at this point in the history
nix: update packages list
  • Loading branch information
giuseppe authored Dec 16, 2024
2 parents 3dbc7e7 + d793348 commit 64deb62
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions build-aux/release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 5 additions & 5 deletions nix/nixpkgs.json
Original file line number Diff line number Diff line change
@@ -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,
Expand Down

1 comment on commit 64deb62

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.