aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-06-11 05:20:43 -0400
committerGitHub <noreply@github.com>2021-06-11 05:20:43 -0400
commita634b2cd5977c60f1907733efe07b61ba36271fb (patch)
treee123d33b9ad828982d3fd570c97d7a777c88a2fb /Makefile
parent08e39fe6def6acb6d39b74a176c47358186c8430 (diff)
parente7e09bf2f0abdbfa6a1cc7f75bfbd795f80624d6 (diff)
downloadpodman-a634b2cd5977c60f1907733efe07b61ba36271fb.tar.gz
podman-a634b2cd5977c60f1907733efe07b61ba36271fb.tar.bz2
podman-a634b2cd5977c60f1907733efe07b61ba36271fb.zip
Merge pull request #10542 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 4a7c727de..f2b9d87de 100644
--- a/Makefile
+++ b/Makefile
@@ -389,10 +389,10 @@ cross: local-cross
.PHONY: nixpkgs
nixpkgs:
@nix run \
- -f channel:nixos-20.09 nix-prefetch-git \
+ -f channel:nixos-21.05 nix-prefetch-git \
-c nix-prefetch-git \
--no-deepClone \
- https://github.com/nixos/nixpkgs refs/heads/nixos-20.09 > nix/nixpkgs.json
+ https://github.com/nixos/nixpkgs refs/heads/nixos-21.05 > nix/nixpkgs.json
# Build statically linked binary
.PHONY: static