diff options
Diffstat (limited to 'pkgs/development/interpreters/octave/default.nix')
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 34 |
1 files changed, 24 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 428d97eaf794..1addccb4bf88 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,22 +1,36 @@ {stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick, pcre, liblapack, texLive, pkgconfig, mesa, fltk, -fftw, fftwSinglePrec, zlib, curl, qrupdate }: +libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk, +fftw, fftwSinglePrec, zlib, curl, qrupdate +, qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null +, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null +}: let - version = "3.6.4"; + version = "3.8.1"; in stdenv.mkDerivation rec { name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "0qn9s7jrjmrn6w3rvp8d7vfnymyv0spnxzrp9l7p8p8zb7wms67s"; + sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 graphicsmagick pcre liblapack pkgconfig mesa fltk zlib curl - fftw fftwSinglePrec qrupdate ]; - - doCheck = true; + fftw fftwSinglePrec qrupdate ] + ++ (stdenv.lib.optional (qt != null) qt) + ++ (stdenv.lib.optional (ghostscript != null) ghostscript) + ++ (stdenv.lib.optional (llvm != null) llvm) + ++ (stdenv.lib.optional (hdf5 != null) hdf5) + ++ (stdenv.lib.optional (glpk != null) glpk) + ++ (stdenv.lib.optional (suitesparse != null) suitesparse) + ++ (stdenv.lib.optional (openjdk != null) openjdk) + ++ (stdenv.lib.optional (gnuplot != null) gnuplot) + ++ (stdenv.lib.optional (python != null) python) + ; + + # there is a mysterious sh: command not found + doCheck = false; /* The build failed with a missing libranlib.la in hydra, but worked on my computer. I think they have concurrency problems */ @@ -27,7 +41,7 @@ stdenv.mkDerivation rec { # Keep a copy of the octave tests detailed results in the output # derivation, because someone may care postInstall = '' - cp test/fntests.log $out/share/octave/${name}-fntests.log + cp test/fntests.log $out/share/octave/${name}-fntests.log || true ''; passthru = { @@ -37,8 +51,8 @@ stdenv.mkDerivation rec { meta = { homepage = http://octave.org/; - license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = with stdenv.lib.maintainers; [viric raskin]; platforms = with stdenv.lib.platforms; linux; }; } |