Merge pull request #223237 from r-ryantm/auto-update/octave

octave: 7.3.0 -> 8.1.0

13 files changed, 43 insertions, 19 deletions

diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix
index c265fe71d4924..95ccaf3d05513 100644
--- a/pkgs/development/octave-modules/control/default.nix
+++ b/pkgs/development/octave-modules/control/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "3.4.0";
+  version = "3.5.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o=";
+    sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/development/octave-modules/database/c_verror.patch b/pkgs/development/octave-modules/database/c_verror.patch
new file mode 100644
index 0000000000000..9726a29512eb5
--- /dev/null
+++ b/pkgs/development/octave-modules/database/c_verror.patch
@@ -0,0 +1,11 @@
+--- a/src/error-helpers.h
++++ b/src/error-helpers.h
+@@ -64,7 +64,7 @@
+       } \
+     catch (OCTAVE__EXECUTION_EXCEPTION& e) \
+       { \
+-        verror (e, __VA_ARGS__); \
++        c_verror (e, __VA_ARGS__); \
+       }
+ #endif
+ 
diff --git a/pkgs/development/octave-modules/database/default.nix b/pkgs/development/octave-modules/database/default.nix
index 3e1fe863276cd..811278af5027e 100644
--- a/pkgs/development/octave-modules/database/default.nix
+++ b/pkgs/development/octave-modules/database/default.nix
@@ -13,6 +13,10 @@ buildOctavePackage rec {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
     sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p";
   };
+  patches = [
+    # Fix for octave 8.x
+    ./c_verror.patch
+  ];
 
   propagatedBuildInputs = [
     postgresql
diff --git a/pkgs/development/octave-modules/doctest/default.nix b/pkgs/development/octave-modules/doctest/default.nix
index 3c02a20cdad15..456b9810df90f 100644
--- a/pkgs/development/octave-modules/doctest/default.nix
+++ b/pkgs/development/octave-modules/doctest/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "doctest";
-  version = "0.7.0";
+  version = "0.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4";
+    sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/image-acquisition/default.nix b/pkgs/development/octave-modules/image-acquisition/default.nix
index 08c4305999b36..e1410fd8368f5 100644
--- a/pkgs/development/octave-modules/image-acquisition/default.nix
+++ b/pkgs/development/octave-modules/image-acquisition/default.nix
@@ -28,5 +28,7 @@ buildOctavePackage rec {
       The Octave-forge Image Aquisition package provides functions to
       capture images from connected devices. Currently only v4l2 is supported.
     '';
+    # Got broke with octave 8.x update, and wasn't updated since 2015
+    broken = true;
   };
 }
