summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cirrus.yml6
-rw-r--r--nix/nixpkgs.json6
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
}