jenkins: Switch from JDK21 to JDK25 (#491796)

This commit is contained in:
Felix Bühler
2026-02-25 20:39:00 +00:00
committed by GitHub
2 changed files with 5 additions and 5 deletions
@@ -83,13 +83,13 @@ in
package = lib.mkPackageOption pkgs "jenkins" { };
javaPackage = lib.mkPackageOption pkgs "jdk21" { };
javaPackage = lib.mkPackageOption pkgs "jdk25" { };
packages = lib.mkOption {
default = [
pkgs.stdenv
pkgs.git
pkgs.jdk21
pkgs.jdk25
config.programs.ssh.package
pkgs.nix
];
+3 -3
View File
@@ -8,7 +8,7 @@
gnused,
makeWrapper,
nix,
jdk21,
jdk25,
writeScript,
nixosTests,
jq,
@@ -33,10 +33,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
cp "$src" "$out/webapps/jenkins.war"
# Create the `jenkins-cli` command.
${jdk21}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
${jdk25}/bin/jar -xf "$src" WEB-INF/lib/cli-${finalAttrs.version}.jar \
&& mv WEB-INF/lib/cli-${finalAttrs.version}.jar "$out/share/jenkins-cli.jar"
makeWrapper "${jdk21}/bin/java" "$out/bin/jenkins-cli" \
makeWrapper "${jdk25}/bin/java" "$out/bin/jenkins-cli" \
--add-flags "-jar $out/share/jenkins-cli.jar"
'';