From c79a1f299fb3583f4148a272dceafd60f1553a82 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 11:20:25 +0800
Subject: [PATCH] sniproxy: 0.6.1 -> 0.7.0

Diff: https://github.com/dlundquist/sniproxy/compare/0.6.1...0.7.0
---
 pkgs/by-name/sn/sniproxy/package.nix | 32 +++++++++-------------------
 1 file changed, 10 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/sn/sniproxy/package.nix b/pkgs/by-name/sn/sniproxy/package.nix
index 0dd200f690d5..2c3c06e6ee19 100644
--- a/pkgs/by-name/sn/sniproxy/package.nix
+++ b/pkgs/by-name/sn/sniproxy/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchurl,
   autoreconfHook,
   gettext,
   libev,
@@ -11,28 +10,18 @@
   udns,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sniproxy";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "dlundquist";
     repo = "sniproxy";
-    rev = version;
-    sha256 = "sha256-htM9CrzaGnn1dnsWQ+0V6N65Og7rsFob3BlSc4UGfFU=";
+    tag = finalAttrs.version;
+    hash = "sha256-TUXwixnBFdegYRzeXlLVno2M3gVXyCw5Jdfb9ulOROs=";
   };
 
-  patches = [
-    ./gettext-0.25.patch
-    (fetchurl {
-      name = "compat-pcre2.patch";
-      # Using Arch Linux patch because the following upstream patches do not apply cleanly:
-      # https://github.com/dlundquist/sniproxy/commit/62e621f050f79eb78598b1296a089ef88a19ea91
-      # https://github.com/dlundquist/sniproxy/commit/7fdd86c054a21f7ac62343010de20f28645b14d2
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/sniproxy/-/raw/3272f9f0d406c51122f90708bfcc7b4ba0eb38c9/sniproxy-0.6.1-pcre2.patch?inline=false";
-      hash = "sha256-v6qdBAWXit0Zg43OsgzCTb4cSPm7gsEXVd7W8LvBgMk=";
-    })
-  ];
+  patches = [ ./gettext-0.25.patch ];
 
   nativeBuildInputs = [
     autoreconfHook
@@ -45,16 +34,15 @@ stdenv.mkDerivation rec {
     udns
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/dlundquist/sniproxy";
     description = "Transparent TLS and HTTP layer 4 proxy with SNI support";
-    license = licenses.bsd2;
-    maintainers = with maintainers; [
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [
       womfoo
       raitobezarius
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "sniproxy";
   };
-
-}
+})