summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-04-14 10:14:51 -0400
committerGitHub <noreply@github.com>2021-04-14 10:14:51 -0400
commitb130dced648350f547767d07bb0b055472ab79bd (patch)
treefcab5435321853513185fff6b9fc10ca745df244
parentb5e9b30212c8d378d1cbccb096ebde216df50139 (diff)
parent77159dbd0a52fc052264f361031d8b9ad155190d (diff)
downloadpodman-b130dced648350f547767d07bb0b055472ab79bd.tar.gz
podman-b130dced648350f547767d07bb0b055472ab79bd.tar.bz2
podman-b130dced648350f547767d07bb0b055472ab79bd.zip
Merge pull request #10019 from alvistack/master-linux-amd64
Update nix pin with `make nixpkgs`
-rw-r--r--Makefile2
-rw-r--r--nix/nixpkgs.json8
2 files changed, 5 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 01d25a856..daf71fd8e 100644
--- a/Makefile
+++ b/Makefile
@@ -389,7 +389,7 @@ nixpkgs:
-f channel:nixos-20.09 nix-prefetch-git \
-c nix-prefetch-git \
--no-deepClone \
- https://github.com/nixos/nixpkgs refs/head/nixos-20.09 > nix/nixpkgs.json
+ https://github.com/nixos/nixpkgs refs/heads/nixos-20.09 > nix/nixpkgs.json
# Build statically linked binary
.PHONY: static
diff --git a/nix/nixpkgs.json b/nix/nixpkgs.json
index 8d2f76a28..54ddb8978 100644
--- a/nix/nixpkgs.json
+++ b/nix/nixpkgs.json
@@ -1,9 +1,9 @@
{
"url": "https://github.com/nixos/nixpkgs",
- "rev": "42a03e4728fc05cb9f123057670e41967f628360",
- "date": "2021-04-02T23:08:32+02:00",
- "path": "/nix/store/d1vqa0kpa69zzcaj5kqgkmrxr3s7vli1-nixpkgs",
- "sha256": "0wrn5nayxckj11z2qlvsya2lzssbccbk50llxmgdm0qb5y14shfk",
+ "rev": "cce26cd83d20356ee96ac9cf1de748e87fcc50b5",
+ "date": "2021-04-12T22:14:24+02:00",
+ "path": "/nix/store/0flgsv9kn7q0b2ipqz35lkxq65p5cv83-nixpkgs",
+ "sha256": "0ji00jz18fvppbi5y98gcalxq2mrsg7dhh9l64yf38jpb5rx3sd4",
"fetchSubmodules": false,
"deepClone": false,
"leaveDotGit": false