From 51d30ce737699e90507a58aa06cfad6d707cf476 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 20 Apr 2025 06:26:07 +0100
Subject: [PATCH] gperf: 3.1 -> 3.3

Changes:
- https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00004.html
- https://lists.gnu.org/archive/html/info-gnu/2025-04/msg00013.html
---
 pkgs/development/tools/misc/gperf/default.nix       |  9 ++-------
 .../tools/misc/gperf/gperf-c++17-register-fix.patch | 13 -------------
 2 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/tools/misc/gperf/gperf-c++17-register-fix.patch

diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix
index 150a0cf0c6e9..a6b789f4faa8 100644
--- a/pkgs/development/tools/misc/gperf/default.nix
+++ b/pkgs/development/tools/misc/gperf/default.nix
@@ -6,18 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gperf";
-  version = "3.1";
+  version = "3.3";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    sha256 = "1qispg6i508rq8pkajh26cznwimbnj06wq9sd85vg95v8nwld1aq";
+    hash = "sha256-/Yfgq6fkOuBUg3r9bNTbA6PyaT3rNhkIXm7Z2NlgStg=";
   };
 
-  patches = [
-    # Clang 16 defaults to C++17, which does not allow `register` as a storage class specifier.
-    ./gperf-c++17-register-fix.patch
-  ];
-
   enableParallelBuilding = true;
 
   meta = {
diff --git a/pkgs/development/tools/misc/gperf/gperf-c++17-register-fix.patch b/pkgs/development/tools/misc/gperf/gperf-c++17-register-fix.patch
deleted file mode 100644
index bb8c414a1a26..000000000000
--- a/pkgs/development/tools/misc/gperf/gperf-c++17-register-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lib/getline.cc b/lib/getline.cc
-index c57c633..0984a7c 100644
---- a/lib/getline.cc
-+++ b/lib/getline.cc
-@@ -55,7 +55,7 @@ getstr (char **lineptr, size_t *n, FILE *stream, char terminator, size_t offset)
- 
-   for (;;)
-     {
--      register int c = getc (stream);
-+      int c = getc (stream);
- 
-       /* We always want at least one char left in the buffer, since we
-          always (unless we get an error while reading the first char)