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

octave: Use latest jdk

Browse Source
This commit is contained in:
Doron Behar 2020-12-10 18:43:01 +02:00
parent 453c116254
commit f602e104b0
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10555,19 +10555,16 @@ in
octave = callPackage ../development/interpreters/octave { octave = callPackage ../development/interpreters/octave {
python = python3; python = python3;
mkDerivation = stdenv.mkDerivation; mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
octave-jit = callPackage ../development/interpreters/octave { octave-jit = callPackage ../development/interpreters/octave {
python = python3; python = python3;
enableJIT = true; enableJIT = true;
mkDerivation = stdenv.mkDerivation; mkDerivation = stdenv.mkDerivation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
octaveFull = libsForQt5.callPackage ../development/interpreters/octave { octaveFull = libsForQt5.callPackage ../development/interpreters/octave {
python = python3; python = python3;
enableQt = true; enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"]; overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}; };
ocropus = callPackage ../applications/misc/ocropus { }; ocropus = callPackage ../applications/misc/ocropus { };