3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

21 commits

Author SHA1 Message Date
Franz Pletz 727eb19a81 jenkins: 2.3 -> 2.13 2016-07-17 17:15:24 +02:00
Bjørn Forsman 8c2d888401 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 4075c10a59
("jenkins: move .war file from $out to $out/lib/jenkins.war") broke
jenkins + tomcat. Fix it by moving jenkins.war to $out/webapps/.
2016-07-15 17:18:44 +02:00
Bjørn Forsman 4075c10a59 jenkins: move .war file from $out to $out/lib/jenkins.war
Fixes #14137, also known as:

  $ nix-shell -p jenkins
  bash: source: /nix/store/ln1yw6c2v8bb2cjqfr1z5aqcssw054wa-jenkins-2.3:
  cannot execute binary file
  [nix-shell exited with error]

The problem is that jenkins.war is not installed inside the directory
$out, but rather _as the file_ $out. Fix it by moving the file to
$out/lib/jenkins.war.

While at it, move buildCommand so that the "meta" section is at the end
of the expression (standard style), and quote shell variables.
2016-07-15 15:12:52 +02:00
Franz Pletz 4a3a92d5c8 jenkins: 1.653 -> 2.3 2016-05-13 17:45:39 +02:00
Graham Christensen 0b8dd57694 jenkins: copy .war to $out, fixes #14137 2016-03-30 11:47:05 -05:00
Allan Espinosa d53c4be32e jenkins: 1.652 -> 1.653 2016-03-15 15:19:48 -05:00
Allan Espinosa 6cab1cd62b jenkins: 1.650 -> 1.652 2016-03-09 01:34:40 -06:00
Allan Espinosa 21917bc8e2 jenkins: 1.649 -> 1.650 2016-02-25 02:16:35 -06:00
Allan Espinosa 491007d0a1 jenkins: 1.647 -> 1.649 2016-02-22 00:37:07 -06:00
Allan Espinosa 60c7bd1237 jenkins: 1.643 -> 1.647 2016-02-17 20:45:01 +01:00
Augustin Borsu 170f91a249 jenkins ci: 1.638 -> 1.643 2015-12-23 15:47:11 +01:00
Bjørn Forsman 30313d5c6e jenkins: 1.637 -> 1.638 (important security fixes)
I fat fingered the previous update, *this* is the real important
security updates:

https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:40:09 +01:00
Bjørn Forsman 7a1c4ab324 jenkins: 1.636 -> 1.637 (security fixes)
https://wiki.jenkins-ci.org/display/SECURITY/Jenkins+Security+Advisory+2015-11-11
2015-11-12 13:34:44 +01:00
Bjørn Forsman eeced1bc51 jenkins: 1.633 -> 1.636 2015-11-02 10:39:16 +01:00
Utku Demir 57ad847982 jenkins: 1.631 -> 1.633 2015-10-14 21:21:12 +03:00
Bjørn Forsman f35de8ea64 jenkins: 1.594 -> 1.631 2015-09-30 17:25:39 +02:00
宋文武 f40a613577 jenkins: update to 1.594 2014-12-18 14:30:14 +08:00
Bjørn Forsman 1a5501889c jenkins: update to latest (v1.579) 2014-09-08 17:08:05 +02:00
Bjørn Forsman af2334912a jenkins: expression cleanup
* Include version number in package name
* Remove trailing dot in meta.description
* Simplify meta by using "with stdenv.lib;"
2014-09-08 17:05:15 +02:00
Corey O'Connor 4b6e67f6c4 add platform and license to package metadata. 2014-03-13 13:01:49 -07:00
Corey O'Connor 9b79d5b298 Add jenkins continuous integration server and user.
By default the jenkins server is executed under the user "jenkins". Which can be configured using
users.jenkins.* options. If a different user is requested by changing services.jenkins.user then
none of the users.jenkins options apply.

This patch does not include jenkins slave configuration. Some config options will probably change
when this is implemented.

Aspects like the user and environment are typically identical between slave and master. The service
configs are different. The design is for users.jenkins to cover the shared aspects while
services.jenkins and services.jenkins-slave cover the master and slave specific aspects,
respectively.

Another option would be to place everything under services.jenkins and have a config that selects
master vs slave.
2014-03-13 13:01:49 -07:00