summaryrefslogtreecommitdiff
path: root/nix
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2020-09-18 08:38:49 -0400
committerGitHub <noreply@github.com>2020-09-18 08:38:49 -0400
commitfc3daaef83b666b83cdc4578723bbfbe8b6f2b05 (patch)
tree05614ca15d8d97949ba8d16479d004077819186a /nix
parent273b9545bbf457fb48ff005b4f771b91c3f40681 (diff)
parent6ad67cd6c16d84cee34a5e101c9ca7ddf7772415 (diff)
downloadpodman-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`
Diffstat (limited to 'nix')
-rw-r--r--nix/nixpkgs.json6
1 files changed, 3 insertions, 3 deletions
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
}