colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #226694 from r-ryantm/auto-update/octaveFull

Browse Source 
octaveFull: 8.1.0 -> 8.2.0
This commit is contained in:
Doron Behar 2023-04-17 14:45:41 -07:00 committed by GitHub
commit 0af9ca97ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 5 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/octave/default.nix
View File

@ -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 = [

9
pkgs/development/octave-modules/ltfat/default.nix
View File

@ -16,15 +16,10 @@ 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 = [
# Fixes a syntax error with performing multiplication.
./syntax-error.patch
];
buildInputs = [
fftw
fftwSinglePrec

15
pkgs/development/octave-modules/ltfat/syntax-error.patch
View File

@ -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)));

2
pkgs/development/octave-modules/stk/default.nix
View File

@ -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=";
};