treewide: migrate openjdk-23 -> openjdk-25

Co-Authored-By: Leona Maroni <dev@leona.is>
This commit is contained in:
Galder Zamarreño
2025-05-14 09:37:12 +02:00
committed by Leona Maroni
parent 1c68856fbc
commit aa31910413
7 changed files with 13 additions and 15 deletions

View File

@@ -4,13 +4,13 @@
maven, maven,
fetchFromGitHub, fetchFromGitHub,
replaceVars, replaceVars,
openjdk23, openjdk25,
libarchive, libarchive,
makeWrapper, makeWrapper,
}: }:
let let
# Wants at least Java 22 # Wants at least Java 22
jdk = openjdk23; jdk = openjdk25;
version = "5.9.6"; version = "5.9.6";
in in
maven.buildMavenPackage { maven.buildMavenPackage {

View File

@@ -3,7 +3,7 @@
fetchFromGitHub, fetchFromGitHub,
fuse3, fuse3,
glib, glib,
jdk23, jdk25,
lib, lib,
libayatana-appindicator, libayatana-appindicator,
makeShellWrapper, makeShellWrapper,
@@ -13,7 +13,7 @@
}: }:
let let
jdk = jdk23.override { enableJavaFX = true; }; jdk = jdk25.override { enableJavaFX = true; };
in in
maven.buildMavenPackage rec { maven.buildMavenPackage rec {
pname = "cryptomator"; pname = "cryptomator";

View File

@@ -4,7 +4,7 @@
fetchFromGitHub, fetchFromGitHub,
makeBinaryWrapper, makeBinaryWrapper,
gradle, gradle,
jdk23, jdk25,
llvmPackages, llvmPackages,
}: }:
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
gradleFlags = [ gradleFlags = [
"-Pllvm_home=${lib.getLib llvmPackages.libclang}" "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
"-Pjdk_home=${jdk23}" "-Pjdk_home=${jdk25}"
]; ];
patches = [ patches = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
description = "Tool which mechanically generates Java bindings from a native library headers"; description = "Tool which mechanically generates Java bindings from a native library headers";
mainProgram = "jextract"; mainProgram = "jextract";
homepage = "https://github.com/openjdk/jextract"; homepage = "https://github.com/openjdk/jextract";
platforms = jdk23.meta.platforms; platforms = jdk25.meta.platforms;
license = licenses.gpl2Only; license = licenses.gpl2Only;
maintainers = with maintainers; [ maintainers = with maintainers; [
jlesquembre jlesquembre

View File

@@ -3,7 +3,7 @@
stdenvNoCC, stdenvNoCC,
fetchurl, fetchurl,
makeWrapper, makeWrapper,
jdk23_headless, jdk25_headless,
libwebp, # Fixes https://github.com/gotson/komga/issues/1294 libwebp, # Fixes https://github.com/gotson/komga/issues/1294
nixosTests, nixosTests,
}: }:
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
]; ];
buildCommand = '' 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 ]} --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libwebp ]}
''; '';
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
description = "Free and open source comics/mangas server"; description = "Free and open source comics/mangas server";
homepage = "https://komga.org/"; homepage = "https://komga.org/";
license = lib.licenses.mit; license = lib.licenses.mit;
platforms = jdk23_headless.meta.platforms; platforms = jdk25_headless.meta.platforms;
maintainers = with lib.maintainers; [ maintainers = with lib.maintainers; [
tebriel tebriel
govanify govanify

View File

@@ -4,12 +4,12 @@
buildPackages, buildPackages,
fetchzip, fetchzip,
makeWrapper, makeWrapper,
openjdk23, openjdk25,
wrapGAppsHook3, wrapGAppsHook3,
jvmFlags ? [ ], jvmFlags ? [ ],
}: }:
let let
jdk = openjdk23.override { jdk = openjdk25.override {
enableJavaFX = true; enableJavaFX = true;
}; };
in in

View File

@@ -35,13 +35,11 @@
jdk17_headless, jdk17_headless,
jdk21_headless, jdk21_headless,
jdk23_headless,
jdk25_headless, jdk25_headless,
jdk-bootstrap ? jdk-bootstrap ?
{ {
"17" = jdk17_headless; "17" = jdk17_headless;
"21" = jdk21_headless; "21" = jdk21_headless;
"23" = jdk23_headless;
"25" = jdk25_headless; "25" = jdk25_headless;
} }
.${featureVersion}, .${featureVersion},

View File

@@ -19,7 +19,7 @@ buildFHSEnv {
p: with p; [ p: with p; [
jar jar
openjdk23 openjdk25
xorg.libX11 xorg.libX11
at-spi2-atk at-spi2-atk
cairo cairo