jenkins: move $out/{lib => webapps}/jenkins.war

As pointed out by @danbst, the tomcat NixOS module expects packages
listed in services.tomcat.webapps to either be direct .war file paths or
have .war files inside a "webapps" directory.

Commit 4075c10a59af455db2012beb313453662f09dad0
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.

+3 -3
+1 -1
nixos/modules/services/continuous-integration/jenkins/default.nix
··· 154 154 ''; 155 155 156 156 script = '' 157 - ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/lib/jenkins.war --httpListenAddress=${cfg.listenAddress} \ 157 + ${pkgs.jdk}/bin/java -jar ${pkgs.jenkins}/webapps/jenkins.war --httpListenAddress=${cfg.listenAddress} \ 158 158 --httpPort=${toString cfg.port} \ 159 159 --prefix=${cfg.prefix} \ 160 160 ${concatStringsSep " " cfg.extraOptions}
+2 -2
pkgs/development/tools/continuous-integration/jenkins/default.nix
··· 10 10 }; 11 11 12 12 buildCommand = '' 13 - mkdir -p "$out/lib" 14 - cp "$src" "$out/lib/jenkins.war" 13 + mkdir -p "$out/webapps" 14 + cp "$src" "$out/webapps/jenkins.war" 15 15 ''; 16 16 17 17 meta = with stdenv.lib; {