Merge pull request #119444 from lorenzleutgeb/gradle-jdk
gradle: Decouple from JDK 8 and support Java Toolchains
This commit is contained in:
Kevin Cox
GitHub
commit
dc447918a0
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchurl, writeText, gradleGen, pkg-config, perl, cmake
|
||||
{ stdenv, lib, fetchurl, writeText, gradle_4, pkg-config, perl, cmake
|
||||
, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib, ffmpeg, python2, ruby
|
||||
, openjdk11-bootstrap }:
|
||||
|
||||
@ -7,9 +7,9 @@ let
|
||||
update = ".0.3";
|
||||
build = "1";
|
||||
repover = "${major}${update}+${build}";
|
||||
gradle_ = (gradleGen.override {
|
||||
gradle_ = (gradle_4.override {
|
||||
java = openjdk11-bootstrap;
|
||||
}).gradle_4_10;
|
||||
});
|
||||
|
||||
makePackage = args: stdenv.mkDerivation ({
|
||||
version = "${major}${update}-${build}";
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradleGen
|
||||
{ stdenv, lib, fetchFromGitHub, writeText, openjdk11_headless, gradle_5
|
||||
, pkg-config, perl, cmake, gperf, gtk2, gtk3, libXtst, libXxf86vm, glib, alsa-lib
|
||||
, ffmpeg, python3, ruby }:
|
||||
|
||||
@ -7,9 +7,9 @@ let
|
||||
update = ".0.1";
|
||||
build = "+1";
|
||||
repover = "${major}${update}${build}";
|
||||
gradle_ = (gradleGen.override {
|
||||
gradle_ = (gradle_5.override {
|
||||
java = openjdk11_headless;
|
||||
}).gradle_5_6;
|
||||
});
|
||||
|
||||
makePackage = args: stdenv.mkDerivation ({
|
||||
version = "${major}${update}${build}";
|
||||
|
||||
@ -1,13 +1,21 @@
|
||||
{ lib, stdenv, fetchurl, unzip, jdk, java ? jdk, makeWrapper }:
|
||||
{ jdk8, jdk11, jdk17 }:
|
||||
|
||||
rec {
|
||||
gradleGen = { version, nativeVersion, sha256 }: stdenv.mkDerivation {
|
||||
gen =
|
||||
|
||||
{ version, nativeVersion, sha256, defaultJava ? jdk8 }:
|
||||
|
||||
{ lib, stdenv, fetchurl, makeWrapper, unzip, java ? defaultJava
|
||||
, javaToolchains ? [ ] }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "gradle";
|
||||
inherit version;
|
||||
|
||||
src = fetchurl {
|
||||
inherit sha256;
|
||||
url = "https://services.gradle.org/distributions/gradle-${version}-bin.zip";
|
||||
url =
|
||||
"https://services.gradle.org/distributions/gradle-${version}-bin.zip";
|
||||
};
|
||||
|
||||
dontBuild = true;
|
||||
@ -15,20 +23,35 @@ rec {
|
||||
nativeBuildInputs = [ makeWrapper unzip ];
|
||||
buildInputs = [ java ];
|
||||
|
||||
installPhase = ''
|
||||
# NOTE: For more information on toolchains,
|
||||
# see https://docs.gradle.org/current/userguide/toolchains.html
|
||||
installPhase = with builtins;
|
||||
let
|
||||
toolchain = rec {
|
||||
var = x: "JAVA_TOOLCHAIN_NIX_${toString x}";
|
||||
vars = (lib.imap0 (i: x: ("${var i} ${x}")) javaToolchains);
|
||||
varNames = lib.imap0 (i: x: var i) javaToolchains;
|
||||
property = " -Porg.gradle.java.installations.fromEnv='${
|
||||
concatStringsSep "," varNames
|
||||
}'";
|
||||
};
|
||||
vars = concatStringsSep "\n" (map (x: " --set ${x} \\")
|
||||
([ "JAVA_HOME ${java}" ] ++ toolchain.vars));
|
||||
in ''
|
||||
mkdir -pv $out/lib/gradle/
|
||||
cp -rv lib/ $out/lib/gradle/
|
||||
|
||||
gradle_launcher_jar=$(echo $out/lib/gradle/lib/gradle-launcher-*.jar)
|
||||
test -f $gradle_launcher_jar
|
||||
makeWrapper ${java}/bin/java $out/bin/gradle \
|
||||
--set JAVA_HOME ${java} \
|
||||
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain"
|
||||
${vars}
|
||||
--add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain${toolchain.property}"
|
||||
'';
|
||||
|
||||
fixupPhase = if (!stdenv.isLinux) then ":" else
|
||||
let arch = if stdenv.is64bit then "amd64" else "i386"; in
|
||||
''
|
||||
dontFixup = !stdenv.isLinux;
|
||||
|
||||
fixupPhase = let arch = if stdenv.is64bit then "amd64" else "i386";
|
||||
in ''
|
||||
mkdir patching
|
||||
pushd patching
|
||||
jar xf $out/lib/gradle/lib/native-platform-linux-${arch}-${nativeVersion}.jar
|
||||
@ -62,12 +85,35 @@ rec {
|
||||
};
|
||||
};
|
||||
|
||||
gradle_latest = gradle_7_3;
|
||||
# NOTE: Default JDKs are LTS versions and according to
|
||||
# https://docs.gradle.org/current/userguide/compatibility.html
|
||||
|
||||
gradle_7_3 = gradleGen (import ./gradle-7.3-spec.nix);
|
||||
gradle_6_9 = gradleGen (import ./gradle-6.9.1-spec.nix);
|
||||
gradle_7 = gen {
|
||||
version = "7.3";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
|
||||
defaultJava = jdk17;
|
||||
};
|
||||
|
||||
# NOTE: No GitHub Release for the following versions. Update.sh will not work.
|
||||
gradle_5_6 = gradleGen (import ./gradle-5.6.4-spec.nix);
|
||||
gradle_4_10 = gradleGen (import ./gradle-4.10.3-spec.nix);
|
||||
gradle_6 = gen {
|
||||
version = "6.9.1";
|
||||
nativeVersion = "0.22-milestone-20";
|
||||
sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
|
||||
defaultJava = jdk11;
|
||||
};
|
||||
|
||||
# NOTE: No GitHub Release for the following versions. `update.sh` will not work.
|
||||
gradle_5 = gen {
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
|
||||
defaultJava = jdk11;
|
||||
};
|
||||
|
||||
gradle_4 = gen {
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
defaultJava = jdk8;
|
||||
};
|
||||
}
|
||||
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
version = "4.10.3";
|
||||
nativeVersion = "0.14";
|
||||
sha256 = "0vhqxnk0yj3q9jam5w4kpia70i4h0q4pjxxqwynh3qml0vrcn9l6";
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
version = "5.6.4";
|
||||
nativeVersion = "0.18";
|
||||
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
version = "6.9.1";
|
||||
nativeVersion = "0.22-milestone-20";
|
||||
sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
version = "7.2";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "1pg6w5czysywsgdvmll5bwd2p6y99cn5sn3gw69cps9mkjd710gm";
|
||||
}
|
||||
@ -1,5 +0,0 @@
|
||||
{
|
||||
version = "7.3";
|
||||
nativeVersion = "0.22-milestone-21";
|
||||
sha256 = "04741q7avmn7rv9h5s6dqj4ibnvdylxrlhvj9wb5kixx96nm53yy";
|
||||
}
|
||||
@ -1,6 +1,6 @@
|
||||
{ lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
|
||||
{ lib, stdenv, fetchFromGitHub, jdk11, gradle_6, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
|
||||
let
|
||||
gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_9;
|
||||
gradle = gradle_6;
|
||||
|
||||
pname = "scenebuilder";
|
||||
version = "15.0.1";
|
||||
|
||||
@ -1,8 +1,5 @@
|
||||
{ lib, stdenv, fetchFromGitHub, jdk, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
|
||||
{ lib, stdenv, fetchFromGitHub, jdk, gradle, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper }:
|
||||
let
|
||||
# The default one still uses jdk8 (#89731)
|
||||
gradle = (gradleGen.override (old: { java = jdk; })).gradle_latest;
|
||||
|
||||
pname = "scenic-view";
|
||||
version = "11.0.2";
|
||||
|
||||
|
||||
@ -3,8 +3,8 @@
|
||||
, makeDesktopItem
|
||||
, copyDesktopItems
|
||||
, fetchFromGitHub
|
||||
, gradleGen
|
||||
, jdk
|
||||
, gradle_6
|
||||
, jdk11
|
||||
, perl
|
||||
|
||||
# for arc
|
||||
@ -87,8 +87,8 @@ let
|
||||
popd
|
||||
'';
|
||||
|
||||
# The default one still uses jdk8 (#89731)
|
||||
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_9;
|
||||
jdk = jdk11;
|
||||
gradle = (gradle_6.override (old: { java = jdk11; }));
|
||||
|
||||
# fake build to pre-download deps into fixed-output derivation
|
||||
deps = stdenv.mkDerivation {
|
||||
@ -96,7 +96,7 @@ let
|
||||
inherit version unpackPhase patches;
|
||||
postPatch = cleanupMindustrySrc;
|
||||
|
||||
nativeBuildInputs = [ gradle_6 perl ];
|
||||
nativeBuildInputs = [ gradle perl ];
|
||||
# Here we download dependencies for both the server and the client so
|
||||
# we only have to specify one hash for 'deps'. Deps can be garbage
|
||||
# collected after the build, so this is not really an issue.
|
||||
@ -136,7 +136,7 @@ stdenv.mkDerivation rec {
|
||||
];
|
||||
nativeBuildInputs = [
|
||||
pkg-config
|
||||
gradle_6
|
||||
gradle
|
||||
makeWrapper
|
||||
jdk
|
||||
] ++ lib.optionals enableClient [
|
||||
|
||||
@ -14652,14 +14652,15 @@ with pkgs;
|
||||
|
||||
gpuvis = callPackage ../development/tools/misc/gpuvis { };
|
||||
|
||||
gradleGen = callPackage ../development/tools/build-managers/gradle {
|
||||
java = jdk8; # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
|
||||
gradle-packages = import ../development/tools/build-managers/gradle {
|
||||
inherit jdk8 jdk11 jdk17;
|
||||
};
|
||||
gradle = res.gradleGen.gradle_latest;
|
||||
gradle_4 = res.gradleGen.gradle_4_10;
|
||||
gradle_5 = res.gradleGen.gradle_5_6;
|
||||
gradle_6 = res.gradleGen.gradle_6_9;
|
||||
gradle_7 = res.gradleGen.gradle_7_3;
|
||||
gradleGen = gradle-packages.gen;
|
||||
gradle_4 = callPackage gradle-packages.gradle_4 { };
|
||||
gradle_5 = callPackage gradle-packages.gradle_5 { };
|
||||
gradle_6 = callPackage gradle-packages.gradle_6 { };
|
||||
gradle_7 = callPackage gradle-packages.gradle_7 { };
|
||||
gradle = gradle_7;
|
||||
|
||||
gperf = callPackage ../development/tools/misc/gperf { };
|
||||
# 3.1 changed some parameters from int to size_t, leading to mismatches.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user