From 00a41a8463e13e06bf11458dae87219775b31174 Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Mon, 23 Dec 2024 23:15:58 +1100
Subject: [PATCH] podman: backport removing incomplete layers fix

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

diff --git a/pkgs/by-name/po/podman/package.nix b/pkgs/by-name/po/podman/package.nix
index f014ae9f0bf2..3786188d9f0b 100644
--- a/pkgs/by-name/po/podman/package.nix
+++ b/pkgs/by-name/po/podman/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   pkg-config,
   installShellFiles,
   buildGoModule,
@@ -91,6 +92,15 @@ buildGoModule rec {
 
     # we intentionally don't build and install the helper so we shouldn't display messages to users about it
     ./rm-podman-mac-helper-msg.patch
+
+    # backport of fix for https://github.com/containers/storage/issues/2184
+    # https://github.com/containers/storage/pull/2185
+    (fetchpatch2 {
+      url = "https://github.com/containers/storage/commit/99b0d2d423c8093807d8a1464437152cd04d7d95.diff?full_index=1";
+      hash = "sha256-aahYXnDf3qCOlb6MfVDqFKCcQG257r5sbh5qnL0T40I=";
+      stripLen = 1;
+      extraPrefix = "vendor/github.com/containers/storage/";
+    })
   ];
 
   vendorHash = null;