Skip to content

Commit b658d41

Browse files
committed
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.
1 parent 5d8de5b commit b658d41

File tree

2 files changed

+2
-38
lines changed

2 files changed

+2
-38
lines changed

pkgs/by-name/hd/hdf4/darwin-aarch64.patch

Lines changed: 0 additions & 11 deletions
This file was deleted.

pkgs/by-name/hd/hdf4/package.nix

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -20,38 +20,13 @@
2020

2121
stdenv.mkDerivation (finalAttrs: {
2222
pname = "hdf";
23-
version = "4.2.15";
23+
version = "4.2.16-2";
2424

2525
src = fetchurl {
2626
url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${finalAttrs.version}/src/hdf-${finalAttrs.version}.tar.bz2";
27-
hash = "sha256-veA171oc1f29Cn8fpcF+mLvVmTABiaxNI08W6bt7yxI=";
27+
hash = "sha256-xcMjS1ASJYrvLkQy9kmzHCGyYBWvuhhXrYNkDD8raSw=";
2828
};
2929

30-
patches = [
31-
# Note that the PPC, SPARC and s390 patches are only needed so the aarch64 patch applies cleanly
32-
(fetchpatch {
33-
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-ppc.patch";
34-
hash = "sha256-AEsj88VzWtyZRk2nFWV/hLD/A2oPje38T/7jvfV1azU=";
35-
})
36-
(fetchpatch {
37-
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-4.2.4-sparc.patch";
38-
hash = "sha256-EKuUQ1m+/HWTFYmkTormtQATDj0rHlQpI4CoK1m+5EY=";
39-
})
40-
(fetchpatch {
41-
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-s390.patch";
42-
hash = "sha256-Ix6Ft+enNHADXFeRTDNijqU9XWmSEz/y8CnQoEleOCo=";
43-
})
44-
(fetchpatch {
45-
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-arm.patch";
46-
hash = "sha256-gytMtvpvR1nzV1NncrYc0yz1ZlBku1AT6sPdubcK85Q=";
47-
})
48-
(fetchpatch {
49-
url = "https://src.fedoraproject.org/rpms/hdf/raw/edbe5f49646b609f5bc9aeeee5a2be47e9556e8c/f/hdf-aarch64.patch";
50-
hash = "sha256-eu+M3UbgI2plJNblAT8hO1xBXbfco6jX8iZMGjXbWoQ=";
51-
})
52-
./darwin-aarch64.patch
53-
];
54-
5530
nativeBuildInputs =
5631
[
5732
cmake

0 commit comments

Comments
 (0)