diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-09-18 08:38:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-18 08:38:49 -0400 |
| commit | fc3daaef83b666b83cdc4578723bbfbe8b6f2b05 (patch) | |
| tree | 05614ca15d8d97949ba8d16479d004077819186a | |
| parent | 273b9545bbf457fb48ff005b4f771b91c3f40681 (diff) | |
| parent | 6ad67cd6c16d84cee34a5e101c9ca7ddf7772415 (diff) | |
| download | podman-fc3daaef83b666b83cdc4578723bbfbe8b6f2b05.tar.gz podman-fc3daaef83b666b83cdc4578723bbfbe8b6f2b05.tar.bz2 podman-fc3daaef83b666b83cdc4578723bbfbe8b6f2b05.zip | |
Merge pull request #7594 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
| -rw-r--r-- | .cirrus.yml | 6 | ||||
| -rw-r--r-- | nix/nixpkgs.json | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 9d220c69a..a11bbbe61 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -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: diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 6ef89ff82..cd885fce2 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -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 } |