From 22f96886cfb31111f35f91761eadf60c22df0460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Jun 2022 22:20:00 +0000
Subject: [PATCH 1/2] netcdf: 4.8.1 -> 4.9.0

https://github.com/Unidata/netcdf-c/releases/tag/v4.9.0
---
 pkgs/development/libraries/netcdf/default.nix | 28 +++++++++++++------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/netcdf/default.nix b/pkgs/development/libraries/netcdf/default.nix
index da2ad9c3f9ba..76478bc80c65 100644
--- a/pkgs/development/libraries/netcdf/default.nix
+++ b/pkgs/development/libraries/netcdf/default.nix
@@ -1,6 +1,7 @@
 { lib, stdenv
 , fetchurl, unzip
 , hdf5
+, libxml2
 , m4
 , curl # for DAP
 , removeReferencesTo
@@ -10,11 +11,11 @@ let
   inherit (hdf5) mpiSupport mpi;
 in stdenv.mkDerivation rec {
   pname = "netcdf" + lib.optionalString mpiSupport "-mpi";
-  version = "4.8.1";
+  version = "4.9.0";
 
   src = fetchurl {
     url = "https://downloads.unidata.ucar.edu/netcdf-c/${version}/netcdf-c-${version}.tar.gz";
-    sha256 = "1cbjwjmp9691clacw5v88hmpz46ngxs3bfpkf2xy1j7cvlkc72l0";
+    hash = "sha256-TJVgIrecCOXhTu6N9RsTwo5hIcK35/qtwhs3WUlAC0k=";
   };
 
   postPatch = ''
@@ -27,7 +28,13 @@ in stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [ m4 removeReferencesTo ];
-  buildInputs = [ hdf5 curl mpi ];
+
+  buildInputs = [
+    curl
+    hdf5
+    libxml2
+    mpi
+  ];
 
   passthru = {
     inherit mpiSupport mpi;
@@ -50,12 +57,15 @@ in stdenv.mkDerivation rec {
   doCheck = !(mpiSupport || (stdenv.isDarwin && stdenv.isAarch64));
   checkInputs = [ unzip ];
 
+  preCheck = ''
+    export HOME=$TEMP
+  '';
+
   meta = {
-      description = "Libraries for the Unidata network Common Data Format";
-      platforms = lib.platforms.unix;
-      homepage = "https://www.unidata.ucar.edu/software/netcdf/";
-      license = {
-        url = "https://www.unidata.ucar.edu/software/netcdf/docs/copyright.html";
-      };
+    description = "Libraries for the Unidata network Common Data Format";
+    platforms = lib.platforms.unix;
+    homepage = "https://www.unidata.ucar.edu/software/netcdf/";
+    changelog = "https://docs.unidata.ucar.edu/netcdf-c/${version}/RELEASE_NOTES.html";
+    license = lib.licenses.bsd3;
   };
 }

From 8d1a4469dd9000bf9d3d445f59531ff9673271e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Jun 2022 10:04:19 +0000
Subject: [PATCH 2/2] python310Packages.netcdf4: 1.5.8 -> 1.6.0

---
 pkgs/development/python-modules/netcdf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix
index 23f2b88a8591..4908e1eb8aee 100644
--- a/pkgs/development/python-modules/netcdf4/default.nix
+++ b/pkgs/development/python-modules/netcdf4/default.nix
@@ -3,13 +3,13 @@
 }:
 buildPythonPackage rec {
   pname = "netCDF4";
-  version = "1.5.8";
+  version = "1.6.0";
 
   disabled = isPyPy;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ca3d468f4812c0999df86e3f428851fb0c17ac34ce0827115c246b0b690e4e84";
+    sha256 = "sha256-le+jc9mj4c0N9xk+duZoDZ7KKOYAl8qBOa/qikNGumM=";
   };
 
   checkInputs = [ pytest ];