diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2020-08-24 05:05:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-24 05:05:02 -0400 |
| commit | 2c567dcbecbf41e9cff6ccd3ad91552b7e923c2a (patch) | |
| tree | 84b9d5d83915ee09f78fdff699063b9520c99716 | |
| parent | e535f6177571b5828ee536f5b0b54f7d0fc03507 (diff) | |
| parent | 41105d81f0e666cd2334d786f1c7bc062a16d24d (diff) | |
| download | podman-2c567dcbecbf41e9cff6ccd3ad91552b7e923c2a.tar.gz podman-2c567dcbecbf41e9cff6ccd3ad91552b7e923c2a.tar.bz2 podman-2c567dcbecbf41e9cff6ccd3ad91552b7e923c2a.zip | |
Merge pull request #7408 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
| -rw-r--r-- | .cirrus.yml | 4 | ||||
| -rw-r--r-- | nix/nixpkgs.json | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/.cirrus.yml b/.cirrus.yml index 964368743..1bf35e142 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -775,11 +775,11 @@ static_build_task: build_script: | set -ex - mkdir -p /nix mkdir -p .cache - mount --bind .cache /nix + 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: diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json index 976284ed4..6ef89ff82 100644 --- a/nix/nixpkgs.json +++ b/nix/nixpkgs.json @@ -1,7 +1,7 @@ { "url": "https://github.com/nixos/nixpkgs", - "rev": "d6a445fe821052861b379d9b6c02d21623c25464", - "date": "2020-08-11T04:28:16+01:00", - "sha256": "064scwaxg8qg4xbmq07hag57saa4bhsb4pgg5h5vfs4nhhwvchg9", + "rev": "5f212d693fe1c82f9c7e20cd57bc69802b36a321", + "date": "2020-08-22T01:42:23+02:00", + "sha256": "1h3819ppllcpw07j884bjh07sma07vrrk1md92sf93cg43nmzncf", "fetchSubmodules": false } |