From 62d7ad930993813a05f277bd9091f6ab2e3b9e80 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 19 Feb 2020 18:39:39 +0200
Subject: [PATCH] octave: Use sundials_2 in package's signature instead of
 callPackage

---
 pkgs/development/interpreters/octave/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                  | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix
index 78f927dc4ee..2e926e16dc6 100644
--- a/pkgs/development/interpreters/octave/default.nix
+++ b/pkgs/development/interpreters/octave/default.nix
@@ -34,7 +34,7 @@
 , jdk ? null
 , python ? null
 , overridePlatforms ? null
-, sundials ? null
+, sundials_2 ? null
 # Qt / GUI is disabled by default
 , enableQt ? false
 , qtbase ? null
@@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
   ++ (stdenv.lib.optional (glpk != null) glpk)
   ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
   ++ (stdenv.lib.optional (jdk != null) jdk)
-  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
   ++ (stdenv.lib.optional (gnuplot != null) gnuplot)
   ++ (stdenv.lib.optional (python != null) python)
   ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
@@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
     fftwSinglePrec
     texinfo
   ]
-  ++ (stdenv.lib.optional (sundials != null) sundials)
+  ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
   ++ (stdenv.lib.optional enableJIT llvm)
   ++ (stdenv.lib.optionals enableQt [
     qtscript
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ae81aac45a..14ed58a1086 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9236,7 +9236,6 @@ in
   # - Build docs:                           yes
   octave = callPackage ../development/interpreters/octave {
     python = python3;
-    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
   };
   # Build summary for this flavor
@@ -9255,7 +9254,6 @@ in
   # - Build docs:                           yes
   octave-jit = callPackage ../development/interpreters/octave {
     python = python3;
-    sundials = sundials_2;
     openblas = if stdenv.isDarwin then openblasCompat else openblas;
     enableJIT = true;
   };
@@ -9276,7 +9274,6 @@ in
   # 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"];