Merge commit 'cfc75eec4603c06503ae750f88cf397e00796ea8'

Conflicts:
	nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix

9 files changed, 19 insertions, 19 deletions

diff --git a/nixpkgs/pkgs/development/octave-modules/communications/default.nix b/nixpkgs/pkgs/development/octave-modules/communications/default.nix
index 8348aba3c3e9..74acc26bb032 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.4";
+  version = "1.2.6";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-SfA81UP0c7VgroxSA/RZVVKZ4arl8Uhpf324F7yGFTo=";
+    sha256 = "sha256-psQuiBOI1mXXZaH4EesVO91r2ViCc0KrKxKM7Xw+gts=";
   };
 
   buildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/control/default.nix b/nixpkgs/pkgs/development/octave-modules/control/default.nix
index 74df9fcda085..8b17493bb36c 100644
--- a/nixpkgs/pkgs/development/octave-modules/control/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/control/default.nix
@@ -8,13 +8,13 @@
 
 buildOctavePackage rec {
   pname = "control";
-  version = "3.5.2";
+  version = "3.6.1";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "pkg-control";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s=";
+    rev = "refs/tags/control-${version}";
+    sha256 = "sha256-7beEsdrne50NY4lGCotxGXwwWnMzUR2CKCc20OCjd0g=";
   };
 
   # Running autoreconfHook inside the src directory fixes a compile issue about
diff --git a/nixpkgs/pkgs/development/octave-modules/general/default.nix b/nixpkgs/pkgs/development/octave-modules/general/default.nix
index 8dabd86ef933..33caeb1ea554 100644
--- a/nixpkgs/pkgs/development/octave-modules/general/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/general/default.nix
@@ -7,11 +7,11 @@
 
 buildOctavePackage rec {
   pname = "general";
-  version = "2.1.2";
+  version = "2.1.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-owzRp5dDxiUo2uRuvUqD+EiuRqHB2sPqq8NmYtQilM8=";
+    sha256 = "sha256-amslJm3haXaAehdm6jYJxcGZl+ggUcnJc3i6YJ3QkyM=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/sockets/default.nix b/nixpkgs/pkgs/development/octave-modules/sockets/default.nix
index 690c775f67e9..80f2f6dc15eb 100644
--- a/nixpkgs/pkgs/development/octave-modules/sockets/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/sockets/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "sockets";
-  version = "1.4.0";
+  version = "1.4.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-GNwFLNV1u3UKJp9lhLtCclD2VSKC9Mko1hBoSn5dTpI=";
+    sha256 = "sha256-u5Nb9PVyMoR0lIzXEMtkZntXbBfpyXrtLB8U+dkgYrc=";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/splines/default.nix b/nixpkgs/pkgs/development/octave-modules/splines/default.nix
index 9a249c467446..1e05ef98c0ce 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.4";
+  version = "1.3.5";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "11a34f6a7615fc8x1smk3lx8vslilx4mrxi8f01la3wq68khnq5f";
+    sha256 = "sha256-r4hod3l8OpyKNs59lGE8EFn3n6tIg0KeezKjsB4D16Y=";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/statistics/default.nix b/nixpkgs/pkgs/development/octave-modules/statistics/default.nix
index 433a70f19bdc..552f7a4f8e37 100644
--- a/nixpkgs/pkgs/development/octave-modules/statistics/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/statistics/default.nix
@@ -6,13 +6,13 @@
 
 buildOctavePackage rec {
   pname = "statistics";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "gnu-octave";
     repo = "statistics";
     rev = "refs/tags/release-${version}";
-    sha256 = "sha256-gFauFIaXKzcPeNvpWHv5FAxYQvZNh7ELrSUIvn43IfQ=";
+    sha256 = "sha256-XJXDiVDg3Nw7a/ih49jtkYRmyvAhTfs3LbBQmw+87oc=";
   };
 
   requiredOctavePackages = [
diff --git a/nixpkgs/pkgs/development/octave-modules/stk/default.nix b/nixpkgs/pkgs/development/octave-modules/stk/default.nix
index 192115309fa7..7afebb9ad942 100644
--- a/nixpkgs/pkgs/development/octave-modules/stk/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/stk/default.nix
@@ -5,11 +5,11 @@
 
 buildOctavePackage rec {
   pname = "stk";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchurl {
     url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz";
-    sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI=";
+    sha256 = "sha256-wTjM9LUcC8BEj3TNxAz877LqJvuoxWUse9PIZoWGnIU=";
   };
 
   meta = with lib; {
diff --git a/nixpkgs/pkgs/development/octave-modules/strings/default.nix b/nixpkgs/pkgs/development/octave-modules/strings/default.nix
index 77353faa4e84..35887d249576 100644
--- a/nixpkgs/pkgs/development/octave-modules/strings/default.nix
+++ b/nixpkgs/pkgs/development/octave-modules/strings/default.nix
@@ -8,11 +8,11 @@
 
 buildOctavePackage rec {
   pname = "strings";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-agpTD9FN1qdp+BYdW5f+GZV0zqZMNzeOdymdo27mTOI=";
+    sha256 = "sha256-9l5eYgzw5K85trRAJW9eMYZxvf0RDNxDlD0MtwrSCLc=";
   };
 
   nativeBuildInputs = [
diff --git a/nixpkgs/pkgs/development/octave-modules/windows/default.nix b/nixpkgs/pkgs/development/octave-modules/windows/default.nix
index 2bcff7c48ea3..1ecbce2f5296 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.6.3";
+  version = "1.6.4";
 
   src = fetchurl {
     url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";
-    sha256 = "sha256-U5Fe5mTn/ms8w9j6NdEtiRFZkKeyV0I3aR+zYQw4yIs=";
+    sha256 = "sha256-LH9+3MLme4UIcpm5o/apNmkbmJ6NsRsW5TkGpmiNHP0=";
   };
 
   meta = with lib; {