From 2f35bf5d34e6bb40b21ce8009c54a0af0b984f36 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 17 Apr 2023 18:53:20 +0000 Subject: [PATCH 1/4] octaveFull: 8.1.0 -> 8.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 45d35d027b88..c2e1454aef9f 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -112,12 +112,12 @@ let }; self = mkDerivation rec { - version = "8.1.0"; + version = "8.2.0"; pname = "octave"; src = fetchurl { url = "mirror://gnu/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8="; + sha256 = "sha256-V9F/kYqUDTjKM0ghHhELNNc1oyKofbccF3xGkqSanIQ="; }; buildInputs = [ From 4463a6c2c42821ef1f7965f1a500c98861303cf4 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Apr 2023 23:25:30 +0300 Subject: [PATCH 2/4] octavePackages.ltfat: update source URL --- pkgs/development/octave-modules/ltfat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index 829f6eb9287e..cb99fdc32a63 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/pkgs/development/octave-modules/ltfat/default.nix @@ -16,8 +16,8 @@ buildOctavePackage rec { version = "2.5.0"; src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-CFLqlHrTwQzCvpPAtQigCVL3Fs8V05Tmh6nkEsnaV2I="; + url = "https://github.com/ltfat/ltfat/releases/download/v${version}/${pname}-${version}-of.tar.gz"; + sha256 = "sha256-8AqEDEfgYwftKUj8ynFQzBa3G3zTdhNtsZ2bW16DV7Q="; }; patches = [ From cd439c64b0abe18e7fe8982b9387c67e31354e74 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Apr 2023 23:32:40 +0300 Subject: [PATCH 3/4] octavePackages.stk: update source URL --- pkgs/development/octave-modules/stk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index 0b161c261c40..192115309fa7 100644 --- a/pkgs/development/octave-modules/stk/default.nix +++ b/pkgs/development/octave-modules/stk/default.nix @@ -8,7 +8,7 @@ buildOctavePackage rec { version = "2.8.0"; src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; + url = "https://github.com/stk-kriging/stk/releases/download/${version}/${pname}-${version}-octpkg.tar.gz"; sha256 = "sha256-dgxpw2L7e9o/zimsLPoqW7dEihrrNsks62XtuXt4zTI="; }; From d8ac078493a6e443786e1204b1edf329d8c3e751 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Mon, 17 Apr 2023 23:51:54 +0300 Subject: [PATCH 4/4] octavePackages.ltfat: remove old syntax-error.patch --- pkgs/development/octave-modules/ltfat/default.nix | 5 ----- .../octave-modules/ltfat/syntax-error.patch | 15 --------------- 2 files changed, 20 deletions(-) delete mode 100644 pkgs/development/octave-modules/ltfat/syntax-error.patch diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index cb99fdc32a63..9d9dba0b01e4 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/pkgs/development/octave-modules/ltfat/default.nix @@ -20,11 +20,6 @@ buildOctavePackage rec { sha256 = "sha256-8AqEDEfgYwftKUj8ynFQzBa3G3zTdhNtsZ2bW16DV7Q="; }; - patches = [ - # Fixes a syntax error with performing multiplication. - ./syntax-error.patch - ]; - buildInputs = [ fftw fftwSinglePrec diff --git a/pkgs/development/octave-modules/ltfat/syntax-error.patch b/pkgs/development/octave-modules/ltfat/syntax-error.patch deleted file mode 100644 index 732030b70434..000000000000 --- a/pkgs/development/octave-modules/ltfat/syntax-error.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/inst/nonstatgab/nsdgt.m b/inst/nonstatgab/nsdgt.m -index ac53963..81656cb 100644 ---- a/inst/nonstatgab/nsdgt.m -+++ b/inst/nonstatgab/nsdgt.m -@@ -149,8 +149,8 @@ for ii = 1:N - col = ceil(Lg/M(ii)); - - temp = zeros(col*M(ii),W,assert_classname(f,g{1})); -- temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@ ... -- times,f(win_range,:),g{ii}(idx)); -+ temp([end-floor(Lg/2)+1:end,1:ceil(Lg/2)],:) = bsxfun(@times, ... -+ f(win_range,:),g{ii}(idx)); - - temp = reshape(temp,M(ii),col,W); - X = squeeze(fft(sum(temp,2)));