From a22fa7944a3134d85c329d0fcf1014c200ab2212 Mon Sep 17 00:00:00 2001
From: Nathan Regner <nathanregner@gmail.com>
Date: Fri, 16 May 2025 23:32:33 -0600
Subject: [PATCH] mvnd: fix build with graalvm-ce 24

---
 pkgs/by-name/mv/mvnd/package.nix              |  6 ++--
 ...roovy-for-compatibility-with-Java-24.patch | 34 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch

diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix
index 473580df7738..59a8645d3a81 100644
--- a/pkgs/by-name/mv/mvnd/package.nix
+++ b/pkgs/by-name/mv/mvnd/package.nix
@@ -19,6 +19,7 @@ let
     x86_64-darwin = "darwin-amd64";
     x86_64-linux = "linux-amd64";
   };
+  inherit (platformMap.${stdenv.system}) os arch;
 in
 
 maven.buildMavenPackage rec {
@@ -30,10 +31,11 @@ maven.buildMavenPackage rec {
     rev = version;
     sha256 = "sha256-c1jD7m4cOdPWQEoaUMcNap2zvvX7H9VaWQv8JSgAnRU=";
   };
+  patches = [ ./patches/0001-update-groovy-for-compatibility-with-Java-24.patch ];
 
   # need graalvm at build-time for the `native-image` tool
   mvnJdk = graalvmPackages.graalvm-ce;
-  mvnHash = "sha256-Bx0XSnpHNxNX07uVPc18py9qbnG5b3b7J4vs44ty034=";
+  mvnHash = "sha256-/Ful6v3hfm+0aa0vBQhqMK6VE+93L3o7pwZ6wmeXzQY=";
 
   nativeBuildInputs = [
     graalvmPackages.graalvm-ce
@@ -101,7 +103,7 @@ maven.buildMavenPackage rec {
     description = "The Apache Maven Daemon";
     homepage = "https://maven.apache.org/";
     license = lib.licenses.asl20;
-    platforms = lib.platforms.unix;
+    platforms = builtins.attrNames platformMap;
     maintainers = with lib.maintainers; [ nathanregner ];
     mainProgram = "mvnd";
   };
diff --git a/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
new file mode 100644
index 000000000000..8bbf9dbd41ab
--- /dev/null
+++ b/pkgs/by-name/mv/mvnd/patches/0001-update-groovy-for-compatibility-with-Java-24.patch
@@ -0,0 +1,34 @@
+From 4d92b26f6cfc7c5f164caf11c1d5325815058624 Mon Sep 17 00:00:00 2001
+From: Nathan Regner <nathanregner@gmail.com>
+Date: Fri, 16 May 2025 23:28:13 -0600
+Subject: [PATCH] build: update groovy for compatibility with Java 24
+
+---
+ pom.xml | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index c1cec38b..7534ffd5 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -80,7 +80,7 @@
+     <!-- cannot upgrade graalvm to 23.0.0 which requires JDK >= 20 -->
+     <graalvm.version>24.0.2</graalvm.version>
+     <graalvm.plugin.version>0.10.2</graalvm.plugin.version>
+-    <groovy.version>4.0.22</groovy.version>
++    <groovy.version>4.0.24</groovy.version>
+     <jakarta.inject.version>1.0</jakarta.inject.version>
+     <jline.version>3.26.3</jline.version>
+     <maven.version>3.9.9</maven.version>
+@@ -91,7 +91,7 @@
+ 
+     <!-- plugin versions a..z -->
+     <buildnumber-maven-plugin.version>3.2.0</buildnumber-maven-plugin.version>
+-    <groovy-maven-plugin.version>3.0.2</groovy-maven-plugin.version>
++    <groovy-maven-plugin.version>4.2.0</groovy-maven-plugin.version>
+     <mrm.version>1.6.0</mrm.version>
+     <junit-platform-launcher.version>1.10.3</junit-platform-launcher.version>
+     <takari-provisio.version>1.0.25</takari-provisio.version>
+-- 
+2.49.0
+