Merge commit '3a8d7958a610cd3fec3a6f424480f91a1b259185'

13 files changed, 26 insertions, 35 deletions

diff --git a/nixpkgs/pkgs/development/octave-modules/arduino/default.nix b/nixpkgs/pkgs/development/octave-modules/arduino/default.nix
index f6536108e6cc..77089827c4b7 100644
--- a/nixpkgs/pkgs/development/octave-modules/arduino/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/arduino/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "arduino";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0fnfk206n31s7diijaylmqhxnr88z6l3l3vsxq4z8gcp9ylm9nkj";
+    sha256 = "0r0bcq2zkwba6ab6yi6czbhrj4adm9m9ggxmzzcd9h40ckqg6wjv";
   };
 
   requiredOctavePackages = [
diff --git a/nixpkgs/pkgs/development/octave-modules/communications/default.nix b/nixpkgs/pkgs/development/octave-modules/communications/default.nix
index 492c837255f7..6c517ec6e5b6 100644
--- a/nixpkgs/pkgs/development/octave-modules/communications/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/communications/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "communications";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1xay2vjyadv3ja8dmqqzm2his8s0rvidz23nq1c2yl3xh1gavyck";
+    sha256 = "1r4r0cia5l5fann1n78c1qdc6q8nizgb09n2fdwb76xnwjan23g3";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/control/default.nix b/nixpkgs/pkgs/development/octave-modules/control/default.nix
index 2d61e30cc60c..b69343b1b4bb 100644
--- a/nixpkgs/pkgs/development/octave-modules/control/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/control/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "3.2.0";
+  version = "3.3.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0gjyjsxs01x0nyc4cgn3d5af17l3lzs8h4hsm57nxd3as48dbwgs";
+    sha256 = "1yksifligq2z3siqw701iq2ydgnj7pnkcw42bfmydcf6fc4drlvy";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix b/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
index 5cb567b2bb85..dc230ef18a86 100644
--- a/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/fuzzy-logic-toolkit/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "fuzzy-logic-toolkit";
-  version = "0.4.5";
+  version = "0.4.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0cs1xh594h1psdinicxrsvm27gzax5jja7bjk4sl3kk2hv24mhml";
+    sha256 = "126x0wjjqmwwgynsgjfdh5rlnww5bsl5hxq1xib15i58mrglh5cd";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix b/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix
index 51c8f300cc59..17d9186da745 100644
--- a/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/instrument-control/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "instrument-control";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0vckax6rx5v3fq5j6kb6n39a5zas9i24x4wvmjlhc8xbykkg5nkk";
+    sha256 = "0cdnnbxihz7chdkhkcgy46pvkij43z9alwr88627z7jaiaah6xby";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix b/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix
index b8607cf5dff9..c74b8b00cfbe 100644
--- a/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/matgeom/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "matgeom";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "05xfmlh1k3mhq8yag7gr8q1ysl1s43vm46fr1i3gcg9b1kkwi8by";
+    sha256 = "12q66dy4ninhki3jslzcamfblcb3cdkfbbzn3a5har1s212lsfiw";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/nan/default.nix b/nixpkgs/pkgs/development/octave-modules/nan/default.nix
index a0517db714bd..f492d4440b19 100644
--- a/nixpkgs/pkgs/development/octave-modules/nan/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/nan/default.nix
@@ -6,11 +6,11 @@
 
 buildOctavePackage rec {
   pname = "nan";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0bp8zl50f8qj5sivl88kjdswm035v4li33fiq3v1gmh0pvgbcw7a";
+    sha256 = "1jailahbrh847875vszibn68lp4n5sdy68q51i7hd64qix8rmmpx";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix b/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix
index e5e26d7bb952..fbd67a0a46a9 100644
--- a/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/nurbs/default.nix
@@ -5,22 +5,13 @@
 
 buildOctavePackage rec {
   pname = "nurbs";
-  version = "1.3.13";
+  version = "1.4.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0zkyldm63pc3pcal3yvj6af24cvpjvv9qfhf0ihhwcsh4w3yggyv";
+    sha256 = "16r05av75nvmkz1knf0nv0gj4fcjjf3jnyf94bdgxf84wahncim7";
   };
 
-  # Has been fixed in more recent commits, but has not been pushed out as a
-  # new version yet.
-  # The sed changes allow nurbs to compile.
-  patchPhase = ''
-    sed -i s/feval/octave::feval/g src/*.cc
-    sed -i s/is_real_type/isreal/g src/*.cc
-    sed -i s/is_cell/iscell/g src/*.cc
-  '';
-
   meta = with lib; {
     homepage = "https://octave.sourceforge.io/nurbs/index.html";
     license = licenses.gpl3Plus;
diff --git a/nixpkgs/pkgs/development/octave-modules/optim/default.nix b/nixpkgs/pkgs/development/octave-modules/optim/default.nix
index b9561faafb12..57a606d3d58d 100644
--- a/nixpkgs/pkgs/development/octave-modules/optim/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/optim/default.nix
@@ -9,11 +9,11 @@
 
 buildOctavePackage rec {
   pname = "optim";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "1z2h8gy99glxh5qi3r22am2vdirlbklkq0lx4r8jrx1ak7awh47r";
+    sha256 = "1175bckiryz0i6zm8zvq7y5rq3lwkmhyiky1gbn33np9qzxcsl3i";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/parallel/default.nix b/nixpkgs/pkgs/development/octave-modules/parallel/default.nix
index 0ea1d4d9df23..11fba7d36300 100644
--- a/nixpkgs/pkgs/development/octave-modules/parallel/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/parallel/default.nix
@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "parallel";
-  version = "4.0.0";
+  version = "4.0.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0wmpak01rsccrnb8is7fsjdlxw15157sqyf9s2fabr16yykfmvi8";
+    sha256 = "1h8vw2r42393px6dk10y3lhpxl168r9d197f9whz6lbk2rg571pa";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/splines/default.nix b/nixpkgs/pkgs/development/octave-modules/splines/default.nix
index 69d5e46147d6..9a249c467446 100644
--- a/nixpkgs/pkgs/development/octave-modules/splines/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/splines/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "splines";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "16wisph8axc5xci0h51zj0y0x2wj6c9zybi2sjpb9v8z9dagjjqa";
+    sha256 = "11a34f6a7615fc8x1smk3lx8vslilx4mrxi8f01la3wq68khnq5f";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/struct/default.nix b/nixpkgs/pkgs/development/octave-modules/struct/default.nix
index a69a8e4b6e22..bd173aab1e37 100644
--- a/nixpkgs/pkgs/development/octave-modules/struct/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/struct/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "struct";
-  version = "1.0.16";
+  version = "1.0.17";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "0gx20r126f0ccl4yflp823xi77p8fh4acx1fv0mmcsglmx4c4vgm";
+    sha256 = "0cw4cspkm553v019zsj2bsmal0i378pm0hv29w82j3v5vysvndq1";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/windows/default.nix b/nixpkgs/pkgs/development/octave-modules/windows/default.nix
index 274ba1e3b7dd..bed63aef9263 100644
--- a/nixpkgs/pkgs/development/octave-modules/windows/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/windows/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "windows";
-  version = "1.5.0";
+  version = "1.6.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "05bsf3q816b9vwgmjdm761ybhmk8raq6dzxqvd11brma0granx3a";
+    sha256 = "110dh6jz088c4fxp9gw79kfib0dl7r3rkcavxx4xpk7bjl2l3xb6";
   };
 
   meta = with lib; {