From b658d41a22b8b9be5bd8f20616c9e3345bc67100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Sat, 21 Dec 2024 09:26:07 +0100
Subject: [PATCH] hdf4: 4.2.15 -> 4.2.16-2

The patches wouldn't apply anymore, but hopefully they're not needed.
This fixes build on {x86_64,aarch64}-linux
and doesn't break aarch64-darwin.
---
 pkgs/by-name/hd/hdf4/darwin-aarch64.patch | 11 ---------
 pkgs/by-name/hd/hdf4/package.nix          | 29 ++---------------------
 2 files changed, 2 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/hd/hdf4/darwin-aarch64.patch

diff --git a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch b/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
deleted file mode 100644
index cff81e581176..000000000000
--- a/pkgs/by-name/hd/hdf4/darwin-aarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/hdf/src/hdfi.h	2021-06-16 16:31:31.000000000 +1200
-+++ b/hdf/src/hdfi.h	2021-06-16 16:42:26.000000000 +1200
-@@ -1343,7 +1343,7 @@
- #endif /* IA64 */
- 
- /* Linux AArch64 */
--#if defined __aarch64__
-+#if defined __aarch64__ && !defined __APPLE__
- 
- #ifdef GOT_MACHINE
- If you get an error on this line more than one machine type has been defined.
diff --git a/pkgs/by-name/hd/hdf4/package.nix b/pkgs/by-name/hd/hdf4/package.nix
index ca839a6bea34..e764e5ac2dd5 100644
--- a/pkgs/by-name/hd/hdf4/package.nix
+++ b/pkgs/by-name/hd/hdf4/package.nix
@@ -20,38 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hdf";
-  version = "4.2.15";
+  version = "4.2.16-2";
 
   src = fetchurl {
     url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI=";
+    hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw=";
   };
 
-  patches = [
-    # Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch";
-      hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch";
-      hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch";
-      hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch";
-      hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q=";
-    })
-    (fetchpatch {
-      url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
-      hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ=";
-    })
-    ./darwin-aarch64.patch
-  ];
-
   nativeBuildInputs =
     [
       cmake