Merge master into staging-next

2020-08-26 08:42:36 +02:00
parent 62f046e902 f6286dea88
commit b61ad0afc2
86 changed files with 2222 additions and 293 deletions
@@ -16,13 +16,13 @@

 buildGoModule rec {
  pname = "podman";
-  version = "2.0.4";
+  version = "2.0.5";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "podman";
    rev = "v${version}";
-    sha256 = "0rnli16nh5m3a8jjkkm1k4f896yk1k1rg48rjiajqhfrr98qwr0f";
+    sha256 = "0db0q52va9w8aprzx08xnv6y84l4x4lc113sd97hjgjnhknp8d3m";
  };

  vendorSha256 = null;