about summary refs log tree commit diff
path: root/pkgs/development/libraries/netcdf
diff options
context:
space:
mode:
authorNiklas Hambüchen <mail@nh2.me>2021-08-17 20:15:45 +0200
committerNiklas Hambüchen <mail@nh2.me>2021-08-18 00:11:43 +0200
commit4826412f318352b6c609b332390c6c0dc2c640ea (patch)
treed87b89f8c9793e5757a01832b4b26b3b7d9ca7ef /pkgs/development/libraries/netcdf
parent3d639aec264891e618fcec304b8a8a2d8ce75991 (diff)
netcdf: 4.7.4 -> 4.8.0
The override of `hdf5` to use `usev110Api` avoids the new error:

    configure: error: HDF5 was not built with API compatibility version v18. Please recompile your libhdf5 install using '--with-default-api-version=v18'.
Diffstat (limited to 'pkgs/development/libraries/netcdf')
-rw-r--r--pkgs/development/libraries/netcdf/default.nix17
1 files changed, 15 insertions, 2 deletions
diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index c345f66e872ae..d24078b91a270 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,4 +1,5 @@
 { lib, stdenv
+, fetchpatch
 , fetchurl
 , hdf5
 , m4
@@ -11,13 +12,25 @@ let
   mpi = hdf5.mpi;
 in stdenv.mkDerivation rec {
   pname = "netcdf";
-  version = "4.7.4";
+  version = "4.8.0"; # Remove patch mentioned below on upgrade
 
   src = fetchurl {
     url = "https://www.unidata.ucar.edu/downloads/netcdf/ftp/${pname}-c-${version}.tar.gz";
-    sha256 = "1a2fpp15a2rl1m50gcvvzd9y6bavl6vjf9zzf63sz5gdmq06yiqf";
+    sha256 = "1mfn8qi4k0b8pyar3wa8v0npj69c7rhgfdlppdwmq5jqk88kb5k7";
   };
 
+  patches = [
+    # Fixes:
+    #     *** Checking vlen of compound file...Sorry! Unexpected result, tst_h_atts3.c, line: 289
+    #     FAIL tst_h_atts3 (exit status: 2)
+    # TODO: Remove with next netcdf release (see https://github.com/Unidata/netcdf-c/pull/1980)
+    (fetchpatch {
+      name = "netcdf-Fix-tst_h_atts3-for-hdf5-1.12.patch";
+      url = "https://github.com/Unidata/netcdf-c/commit/9fc8ae62a8564e095ff17f4612874581db0e4db5.patch";
+      sha256 = "128kxz5jikq32x5qjmi0xdngi0k336rf6bvbcppvlk5gibg5nk7v";
+    })
+  ];
+
   postPatch = ''
     patchShebangs .