diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2020-10-19 19:50:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-19 19:50:20 +0200 |
| commit | 46bd18fff6d4693c901f3e18447abf211ed6a5d0 (patch) | |
| tree | 5ce6c1ac4022484c08e741614b8f5edbbad987f4 /nixos | |
| parent | 506e73b1b6de47d522a72be78c10424f85c7cd19 (diff) | |
| parent | 685ae84cb0d8abc7500e283770074cd65b731e86 (diff) | |
Merge pull request #99541 from acelpb/jenkins
nixos/jenkins: switch to openjdk11 as openjdk14 is not supported
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/continuous-integration/jenkins/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 1477c471f8ab..cdc3b4b5c58f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -86,8 +86,8 @@ in { }; packages = mkOption { - default = [ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]; - defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk config.programs.ssh.package pkgs.nix ]"; + default = [ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]; + defaultText = "[ pkgs.stdenv pkgs.git pkgs.jdk11 config.programs.ssh.package pkgs.nix ]"; type = types.listOf types.package; description = '' Packages to add to PATH for the jenkins process. @@ -207,7 +207,7 @@ in { # For reference: https://wiki.jenkins.io/display/JENKINS/JenkinsLinuxStartupScript script = '' - ${pkgs.jdk}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ + ${pkgs.jdk11}/bin/java ${concatStringsSep " " cfg.extraJavaOptions} -jar ${cfg.package}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ --httpPort=${toString cfg.port} \ --prefix=${cfg.prefix} \ -Djava.awt.headless=true \ |