From aa31910413f3466a2660e7f0412ba55998adf08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Wed, 14 May 2025 09:37:12 +0200
Subject: [PATCH] treewide: migrate openjdk-23 -> openjdk-25

Co-Authored-By: Leona Maroni <dev@leona.is>
---
 pkgs/by-name/cr/cratedb/package.nix        | 4 ++--
 pkgs/by-name/cr/cryptomator/package.nix    | 4 ++--
 pkgs/by-name/je/jextract/package.nix       | 6 +++---
 pkgs/by-name/ko/komga/package.nix          | 6 +++---
 pkgs/by-name/mo/moneydance/package.nix     | 4 ++--
 pkgs/by-name/op/openjfx/package.nix        | 2 --
 pkgs/by-name/re/recaf-launcher/package.nix | 2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix
index 77158519c689..8119c0d7f7fd 100644
--- a/pkgs/by-name/cr/cratedb/package.nix
+++ b/pkgs/by-name/cr/cratedb/package.nix
@@ -4,13 +4,13 @@
   maven,
   fetchFromGitHub,
   replaceVars,
-  openjdk23,
+  openjdk25,
   libarchive,
   makeWrapper,
 }:
 let
   # Wants at least Java 22
-  jdk = openjdk23;
+  jdk = openjdk25;
   version = "5.9.6";
 in
 maven.buildMavenPackage {
diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index 51d690c54019..616ed7a5208a 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   fuse3,
   glib,
-  jdk23,
+  jdk25,
   lib,
   libayatana-appindicator,
   makeShellWrapper,
@@ -13,7 +13,7 @@
 }:
 
 let
-  jdk = jdk23.override { enableJavaFX = true; };
+  jdk = jdk25.override { enableJavaFX = true; };
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 46ddcad2cf1c..65d264787b83 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeBinaryWrapper,
   gradle,
-  jdk23,
+  jdk25,
   llvmPackages,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   gradleFlags = [
     "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk_home=${jdk23}"
+    "-Pjdk_home=${jdk25}"
   ];
 
   patches = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     description = "Tool which mechanically generates Java bindings from a native library headers";
     mainProgram = "jextract";
     homepage = "https://github.com/openjdk/jextract";
-    platforms = jdk23.meta.platforms;
+    platforms = jdk25.meta.platforms;
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
       jlesquembre
diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 3cde789aeab0..3572acb97885 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk23_headless,
+  jdk25_headless,
   libwebp, # Fixes https://github.com/gotson/komga/issues/1294
   nixosTests,
 }:
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   buildCommand = ''
-    makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
+    makeWrapper ${jdk25_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libwebp ]}
   '';
 
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Free and open source comics/mangas server";
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
-    platforms = jdk23_headless.meta.platforms;
+    platforms = jdk25_headless.meta.platforms;
     maintainers = with lib.maintainers; [
       tebriel
       govanify
diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix
index b020ace87177..396dc7d007a4 100644
--- a/pkgs/by-name/mo/moneydance/package.nix
+++ b/pkgs/by-name/mo/moneydance/package.nix
@@ -4,12 +4,12 @@
   buildPackages,
   fetchzip,
   makeWrapper,
-  openjdk23,
+  openjdk25,
   wrapGAppsHook3,
   jvmFlags ? [ ],
 }:
 let
-  jdk = openjdk23.override {
+  jdk = openjdk25.override {
     enableJavaFX = true;
   };
 in
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 0b15ba7706c6..02c313c74425 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -35,13 +35,11 @@
 
   jdk17_headless,
   jdk21_headless,
-  jdk23_headless,
   jdk25_headless,
   jdk-bootstrap ?
     {
       "17" = jdk17_headless;
       "21" = jdk21_headless;
-      "23" = jdk23_headless;
       "25" = jdk25_headless;
     }
     .${featureVersion},
diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix
index 1c869bf20cba..c828c98e2dd2 100644
--- a/pkgs/by-name/re/recaf-launcher/package.nix
+++ b/pkgs/by-name/re/recaf-launcher/package.nix
@@ -19,7 +19,7 @@ buildFHSEnv {
     p: with p; [
       jar
 
-      openjdk23
+      openjdk25
       xorg.libX11
       at-spi2-atk
       cairo