Unverified Commit 19bc619c authored by Doron Behar's avatar Doron Behar Committed by GitHub
Browse files

Merge pull request #328318 from r-ryantm/auto-update/octave 

octave: 8.4.0 -> 9.2.0
parents ac81de77 29340b77

pkgs/development/interpreters/octave/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -93,12 +93,12 @@ let 
  # To avoid confusion later in passthru

  allPkgs = pkgs;

in stdenv.mkDerivation (finalAttrs: {

    version = "8.4.0";

    version = "9.2.0";

    pname = "octave";



    src = fetchurl {

      url = "mirror://gnu/octave/octave-${finalAttrs.version}.tar.gz";

      sha256 = "sha256-azjdl1FnhCSus6nWZkMrHzeOs5caISkKkM09NRGdVq0=";

      sha256 = "sha256-BjZVSwWZaZfkMcqtRCLAA4bS18aJAEcnAP7PX/63yZE=";

    };



    buildInputs = [

pkgs/development/libraries/qrupdate/default.nix

+5 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ stdenv.mkDerivation (finalAttrs: { 
    ])}"

  ];



  # https://github.com/mpimd-csc/qrupdate-ng/issues/4

  patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [

    ./disable-zch1dn-test.patch

  ];



  doCheck = true;



  nativeBuildInputs = [

pkgs/development/libraries/qrupdate/disable-zch1dn-test.patch

0 → 100644
+13 −0
Original line number Diff line number Diff line 
diff --git i/test/tch1dn.f w/test/tch1dn.f

index 25ec990..3f83e7e 100644

--- i/test/tch1dn.f

+++ w/test/tch1dn.f

@@ -34,8 +34,6 @@ c

       call dtest(n)

       write (*,*) 'cch1dn test:'

       call ctest(n)

-      write (*,*) 'zch1dn test:'

-      call ztest(n)

 

       call pstats

       end program

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

+2 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ 


buildOctavePackage rec {

  pname = "ncarray";

  version = "1.0.5";

  version = "1.0.6";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-HhQWLUA/6wqYi6TP3PC+N2zgi4UojDxbG9pgQzFaQ8c=";

    sha256 = "sha256-W6L2Esm7AdzntT7cimKylbeKYcZWKhHim96N5dM/qoE=";

  };



  buildInputs = [

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

+2 −2
Original line number Diff line number Diff line
@@ -6,11 +6,11 @@ 


buildOctavePackage rec {

  pname = "netcdf";

  version = "1.0.16";

  version = "1.0.17";



  src = fetchurl {

    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "sha256-1Lr+6xLRXxSeUhM9+WdCUPFRZSWdxtAQlxpiv4CHJrs=";

    sha256 = "sha256-uuFD8VNeWbyHFyWMDMzWDd2n+dG9EFmc/JnZU2tx+Uk=";

  };



  buildInputs = [