public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octave: 4.2.2 -> 4.4.1 (#47391)

Browse Source
This commit is contained in:
Lancelot SIX 2018-09-28 11:34:56 +02:00 committed by xeji
parent d994f1cfd4
commit ddeeade148
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/interpreters/octave/default.nix
View File

@ -18,11 +18,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "4.2.2"; version = "4.4.1";
name = "octave-${version}"; name = "octave-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://gnu/octave/${name}.tar.gz"; url = "mirror://gnu/octave/${name}.tar.gz";
sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9";
}; };
buildInputs = [ gfortran readline ncurses perl flex texinfo qhull buildInputs = [ gfortran readline ncurses perl flex texinfo qhull
@ -46,17 +46,15 @@ stdenv.mkDerivation rec {
substituteInPlace libinterp/corefcn/help.cc \ substituteInPlace libinterp/corefcn/help.cc \
--replace 'Vmakeinfo_program = "makeinfo"' \ --replace 'Vmakeinfo_program = "makeinfo"' \
'Vmakeinfo_program = "${texinfo}/bin/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; doCheck = !stdenv.isDarwin;
enableParallelBuilding = true; enableParallelBuilding = true;
# See https://savannah.gnu.org/bugs/?50339
F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else "";
configureFlags = configureFlags =
[ "--enable-readline" [ "--enable-readline"
"--enable-dl" "--enable-dl"
@ -82,6 +80,7 @@ stdenv.mkDerivation rec {
homepage = http://octave.org/; homepage = http://octave.org/;
license = stdenv.lib.licenses.gpl3Plus; license = stdenv.lib.licenses.gpl3Plus;
maintainers = with stdenv.lib.maintainers; [raskin]; maintainers = with stdenv.lib.maintainers; [raskin];
description = "Scientific Pragramming Language";
platforms = if overridePlatforms == null then platforms = if overridePlatforms == null then
(with stdenv.lib.platforms; linux ++ darwin) (with stdenv.lib.platforms; linux ++ darwin)
else overridePlatforms; else overridePlatforms;