From 0df00a6cebb02086db5bca5c317e3ddbc3addf8c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 11 Feb 2020 22:43:53 +0200
Subject: [PATCH] octave: cleanup callPackages and use sundials_2

---
 pkgs/top-level/all-packages.nix | 70 ++++++++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 37023b220ef..0ae81aac45a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };