Skip to content

Commit

Permalink
Merge pull request #7594 from alvistack/master-linux-amd64
Browse files Browse the repository at this point in the history
Update nix pin with `make nixpkgs`
  • Loading branch information
openshift-merge-robot authored Sep 18, 2020
2 parents 273b954 + 6ad67cd commit fc3daae
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
6 changes: 4 additions & 2 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -594,12 +594,14 @@ static_build_task:
mv .cache /nix
if [[ -z $(ls -A /nix) ]]; then podman run --rm --privileged -ti -v /:/mnt nixos/nix cp -rfT /nix /mnt/nix; fi
podman run --rm --privileged -ti -v /nix:/nix -v ${PWD}:${PWD} -w ${PWD} nixos/nix nix --print-build-logs --option cores 8 --option max-jobs 8 build --file nix/
mv /nix .cache
chown -Rf $(whoami) .cache
binaries_artifacts:
path: "result/bin/podman"

save_cache_script: |
mv /nix .cache
chown -Rf $(whoami) .cache
darwin_build_task:
depends_on:
Expand Down
6 changes: 3 additions & 3 deletions nix/nixpkgs.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"url": "https://github.com/nixos/nixpkgs",
"rev": "5f212d693fe1c82f9c7e20cd57bc69802b36a321",
"date": "2020-08-22T01:42:23+02:00",
"sha256": "1h3819ppllcpw07j884bjh07sma07vrrk1md92sf93cg43nmzncf",
"rev": "d5a689edda8219a1e20fd3871174b994cf0a94a3",
"date": "2020-09-13T01:58:20+02:00",
"sha256": "0m6nmi1fx0glfbg52kqdjgidxylk4p5xnx9v35wlsfi1j2xhkia4",
"fetchSubmodules": false
}

0 comments on commit fc3daae

Please sign in to comment.