diff --git a/pkgs/development/octave-modules/level-set/default.nix b/pkgs/development/octave-modules/level-set/default.nix
index 3cce6f2cad559..3cc0873e3813b 100644
--- a/pkgs/development/octave-modules/level-set/default.nix
+++ b/pkgs/development/octave-modules/level-set/default.nix
@@ -23,7 +23,7 @@ buildOctavePackage rec {
   # corrected to have a %s format specifier. However, logic_error() also
   # exists, (a simple regex also matches that), but logic_error() doesn't
   # require a format specifier. So, this regex was born to handle that...
-  patchPhase = ''
+  postPatch = ''
     substituteInPlace build.sh --replace "level-set-0.3.1" "${pname}-${version}" \
                                --replace "\`pwd\`" '/build'
     sed -i -E 's#[^[:graph:]]error \(# error \(\"%s\", #g' src/*.cpp
@@ -51,7 +51,7 @@ buildOctavePackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ KarlJoad ];
     description = "Routines for calculating the time-evolution of the level-set equation and extracting geometric information from the level-set function";
-    # /build/level-set-2019-04-13.tar.gz: Cannot open: No such file or directory
-    broken = stdenv.isDarwin;
+    # Got broke with octave 8.x update, and wasn't updated since 2019
+    broken = true;
   };
 }
diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix
index 505670f6298b1..829f6eb9287e6 100644
--- a/pkgs/development/octave-modules/ltfat/default.nix
+++ b/pkgs/development/octave-modules/ltfat/default.nix
@@ -13,11 +13,11 @@
 
 buildOctavePackage rec {
   pname = "ltfat";
-  version = "2.3.1";
+  version = "2.5.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0gghh5a4w649ff776wvidfvqas87m0n7rqs960pid1d11bnyqqrh";
+    sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I=";
   };
 
   patches = [
diff --git a/pkgs/development/octave-modules/ocl/default.nix b/pkgs/development/octave-modules/ocl/default.nix
index 21ba508500e97..6c6d306abd1d5 100644
--- a/pkgs/development/octave-modules/ocl/default.nix
+++ b/pkgs/development/octave-modules/ocl/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "ocl";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-jQdwZwQNU3PZZFa3lp0hIr0GDt/XFHLJoq4waLI4gS8=";
+    sha256 = "sha256-NVUefSGv5/l1B7sES7NG1gU8Ms2gfmb8OGxQrhzWlus=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/parallel/default.nix b/pkgs/development/octave-modules/parallel/default.nix
index 11fba7d363009..45c57d72f20fb 100644
--- a/pkgs/development/octave-modules/parallel/default.nix
+++ b/pkgs/development/octave-modules/parallel/default.nix
@@ -14,6 +14,9 @@ buildOctavePackage rec {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
     sha256 = "1h8vw2r42393px6dk10y3lhpxl168r9d197f9whz6lbk2rg571pa";
   };
+  patches = [
+    ../database/c_verror.patch
+  ];
 
   nativeBuildInputs = [
     pkg-config
@@ -32,5 +35,8 @@ buildOctavePackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ KarlJoad ];
     description = "Parallel execution package";
+    # Although upstream has added an identical patch to that of ../database, it
+    # still won't build with octave>8.1
+    broken = true;
   };
 }
diff --git a/pkgs/development/octave-modules/sparsersb/default.nix b/pkgs/development/octave-modules/sparsersb/default.nix
index 507ed1100a425..41ee75cb1a800 100644
--- a/pkgs/development/octave-modules/sparsersb/default.nix
+++ b/pkgs/development/octave-modules/sparsersb/default.nix
@@ -22,5 +22,7 @@ buildOctavePackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ KarlJoad ];
     description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations";
+    # Broken since octave>8.x
+    broken = true;
   };
 }
diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix
index fa67936d2bcd1..0b161c261c407 100644
--- a/pkgs/development/octave-modules/stk/default.nix
+++ b/pkgs/development/octave-modules/stk/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "stk";
-  version = "2.7.0";
+  version = "2.8.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-vIf+XDLvLNOMwptFCgiqfl+o3PIQ+KLpsJhOArd7gMM=";
+    sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI=";
   };
 
   meta = with lib; {
diff --git a/pkgs/development/octave-modules/symbolic/default.nix b/pkgs/development/octave-modules/symbolic/default.nix
index 1d3715b3d73b6..2ca59a972cb69 100644
--- a/pkgs/development/octave-modules/symbolic/default.nix
+++ b/pkgs/development/octave-modules/symbolic/default.nix
@@ -14,13 +14,13 @@ let
 in
 buildOctavePackage rec {
   pname = "symbolic";
-  version = "3.0.1";
+  version = "3.1.1";
 
   src = fetchFromGitHub {
     owner = "cbm755";
     repo = "octsympy";
-    rev = "v${version}";
-    hash = "sha256-FJb5uazqEiyNI6TL9WVewMoQnC3CutcHENl+umNZeto=";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-6LmLzTwcBhvMDBE7u/lIkSUP97qFMPRHkxfbAyvas6M=";
   };
 
   propagatedBuildInputs = [ pythonEnv ];
diff --git a/pkgs/development/octave-modules/tisean/default.nix b/pkgs/development/octave-modules/tisean/default.nix
index bfe01f10f2fff..71d05dc7a1f00 100644
--- a/pkgs/development/octave-modules/tisean/default.nix
+++ b/pkgs/development/octave-modules/tisean/default.nix
@@ -1,5 +1,4 @@
 { buildOctavePackage
-, stdenv
 , lib
 , fetchurl
 # Octave dependencies
@@ -30,7 +29,7 @@ buildOctavePackage rec {
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [ KarlJoad ];
     description = "Port of TISEAN 3.0.1";
-    # Some gfortran symbols claimed to be missing
-    broken = stdenv.isDarwin;
+    # Broken since octave 8.x update, and wasn't updated since 2021
+    broken = true;
   };
 }