diff options
| author | Lancelot SIX <lsix+github@lancelotsix.com> | 2018-09-28 11:34:56 +0200 |
|---|---|---|
| committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-09-28 11:34:56 +0200 |
| commit | ddeeade148809080087b5f477ba37546993ba247 (patch) | |
| tree | 300da5ca6cc1c04ea8627a833e928e956e0a843d | |
| parent | d994f1cfd4d9e04fc45e40f911b1d72b786d5d03 (diff) | |
| download | nixlib-ddeeade148809080087b5f477ba37546993ba247.tar nixlib-ddeeade148809080087b5f477ba37546993ba247.tar.gz nixlib-ddeeade148809080087b5f477ba37546993ba247.tar.bz2 nixlib-ddeeade148809080087b5f477ba37546993ba247.tar.lz nixlib-ddeeade148809080087b5f477ba37546993ba247.tar.xz nixlib-ddeeade148809080087b5f477ba37546993ba247.tar.zst nixlib-ddeeade148809080087b5f477ba37546993ba247.zip | |
octave: 4.2.2 -> 4.4.1 (#47391)
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index f6bd96af40f5..cbe919c70929 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - version = "4.2.2"; + version = "4.4.1"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.gz"; - sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; + sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull @@ -46,17 +46,15 @@ stdenv.mkDerivation rec { substituteInPlace libinterp/corefcn/help.cc \ --replace 'Vmakeinfo_program = "makeinfo"' \ 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"' - '' - # REMOVE ON VERSION BUMP - # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 - + stdenv.lib.optionalString stdenv.isDarwin '' - sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc ''; doCheck = !stdenv.isDarwin; enableParallelBuilding = true; + # See https://savannah.gnu.org/bugs/?50339 + F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else ""; + configureFlags = [ "--enable-readline" "--enable-dl" @@ -82,6 +80,7 @@ stdenv.mkDerivation rec { homepage = http://octave.org/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [raskin]; + description = "Scientific Pragramming Language"; platforms = if overridePlatforms == null then (with stdenv.lib.platforms; linux ++ darwin) else overridePlatforms; |