From 7107e41d66ab3671b9fe824a6aa9f9b7a55ea513 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Sat, 23 May 2026 00:21:52 +0200
Subject: [PATCH] ip2unix: 2.2.1 -> 2.2.2

This update comes with a bunch of fixes:

  * Out of range string_view access in globpath. Thanks to Adam
    Mizerski. This patch was already in nixpkgs because it led to a test
    failure.
  * Typo in README and manpage.
  * Invalid use of PROVIDE in linker script. This was the reason why
    ip2unix failed to build on x86_64-linux after our binutils upgrade.
  * reject rule not working with sendto/sendmsg.
  * Bug in accept if stdin was closed and accept would return FD 0.
  * Broken abstract socket support if used with from-abstract.
  * Race condition if the program uses library calls wrapped by ip2unix
    before initialisation was done. This fixes the integration tests on
    aarch64-linux.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/by-name/ip/ip2unix/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix
index 00fb619f502e..78f9d591a9eb 100644
--- a/pkgs/by-name/ip/ip2unix/package.nix
+++ b/pkgs/by-name/ip/ip2unix/package.nix
@@ -20,24 +20,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ip2unix";
-  version = "2.2.1";
+  version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-+p5wQbX35LAjZ4vIE4AhI4M6gQ7gVviqf9jJDAr9xg8";
+    hash = "sha256-QWhOO2tHl8fwXy0k9W+I/XHPJI8OJyexMsgOSJes37s";
   };
 
-  patches = [
-    # https://github.com/nixcloud/ip2unix/pull/35
-    # fix out of range string_view access
-    (fetchpatch {
-      url = "https://github.com/nixcloud/ip2unix/commit/050ddf76b4b925f27e255fbb820b0700407ceb2b.patch";
-      hash = "sha256-5vaLmZmwuiMGV4KnVhuDSnXG1a390aBU51TShwpaMLs=";
-    })
-  ];
-
   nativeBuildInputs = [
     meson
     ninja