From ccb7c34d0dd770bab2235d1a1f66d9f8acccdd9c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 1 Jun 2026 08:44:33 +0300
Subject: [PATCH] zsh: 5.9 -> 5.9.1

(cherry picked from commit 1c82216b08615e30a7eb4ef47762361e725f7613)
---
 .../zs/zsh/fix-sigsuspend-probe-c23.patch     | 17 -------
 pkgs/by-name/zs/zsh/package.nix               | 45 +------------------
 2 files changed, 2 insertions(+), 60 deletions(-)
 delete mode 100644 pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch

diff --git a/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch b/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch
deleted file mode 100644
index 46c060b235d2..000000000000
--- a/pkgs/by-name/zs/zsh/fix-sigsuspend-probe-c23.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Prototype the K&R handler so the probe still compiles under -std=gnu23
-(selected by autoconf 2.73). Upstream removed the probe in 8dd271fdec52,
-which does not apply against 5.9 with the PCRE backports.
-
-https://github.com/NixOS/nixpkgs/issues/513543
---- a/configure.ac
-+++ b/configure.ac
-@@ -2334,8 +2334,7 @@ if test x$signals_style = xPOSIX_SIGNALS; then
- #include <signal.h>
- #include <unistd.h>
- int child=0;
--void handler(sig)
--    int sig;
-+void handler(int sig)
- {if(sig==SIGCHLD) child=1;}
- int main() {
-     struct sigaction act;
diff --git a/pkgs/by-name/zs/zsh/package.nix b/pkgs/by-name/zs/zsh/package.nix
index 1ec13496c599..d8d86ba0399f 100644
--- a/pkgs/by-name/zs/zsh/package.nix
+++ b/pkgs/by-name/zs/zsh/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   autoreconfHook,
   yodl,
   perl,
@@ -18,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsh";
-  version = "5.9";
+  version = "5.9.1";
   outputs = [
     "out"
     "doc"
@@ -28,52 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://sourceforge/zsh/zsh-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-m40ezt1bXoH78ZGOh2dSp92UjgXBoNuhCrhjhC1FrNU=";
+    sha256 = "sha256-XSC+wD+YHcTpoJ7CRedBU4j/ZB95xcXEFrUELljYKA0=";
   };
 
   patches = [
     # fix location of timezone data for TZ= completion
     ./tz_completion.patch
-    # Fixes configure misdetection when using clang 16, resulting in broken subshells on Darwin.
-    # This patch can be dropped with the next release of zsh.
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/ab4d62eb975a4c4c51dd35822665050e2ddc6918.patch";
-      hash = "sha256-nXB4w7qqjZJC7/+CDxnNy6wu9qNwmS3ezjj/xK7JfeU=";
-      excludes = [ "ChangeLog" ];
-    })
-    # Fixes compatibility with texinfo 7.1. This patch can be dropped with the next release of zsh.
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/ecd3f9c9506c7720dc6c0833dc5d5eb00e4459c4.patch";
-      hash = "sha256-oA8GC8LmuqNKGuPqGfiQVhL5nWb7ArLWGUI6wjpsIW8=";
-      excludes = [ "ChangeLog" ];
-    })
-    # PCRE 2.x support
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/1b421e4978440234fb73117c8505dad1ccc68d46.patch";
-      hash = "sha256-jqTXnz56L3X21e3kXtzrT1jKEq+K7ittFjL7GdHVq94=";
-      excludes = [ "ChangeLog" ];
-    })
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/b62e911341c8ec7446378b477c47da4256053dc0.patch";
-      hash = "sha256-MfyiLucaSNNfdCLutgv/kL/oi/EVoxZVUd1KjGzN9XI=";
-      excludes = [ "ChangeLog" ];
-    })
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/10bdbd8b5b0b43445aff23dcd412f25cf6aa328a.patch";
-      hash = "sha256-bl1PG9Zk1wK+2mfbCBhD3OEpP8HQboqEO8sLFqX8DmA=";
-      excludes = [ "ChangeLog" ];
-    })
-    # autoconf 2.73 picks -std=gnu23, breaking the K&R sigsuspend probe and
-    # causing $(...) hangs. Drop with the next zsh release.
-    ./fix-sigsuspend-probe-c23.patch
-  ]
-  ++ lib.optionals stdenv.cc.isGNU [
-    # Fixes compilation with gcc >= 14.
-    (fetchpatch {
-      url = "https://github.com/zsh-users/zsh/commit/4c89849c98172c951a9def3690e8647dae76308f.patch";
-      hash = "sha256-l5IHQuIXo0N6ynLlZoQA7wJd/C7KrW3G7nMzfjQINkw=";
-      excludes = [ "ChangeLog" ];
-    })
   ];
 
   strictDeps = true;