Merge pull request #66190 from jonringer/bump-cdo

cdo: 1.9.0 -> 1.9.7.1
This commit is contained in:
markuskowa 2019-08-06 19:32:49 +02:00 committed by GitHub
commit 03dcf02ac3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 11 deletions

View file

@ -5,15 +5,15 @@
}:
stdenv.mkDerivation rec {
version = "1.9.0";
name = "cdo-${version}";
pname = "cdo";
version = "1.9.7.1";
# Dependencies
buildInputs = [ curl netcdf hdf5 ];
src = fetchurl {
url = "https://code.mpimet.mpg.de/attachments/download/15187/${name}.tar.gz";
sha256 = "024hsr6qfg2dicwvm0vvkg3fr998bchf0qgwpj2v0jmz7a67ydnz";
url = "https://code.mpimet.mpg.de/attachments/download/20124/${pname}-${version}.tar.gz";
sha256 = "0b4n8dwxfsdbz4jflsx0b75hwapdf1rp14p48dfr7ksv0qp9aw9p";
};
# Configure phase
@ -23,15 +23,15 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (enable_all_static) "--enable-all-static"
++ stdenv.lib.optional (enable_cxx) "--enable-cxx";
meta = {
meta = with stdenv.lib; {
description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
longDescription = ''
Supported data formats are GRIB 1/2, netCDF 3/4, SERVICE, EXTRA and IEG.
There are more than 600 operators available.
'';
homepage = https://code.mpimet.mpg.de/projects/cdo/;
license = stdenv.lib.licenses.gpl2;
maintainers = [ stdenv.lib.maintainers.ltavard ];
platforms = with stdenv.lib.platforms; linux ++ darwin;
license = licenses.gpl2;
maintainers = [ maintainers.ltavard ];
platforms = with platforms; linux ++ darwin;
};
}

View file

@ -10240,9 +10240,7 @@ in
cdk = callPackage ../development/libraries/cdk {};
cdo = callPackage ../development/libraries/cdo {
stdenv = gccStdenv;
};
cdo = callPackage ../development/libraries/cdo { };
cimg = callPackage ../development/libraries/cimg { };