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

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

octave: 7.3.0 -> 8.1.0
parents 53ffab75 14031667

pkgs/development/interpreters/octave/default.nix

+4 −4
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
, portaudio

, libX11

, graphicsmagick

, pcre

, pcre2

, pkg-config

, libGL

, libGLU
@@ -112,12 +112,12 @@ let 
  };



  self = mkDerivation rec {

    version = "7.3.0";

    version = "8.1.0";

    pname = "octave";



    src = fetchurl {

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

      sha256 = "sha256-bhSkZJ1wr0WrZg+Mu/ZFqvHsM/JfiL/aRpfLF+RAxPU=";

      sha256 = "sha256-gFIHTRew72Q9A33oqziWcsdSuyAe6c6k36aYWPtqIT8=";

    };



    buildInputs = [
@@ -127,7 +127,7 @@ let 
      flex

      qhull

      graphicsmagick

      pcre

      pcre2

      fltk

      zlib

      curl

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

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


buildOctavePackage rec {

  pname = "control";

  version = "3.4.0";

  version = "3.5.1";



  src = fetchurl {

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

    sha256 = "sha256-bsagbhOtKIr62GMcxB9yR+RwlvoejQQkDU7QHvvkp3o=";

    sha256 = "sha256-U/o0RQoHdDhPP3xuiR9gCFb60CKrA30bpc/dH/ozDpg=";

  };



  nativeBuildInputs = [

pkgs/development/octave-modules/database/c_verror.patch

0 → 100644
+11 −0
Original line number Diff line number Diff line 
--- a/src/error-helpers.h

+++ b/src/error-helpers.h

@@ -64,7 +64,7 @@

       } \

     catch (OCTAVE__EXECUTION_EXCEPTION& e) \

       { \

-        verror (e, __VA_ARGS__); \

+        c_verror (e, __VA_ARGS__); \

       }

 #endif

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

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,10 @@ buildOctavePackage rec { 
    url = "mirror://sourceforge/octave/${pname}-${version}.tar.gz";

    sha256 = "1c0n76adi0jw6bx62s04vjyda6kb6ca8lzz2vam43vdy10prcq9p";

  };

  patches = [

    # Fix for octave 8.x

    ./c_verror.patch

  ];



  propagatedBuildInputs = [

    postgresql

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

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


buildOctavePackage rec {

  pname = "doctest";

  version = "0.7.0";

  version = "0.8.0";



  src = fetchurl {

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

    sha256 = "0hh9izj9ds69bmrvmmj16fd1c4z7733h50c7isl8f714srw26kf4";

    sha256 = "sha256-/oXJ7NnbbdsVfhNOYU/tkkYwKhYs5zKMEjybmbf0Cok=";

  };



  meta = with lib; {