Merge master into staging-next

2021-05-20 18:36:00 +00:00
parent 274ec21015 52770ccd46
commit 34a05e29f1
13 changed files with 166 additions and 30 deletions
@@ -14,21 +14,17 @@

 buildGoModule rec {
  pname = "buildah";
-  version = "1.20.1";
+  version = "1.21.0";

  src = fetchFromGitHub {
    owner = "containers";
    repo = "buildah";
    rev = "v${version}";
-    sha256 = "sha256-nlZblUPS0678dR0hyp+V9uH/nHL9YH81+O1Zzq8T8Pw=";
+    sha256 = "sha256-uNb5HCEft1vXASli+2zdKWzFzsAlI9/ILBWa7OQZBwE=";
  };

  outputs = [ "out" "man" ];

-  patches = [
-    ../../../applications/virtualization/podman/remove-unconfigured-runtime-warn.patch
-  ];
-
  vendorSha256 = null;

  doCheck = false;