ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #89731 from doronbehar/jdk_rename

Browse Source
This commit is contained in:
Gabriel Ebner 2020-09-20 11:07:55 +02:00 committed by GitHub
commit efa2089077
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
22 changed files with 267 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/networking/browsers/chromium/common.nix
View File

@ -17,7 +17,7 @@
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg_3, libxslt, libxml2, at-spi2-core
, jre
, jre8
, pipewire_0_2
# optional dependencies
@ -50,6 +50,8 @@ with stdenv.lib;
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# The additional attributes for creating derivations based on the chromium
# source tree.
extraAttrs = buildFun base;

4
pkgs/applications/networking/browsers/ungoogled-chromium/common.nix
View File

@ -17,7 +17,7 @@
, libXScrnSaver, libXcursor, libXtst, libGLU, libGL
, protobuf, speechd, libXdamage, cups
, ffmpeg_3, libxslt, libxml2, at-spi2-core
, jre
, jre8
, pipewire_0_2
# optional dependencies
@ -52,6 +52,8 @@ with stdenv.lib;
# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html
let
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
# The additional attributes for creating derivations based on the chromium
# source tree.
extraAttrs = buildFun base;

4
pkgs/applications/networking/charles/default.nix
View File

@ -3,7 +3,7 @@ stdenv
, makeWrapper
, makeDesktopItem
, fetchurl
, jre
, jdk8
}:
let
@ -31,7 +31,7 @@ let
buildInputs = [ makeWrapper ];
installPhase = ''
makeWrapper ${jre}/bin/java $out/bin/charles \
makeWrapper ${jdk8.jre}/bin/java $out/bin/charles \
--add-flags "-Xmx1024M -Dcharles.config='~/.charles.config' -jar $out/share/java/charles.jar"
for fn in lib/*.jar; do

3
pkgs/applications/networking/instant-messengers/jitsi/default.nix
View File

@ -1,8 +1,9 @@
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk
{ stdenv, lib, fetchurl, makeDesktopItem, unzip, ant, jdk8
# Optional, Jitsi still runs without, but you may pass null:
, alsaLib, dbus, gtk2, libpulseaudio, openssl, xorg
}:
let jdk = jdk8; in
stdenv.mkDerivation rec {
pname = "jitsi";
version = "2.10.5550";

2
pkgs/applications/science/logic/leo3/binary.nix
View File

@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
mkdir -p "$out"/{bin,lib/java/leo3}
cp "${jar}" "$out/lib/java/leo3/leo3.jar"
echo "#!${runtimeShell}" > "$out/bin/leo3"
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" > "$out/bin/leo3"
echo "'${openjdk}/bin/java' -jar '$out/lib/java/leo3/leo3.jar' \"\$@\"" >> "$out/bin/leo3"
chmod a+x "$out/bin/leo3"
'';

4
pkgs/applications/science/math/sage/sage-env.nix
View File

@ -50,7 +50,7 @@
, zlib
, gsl
, ntl
, jdk
, jdk8
, less
}:
@ -61,6 +61,8 @@ assert (!blas.isILP64) && (!lapack.isILP64);
# dependencies.
let
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
runtimepath = (lib.makeBinPath ([
"@sage-local@"
"@sage-local@/build"

4
pkgs/development/compilers/jasmin/default.nix
View File

@ -1,13 +1,13 @@
{ stdenv
, fetchurl
, unzip
, jdk
, jdk8
, ant
, makeWrapper
, jre
, callPackage
}:
let jre = jdk8.jre; jdk = jdk8; in
stdenv.mkDerivation rec {
pname = "jasmin";
version = "2.4";

7
pkgs/development/interpreters/erlang/generic-builder.nix
View File

@ -1,6 +1,7 @@
{ pkgs, stdenv, fetchFromGitHub, makeWrapper, gawk, gnum4, gnused
, libxml2, libxslt, ncurses, openssl, perl, autoconf
, openjdk ? null # javacSupport
# TODO: use jdk https://github.com/NixOS/nixpkgs/pull/89731
, openjdk8 ? null # javacSupport
, unixODBC ? null # odbcSupport
, libGL ? null, libGLU ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport
, parallelBuild ? false
@ -17,7 +18,7 @@
, enableThreads ? true
, enableSmpSupport ? true
, enableKernelPoll ? true
, javacSupport ? false, javacPackages ? [ openjdk ]
, javacSupport ? false, javacPackages ? [ openjdk8 ]
, odbcSupport ? false, odbcPackages ? [ unixODBC ]
, wxSupport ? true, wxPackages ? [ libGL libGLU wxGTK xorg.libX11 ]
, preUnpack ? "", postUnpack ? ""
@ -36,7 +37,7 @@ assert wxSupport -> (if stdenv.isDarwin
else libGL != null && libGLU != null && wxGTK != null && xorg != null);
assert odbcSupport -> unixODBC != null;
assert javacSupport -> openjdk != null;
assert javacSupport -> openjdk8 != null;
let
inherit (stdenv.lib) optional optionals optionalAttrs optionalString;

5
pkgs/development/java-modules/jogl/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchgit, ant, jdk, git, xorg, udev, libGL, libGLU }:
{ stdenv, fetchgit, ant, jdk8, git, xorg, udev, libGL, libGLU }:
{
jogl_2_3_2 =
@ -28,7 +28,8 @@
-exec sed -i 's@"libGLU.so"@"${libGLU}/lib/libGLU.so"@' {} \;
'';
nativeBuildInputs = [ jdk ant git ];
# TODO: upgrade to jdk https://github.com/NixOS/nixpkgs/pull/89731
nativeBuildInputs = [ jdk8 ant git ];
buildInputs = [ udev xorg.libX11 xorg.libXrandr xorg.libXcursor xorg.libXt xorg.libXxf86vm xorg.libXrender ];
buildPhase = ''

3
pkgs/development/libraries/java/dbus-java/default.nix
View File

@ -1,5 +1,6 @@
{stdenv, fetchurl, gettext, jdk, libmatthew_java}:
{stdenv, fetchurl, gettext, jdk8, libmatthew_java}:
let jdk = jdk8; in
stdenv.mkDerivation {
name = "dbus-java-2.7";
src = fetchurl {

4
pkgs/development/tools/drip/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, jdk, which, makeWrapper }:
{ stdenv, fetchFromGitHub, jdk8, which, makeWrapper }:
stdenv.mkDerivation rec {
pname = "drip";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ makeWrapper ];
buildInputs = [ jdk ];
buildInputs = [ jdk8 ];
postPatch = ''
patchShebangs .

3
pkgs/development/tools/global-platform-pro/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, maven, makeWrapper, jre_headless, pcsclite }:
{ stdenv, fetchFromGitHub, jdk8, maven, makeWrapper, jre8_headless, pcsclite }:
let jdk = jdk8; jre_headless = jre8_headless; in
# TODO: This is quite a bit of duplicated logic with gephi. Factor it out?
stdenv.mkDerivation rec {
pname = "global-platform-pro";

6
pkgs/games/dwarf-fortress/default.nix
View File

@ -86,6 +86,8 @@ let
twbt = twbt;
dfhack = dfhack;
dwarf-therapist = dwarf-therapist;
jdk = pkgs.jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
}) (lib.attrNames self.df-hashes));
@ -104,7 +106,9 @@ let
soundSense = callPackage ./soundsense.nix { };
legends-browser = callPackage ./legends-browser {};
legends-browser = callPackage ./legends-browser {
jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
themes = recurseIntoAttrs (callPackage ./themes {
stdenv = stdenvNoCC;

3
pkgs/games/multimc/default.nix
View File

@ -1,6 +1,7 @@
{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
{ stdenv, mkDerivation, fetchFromGitHub, cmake, jdk8, zlib, file, makeWrapper, xorg, libpulseaudio, qtbase }:
let
jdk = jdk8;
libpath = with xorg; stdenv.lib.makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libpulseaudio ];
in mkDerivation rec {
pname = "multimc";

2
pkgs/games/steam/fhsenv.nix
View File

@ -35,7 +35,7 @@ let
# Steam VR
procps
usbutils
] ++ lib.optional withJava jdk
] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
++ lib.optional withPrimus primus
++ extraPkgs pkgs;

4
pkgs/servers/apache-kafka/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, jre, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
{ stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps,
majorVersion ? "1.0" }:
let
@ -54,6 +54,8 @@ let
sha256 = "1vng5ipkjzqy0wijc706w2m1rjl5d0nsgbxiacci739y1jmjnn5r";
};
};
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
in
with versionMap.${majorVersion};

3
pkgs/tools/misc/ili2c/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, ant, makeWrapper, jre }:
{ stdenv, fetchFromGitHub, jdk8, ant, makeWrapper, jre8 }:
let jdk = jdk8; jre = jre8; in
stdenv.mkDerivation rec {
pname = "ili2c";
version = "5.0.8";

4
pkgs/tools/misc/opentsdb/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools
{ stdenv, autoconf, automake, curl, fetchurl, jdk8, makeWrapper, nettools
, python, git
}:
with stdenv.lib;
let jdk = jdk8; jre = jdk8.jre; in
stdenv.mkDerivation rec {
pname = "opentsdb";

3
pkgs/tools/networking/zap/default.nix
View File

@ -1,5 +1,6 @@
{ stdenv, fetchFromGitHub, jdk, ant, runtimeShell }:
{ stdenv, fetchFromGitHub, jdk8, ant, runtimeShell }:
let jdk = jdk8; in
stdenv.mkDerivation rec {
pname = "zap";
version = "2.7.0";

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

@ -743,7 +743,9 @@ in
arduino-cli = callPackage ../development/arduino/arduino-cli { };
arduino-core = callPackage ../development/arduino/arduino-core { };
arduino-core = callPackage ../development/arduino/arduino-core {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
arduino-mk = callPackage ../development/arduino/arduino-mk {};
@ -1249,7 +1251,9 @@ in
aws_mturk_clt = callPackage ../tools/misc/aws-mturk-clt { };
awstats = callPackage ../tools/system/awstats { };
awstats = callPackage ../tools/system/awstats {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
awsweeper = callPackage ../tools/admin/awsweeper { };
@ -1260,6 +1264,7 @@ in
axoloti = callPackage ../applications/audio/axoloti {
gcc-arm-embedded = pkgsCross.arm-embedded.buildPackages.gcc;
binutils-arm-embedded = pkgsCross.arm-embedded.buildPackages.binutils;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
dfu-util-axoloti = callPackage ../applications/audio/axoloti/dfu-util.nix { };
libusb1-axoloti = callPackage ../applications/audio/axoloti/libusb1.nix {
@ -1267,7 +1272,10 @@ in
inherit (darwin.apple_sdk.frameworks) IOKit;
};
azureus = callPackage ../tools/networking/p2p/azureus { };
azureus = callPackage ../tools/networking/p2p/azureus {
jdk = jdk8;
swt = swt_jdk8;
};
b3sum = callPackage ../tools/security/b3sum {};
@ -1969,7 +1977,9 @@ in
fsql = callPackage ../tools/misc/fsql { };
fop = callPackage ../tools/typesetting/fop { };
fop = callPackage ../tools/typesetting/fop {
jdk = openjdk8;
};
fondu = callPackage ../tools/misc/fondu { };
@ -2764,6 +2774,7 @@ in
collectd = callPackage ../tools/system/collectd {
libsigrok = libsigrok-0-3-0; # not compatible with >= 0.4.0 yet
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
collectd-data = callPackage ../tools/system/collectd/data.nix { };
@ -3420,7 +3431,9 @@ in
choose = callPackage ../tools/text/choose { };
emscripten = callPackage ../development/compilers/emscripten { };
emscripten = callPackage ../development/compilers/emscripten {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { });
@ -3439,17 +3452,21 @@ in
elasticsearch6 = callPackage ../servers/search/elasticsearch/6.x.nix {
utillinux = utillinuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch6-oss = callPackage ../servers/search/elasticsearch/6.x.nix {
enableUnfree = false;
utillinux = utillinuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7 = callPackage ../servers/search/elasticsearch/7.x.nix {
utillinux = utillinuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch7-oss = callPackage ../servers/search/elasticsearch/7.x.nix {
enableUnfree = false;
utillinux = utillinuxMinimal;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticsearch = elasticsearch6;
elasticsearch-oss = elasticsearch6-oss;
@ -3817,7 +3834,9 @@ in
fusuma = callPackage ../tools/inputmethods/fusuma {};
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { });
fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
});
inherit (fdbPackages)
foundationdb51
@ -4378,11 +4397,11 @@ in
}));
hdfview = callPackage ../tools/misc/hdfview {
javac = jdk;
javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731
};
hdf_java = callPackage ../tools/misc/hdfjava {
javac = jdk;
javac = jdk8; # TODO: https://github.com/NixOS/nixpkgs/pull/89731
};
hecate = callPackage ../applications/editors/hecate { };
@ -4466,7 +4485,10 @@ in
i2c-tools = callPackage ../os-specific/linux/i2c-tools { };
i2p = callPackage ../tools/networking/i2p {};
i2p = callPackage ../tools/networking/i2p {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
i2pd = callPackage ../tools/networking/i2pd { };
@ -4664,7 +4686,9 @@ in
jid = callPackage ../development/tools/jid { };
jing = res.jing-trang;
jing-trang = callPackage ../tools/text/xml/jing-trang { };
jing-trang = callPackage ../tools/text/xml/jing-trang {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
jira-cli = callPackage ../development/tools/jira_cli { };
@ -6399,7 +6423,10 @@ in
profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { };
projectlibre = callPackage ../applications/misc/projectlibre { };
projectlibre = callPackage ../applications/misc/projectlibre {
jre = jre8;
jdk = jdk8;
};
projectm = libsForQt5.callPackage ../applications/audio/projectm { };
@ -6498,7 +6525,9 @@ in
ucx = callPackage ../development/libraries/ucx {};
openmodelica = callPackage ../applications/science/misc/openmodelica { };
openmodelica = callPackage ../applications/science/misc/openmodelica {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
qarte = libsForQt514.callPackage ../applications/video/qarte { };
@ -8170,6 +8199,7 @@ in
xtreemfs = callPackage ../tools/filesystems/xtreemfs {
boost = boost165;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
xurls = callPackage ../tools/text/xurls {};
@ -8384,7 +8414,10 @@ in
### DEVELOPMENT / COMPILERS
abcl = callPackage ../development/compilers/abcl {};
abcl = callPackage ../development/compilers/abcl {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
adoptopenjdk-bin-13-packages-linux = import ../development/compilers/adoptopenjdk-bin/jdk13-linux.nix;
adoptopenjdk-bin-13-packages-darwin = import ../development/compilers/adoptopenjdk-bin/jdk13-darwin.nix;
@ -8464,6 +8497,7 @@ in
avian = callPackage ../development/compilers/avian {
inherit (darwin.apple_sdk.frameworks) CoreServices Foundation;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
bigloo = callPackage ../development/compilers/bigloo { };
@ -8545,7 +8579,9 @@ in
clean = callPackage ../development/compilers/clean { };
closurecompiler = callPackage ../development/compilers/closure { };
closurecompiler = callPackage ../development/compilers/closure {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cmdstan = callPackage ../development/compilers/cmdstan { };
@ -9173,6 +9209,11 @@ in
else
openjdk8.override { headless = true; };
jdk8 = openjdk8;
jdk8_headless = openjdk8_headless;
jre8 = openjdk8.jre;
jre8_headless = openjdk8_headless.jre;
openjdk11-bootstrap =
if adoptopenjdk-hotspot-bin-11.meta.available then
adoptopenjdk-hotspot-bin-11
@ -9213,7 +9254,10 @@ in
};
};
/* current JDK */
jdk11 = openjdk11;
jdk11_headless = openjdk11_headless;
/* Latest JDK */
openjdk14 =
if stdenv.isDarwin then
callPackage ../development/compilers/openjdk/darwin { }
@ -9229,23 +9273,18 @@ in
else
openjdk14.override { headless = true; };
openjdk = openjdk8;
openjdk_headless = openjdk8_headless;
jdk8 = openjdk8;
jdk8_headless = openjdk8_headless;
jre8 = openjdk8.jre;
jre8_headless = openjdk8_headless.jre;
jdk11 = openjdk11;
jdk11_headless = openjdk11_headless;
jdk14 = openjdk14;
jdk14_headless = openjdk14_headless;
jdk = jdk8;
jre = jre8;
jre_headless = jre8_headless;
/* default JDK */
jdk = jdk14;
# jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490
jre = jdk14;
jre_headless = jdk14_headless;
openjdk = openjdk14;
openjdk_headless = openjdk14_headless;
inherit (callPackages ../development/compilers/graalvm {
gcc = if stdenv.targetPlatform.isDarwin then gcc8 else gcc;
@ -9289,7 +9328,9 @@ in
jasmin = callPackage ../development/compilers/jasmin { };
java-service-wrapper = callPackage ../tools/system/java-service-wrapper { };
java-service-wrapper = callPackage ../tools/system/java-service-wrapper {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
javacard-devkit = pkgsi686Linux.callPackage ../development/compilers/javacard-devkit { };
@ -9430,7 +9471,9 @@ in
manticore = callPackage ../development/compilers/manticore { };
mercury = callPackage ../development/compilers/mercury { };
mercury = callPackage ../development/compilers/mercury {
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
microscheme = callPackage ../development/compilers/microscheme { };
@ -9485,6 +9528,7 @@ in
mozart2 = callPackage ../development/compilers/mozart {
emacs = emacs-nox;
jre_headless = jre8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
mozart2-binary = callPackage ../development/compilers/mozart/binary.nix { };
@ -9731,7 +9775,10 @@ in
metal = callPackage ../development/libraries/metal { };
metals = callPackage ../development/tools/metals { };
scalafix = callPackage ../development/tools/scalafix { };
scalafix = callPackage ../development/tools/scalafix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
scalafmt = callPackage ../development/tools/scalafmt { };
sdcc = callPackage ../development/compilers/sdcc {
@ -9773,6 +9820,7 @@ in
swiProlog = callPackage ../development/compilers/swi-prolog {
inherit (darwin.apple_sdk.frameworks) Security;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
swiPrologWithGui = swiProlog.override { withGui = true; };
@ -9963,7 +10011,9 @@ in
guile = guile_2_2;
inherit (callPackages ../applications/networking/cluster/hadoop { })
inherit (callPackages ../applications/networking/cluster/hadoop {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
})
hadoop_2_7
hadoop_2_8
hadoop_2_9
@ -10070,15 +10120,18 @@ in
octave = callPackage ../development/interpreters/octave {
python = python3;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octave-jit = callPackage ../development/interpreters/octave {
python = python3;
enableJIT = true;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
octaveFull = (lowPrio (libsForQt512.callPackage ../development/interpreters/octave {
python = python3;
enableQt = true;
overridePlatforms = ["x86_64-linux" "x86_64-darwin"];
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
}));
ocropus = callPackage ../applications/misc/ocropus { };
@ -10441,7 +10494,9 @@ in
adtool = callPackage ../tools/admin/adtool { };
inherit (callPackage ../development/tools/alloy { })
inherit (callPackage ../development/tools/alloy {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
})
alloy4
alloy5
alloy;
@ -10458,13 +10513,21 @@ in
ansible-lint = with python3.pkgs; toPythonApplication ansible-lint;
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix { };
antlr = callPackage ../development/tools/parsing/antlr/2.7.7.nix {
jdk = jdk8; # todo: remove override https://github.com/nixos/nixpkgs/pull/89731
};
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { };
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix { };
antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
antlr3_5 = callPackage ../development/tools/parsing/antlr/3.5.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
antlr3 = antlr3_5;
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { };
antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
antlr4 = antlr4_7;
apacheAnt = callPackage ../development/tools/build-managers/apache-ant { };
@ -10634,7 +10697,9 @@ in
wxGTK = wxGTK30;
};
buck = callPackage ../development/tools/build-managers/buck { };
buck = callPackage ../development/tools/build-managers/buck {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
buildkite-agent = buildkite-agent3;
buildkite-agent2 = throw "pkgs.buildkite-agent2 has been discontinued. Please use pkgs.buildkite-agent (v3.x)";
@ -10978,11 +11043,15 @@ in
gdbgui = python3Packages.callPackage ../development/tools/misc/gdbgui { };
pmd = callPackage ../development/tools/analysis/pmd { };
pmd = callPackage ../development/tools/analysis/pmd {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
pmdk = callPackage ../development/libraries/pmdk { };
jdepend = callPackage ../development/tools/analysis/jdepend { };
jdepend = callPackage ../development/tools/analysis/jdepend {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
fedpkg = pythonPackages.callPackage ../development/tools/fedpkg { };
@ -11040,7 +11109,7 @@ in
gputils = callPackage ../development/tools/misc/gputils { };
gradleGen = callPackage ../development/tools/build-managers/gradle {
java = jdk;
java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
};
gradle = res.gradleGen.gradle_latest;
gradle_4_10 = res.gradleGen.gradle_4_10;
@ -11219,7 +11288,9 @@ in
massif-visualizer = libsForQt514.callPackage ../development/tools/analysis/massif-visualizer { };
maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven { };
maven3 = callPackage ../development/tools/build-managers/apache-maven {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
mavproxy = python3Packages.callPackage ../applications/science/robotics/mavproxy { };
@ -11888,6 +11959,7 @@ in
belle-sip = callPackage ../development/libraries/belle-sip {
stdenv = gcc8Stdenv;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
libbfd = callPackage ../development/libraries/libbfd { };
@ -12340,7 +12412,9 @@ in
freeimage = callPackage ../development/libraries/freeimage { };
freetts = callPackage ../development/libraries/freetts { };
freetts = callPackage ../development/libraries/freetts {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
frog = res.languageMachines.frog;
@ -12403,7 +12477,9 @@ in
gecode_6 = qt5.callPackage ../development/libraries/gecode { };
gecode = gecode_6;
gephi = callPackage ../applications/science/misc/gephi { };
gephi = callPackage ../applications/science/misc/gephi {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
gegl = callPackage ../development/libraries/gegl {
inherit (darwin.apple_sdk.frameworks) OpenGL;
@ -13822,7 +13898,9 @@ in
guile = guile_2_0;
};
libmatthew_java = callPackage ../development/libraries/java/libmatthew-java { };
libmatthew_java = callPackage ../development/libraries/java/libmatthew-java {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
libmatroska = callPackage ../development/libraries/libmatroska { };
@ -15085,7 +15163,10 @@ in
range-v3 = callPackage ../development/libraries/range-v3 {};
rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {};
rabbitmq-java-client = callPackage ../development/libraries/rabbitmq-java-client {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
rapidcheck = callPackage ../development/libraries/rapidcheck {};
@ -15155,8 +15236,8 @@ in
resolv_wrapper = callPackage ../development/libraries/resolv_wrapper { };
rhino = callPackage ../development/libraries/java/rhino {
javac = jdk;
jvm = jre;
javac = jdk8;
jvm = jre8;
};
rlog = callPackage ../development/libraries/rlog { };
@ -16015,7 +16096,9 @@ in
gwtwidgets = callPackage ../development/libraries/java/gwt-widgets { };
javaCup = callPackage ../development/libraries/java/cup { };
javaCup = callPackage ../development/libraries/java/cup {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
jdom = callPackage ../development/libraries/java/jdom { };
@ -16046,6 +16129,9 @@ in
smack = callPackage ../development/libraries/java/smack { };
swt = callPackage ../development/libraries/java/swt { };
swt_jdk8 = callPackage ../development/libraries/java/swt {
jdk = jdk8;
};
### DEVELOPMENT / LIBRARIES / JAVASCRIPT
@ -16155,6 +16241,7 @@ in
withRecommendedPackages = false;
inherit (darwin.apple_sdk.frameworks) Cocoa Foundation;
inherit (darwin) libobjc;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
rWrapper = callPackage ../development/r-modules/wrapper.nix {
@ -16239,18 +16326,26 @@ in
cadvisor = callPackage ../servers/monitoring/cadvisor { };
cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix { };
cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix { };
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix { };
cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix { };
cassandra_2_1 = callPackage ../servers/nosql/cassandra/2.1.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra_2_2 = callPackage ../servers/nosql/cassandra/2.2.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra_3_0 = callPackage ../servers/nosql/cassandra/3.0.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra_3_11 = callPackage ../servers/nosql/cassandra/3.11.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
cassandra = cassandra_3_11;
apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix {
java = jdk;
java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
apache-jena-fuseki = callPackage ../servers/nosql/apache-jena/fuseki-binary.nix {
java = jdk;
java = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
apcupsd = callPackage ../servers/apcupsd { };
@ -16354,9 +16449,14 @@ in
biboumi = callPackage ../servers/xmpp/biboumi { };
elasticmq = callPackage ../servers/elasticmq { };
elasticmq = callPackage ../servers/elasticmq {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { };
elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
eventstore = callPackage ../servers/nosql/eventstore {
Nuget = dotnetPackages.Nuget;
@ -17139,7 +17239,9 @@ in
xinetd = callPackage ../servers/xinetd { };
zookeeper = callPackage ../servers/zookeeper { };
zookeeper = callPackage ../servers/zookeeper {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
zookeeper_mt = callPackage ../development/libraries/zookeeper_mt { };
@ -20679,9 +20781,14 @@ in
python3Packages = python37Packages;
};
freemind = callPackage ../applications/misc/freemind { };
freemind = callPackage ../applications/misc/freemind {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
freenet = callPackage ../applications/networking/p2p/freenet { };
freenet = callPackage ../applications/networking/p2p/freenet {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {};
@ -21337,7 +21444,9 @@ in
jdupes = callPackage ../tools/misc/jdupes { };
jedit = callPackage ../applications/editors/jedit { };
jedit = callPackage ../applications/editors/jedit {
jdk = jdk8; # TODO: upgrade
};
jgmenu = callPackage ../applications/misc/jgmenu { };
@ -21628,6 +21737,7 @@ in
(libreoffice-args // {
icu = icu64;
variant = "still";
jdk = jdk8;
});
});
libreoffice-still-unwrapped = libreoffice-still.libreoffice;
@ -22509,7 +22619,9 @@ in
};
pdfcpu = callPackage ../applications/graphics/pdfcpu { };
pdftk = callPackage ../tools/typesetting/pdftk { };
pdftk = callPackage ../tools/typesetting/pdftk {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
pdftk-legacy = lowPrio (callPackage ../tools/typesetting/pdftk/legacy.nix { });
pdfgrep = callPackage ../tools/typesetting/pdfgrep { };
@ -22631,7 +22743,9 @@ in
pommed_light = callPackage ../os-specific/linux/pommed-light {};
polymake = callPackage ../applications/science/math/polymake { };
polymake = callPackage ../applications/science/math/polymake {
openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
pond = callPackage ../applications/networking/instant-messengers/pond { };
@ -22944,6 +23058,7 @@ in
rstudio = libsForQt514.callPackage ../applications/editors/rstudio {
boost = boost166;
llvmPackages = llvmPackages_7;
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {});
@ -23105,8 +23220,13 @@ in
linuxstopmotion = callPackage ../applications/video/linuxstopmotion { };
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { })
sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
})
// (callPackage ../applications/misc/sweethome3d/editors.nix {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
sweethome3dApp = sweethome3d.application;
})
);
@ -23729,6 +23849,7 @@ in
virtualbox = libsForQt514.callPackage ../applications/virtualization/virtualbox {
stdenv = stdenv_32bit;
inherit (gnome2) libIDL;
jdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
virtualboxHardened = lowPrio (virtualbox.override {
@ -23815,7 +23936,10 @@ in
vue = callPackage ../applications/misc/vue { };
vuze = callPackage ../applications/networking/p2p/vuze { };
vuze = callPackage ../applications/networking/p2p/vuze {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
vwm = callPackage ../applications/window-managers/vwm { };
@ -24118,11 +24242,19 @@ in
gtk = gtk2;
};
kodiPlain = callPackage ../applications/video/kodi { };
kodiPlain = callPackage ../applications/video/kodi {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
kodiPlainWayland = callPackage ../applications/video/kodi { useWayland = true; };
kodiPlainWayland = callPackage ../applications/video/kodi {
useWayland = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
kodiGBM = callPackage ../applications/video/kodi { useGbm = true; };
kodiGBM = callPackage ../applications/video/kodi {
useGbm = true;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
kodiPlugins = recurseIntoAttrs (callPackage ../applications/video/kodi/plugins.nix {});
@ -25653,7 +25785,9 @@ in
gwyddion = callPackage ../applications/science/chemistry/gwyddion {};
jmol = callPackage ../applications/science/chemistry/jmol { };
jmol = callPackage ../applications/science/chemistry/jmol {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
marvin = callPackage ../applications/science/chemistry/marvin { };
@ -26143,7 +26277,9 @@ in
cvc3 = callPackage ../applications/science/logic/cvc3 {
gmp = lib.overrideDerivation gmp (a: { dontDisableStatic = true; });
};
cvc4 = callPackage ../applications/science/logic/cvc4 {};
cvc4 = callPackage ../applications/science/logic/cvc4 {
jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
drat-trim = callPackage ../applications/science/logic/drat-trim {};
@ -26277,7 +26413,9 @@ in
z3 = callPackage ../applications/science/logic/z3 { python = python2; };
z3-tptp = callPackage ../applications/science/logic/z3/tptp.nix {};
tlaplus = callPackage ../applications/science/logic/tlaplus {};
tlaplus = callPackage ../applications/science/logic/tlaplus {
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix {
inherit (ocaml-ng.ocamlPackages_4_05) ocaml;
};
@ -26598,7 +26736,11 @@ in
auctex = callPackage ../tools/typesetting/tex/auctex { };
areca = callPackage ../applications/backup/areca { };
areca = callPackage ../applications/backup/areca {
jdk = jdk8;
jre = jre8;
swt = swt_jdk8;
};
attract-mode = callPackage ../misc/emulators/attract-mode { };
@ -27174,6 +27316,7 @@ in
gdal = gdal.override {libmysqlclient = mysql // {lib = {dev = mysql;};};};
mysql = mysql;
pcre = pcre-cpp;
jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
});
r128gain = callPackage ../applications/audio/r128gain { };

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

@ -10230,7 +10230,8 @@ let
propagatedBuildInputs = [ Inline ];
makeMakerFlags = "J2SDK=${pkgs.jdk}";
# TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
makeMakerFlags = "J2SDK=${pkgs.jdk8}";
# FIXME: Apparently tests want to access the network.
doCheck = false;

4
pkgs/top-level/python-packages.nix
View File

@ -6463,7 +6463,9 @@ in {
six = callPackage ../development/python-modules/six { };
skein = callPackage ../development/python-modules/skein { };
skein = callPackage ../development/python-modules/skein {
jre = pkgs.jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731
};
sklearn-deap = callPackage ../development/python-modules/sklearn-deap { };