From d7a368779abec248368e8c0129854b168ed1e68d Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sat, 27 Jun 2026 15:30:26 +0000
Subject: [PATCH 1/3] podman: 5.8.3 -> 5.8.4

Fixes CVE-2026-57231/GHSA-4hq8-gpf5-8p68 (#535959)
---
 pkgs/by-name/po/podman/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 0b2ab61c9351..0f2c6f07607a 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -42,13 +42,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "podman";
-  version = "5.8.3";
+  version = "5.8.4";
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "podman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MS5eaGTcCAtEvoQUhGlX8UfoOqNOv0VAoeFxfAvB3Zs=";
+    hash = "sha256-zhEtMZVKiv1L72EMlwgz8sHpmvhejGp98oW63aPj+rQ=";
   };
 
   patches = [

From ebd782baf852fa9223ad5aabd04e9071edd7c9fd Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sun, 28 Jun 2026 06:17:30 +0000
Subject: [PATCH 2/3] podman: Limit the platform to linux

---
 pkgs/by-name/po/podman/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index 0f2c6f07607a..f8314ebeefcf 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -204,5 +204,6 @@ buildGoModule (finalAttrs: {
     license = lib.licenses.asl20;
     teams = [ lib.teams.podman ];
     mainProgram = "podman";
+    platforms = lib.platforms.linux;
   };
 })

From bc237fdc0acd50181a8c1d7fff897e2675a0d997 Mon Sep 17 00:00:00 2001
From: klea <klea@iwnp.org>
Date: Sun, 28 Jun 2026 06:30:39 +0000
Subject: [PATCH 3/3] nixos/tests/podman: replace deprecated os.system in
 tls-ghostunnel

Seems the shell script ${gen-ca} doesn't have a prefix, and thus requires being
run on a shell.
---
 nixos/tests/podman/tls-ghostunnel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix
index 1fcfd08f0efc..027683df4b25 100644
--- a/nixos/tests/podman/tls-ghostunnel.nix
+++ b/nixos/tests/podman/tls-ghostunnel.nix
@@ -83,7 +83,7 @@ import ../make-test-python.nix (
     };
 
     testScript = ''
-      import os
+      import subprocess
       import shlex
 
 
@@ -93,7 +93,7 @@ import ../make-test-python.nix (
 
       def cmd(command):
         print(f"+{command}")
-        r = os.system(command)
+        r = subprocess.run(command, shell=True).returncode
         if r != 0:
           raise Exception(f"Command {command} failed with exit code {r}")