diff options
author | Ryan Mulligan <ryan@ryantm.com> | 2021-03-23 07:05:49 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-23 07:05:49 -0700 |
commit | d9cecf868228da4c8e354aef2f8ac4352d0d4ea5 (patch) | |
tree | a0ae1271d359417fe274872b4dd2c1fbf832c5fe /pkgs/development | |
parent | e2740dbc691e0604b450660a2454b5867da23246 (diff) | |
parent | cc302fcbec392e66b086518a59e4fcaeebd39f6b (diff) |
Merge pull request #117341 from bzizou/nco
nco: 4.9.7 -> 4.9.8 + fix license and deps
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/nco/default.nix | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index e8053ce27023d..958be905f835d 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,15 +1,15 @@ { lib, stdenv, fetchzip, netcdf, netcdfcxx4, gsl, udunits, antlr, which, curl, flex, coreutils }: stdenv.mkDerivation rec { - version = "4.9.7"; + version = "4.9.8"; pname = "nco"; - nativeBuildInputs = [ flex which ]; - buildInputs = [ netcdf netcdfcxx4 gsl udunits antlr curl coreutils ]; + nativeBuildInputs = [ flex which antlr ]; + buildInputs = [ netcdf netcdfcxx4 gsl udunits curl coreutils ]; src = fetchzip { url = "https://github.com/nco/nco/archive/${version}.tar.gz"; - sha256 = "sha256-Q4okOoyodofAsMrSmAhFISeY05Be+i7OX4qy2annQq4="; + sha256 = "sha256-fOdmM0I/UGhxacofEBfw9UmOOrMDUXs59ca8uvkQKqw="; }; prePatch = '' @@ -19,11 +19,13 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + parallelBuild = true; + meta = { description = "NetCDF Operator toolkit"; longDescription = "The NCO (netCDF Operator) toolkit manipulates and analyzes data stored in netCDF-accessible formats, including DAP, HDF4, and HDF5"; homepage = "http://nco.sourceforge.net/"; - license = lib.licenses.gpl3; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.bzizou ]; platforms = lib.platforms.linux; }; |