diff options
Diffstat (limited to 'pkgs/development/octave-modules')
4 files changed, 25 insertions, 29 deletions
diff --git a/pkgs/development/octave-modules/control/default.nix b/pkgs/development/octave-modules/control/default.nix index 95ccaf3d05513..74df9fcda0857 100644 --- a/pkgs/development/octave-modules/control/default.nix +++ b/pkgs/development/octave-modules/control/default.nix @@ -1,21 +1,37 @@ { buildOctavePackage , lib -, fetchurl +, fetchFromGitHub , gfortran , lapack, blas +, autoreconfHook }: buildOctavePackage rec { pname = "control"; - version = "3.5.1"; + version = "3.5.2"; - src = fetchurl { - url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz"; - sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg="; + src = fetchFromGitHub { + owner = "gnu-octave"; + repo = "pkg-control"; + rev = "${pname}-${version}"; + sha256 = "sha256-isUHovpknIFclspHjAtUxGLkrdxitdWSnQMED9n+R3s="; }; + # Running autoreconfHook inside the src directory fixes a compile issue about + # the config.h header for control missing. + # This is supposed to be handled by control's top-level Makefile, but does not + # appear to be working. This manually forces it instead. + preAutoreconf = '' + pushd src + ''; + + postAutoreconf = '' + popd + ''; + nativeBuildInputs = [ gfortran + autoreconfHook ]; buildInputs = [ @@ -23,7 +39,7 @@ buildOctavePackage rec { ]; meta = with lib; { - homepage = "https://octave.sourceforge.io/control/index.html"; + homepage = "https://gnu-octave.github.io/packages/control/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Computer-Aided Control System Design (CACSD) Tools for GNU Octave, based on the proven SLICOT Library"; diff --git a/pkgs/development/octave-modules/ltfat/default.nix b/pkgs/development/octave-modules/ltfat/default.nix index 829f6eb9287e6..9d9dba0b01e44 100644 --- a/pkgs/development/octave-modules/ltfat/default.nix +++ b/pkgs/development/octave-modules/ltfat/default.nix @@ -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 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 732030b704342..0000000000000 --- 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))); diff --git a/pkgs/development/octave-modules/stk/default.nix b/pkgs/development/octave-modules/stk/default.nix index 0b161c261c407..192115309fa74 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="; }; |