Unverified Commit 0af9ca97 authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

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

octaveFull: 8.1.0 -> 8.2.0
parents cb2d5a2f d8ac0784

pkgs/development/interpreters/octave/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = [

pkgs/development/octave-modules/ltfat/default.nix

+2 −7
Original line number Diff line number Diff line
@@ -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

pkgs/development/octave-modules/ltfat/syntax-error.patch

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
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)));

pkgs/development/octave-modules/stk/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -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=";

  };