Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

octave: 4.2.2 -> 4.4.1 (#47391)

authored by

Lancelot SIX and committed by
xeji
ddeeade1 d994f1cf

+6 -7
+6 -7
pkgs/development/interpreters/octave/default.nix
··· 18 in 19 20 stdenv.mkDerivation rec { 21 - version = "4.2.2"; 22 name = "octave-${version}"; 23 src = fetchurl { 24 url = "mirror://gnu/octave/${name}.tar.gz"; 25 - sha256 = "0vkjfrpv7aikcn73bxqkph1qrhrdx7jqy193n8d8lwp7v2al7f3p"; 26 }; 27 28 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull ··· 46 substituteInPlace libinterp/corefcn/help.cc \ 47 --replace 'Vmakeinfo_program = "makeinfo"' \ 48 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"' 49 - '' 50 - # REMOVE ON VERSION BUMP 51 - # Needed for Octave-4.2.1 on darwin. See https://savannah.gnu.org/bugs/?50234 52 - + stdenv.lib.optionalString stdenv.isDarwin '' 53 - sed 's/inline file_stat::~file_stat () { }/file_stat::~file_stat () { }/' -i ./liboctave/system/file-stat.cc 54 ''; 55 56 doCheck = !stdenv.isDarwin; 57 58 enableParallelBuilding = true; 59 60 configureFlags = 61 [ "--enable-readline" ··· 82 homepage = http://octave.org/; 83 license = stdenv.lib.licenses.gpl3Plus; 84 maintainers = with stdenv.lib.maintainers; [raskin]; 85 platforms = if overridePlatforms == null then 86 (with stdenv.lib.platforms; linux ++ darwin) 87 else overridePlatforms;
··· 18 in 19 20 stdenv.mkDerivation rec { 21 + version = "4.4.1"; 22 name = "octave-${version}"; 23 src = fetchurl { 24 url = "mirror://gnu/octave/${name}.tar.gz"; 25 + sha256 = "15xfcx6dc7p204b92i7va2a7ygff637l370x7zjj3vzl2brd1yq9"; 26 }; 27 28 buildInputs = [ gfortran readline ncurses perl flex texinfo qhull ··· 46 substituteInPlace libinterp/corefcn/help.cc \ 47 --replace 'Vmakeinfo_program = "makeinfo"' \ 48 'Vmakeinfo_program = "${texinfo}/bin/makeinfo"' 49 ''; 50 51 doCheck = !stdenv.isDarwin; 52 53 enableParallelBuilding = true; 54 + 55 + # See https://savannah.gnu.org/bugs/?50339 56 + F77_INTEGER_8_FLAG = if openblas.blas64 then "-fdefault-integer-8" else ""; 57 58 configureFlags = 59 [ "--enable-readline" ··· 80 homepage = http://octave.org/; 81 license = stdenv.lib.licenses.gpl3Plus; 82 maintainers = with stdenv.lib.maintainers; [raskin]; 83 + description = "Scientific Pragramming Language"; 84 platforms = if overridePlatforms == null then 85 (with stdenv.lib.platforms; linux ++ darwin) 86 else overridePlatforms;