diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 12ba4e342985..66633efef193 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -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 ]; diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index f8aa92275e96..cc23ed10c282 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -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" '';