From c4d43ee1f81ced167ac99901afb6919cfb9156be Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 4 Jun 2021 09:10:09 +1000
Subject: [PATCH] podman: 3.1.2 -> 3.2.1

https://github.com/containers/podman/releases/tag/v3.2.0
https://github.com/containers/podman/releases/tag/v3.2.1
---
 .../virtualization/podman/default.nix         | 10 +++-----
 .../remove-unconfigured-runtime-warn.patch    | 23 -------------------
 2 files changed, 3 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch

diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index 10a6d726aef..0f5eaecb67d 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -17,19 +17,15 @@
 
 buildGoModule rec {
   pname = "podman";
-  version = "3.1.2";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
     rev = "v${version}";
-    sha256 = "sha256-PS41e7myv5xCSJIeT+SRj4rLVCXpthq7KeHisYoSiOE=";
+    sha256 = "sha256-nnVMK4ST9Z2Oi1yLiFRIc9qAlJF4UEtE90iseHhKGlQ=";
   };
 
-  patches = [
-    ./remove-unconfigured-runtime-warn.patch
-  ];
-
   vendorSha256 = null;
 
   doCheck = false;
@@ -61,7 +57,7 @@ buildGoModule rec {
   installPhase = ''
     runHook preInstall
   '' + lib.optionalString stdenv.isDarwin ''
-    mv bin/{podman-remote,podman}
+    mv bin/{darwin/podman,podman}
   '' + ''
     install -Dm555 bin/podman $out/bin/podman
     installShellCompletion --bash completions/bash/*
diff --git a/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch b/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch
deleted file mode 100644
index 8530cd93cdf..00000000000
--- a/pkgs/applications/virtualization/podman/remove-unconfigured-runtime-warn.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Remove warning "WARN[0000] Found default OCIruntime /nix/store/.../bin/crun path which is missing from [engine.runtimes] in containers.conf
-
-It doesn't make sense as we promote using the podman wrapper where runtime paths will vary because they are nix store paths.
----
- vendor/github.com/containers/common/pkg/config/config.go | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/vendor/github.com/containers/common/pkg/config/config.go b/vendor/github.com/containers/common/pkg/config/config.go
-index 4a98c7e92..4a95a2a49 100644
---- a/vendor/github.com/containers/common/pkg/config/config.go
-+++ b/vendor/github.com/containers/common/pkg/config/config.go
-@@ -605,8 +605,7 @@ func (c *EngineConfig) findRuntime() string {
- 				return name
- 			}
- 		}
--		if path, err := exec.LookPath(name); err == nil {
--			logrus.Warningf("Found default OCIruntime %s path which is missing from [engine.runtimes] in containers.conf", path)
-+		if _, err := exec.LookPath(name); err == nil {
- 			return name
- 		}
- 	}
---
-2.30.0