diff options
| author | Kevin Cox <kevincox@kevincox.ca> | 2021-11-22 16:27:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-22 16:27:10 -0500 |
| commit | dc447918a0da3926cc4832ea8735645a04d07daa (patch) | |
| tree | f976638f6cfdc0650d8b3a4fffad65e899a982b8 /pkgs/top-level | |
| parent | 706f94d8b9aedf69e2d5b02ad75da2852677adf0 (diff) | |
| parent | 01f4c7ec881a0a52638f090aacf51461a20b472f (diff) | |
| download | nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar.gz nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar.bz2 nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar.lz nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar.xz nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.tar.zst nixpkgs-dc447918a0da3926cc4832ea8735645a04d07daa.zip | |
Merge pull request #119444 from lorenzleutgeb/gradle-jdk
gradle: Decouple from JDK 8 and support Java Toolchains
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98696a445cc..c4c46dbfe11 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 = 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; + gradle-packages = import ../development/tools/build-managers/gradle { + inherit jdk8 jdk11 jdk17; + }; + 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. |