From 3e439e7cc4bd14893db755d37404305d323d8a0a Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 27 Feb 2023 20:31:14 +0000
Subject: [PATCH 1/5] netcdf: add bzip2/libzip/zstd dependencies (and allow for
 szip support; disabled by default because it's nonfree)

---
 pkgs/development/libraries/netcdf/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 188dd586797b..ead0b9c35291 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,6 +1,11 @@
 { lib, stdenv
 , fetchurl, unzip
 , hdf5
+, bzip2
+, libzip
+, zstd
+, szipSupport ? false
+, szip
 , libxml2
 , m4
 , curl # for DAP
@@ -34,7 +39,10 @@ in stdenv.mkDerivation rec {
     hdf5
     libxml2
     mpi
-  ];
+    bzip2
+    libzip
+    zstd
+  ] ++ lib.optional szipSupport szip;
 
   passthru = {
     inherit mpiSupport mpi;

From 8dbf47975942793c7fd9646a038c684dbb05ddce Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 27 Feb 2023 20:31:37 +0000
Subject: [PATCH 2/5] netcdf: enable parallel building

---
 pkgs/development/libraries/netcdf/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index ead0b9c35291..544367a2992f 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -56,6 +56,8 @@ in stdenv.mkDerivation rec {
   ]
   ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
 
+  enableParallelBuilding = true;
+
   disallowedReferences = [ stdenv.cc ];
 
   postFixup = ''

From 981839f265b5b73dcd12fa9f5fdf78269d27e971 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 27 Feb 2023 20:31:52 +0000
Subject: [PATCH 3/5] netcdf: install plugins into lib/hdf5-plugins

---
 pkgs/development/libraries/netcdf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index 544367a2992f..ed869275c9d2 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -53,6 +53,7 @@ in stdenv.mkDerivation rec {
       "--enable-dap"
       "--enable-shared"
       "--disable-dap-remote-tests"
+      "--with-plugin-dir=${placeholder "out"}/lib/hdf5-plugins"
   ]
   ++ (lib.optionals mpiSupport [ "--enable-parallel-tests" "CC=${mpi}/bin/mpicc" ]);
 

From 6123056e1840d9d56d7d8723ecd30eeb3df11675 Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 27 Feb 2023 20:32:04 +0000
Subject: [PATCH 4/5] netcdf-cxx4: during tests, use netcdf's installed plugins

---
 pkgs/development/libraries/netcdf-cxx4/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index 82d0e8c132d0..3eed199a641e 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
   # Setting Filter....Caught unexpected exception.
   doCheck = false;
   enableParallelChecking = false;
+  preCheck = ''
+    export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins
+  '';
 
   meta = {
     description = "C++ API to manipulate netcdf files";

From de8e79c9ba13bc023278cf0d35990738108b9b8a Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <git@lukegb.com>
Date: Mon, 27 Feb 2023 20:34:19 +0000
Subject: [PATCH 5/5] Revert "netcdfcxx4: disable tests"

This reverts commit 18df4e28c44ac5dfc36002395ccdb365e0df9bae.
---
 pkgs/development/libraries/netcdf-cxx4/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/netcdf-cxx4/default.nix b/pkgs/development/libraries/netcdf-cxx4/default.nix
index 3eed199a641e..5f0fade2566e 100644
--- a/pkgs/development/libraries/netcdf-cxx4/default.nix
+++ b/pkgs/development/libraries/netcdf-cxx4/default.nix
@@ -17,9 +17,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ninja ];
   buildInputs = [ netcdf hdf5 curl ];
 
-  # 10 - cxx4_test_filter (Failed)
-  # Setting Filter....Caught unexpected exception.
-  doCheck = false;
+  doCheck = true;
   enableParallelChecking = false;
   preCheck = ''
     export HDF5_PLUGIN_PATH=${netcdf}/lib/hdf5-plugins