gradle: add 7.3-rc-3, 6.8 -> 6.9.1

main
Lorenz Leutgeb 3 years ago
parent 94d91a448b
commit 43750fb958
  1. 21
      pkgs/development/tools/build-managers/gradle/default.nix
  2. 2
      pkgs/development/tools/scenebuilder/default.nix
  3. 2
      pkgs/games/mindustry/default.nix
  4. 2
      pkgs/top-level/all-packages.nix

@ -63,24 +63,33 @@ rec {
};
};
gradle_7_3 = gradleGen (gradleSpec {
version = "7.3-rc-2";
nativeVersion = "0.22-milestone-21";
sha256 = "0ydg26i376bjax5lval9n79v8afng467vkx3zdga0bzxl8dbi9z6";
});
gradle_latest = gradle_7;
gradle_7 = gradleGen (gradleSpec {
# NOTE: 7.3 is a candidate.
gradle_7 = gradle_7_2;
gradle_7_2 = gradleGen (gradleSpec {
version = "7.2";
nativeVersion = "0.22-milestone-21";
sha256 = "1pg6w5czysywsgdvmll5bwd2p6y99cn5sn3gw69cps9mkjd710gm";
});
gradle_6_8 = gradleGen (gradleSpec {
version = "6.8.3";
nativeVersion = "0.22-milestone-9";
sha256 = "01fjrk5nfdp6mldyblfmnkq2gv1rz1818kzgr0k2i1wzfsc73akz";
gradle_6_9 = gradleGen (gradleSpec {
version = "6.9.1";
nativeVersion = "0.22-milestone-20";
sha256 = "1zmjfwlh34b65rdx9izgavw3qwqqwm39h5siyj2bf0m55111a4lc";
});
gradle_5_6 = gradleGen (gradleSpec {
version = "5.6.4";
nativeVersion = "0.18";
sha256 = "1f3067073041bc44554d0efe5d402a33bc3d3c93cc39ab684f308586d732a80d";
sha256 = "03d86bbqd19h9xlanffcjcy3vg1k5905vzhf9mal9g21603nfc0z";
});
gradle_4_10 = gradleGen (gradleSpec {

@ -1,6 +1,6 @@
{ lib, stdenv, fetchFromGitHub, jdk11, gradleGen, makeDesktopItem, copyDesktopItems, perl, writeText, runtimeShell, makeWrapper, glib, wrapGAppsHook }:
let
gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_8;
gradle = (gradleGen.override (old: { java = jdk11; })).gradle_6_9;
pname = "scenebuilder";
version = "15.0.1";

@ -88,7 +88,7 @@ let
'';
# The default one still uses jdk8 (#89731)
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_8;
gradle_6 = (gradleGen.override (old: { java = jdk; })).gradle_6_9;
# fake build to pre-download deps into fixed-output derivation
deps = stdenv.mkDerivation {

@ -14567,7 +14567,7 @@ with pkgs;
gradle_4_10 = res.gradleGen.gradle_4_10;
gradle_4 = gradle_4_10;
gradle_5 = res.gradleGen.gradle_5_6;
gradle_6 = res.gradleGen.gradle_6_8;
gradle_6 = res.gradleGen.gradle_6_9;
gradle_7 = res.gradleGen.gradle_7;
gperf = callPackage ../development/tools/misc/gperf { };

Loading…
Cancel
Save