swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 12:29:02 +02:00
Code Issues Packages Projects Releases Wiki Activity

netcdf: 4.7.4 -> 4.8.0

Browse source 
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'.
This commit is contained in:
Niklas Hambüchen 2021-08-17 20:15:45 +02:00
parent 3d639aec26
commit 4826412f31
2 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/development/libraries/netcdf/default.nix
View file

@ -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 .

6
pkgs/top-level/all-packages.nix
View file

@ -7328,10 +7328,12 @@ with pkgs;
netatalk = callPackage ../tools/filesystems/netatalk { };
netcdf = callPackage ../development/libraries/netcdf { };
netcdf = callPackage ../development/libraries/netcdf {
hdf5 = hdf5.override { usev110Api = true; };
};
netcdf-mpi = appendToName "mpi" (netcdf.override {
hdf5 = hdf5-mpi;
hdf5 = hdf5-mpi.override { usev110Api = true; };
});
netcdfcxx4 = callPackage ../development/libraries/netcdf-cxx4 { };