From 640586d9d8b5f95d838bb1aae697e93fc2deb802 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Sat, 13 Apr 2024 11:30:36 +0200
Subject: [PATCH] libmicrohttpd: remove unused old versions

---
 pkgs/development/libraries/libmicrohttpd/0.9.69.nix | 10 ----------
 pkgs/development/libraries/libmicrohttpd/0.9.71.nix | 10 ----------
 pkgs/development/libraries/libmicrohttpd/0.9.72.nix | 10 ----------
 pkgs/development/libraries/libmicrohttpd/0.9.74.nix | 10 ----------
 .../development/libraries/libmicrohttpd/generic.nix | 13 +------------
 pkgs/top-level/all-packages.nix                     |  8 --------
 6 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 pkgs/development/libraries/libmicrohttpd/0.9.69.nix
 delete mode 100644 pkgs/development/libraries/libmicrohttpd/0.9.71.nix
 delete mode 100644 pkgs/development/libraries/libmicrohttpd/0.9.72.nix
 delete mode 100644 pkgs/development/libraries/libmicrohttpd/0.9.74.nix

diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.69.nix b/pkgs/development/libraries/libmicrohttpd/0.9.69.nix
deleted file mode 100644
index 866658c224f3..000000000000
--- a/pkgs/development/libraries/libmicrohttpd/0.9.69.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl }:
-
-callPackage ./generic.nix ( rec {
-  version = "0.9.69";
-
-  src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
-    sha256 = "sha256-+5trFIt4dJPmN9MINYhxHmXLy3JvoCzuLNVDxd4n434=";
-  };
-})
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix b/pkgs/development/libraries/libmicrohttpd/0.9.71.nix
deleted file mode 100644
index 7e60f8c72726..000000000000
--- a/pkgs/development/libraries/libmicrohttpd/0.9.71.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl }:
-
-callPackage ./generic.nix ( rec {
-  version = "0.9.71";
-
-  src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
-    sha256 = "10mii4mifmfs3v7kgciqml7f0fj7ljp0sngrx64pnwmgbzl4bx78";
-  };
-})
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix b/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
deleted file mode 100644
index 4c695218184c..000000000000
--- a/pkgs/development/libraries/libmicrohttpd/0.9.72.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl }:
-
-callPackage ./generic.nix ( rec {
-  version = "0.9.72";
-
-  src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
-    sha256 = "sha256-Cugl+ODX9BIB/USg3xz0VMHLC8UP6dWcJlUiYCZML/g=";
-  };
-})
diff --git a/pkgs/development/libraries/libmicrohttpd/0.9.74.nix b/pkgs/development/libraries/libmicrohttpd/0.9.74.nix
deleted file mode 100644
index c4b3343ecd4c..000000000000
--- a/pkgs/development/libraries/libmicrohttpd/0.9.74.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ callPackage, fetchurl }:
-
-callPackage ./generic.nix ( rec {
-  version = "0.9.74";
-
-  src = fetchurl {
-    url = "mirror://gnu/libmicrohttpd/libmicrohttpd-${version}.tar.gz";
-    sha256 = "sha256-QgNdAmE3MyS/tDQBj0q4klFLECU9GvIy5BtMwsEeZQs=";
-  };
-})
diff --git a/pkgs/development/libraries/libmicrohttpd/generic.nix b/pkgs/development/libraries/libmicrohttpd/generic.nix
index d5bc619e9042..0af066c71238 100644
--- a/pkgs/development/libraries/libmicrohttpd/generic.nix
+++ b/pkgs/development/libraries/libmicrohttpd/generic.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {}, fetchpatch }:
+{ lib, stdenv, libgcrypt, curl, gnutls, pkg-config, libiconv, libintl, version, src, meta ? {} }:
 
 let
   meta_ = meta;
@@ -8,17 +8,6 @@ stdenv.mkDerivation rec {
   pname = "libmicrohttpd";
   inherit version src;
 
-  patches = lib.optionals (lib.versionOlder version "0.9.76") [
-    (fetchpatch {
-      name = "CVE-2023-27371.patch";
-      url = "https://git.gnunet.org/libmicrohttpd.git/patch/?id=e0754d1638c602382384f1eface30854b1defeec";
-      hash = "sha256-vzrq9HPysGpc13rFEk6zLPgpUqp/ST4q/Wp30Dam97k=";
-      excludes = [
-        "ChangeLog"
-      ];
-    })
-  ];
-
   outputs = [ "out" "dev" "devdoc" "info" ];
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ libgcrypt curl gnutls libiconv libintl ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 50102825047d..a21b8b00ebcf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -22785,16 +22785,8 @@ with pkgs;
 
   inherit
     ({
-      libmicrohttpd_0_9_69 = callPackage ../development/libraries/libmicrohttpd/0.9.69.nix { };
-      libmicrohttpd_0_9_71 = callPackage ../development/libraries/libmicrohttpd/0.9.71.nix { };
-      libmicrohttpd_0_9_72 = callPackage ../development/libraries/libmicrohttpd/0.9.72.nix { };
-      libmicrohttpd_0_9_74 = callPackage ../development/libraries/libmicrohttpd/0.9.74.nix { };
       libmicrohttpd_0_9_77 = callPackage ../development/libraries/libmicrohttpd/0.9.77.nix { };
     })
-    libmicrohttpd_0_9_69
-    libmicrohttpd_0_9_71
-    libmicrohttpd_0_9_72
-    libmicrohttpd_0_9_74
     libmicrohttpd_0_9_77
     ;