treewide: migrate openjdk-23 -> openjdk-25
Co-Authored-By: Leona Maroni <dev@leona.is>
This commit is contained in:
committed by
Leona Maroni
parent
1c68856fbc
commit
aa31910413
@@ -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 {
|
||||
|
||||
@@ -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";
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -4,12 +4,12 @@
|
||||
buildPackages,
|
||||
fetchzip,
|
||||
makeWrapper,
|
||||
openjdk23,
|
||||
openjdk25,
|
||||
wrapGAppsHook3,
|
||||
jvmFlags ? [ ],
|
||||
}:
|
||||
let
|
||||
jdk = openjdk23.override {
|
||||
jdk = openjdk25.override {
|
||||
enableJavaFX = true;
|
||||
};
|
||||
in
|
||||
|
||||
@@ -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},
|
||||
|
||||
@@ -19,7 +19,7 @@ buildFHSEnv {
|
||||
p: with p; [
|
||||
jar
|
||||
|
||||
openjdk23
|
||||
openjdk25
|
||||
xorg.libX11
|
||||
at-spi2-atk
|
||||
cairo
|
||||
|
||||
Reference in New Issue
Block a user