From 59de3a510756ea9b370da077e347509ee70a197b Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Sat, 2 Aug 2025 18:45:24 +0200
Subject: [PATCH] keyspersecond: build with gradle_8, remove gradle_7

---
 .../ke/keyspersecond/gradleShadowJar.patch    | 27 +++++++++++++++++++
 pkgs/by-name/ke/keyspersecond/package.nix     | 11 ++++++--
 2 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ke/keyspersecond/gradleShadowJar.patch

diff --git a/pkgs/by-name/ke/keyspersecond/gradleShadowJar.patch b/pkgs/by-name/ke/keyspersecond/gradleShadowJar.patch
new file mode 100644
index 000000000000..7e42aa0d7bc8
--- /dev/null
+++ b/pkgs/by-name/ke/keyspersecond/gradleShadowJar.patch
@@ -0,0 +1,27 @@
+diff --git a/build.gradle b/build.gradle
+index 6adb040..f442496 100644
+--- a/build.gradle
++++ b/build.gradle
+@@ -56,8 +56,10 @@ sourceCompatibility = 1.8
+ javadoc.options.memberLevel = JavadocMemberLevel.PRIVATE
+ group = 'dev.roanh.kps'
+ ext.artifact = 'keyspersecond'
+-shadowJar.archiveName = 'KeysPerSecond-v' + version + '.jar'
+-application.mainClassName = 'dev.roanh.kps.Main'
++shadowJar.archiveBaseName = 'KeysPerSecond'
++shadowJar.archiveVersion = 'v' + version
++shadowJar.archiveClassifier = ''
++application.mainClass = 'dev.roanh.kps.Main'
+
+ test{
+ 	useJUnitPlatform()
+@@ -129,7 +131,7 @@ shadowJar{
+
+ launch4j{
+ 	jarTask = project.tasks.shadowJar
+-	mainClassName = application.mainClassName
++	mainClassName = application.mainClass
+ 	icon = "${projectDir}/kps.ico"
+ 	jreMinVersion = project.sourceCompatibility
+ 	bundledJrePath = "%JAVA_HOME%"
+--
diff --git a/pkgs/by-name/ke/keyspersecond/package.nix b/pkgs/by-name/ke/keyspersecond/package.nix
index c88dfa984610..940760e086aa 100644
--- a/pkgs/by-name/ke/keyspersecond/package.nix
+++ b/pkgs/by-name/ke/keyspersecond/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  gradle_7,
+  gradle_8,
   copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
@@ -17,7 +17,7 @@
 }:
 
 let
-  gradle = gradle_7;
+  gradle = gradle_8;
 
   libPath = lib.makeLibraryPath [
     # used by the Java2D OpenGL backend
@@ -42,6 +42,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-DGpXbCInq+RS56Ae5Y6xzyWqwXAm26c0vOYrFqDvl+8=";
   };
 
+  patches = [
+    # deprecated shadowJar.archiveName, application.mainClassName
+    # patches already in `master` branch, but no new release yet
+    # and would be spread along multiple cherry-picks
+    ./gradleShadowJar.patch
+  ];
+
   sourceRoot = "${finalAttrs.src.name}/KeysPerSecond";
 
   nativeBuildInputs = [