Commit Graph

317 Commits

Author SHA1 Message Date
Pascal Wittmann
62d62b6588 Fixed some licenses 2015-06-10 13:00:42 +02:00
Pascal Wittmann
023be72082 tomcat8: update from 8.0.9 to 8.0.23, fixes CVE-2014-7810 2015-06-09 14:28:39 +02:00
Pascal Wittmann
9b417df916 tomcat7: update from 7.0.55 to 7.0.62, fixes CVE-2014-7810 2015-06-09 14:27:13 +02:00
Pascal Wittmann
bd62b7cd00 tomcat: update from 6.0.39 to 6.0.44
potentially fixes CVE-2014-0227, CVE-2014-0119, CVE-2014-0099, CVE-2014-0096, CVE-2014-0075
2015-05-31 16:55:26 +02:00
Dan Peebles
4d12ea8311 Add micro-httpd package 2015-05-28 03:16:46 +00:00
Rickard Nilsson
a92271f195 lua-nginx-module: Update from 0.9.15 to 0.9.16rc1
This fixes the build that has been broken since nginx was bumped to 1.8.0
2015-05-26 08:05:26 +02:00
Arseniy Seroka
54be459b7f Merge pull request #7988 from johbo/fix-mod-python
mod_python: Avoid that git is called to generate a version
2015-05-25 21:23:35 +03:00
Johannes Bornhold
2ed4587b61 mod_python: Avoid that git is called to generate a version
This failed when building mod_python and resulted in a broken
value being included in the file "version.py".
2015-05-25 18:24:22 +02:00
John Wiegley
5ac9e87b1b nginx: Fix build for Darwin (no AIO there) 2015-05-21 12:42:06 -05:00
Michael Raskin
f6e852554c Update Nginx 2015-05-10 13:36:43 +03:00
William A. Kennington III
6e2dde7b78 nginx: 1.6.3 -> 1.8.0 2015-04-22 15:28:10 -07:00
Rickard Nilsson
c61dff28ae nginx: Add fluentd module 2015-04-15 13:12:32 +02:00
Austin Seipp
2c4a005549 nixpkgs: openresty 1.7.7.1 -> 1.7.10.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-12 11:35:37 -05:00
William A. Kennington III
9ca0d6ecf8 nginx: 1.6.2 -> 1.6.3 2015-04-08 13:17:42 -07:00
Austin Seipp
6a41d14686 nixpkgs: nginxUnstable 1.7.10 -> 1.7.11
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-04-02 16:27:51 -05:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Michael Raskin
09e74005b0 update nginx unstable 2015-03-09 01:03:01 +03:00
Eelco Dolstra
b1ec8e6c64 apache-httpd: Update to 2.4.12
CVE-2014-3583, CVE-2014-3581, CVE-2014-8109, CVE-2013-5704.
2015-02-24 16:10:55 +01:00
Rickard Nilsson
c7c917dfff nginx: Add set-misc-nginx-module 2015-01-21 12:38:34 +01:00
Domen Kožar
48bae0e685 Merge pull request #5821 from eduarrrd/pshs
pshs: 0.2.5 -> 0.2.6
2015-01-18 10:32:50 +01:00
Eduard Bachmakov
2a338357f3 pshs: 0.2.5 -> 0.2.6 2015-01-17 21:00:41 -05:00
Vincent Laporte
4361a7a597 couchdb: fix build 2015-01-16 08:51:22 +01:00
Eduard Bachmakov
f9a5ad039b Add package pshs-0.2.5
Announcement blog post:
http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/licenses/
2015-01-14 22:56:54 -05:00
aszlig
c5354fafce
lighttpd: Fix building with magnet support.
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-01-13 08:37:56 +01:00
Jaka Hudoklin
a6fd4673b0 Merge pull request #5555 from offlinehacker/pkgs/nginx/syslog_fix_rev
nginx: syslog extension, fix git revision
2015-01-05 13:25:00 +01:00
Jaka Hudoklin
9e766dcc6b nginx: syslog extension, fix git revision 2015-01-03 20:08:33 +01:00
Michael Raskin
187646f071 Return proper 404 when path is missing 2015-01-03 16:56:05 +03:00
Michael Raskin
d64160ec99 Add optional IPv6 support for nix-binary-cache 2015-01-03 03:05:26 +03:00
Cillian de Róiste
e75f0a7f86 yaws: update from 1.98 to 1.99 2015-01-02 23:49:15 +01:00
Michael Raskin
b51dec7b77 Nginx unstable: 1.7.8 -> 1.7.9 2014-12-31 20:53:58 +03:00
Austin Seipp
5eba046b5d nixpkgs: openresty 1.7.4.1rc2 -> 1.7.7.1
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-12-27 12:43:52 -06:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Michael Raskin
90b05b8d0e Nginx-unstable: 1.7.7 → 1.7.8 2014-12-21 11:14:25 +03:00
Pascal Wittmann
f94580da69 Fix license attribute of many bsd-like licensed packages 2014-12-21 00:00:35 +01:00
Michael Raskin
eff240d9d9 Fix missing paths 2014-12-20 21:49:02 +03:00
Michael Raskin
6c91f23ca5 Try to defend against chroot paths in store matching derivation paths 2014-12-17 21:49:18 +03:00
Shea Levy
2db4171978 Add jetty 9.2.5 2014-11-23 19:27:11 -05:00
Eelco Dolstra
f33fa1b66b Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/development/libraries/boost/generic.nix
2014-11-11 23:48:08 +01:00
Pascal Wittmann
8df0e0b151 Fixed many descriptions 2014-11-11 14:36:34 +01:00
Eelco Dolstra
db4053fb59 httpd-2.2: Enable building of mod_cache and friends 2014-11-11 10:39:24 +01:00
Luca Bruno
6af0d6974f Merge branch 'master' into staging 2014-11-10 10:03:52 +01:00
Domen Kožar
824879cfd4 tomcat-connectors: 1.2.32 -> 1.2.40 2014-11-08 19:48:54 +01:00
Luca Bruno
83221f3886 Merge branch 'master' into staging
Makes the build more useful:
- Disabled hybrid iso, makes installer tests pass again
- Imagemagick fixes to the "Illegal instruction" thing
2014-11-08 15:56:40 +01:00
Eelco Dolstra
2819063c37 mod_evasive: Add Apache version check 2014-11-07 11:42:43 +01:00
Eelco Dolstra
690154993d mod_fastcgi: Fix building against Apache 2.4 2014-11-07 11:38:50 +01:00
Eelco Dolstra
bad2955079 mod_python: Update to 3.5.0
This fixes building against Apache 2.4.
2014-11-07 11:31:04 +01:00
Eelco Dolstra
0518ccf5af Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/stdenv/generic/default.nix
2014-11-06 10:16:39 +01:00
Mateusz Kowalczyk
007f80c1d0 Turn more licenses into lib.licenses style
Should eval cleanly, as far as -A tarball tells me.

Relevant: issue #2999, issue #739
2014-11-06 00:48:16 +00:00
Vladimír Čunát
52404a868d Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272

TODO: port e22889064f

Conflicts:
	nixos/tests/gnome3_10.nix (auto-solved)
	pkgs/applications/video/aegisub/default.nix
	pkgs/development/libraries/boost/1.55.nix
2014-11-05 15:00:44 +01:00
Eelco Dolstra
7495c61d49 Merge remote-tracking branch 'origin/darwin-clang-stdenv' into staging
Conflicts:
	pkgs/applications/editors/vim/macvim.nix
2014-11-04 14:30:43 +01:00