diff options
| author | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2021-11-16 09:07:35 +0100 |
|---|---|---|
| committer | Lorenz Leutgeb <lorenz@leutgeb.xyz> | 2021-11-19 18:54:25 +0100 |
| commit | 01f4c7ec881a0a52638f090aacf51461a20b472f (patch) | |
| tree | 3f075b9ade2bc26bb6580a226264c51b29729acf /pkgs/top-level | |
| parent | 6b68d74f036def3d48a23969edfd0fa47f34af3e (diff) | |
| download | nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar.gz nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar.bz2 nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar.lz nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar.xz nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.tar.zst nixpkgs-01f4c7ec881a0a52638f090aacf51461a20b472f.zip | |
gradle: Decouple gradleGen and JDK
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 6b19e97f089..cf7a049aa08 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14598,14 +14598,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. |