diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2020-10-15 14:55:55 -0700 |
|---|---|---|
| committer | Jon <jonringer@users.noreply.github.com> | 2020-10-15 22:27:03 -0700 |
| commit | cc54d5332e07f9c20dce2ac78c33c70d1b21c22d (patch) | |
| tree | 2318c37274bac083e475a613fd496dfea73c5b9c /pkgs/tools/misc/hdf4 | |
| parent | 400d1c9e28c484f89d0a637294f9f47e7c445392 (diff) | |
hdf4: 4.2.14 -> 4.2.15, fix build
Diffstat (limited to 'pkgs/tools/misc/hdf4')
| -rw-r--r-- | pkgs/tools/misc/hdf4/default.nix | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index d5b8291d78ed6..5e5154111dc98 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -9,30 +9,17 @@ stdenv.mkDerivation rec { pname = "hdf"; - version = "4.2.14"; + version = "4.2.15"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF/releases/HDF${version}/src/hdf-${version}.tar.bz2"; - sha256 = "0n29klrrbwan9307np0d9hr128dlpc4nnlf57a140080ll3jmp8l"; + sha256 = "04nbgfxyj5jg4d6sr28162cxbfwqgv0sa7vz1ayzvm8wbbpkbq5x"; }; - patches = let - # The Debian patch revision to fetch from; this may differ from our package - # version, but older patches should still apply. - patchRev = "4.2.13-4"; - getPatch = name: sha256: fetchpatch { - inherit sha256; - url = "https://salsa.debian.org/debian-gis-team/hdf4/raw/debian/${patchRev}/debian/patches/${name}"; - }; - - in [ - (getPatch "64bit" "1xqk9zpch4m6ipa0f3x2cm8rwaz4p0ppp1vqglvz18j6q91p8b5y") - (getPatch "hdfi.h" "01fr9csylnvk9jd9jn9y23bvxy192s07p32pr76mm3gwhgs9h7r4") - (getPatch "hdf-4.2.10-aarch64.patch" "1hl0xw5pd9xhpq49xpwgg7c4z6vv5p19x6qayixw0myvgwj1r4zn") - (getPatch "reproducible-builds.patch" "02j639w26xkxpxx3pdhbi18ywz8w3qmjpqjb83n47gq29y4g13hc") + nativeBuildInputs = [ + cmake ]; buildInputs = [ - cmake libjpeg szip zlib |