From 366d3c64f5541a0303519b3180554694a0ad1a08 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Dec 2022 18:45:31 +0100 Subject: [PATCH 1/3] antlr2: drop python2 --- pkgs/development/tools/parsing/antlr/2.7.7.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/tools/parsing/antlr/2.7.7.nix b/pkgs/development/tools/parsing/antlr/2.7.7.nix index 3fc1b2cd8661..b7437d70bf80 100644 --- a/pkgs/development/tools/parsing/antlr/2.7.7.nix +++ b/pkgs/development/tools/parsing/antlr/2.7.7.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, jdk, python2 }: +{ lib, stdenv, fetchurl, jdk }: stdenv.mkDerivation rec { pname = "antlr"; @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { }; patches = [ ./2.7.7-fixes.patch ]; buildInputs = [ jdk ]; - nativeBuildInputs = [ python2 ]; meta = with lib; { description = "Powerful parser generator"; From 18df4e28c44ac5dfc36002395ccdb365e0df9bae Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Dec 2022 18:53:52 +0100 Subject: [PATCH 2/3] netcdfcxx4: disable tests --- pkgs/development/libraries/netcdf-cxx4/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix index 698a8152a445..82d0e8c132d0 100644 --- a/pkgs/development/libraries/netcdf-cxx4/default.nix +++ b/pkgs/development/libraries/netcdf-cxx4/default.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ninja ]; buildInputs = [ netcdf hdf5 curl ]; - doCheck = true; + # 10 - cxx4_test_filter (Failed) + # Setting Filter....Caught unexpected exception. + doCheck = false; enableParallelChecking = false; meta = { From 14575438126b6813f67f66100ac8bc79d6109a88 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 3 Dec 2022 19:02:29 +0100 Subject: [PATCH 3/3] nco: add darwin support --- pkgs/development/libraries/nco/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nco/default.nix b/pkgs/development/libraries/nco/default.nix index 9d90e399ca77..ef396f299937 100644 --- a/pkgs/development/libraries/nco/default.nix +++ b/pkgs/development/libraries/nco/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils }: +{ lib, stdenv, fetchFromGitHub, netcdf, netcdfcxx4, gsl, udunits, antlr2, which, curl, flex, coreutils, libtool }: stdenv.mkDerivation rec { pname = "nco"; @@ -22,6 +22,8 @@ stdenv.mkDerivation rec { --replace "/bin/mv" "${coreutils}/bin/mv" ''; + makeFlags = lib.optionals stdenv.isDarwin [ "LIBTOOL=${libtool}/bin/libtool" ]; + enableParallelBuilding = true; meta = with lib; { @@ -30,6 +32,6 @@ stdenv.mkDerivation rec { homepage = "http://nco.sourceforge.net/"; license = licenses.bsd3; maintainers = with maintainers; [ bzizou ]; - platforms = platforms.linux; + platforms = platforms.unix; }; }