public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octave: Use sundials_2 in package's signature instead of callPackage

Browse Source
This commit is contained in:
Doron Behar 2020-02-19 18:39:39 +02:00
parent b631f620d4
commit 62d7ad9309
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/octave/default.nix
View File

@ -34,7 +34,7 @@
, jdk ? null , jdk ? null
, python ? null , python ? null
, overridePlatforms ? null , overridePlatforms ? null
, sundials ? null , sundials_2 ? null
# Qt / GUI is disabled by default # Qt / GUI is disabled by default
, enableQt ? false , enableQt ? false
, qtbase ? null , qtbase ? null
@ -99,7 +99,7 @@ stdenv.mkDerivation rec {
++ (stdenv.lib.optional (glpk != null) glpk) ++ (stdenv.lib.optional (glpk != null) glpk)
++ (stdenv.lib.optional (suitesparse != null) suitesparse) ++ (stdenv.lib.optional (suitesparse != null) suitesparse)
++ (stdenv.lib.optional (jdk != null) jdk) ++ (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 (gnuplot != null) gnuplot)
++ (stdenv.lib.optional (python != null) python) ++ (stdenv.lib.optional (python != null) python)
++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ])
@ -112,7 +112,7 @@ stdenv.mkDerivation rec {
fftwSinglePrec fftwSinglePrec
texinfo texinfo
] ]
++ (stdenv.lib.optional (sundials != null) sundials) ++ (stdenv.lib.optional (sundials_2 != null) sundials_2)
++ (stdenv.lib.optional enableJIT llvm) ++ (stdenv.lib.optional enableJIT llvm)
++ (stdenv.lib.optionals enableQt [ ++ (stdenv.lib.optionals enableQt [
qtscript qtscript

3
pkgs/top-level/all-packages.nix
View File

@ -9236,7 +9236,6 @@ in
# - Build docs: yes # - Build docs: yes
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
python = python3; python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas; openblas = if stdenv.isDarwin then openblasCompat else openblas;
}; };
# Build summary for this flavor # Build summary for this flavor
@ -9255,7 +9254,6 @@ in
# - Build docs: yes # - Build docs: yes
octave-jit = callPackage ../development/interpreters/octave { octave-jit = callPackage ../development/interpreters/octave {
python = python3; python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas; openblas = if stdenv.isDarwin then openblasCompat else openblas;
enableJIT = true; enableJIT = true;
}; };
@ -9276,7 +9274,6 @@ in
# Build summary for this flavor # Build summary for this flavor
octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave { octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
python = python3; python = python3;
sundials = sundials_2;
openblas = if stdenv.isDarwin then openblasCompat else openblas; openblas = if stdenv.isDarwin then openblasCompat else openblas;
enableQt = true; enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; overridePlatforms = ["x86_64-linux" "x86_64-darwin"];