From 47b85e1d7ae4e05611d321f722f4105782e91ad5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Jul 2024 01:21:39 +0000
Subject: [PATCH 1/4] octave: 8.4.0 -> 9.2.0

---
 pkgs/development/interpreters/octave/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index ab9128772d3c..c0329b45c557 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -93,12 +93,12 @@ let
   # To avoid confusion later in passthru
   allPkgs = pkgs;
 in stdenv.mkDerivation (finalAttrs: {
-    version = "8.4.0";
+    version = "9.2.0";
     pname = "octave";
 
     src = fetchurl {
       url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";
-      sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0=";
+      sha256 = "sha256-BjZVSwWZaZfkMcqtRCLAA4bS18aJAEcnAP7PX/63yZE=";
     };
 
     buildInputs = [

From edd9fe801118c1cb9bd83fa700a211e9c5b1d0f8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 19 Jul 2024 11:33:12 +0300
Subject: [PATCH 2/4] octavePackages.ncarray: 1.0.5 -> 1.0.6

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

diff --git a/pkgs/development/octave-modules/ncarray/default.nix b/pkgs/development/octave-modules/ncarray/default.nix
index c028ba7f1d3e..0c5546ffd121 100644
--- a/pkgs/development/octave-modules/ncarray/default.nix
+++ b/pkgs/development/octave-modules/ncarray/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "ncarray";
-  version = "1.0.5";
+  version = "1.0.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-HhQWLUA/6wqYi6TP3PC+N2zgi4UojDxbG9pgQzFaQ8c=";
+    sha256 = "sha256-W6L2Esm7AdzntT7cimKylbeKYcZWKhHim96N5dM/qoE=";
   };
 
   buildInputs = [

From 54866f710833d0a14d97a1158019fd0e9763900b Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 19 Jul 2024 11:33:33 +0300
Subject: [PATCH 3/4] octavePackages.netcdf: 1.0.16 -> 1.0.17

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

diff --git a/pkgs/development/octave-modules/netcdf/default.nix b/pkgs/development/octave-modules/netcdf/default.nix
index b2b7eeda42e9..280819806838 100644
--- a/pkgs/development/octave-modules/netcdf/default.nix
+++ b/pkgs/development/octave-modules/netcdf/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "netcdf";
-  version = "1.0.16";
+  version = "1.0.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-1Lr+6xLRXxSeUhM9+WdCUPFRZSWdxtAQlxpiv4CHJrs=";
+    sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk=";
   };
 
   buildInputs = [

From 29340b7706a80655d648c5bb0dac4783621c730f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 21 Jul 2024 10:21:33 +0300
Subject: [PATCH 4/4] qrupdate: disable a failing test on x86_64-darwin

---
 pkgs/development/libraries/qrupdate/default.nix     |  5 +++++
 .../libraries/qrupdate/disable-zch1dn-test.patch    | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch

diff --git a/pkgs/development/libraries/qrupdate/default.nix b/pkgs/development/libraries/qrupdate/default.nix
index 12531286d33d..282b926b2e77 100644
--- a/pkgs/development/libraries/qrupdate/default.nix
+++ b/pkgs/development/libraries/qrupdate/default.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     ])}"
   ];
 
+  # https://github.com/mpimd-csc/qrupdate-ng/issues/4
+  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
+    ./disable-zch1dn-test.patch
+  ];
+
   doCheck = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch b/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
new file mode 100644
index 000000000000..9953f7b43d7a
--- /dev/null
+++ b/pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch
@@ -0,0 +1,13 @@
+diff --git i/test/tch1dn.f w/test/tch1dn.f
+index 25ec990..3f83e7e 100644
+--- i/test/tch1dn.f
++++ w/test/tch1dn.f
+@@ -34,8 +34,6 @@ c
+       call dtest(n)
+       write (*,*) 'cch1dn test:'
+       call ctest(n)
+-      write (*,*) 'zch1dn test:'
+-      call ztest(n)
+ 
+       call pstats
+       end program