From 8b031cac44ae8fb02b6017863aeefe727806ad41 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 2 Feb 2023 09:25:13 +1000
Subject: [PATCH] podman: 4.3.1 -> 4.4.0

https://github.com/containers/podman/releases/tag/v4.4.0
---
 nixos/tests/podman/default.nix                |  2 --
 nixos/tests/podman/tls-ghostunnel.nix         |  3 ---
 .../virtualization/podman/default.nix         |  4 +--
 .../podman/rm-podman-mac-helper-msg.patch     | 26 +++++++++----------
 4 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/nixos/tests/podman/default.nix b/nixos/tests/podman/default.nix
index c2ea399d65af..c9b234d2b609 100644
--- a/nixos/tests/podman/default.nix
+++ b/nixos/tests/podman/default.nix
@@ -149,7 +149,6 @@ import ../make-test-python.nix (
           docker.succeed(su_cmd("docker version"))
 
       with subtest("Run container via docker cli"):
-          docker.succeed("docker network create default")
           docker.succeed("tar cv --files-from /dev/null | podman import - scratchimg")
           docker.succeed(
             "docker run -d --name=sleeping -v /nix/store:/nix/store -v /run/current-system/sw/bin:/bin localhost/scratchimg /bin/sleep 10"
@@ -158,7 +157,6 @@ import ../make-test-python.nix (
           docker.succeed("podman ps | grep sleeping")
           docker.succeed("docker stop sleeping")
           docker.succeed("docker rm sleeping")
-          docker.succeed("docker network rm default")
 
       with subtest("A podman non-member can not use the docker cli"):
           docker.fail(su_cmd("docker version", user="mallory"))
diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix
index 268a55701ccf..52c31dc21f10 100644
--- a/nixos/tests/podman/tls-ghostunnel.nix
+++ b/nixos/tests/podman/tls-ghostunnel.nix
@@ -113,9 +113,6 @@ import ../make-test-python.nix (
       podman.wait_for_unit("sockets.target")
       podman.wait_for_unit("ghostunnel-server-podman-socket.service")
 
-      with subtest("Create default network"):
-          podman.succeed("docker network create default")
-
       with subtest("Root docker cli also works"):
           podman.succeed("docker version")
 
diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix
index f6cc83fde17c..630d6a3be12b 100644
--- a/pkgs/applications/virtualization/podman/default.nix
+++ b/pkgs/applications/virtualization/podman/default.nix
@@ -18,13 +18,13 @@
 
 buildGoModule rec {
   pname = "podman";
-  version = "4.3.1";
+  version = "4.4.0";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
     rev = "v${version}";
-    sha256 = "sha256-UOAQtGDoZe+Av4+9RQCJiV3//B/pdF0pEsca4FonGxY=";
+    sha256 = "sha256-kyeON8S7CCVdHt09wigNXDWScgyaLzC4EhOts8ViP2w=";
   };
 
   patches = [
diff --git a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
index 902a50e4ce24..d1fe9bcc9b0a 100644
--- a/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
+++ b/pkgs/applications/virtualization/podman/rm-podman-mac-helper-msg.patch
@@ -1,16 +1,16 @@
 diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go
-index a6907c0df..717d82ff3 100644
+index 4f25b4d26..8a79862fd 100644
 --- a/pkg/machine/qemu/machine.go
 +++ b/pkg/machine/qemu/machine.go
-@@ -1483,11 +1483,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward
- 		case notInstalled:
- 			fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n")
- 			fmt.Printf("address can't be used by podman. ")
--			if helper := findClaimHelper(); len(helper) > 0 {
--				fmt.Printf("If you would like to install it run the\nfollowing commands:\n")
--				fmt.Printf("\n\tsudo %s install\n", helper)
--				fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix)
--			}
- 		case machineLocal:
- 			fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
- 		case claimUnsupported:
+@@ -1509,11 +1509,6 @@ func (v *MachineVM) waitAPIAndPrintInfo(forwardState apiForwardingState, forward
+ 			case notInstalled:
+ 				fmt.Printf("\nThe system helper service is not installed; the default Docker API socket\n")
+ 				fmt.Printf("address can't be used by podman. ")
+-				if helper := findClaimHelper(); len(helper) > 0 {
+-					fmt.Printf("If you would like to install it run the\nfollowing commands:\n")
+-					fmt.Printf("\n\tsudo %s install\n", helper)
+-					fmt.Printf("\tpodman machine stop%s; podman machine start%s\n\n", suffix, suffix)
+-				}
+ 			case machineLocal:
+ 				fmt.Printf("\nAnother process was listening on the default Docker API socket address.\n")
+ 			case claimUnsupported: