From 43750fb958839d5c1de3b3a388da02c16585883a Mon Sep 17 00:00:00 2001
From: Lorenz Leutgeb <lorenz@leutgeb.xyz>
Date: Wed, 27 Oct 2021 15:25:15 +0200
Subject: [PATCH] gradle: add 7.3-rc-3, 6.8 -> 6.9.1

---
 .../tools/build-managers/gradle/default.nix   | 21 +++++++++++++------
 .../tools/scenebuilder/default.nix            |  2 +-
 pkgs/games/mindustry/default.nix              |  2 +-
 pkgs/top-level/all-packages.nix               |  2 +-
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 5e2ef7ef944..722b7440b6d 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.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 {
diff --git a/pkgs/development/tools/scenebuilder/default.nix b/pkgs/development/tools/scenebuilder/default.nix
index 6bac5a95fcb..b2e1e69487e 100644
--- a/pkgs/development/tools/scenebuilder/default.nix
+++ b/pkgs/development/tools/scenebuilder/default.nix
@@ -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";
diff --git a/pkgs/games/mindustry/default.nix b/pkgs/games/mindustry/default.nix
index 73207923839..2dbf32e8257 100644
--- a/pkgs/games/mindustry/default.nix
+++ b/pkgs/games/mindustry/default.nix
@@ -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 {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ca55821a01e..0f689bea30a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 { };