From 9fd74d2f9ad8fe26dcaa0a2e0210f6320787390a Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@nix.build>
Date: Wed, 16 Aug 2023 17:07:47 +0200
Subject: [PATCH] ip2unix: 2.1.4 -> 2.2.0

Upstream changes:

  * Unlink socket file before bind if SO_REUSEADDR is used.
  * Add support for Linux abstract sockets.
  * Add support for matching an existing Unix domain socket or abstract
    socket.
  * Add stream/datagram aliases for tcp/udp socket types.
  * Add flag to prevent unlinking of socket files when closing sockets.
  * Fix missing header files for newer GCC versions, thanks to Varun
    Madiath.
  * Fix use-after-free of blackhole working directory path.
  * Fix a few compiler warnings on unnecessary allocation of string
    literals.
  * Add deprecation warnings if rules are specified in YAML format.
  * Rule files (-f) are now just a list of newline-separated rule (-r)
    arguments instead of YAML files.
  * Improve serializer to be more robust in end-of-stream conditions.
  * Bump requirements to require at least GCC version 9.
  * No longer prefer C library path over using RTLD_NEXT.

The missing include added via postPatch is no longer needed as it has
been fixed upstream.

Signed-off-by: aszlig <aszlig@nix.build>
---
 pkgs/tools/networking/ip2unix/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/ip2unix/default.nix b/pkgs/tools/networking/ip2unix/default.nix
index fabbbb40e7a7..93bd2507bf6f 100644
--- a/pkgs/tools/networking/ip2unix/default.nix
+++ b/pkgs/tools/networking/ip2unix/default.nix
@@ -5,19 +5,15 @@
 
 stdenv.mkDerivation rec {
   pname = "ip2unix";
-  version = "2.1.4";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "nixcloud";
     repo = "ip2unix";
     rev = "v${version}";
-    sha256 = "1pl8ayadxb0zzh5s26yschkjhr1xffbzzv347m88f9y0jv34d24r";
+    hash = "sha256-7Q2s7wBkt5OTbQnx7Q5mGRWBOtr6yRsFBh+CUu8CmMQ";
   };
 
-  postPatch = ''
-    sed '1i#include <array>' -i src/dynports/dynports.cc # gcc12
-  '';
-
   nativeBuildInputs = [
     meson ninja pkg-config asciidoc libxslt.bin docbook_xml_dtd_45 docbook_xsl
     libxml2.bin docbook5 python3Packages.pytest python3Packages.pytest-timeout