From 00e7de92e3ba52d8d3808ee08aef85caa21d6265 Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Wed, 4 Jun 2025 23:17:13 +0200
Subject: [PATCH] shh: 2025.4.12 -> 2025.6.4

---
 pkgs/by-name/sh/shh/package.nix | 28 ++++++----------------------
 1 file changed, 6 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index e2b894df6760..8bc26f187235 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -19,40 +19,24 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "shh";
-  version = "2025.4.12";
+  version = "2025.6.4";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${version}";
-    hash = "sha256-+JWz0ya6gi8pPERnpAcQIe7zZUzWGxha+9/gizMVtEw=";
+    hash = "sha256-rhn7qy/cF1vjCFnEoVzVmKNcI/TBUEMxp5pzzC8c9bw=";
   };
 
-  cargoHash = "sha256-rrOH76LHYSEeuNiMIICpAO7U/sz5V0JRO22mbIICQWw=";
-
-  # needs to be done this way to bypass patch conflicts
-  cargoPatches = [
-    (fetchpatch {
-      # to be removed after next release
-      name = "refactor-man-page-generation-command.patch";
-      url = "https://github.com/desbma/shh/commit/849b9a6646981c83a72a977b6398371e29d3b928.patch";
-      hash = "sha256-LZlUFfPtt2ScTxQbQ9j3Kzvp7T4MCFs92cJiI3YbWns=";
-    })
-    (fetchpatch {
-      # to be removed after next release
-      name = "support-shell-auto-complete.patch";
-      url = "https://github.com/desbma/shh/commit/74914dc8cfd74dbd7e051a090cc4c1f561b8cdde.patch";
-      hash = "sha256-WgKRQAEwSpXdQUnrZC1Bp4RfKg2J9kPkT1k6R2wwgT8=";
-    })
-  ];
+  cargoHash = "sha256-hk4IG/FOwrLrV7kPDQigkpWwQzmvf1LvyrIesMYO3jk=";
 
   patches = [
     ./fix_run_checks.patch
     (fetchpatch {
       # to be removed after next release
-      name = "feat-static-strace-path-support-at-compile-time.patch";
-      url = "https://github.com/desbma/shh/commit/da62ceeb227de853be06610721744667c6fe994b.patch";
-      hash = "sha256-p/W7HRZZ4TpIwrWN8wQB/SH3C8x3ZLXzwGV50oK/znQ=";
+      name = "support-kernels-without-kernel-unprivileged_userns_clone.patch";
+      url = "https://github.com/desbma/shh/commit/f103b06c756dbb43aec615b590680cc99cbb0f00.patch";
+      hash = "sha256-K68tU7EN51jUayoP+WAUuvqqB2eqyDXnAdLsWEd/eAM=";
     })
   ];