octave: cleanup callPackages and use sundials_2

This commit is contained in:
Doron Behar 2020-02-11 22:43:53 +02:00
parent 749afca8dc
commit 0df00a6ceb

View File

@ -9220,24 +9220,66 @@ in
git = gitMinimal;
};
# Build summary for this flavor
# - Build Octave Qt GUI: no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
# - JIT compiler for loops: no
# - Build Java interface: yes
# - Build static libraries: no
# - Build shared libraries: yes
# - Dynamic Linking API: dlopen
# - Include support for GNU readline: yes
# - 64-bit array dims and indexing: yes
# - 64-bit BLAS array dims and indexing: yes
# - OpenMP SMP multithreading: yes
# - Truncate intermediate FP results: yes
# - Build cross tools: no
# - Build docs: yes
octave = callPackage ../development/interpreters/octave {
qt = null;
qscintilla = null;
ghostscript = null;
graphicsmagick = null;
llvm = null;
hdf5 = null;
glpk = null;
suitesparse = null;
jdk = null;
python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
};
octaveFull = (lowPrio (octave.override {
qt = qt4;
inherit qscintilla;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
# Build summary for this flavor
# - Build Octave Qt GUI: no (missing:QtCore QtGui QtNetwork QtHelp QtXml)
# - JIT compiler for loops: yes
# - Build Java interface: yes
# - Build static libraries: no
# - Build shared libraries: yes
# - Dynamic Linking API: dlopen
# - Include support for GNU readline: yes
# - 64-bit array dims and indexing: yes
# - 64-bit BLAS array dims and indexing: yes
# - OpenMP SMP multithreading: yes
# - Truncate intermediate FP results: yes
# - Build cross tools: no
# - Build docs: yes
octave-jit = callPackage ../development/interpreters/octave {
python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
enableJIT = true;
};
# Build summary for this flavor
# - Build Octave Qt GUI: yes
# - JIT compiler for loops: no
# - Build Java interface: yes
# - Build static libraries: no
# - Build shared libraries: yes
# - Dynamic Linking API: dlopen
# - Include support for GNU readline: yes
# - 64-bit array dims and indexing: yes
# - 64-bit BLAS array dims and indexing: yes
# - OpenMP SMP multithreading: yes
# - Truncate intermediate FP results: yes
# - Build cross tools: no
# - Build docs: yes
# Build summary for this flavor
octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas;
enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
}));
ocropus = callPackage ../applications/misc/ocropus { };