mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-17 17:44:44 +00:00
Merge pull request #331280 from mattpolzin/cdo-update
cdo: 2.2.2 -> 2.4.2
This commit is contained in:
commit
e160572637
@ -9,14 +9,14 @@
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "cdo";
|
||||
version = "2.2.2";
|
||||
version = "2.4.2";
|
||||
|
||||
# Dependencies
|
||||
buildInputs = [ curl netcdf hdf5 python3 ];
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/28882/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-QZx3MVJEAZr0GilsBQZvR0zMv5Tev6rp4hBtpRvHyTc=";
|
||||
url = "https://code.mpimet.mpg.de/attachments/download/29481/${pname}-${version}.tar.gz";
|
||||
sha256 = "sha256-TfH+K4+S9Uwn6585nt+rQNkyIAWmcyyhUk71wWJ6xOc=";
|
||||
};
|
||||
|
||||
configureFlags = [
|
||||
@ -28,6 +28,12 @@ stdenv.mkDerivation rec {
|
||||
++ lib.optional enable_all_static "--enable-all-static"
|
||||
++ lib.optional enable_cxx "--enable-cxx";
|
||||
|
||||
# address error: 'TARGET_OS_MACCATALYST' is not defined,
|
||||
# evaluates to 0 [-Werror,-Wundef-prefix=TARGET_OS_]
|
||||
# we don't want to appear to be a catalyst build;
|
||||
# we are a TARGET_OS_MAC
|
||||
env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-DTARGET_OS_MACCATALYST=0";
|
||||
|
||||
meta = with lib; {
|
||||
description = "Collection of command line Operators to manipulate and analyse Climate and NWP model Data";
|
||||
mainProgram = "cdo";
|
||||
|
Loading…
Reference in New Issue
Block a user