Commit Graph

291 Commits

Author SHA1 Message Date
Mateusz Kowalczyk
7a45996233 Turn some license strings into lib.licenses values 2014-07-28 11:31:14 +02:00
Eelco Dolstra
f64d84698e Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/applications/audio/espeak/edit.nix
	pkgs/applications/audio/lmms/default.nix
	pkgs/desktops/e18/enlightenment.nix
	pkgs/games/exult/default.nix
	pkgs/os-specific/linux/alsa-plugins/default.nix
2014-07-28 11:30:49 +02:00
Marc Weber
ba154ec9d4 apache 2_4 update, fixes some CVE's
See http://www.apache.org/dist/httpd/Announcement2.4.html It compiles,
didn't run it. I guess minor update doesn't cause much trouble even
though there are some new features
2014-07-24 18:10:10 +02:00
Eelco Dolstra
95b828de42 Merge remote-tracking branch 'origin/master' into staging 2014-07-07 13:16:26 +02:00
Rok Garbas
fac41b58ca couchdb: update to 1.6.0 2014-07-05 09:18:42 +01:00
Eelco Dolstra
06fc1ec34d Merge remote-tracking branch 'origin/master' into staging
Conflicts:
	pkgs/servers/serfdom/default.nix
2014-07-01 11:25:41 +02:00
Eelco Dolstra
40f7b0f9df Another attempt to eradicate ensureDir
See c556a6ea46.
2014-06-30 14:56:10 +02:00
Michael Raskin
54586a77e7 Adding a minimal script set to serve store as a dynamical binary cache 2014-06-30 00:39:54 +04:00
Bjørn Forsman
5082caa72d axis2: add meta.description 2014-06-22 22:38:27 +02:00
Mathijs Kwik
76c2c0c499 nginx: add echo module, fix aio on linux&freebsd 2014-06-16 22:43:58 +02:00
Ricky Elrod
379c2731b2 update spawn-fcgi to 1.6.4
Signed-off-by: Ricky Elrod <ricky@elrod.me>
2014-06-13 23:01:47 -04:00
Rok Garbas
eb8a331510 couchdb: update to 1.5.1 2014-06-01 15:01:22 +01:00
Charles Strahan
6d173e2a81 spawn-fcgi: Add package 2014-05-25 15:27:58 +02:00
Austin Seipp
008dc39ca3 Merge pull request #2518 from jwiegley/nginx
Add -Wno-error=deprecated-declarations for nginx, required to build on Darwin
2014-05-17 14:48:27 -05:00
Jaka Hudoklin
eabfc509ef nginx: fix syslog module 2014-05-07 23:54:57 +02:00
John Wiegley
622aa834b7 Add -Wno-error=deprecated-declarations for nginx, required to build on Darwin 2014-05-05 02:18:47 -05:00
Austin Seipp
b10f4af8f9 nginx: upgrade to 1.6.0, expose many more modules
By default, we now build all the optional nginx modules, including the
out-of-band ones like moreheaders and rtmp support.

Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 01:24:38 -05:00
Austin Seipp
e67cc9ba07 nginx: build http_stub_status module
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-05-02 00:42:40 -05:00
Eelco Dolstra
65a78e16f1 httpd: Update to 2.2.27
CVE-2013-6438, CVE-2014-0098
2014-05-01 11:48:56 +02:00
Linquize
7d5a5354d8 axis2: Remove the extra slash in URL 2014-04-25 07:32:23 +08:00
Luca Bruno
e08861a4cd mod_dnssd: new apache httpd 2.2 module
Provide Zeroconf support via DNS-SD using Avahi

http://0pointer.de/lennart/projects/mod_dnssd
2014-04-14 09:58:03 +02:00
Peter Simons
2d4919dbb4 apacheHttpd_2_4: update from 2.4.7 to 2.4.9 2014-04-09 12:41:11 +02:00
Evgeny Egorochkin
431ff0f769 nginx: update from 1.4.6 to 1.4.7 2014-03-26 19:15:04 +02:00
Rob Vermaas
94990a5935 tomcat6: update from 6.0.37 to 6.0.39, potentially fixes CVE-2013-4286, CVE-2013-4322, CVE-2013-4590, CVE-2014-0033 2014-03-21 13:12:52 +01:00
Rickard Nilsson
ec3dbdf93d New package: winstone 0.9.10, a Java Servlet container 2014-03-12 23:14:09 +01:00
Bjørn Forsman
f191aa32ba lighttpd: add enableMysql option, to build 'mod_mysql_vhost'
Now we have options to build all available modules/plugins.
2014-03-12 23:04:03 +01:00
Bjørn Forsman
37ad2a7d28 lighttpd: bump 1.4.34 -> 1.4.35 (security fixes)
From http://www.lighttpd.net/:

  Important changes
  -----------------
  This release contains a lot of bug fixes, many detected by scan.coverity.com
  (and more to come). The main reason for the release is a fix for an SQL
  injection (and path traversal) bug triggered by specially crafted (and
  invalid) Host: headers.

  Security fixes
  --------------
  http://download.lighttpd.net/lighttpd/security/lighttpd_sa_2014_01.txt (no CVE yet)

NOTE: We (nixpkgs) currently don't build the mod_mysql_vhost module mentioned
above.
2014-03-12 22:49:47 +01:00
Evgeny Egorochkin
20a2b1af93 nginx: update from 1.4.5 to 1.4.6 2014-03-05 05:10:32 +02:00
Rok Garbas
a6a3b22bc0 removing unused couchdb files 2014-02-27 13:34:11 +01:00
Rok Garbas
62438c09f7 update couchdb to 1.5.0(current latest) and add service for it 2014-02-27 13:34:11 +01:00
Sander van der Burg
44a9ebac47 axis2: bump to version 1.6.2 2014-02-18 18:07:24 +01:00
Evgeny Egorochkin
c67f562d5e add branch info 2014-02-18 04:13:45 +02:00
Domen Kožar
aa6ddfb119 nginx: 1.4.4 -> 1.4.5 2014-02-12 19:13:36 +01:00
Peter Simons
1671054702 mod_wsgi: update from 3.3 to 3.4 2014-01-15 17:29:14 +01:00
Nixpkgs Monitor
0c6ebeb734 lighttpd: update from 1.4.33 to 1.4.34, potentially fixes CVE-2013-4508 2014-01-14 11:55:48 +01:00
Peter Simons
0266ac9c30 apache-httpd-2.4: revert "enable building the 'event'-based mpm worker"
Commit 0c3d910cd027a926ffc8538ea60cf2da099d7808 didn't have any effect.
The 'event' MPM module isn't built because our version of APR is too old.
2014-01-08 13:17:40 +01:00
Peter Simons
cdfd953ffa apache-httpd-2.4: enable building the 'event'-based mpm worker
Adding "LoadModule mpm_event_module modules/mod_mpm_event.so" to httpd.conf
enables that worker instead of the default choice.
2013-12-29 12:52:54 +01:00
Nixpkgs Monitor
3f39947054 jetty61: update from 6.1.21 to 6.1.26 2013-12-18 18:18:33 +02:00
Domen Kožar
b239c3f3ee Merge pull request #1370 from offlinehacker/pkgs/nginx/module_moreheaders
nginx: add headers more nginx module
2013-12-13 02:45:45 -08:00
Jaka Hudoklin
1b019fe39f nginx: enable ipv6 and spdy 2013-12-13 09:42:06 +01:00
Jaka Hudoklin
698860bf7c nginx: add headers more nginx module 2013-12-13 09:38:34 +01:00
Nixpkgs Monitor
6996067dcf apacheHttpd_2_4: update from 2.4.6 to 2.4.7 2013-12-09 10:49:00 +02:00
Nixpkgs Monitor
e523fdfc47 apacheHttpd: update from 2.2.25 to 2.2.26 2013-12-09 10:47:10 +02:00
Nixpkgs Monitor
e72352761c tomcat6: update from 6.0.32 to 6.0.37, potentially fixes CVE-2012-0022, CVE-2012-2733, CVE-2012-3544, CVE-2012-3546, CVE-2012-4431, CVE-2012-4534, CVE-2012-5568, CVE-2012-5885, CVE-2012-5886, CVE-2012-5887, CVE-2013-2067 2013-12-04 05:07:47 +02:00
Michael Raskin
2f53f6c82d Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00
Michael Raskin
980c7929ab Updating Nginx to 1.4.4 2013-11-25 10:59:39 +04:00
Rok Garbas
174f5813ef nginx: rtmp module - commited to fast. now it works. 2013-11-18 17:04:30 +01:00
Rok Garbas
f73185d596 nginx: adding rtmp module 2013-11-18 16:02:33 +01:00
Bjørn Forsman
9c0e95663a lighttpd: update 1.4.32 -> 1.4.33
Changes in this version: http://www.lighttpd.net/2013/9/27/1-4-33/
2013-11-17 23:06:25 +01:00
Moritz Ulrich
6937e0a99b yaws: Update to 1.98.
This fixes the build when compiled with Erlang 16B01 (default).

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 20:04:26 +01:00
Eelco Dolstra
c88055e1a2 Set meta.hydraPlatforms instead of meta.platforms for some packages 2013-11-05 00:06:10 +01:00
Eelco Dolstra
01087750ba Don't build some packages on some platforms 2013-11-04 21:11:00 +01:00
Eelco Dolstra
798ce14839 apache-httpd: Update to 2.4.6 2013-11-04 21:10:59 +01:00
Jaka Hudoklin
5de7170aa5 nginx: Add optional patch for syslog support.
close #1055.
2013-10-20 22:51:27 +03:00
Domen Kožar
9e33bcc54d nginx: 1.4.1 -> 1.4.3 2013-10-17 23:36:21 +02:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
aszlig
c9614d2d05
lighttpd: Allow to compile with magnet support.
This also adds pkgconfig to the dependency list so we don't need to
specify the path to OpenSSL anymore, because we need pkgconfig in order
to correctly find Lua anyway.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-09-27 15:23:29 +02:00
Ludovic Courtès
2e937c437a unmaintain several packages 2013-08-16 23:45:01 +02:00
aszlig
b42eb45429
thttpd: New package, version 2.25b.
We already have mini_httpd, but IMHO it is *too* minimal as in not very
flexible in configuration (for example, I haven't found any runtime
configuration for disabling logging), so that's why I decided to add
thttpd, which serves quite well as an ad-hoc HTTPd.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2013-07-30 05:59:59 +02:00
Eelco Dolstra
ca0936f17f apache-httpd: Update to 2.2.25
CVE-2013-1896, CVE-2013-1862.
2013-07-17 12:59:29 +02:00
Michael Raskin
1800db96d7 Update nginx 2013-07-11 10:28:52 +04:00
Domen Kozar
f2ee089784 nginx: 1.2.8 -> 1.2.9 (CVE-2013-2070) 2013-07-09 15:42:14 +02:00
Jason \"Don\" O'Conal
ccb7715de8 apacheHttpd_2_4: fix build on darwin 2013-07-07 13:46:43 +02:00
Jason "Don" O'Conal
85f2674e22 apacheHttpd: minor modifications to meta attrs
* add myself as a maintainer
* use reference to `stdenv.lib.licenses.asl20` rather than literal
  string
2013-06-16 12:10:19 +10:00
Jason "Don" O'Conal
2735e9c8d6 apacheHttpd: fix build on darwin
* remove the gcc_s library from NIX_LDFLAGS (not available on darwin)
2013-06-14 18:16:37 +10:00
Evgeny Egorochkin
9c6f7cc9c1 Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions. 2013-06-07 03:15:45 +03:00
Rob Vermaas
d5f7976aef Fix maintainers attribute 2013-05-21 09:20:00 +02:00
Bjørn Forsman
05bb66ce20 Add myself as maintainer for several packages
And set missing meta.platforms for the packages I've added earlier.
2013-05-20 20:28:15 +02:00
Eelco Dolstra
cd6da089a6 nginx: Update to 1.2.8 2013-05-07 17:33:51 +02:00
Shea Levy
e39ddf321c nginx: Don't fetch the full WebDAV extension unless needed
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-05 15:48:07 -04:00
Russell O'Connor
9808445598 Add optional third party support for fullWebDAV.
This follows the directions fom http://wiki.nginx.org/HttpDavModule.
2013-05-05 15:19:03 -04:00
Shea Levy
b8c2fc71b3 jboss: Update to 7.1.1.Final
Signed-off-by: Shea Levy <shea@shealevy.com>
2013-05-01 11:22:37 -04:00
Pascal Wittmann
b6e7d86525 Lighttpd: Enable SSL
With this patch support for SSL is compiled into lighttpd.

IMO encryption is in most use cases important, therefore SSL support should be build in. This would simplify the setup of a standard web application a lot.
 
SSL support of lighttpd is documented at  
  http://redmine.lighttpd.net/projects/1/wiki/Docs_SSL
2013-04-23 14:30:57 +03:00
Bjørn Forsman
238c26cea9 lighttpd: fix build warnings
The build complains about missing "file" and "which" commands, so add them as
build inputs.

"file" is used by the autotools configure script to tweak what -m flag
(if any) to pass to the linker when it asks it for shared library
support.

Here is an example of -m values for GNU ld:
  Supported emulations:
   elf_x86_64
   elf32_x86_64
   elf_i386
   i386linux
   elf_l1om
   elf_k1om

"which" is used in the build phase to look for svnversion and git, to build a
version stamp. Since we build from a release tarball (and don't pass svn or git
as inputs either), this check fails and falls back to the version number in the
tarball.

There is one build warning left, but I think this is normal on NixOS:

  /tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found
2013-04-01 15:28:35 +02:00
Bjørn Forsman
c3190ef1d8 lighttpd: bump to version 1.4.32
One important denial of service (in 1.4.31) fix: CVE-2012-5533[1].

NOTE: There are some errors about missing commands during the build, but
I'm pretty sure they were there before. And the result seems to be
working anyway...

 * /usr/bin/file: No such file or directory
 * /bin/sh: line 2: which: command not found
 * /tmp/nix-build-lighttpd-1.4.32.drv-0/lighttpd-1.4.32/libtool: line 1085: ldconfig: command not found

[1] http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-5533
2013-04-01 14:12:03 +02:00
Peter Simons
171425c8a0 mini-httpd: update to version 1.4 2013-03-28 13:56:22 +01:00
Eelco Dolstra
8a42c8b94e httpd: Update to 2.2.24 2013-03-28 13:13:36 +01:00
Peter Simons
72e4be65cc mini-httpd: update to version 1.3 2013-03-21 11:01:16 +01:00
Eelco Dolstra
f2f860bd29 httpd: Update to 2.4.4
CVE-2012-3499, CVE-2012-4558
2013-02-27 14:43:00 +01:00
Cillian de Róiste
23bff22fc1 Add yaws, an Erlang HTTP server 2013-02-20 22:34:55 +01:00
Peter Simons
f1b54f8ee2 mini-httpd: update to version 1.2 2013-02-09 22:50:50 +01:00
Michael Raskin
f54b40f80e 4store: fix build 2012-12-04 17:09:31 +04:00
Michael Raskin
d7bbb34d64 Update CouchDB 2012-12-04 10:17:06 +04:00
Michael Raskin
46c57d105c Update 4store 2012-12-04 10:16:41 +04:00
Eelco Dolstra
5553546c21 Remove a bunch of unreferenced files
Plus a small number of obsolete packages (like old versions of qemu).
2012-11-29 13:43:37 +01:00
Michael Raskin
426b75c0a4 Fix unneeded /bin/sh reference 2012-11-10 15:03:40 +04:00
aszlig
0b592ce677
apache-httpd/2.4: Add modules for NixOS service.
The NixOS service module loads those modules by default. So we need to build
them here as well.

I'm not really sure why these modules are included by default, because (except
from maybe CGI) they obviously are only usable in very rare cases. Am I wrong?

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:08 +02:00
aszlig
2f3dcb9dd2
apache-httpd/2.4: Fix libxml2 support.
The reason because the configure script is unnable to find libxml2 is because it
is searching for a header file in `libxml/*.h`. Obviously this cases an error,
because it's actually in `${libxml2}/include/libxml2/libxml/*.h`, so let's add
the parent directory to --with-libxml2 and remove the comment from buildInputs.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2012-10-17 15:56:07 +02:00
Eelco Dolstra
34ff91d602 nginx: Update to 1.2.4 2012-10-09 14:20:44 -04:00
Eelco Dolstra
f75dddde80 apache-httpd: Update to 2.2.23
Fixes CVE-2012-0883, CVE-2012-2687.
2012-10-02 11:45:54 -04:00
Peter Simons
a596022d80 apache-httpd: update to version 2.4.3 2012-09-27 13:46:50 +02:00
Rob Vermaas
eb29e0449b Add mod_evasive 2012-07-31 15:51:31 +02:00
Peter Simons
b98782f339 apache-httpd-2.4: build MPMs as DSOs so that the desired one can be selected at run-time 2012-07-07 09:09:05 +02:00
Peter Simons
32449b5ae6 apache-httpd-2.4: replace use of tabs with blanks 2012-07-07 08:57:53 +02:00
Peter Simons
ea1d479afb apache-httpd-2.4: ensure that libgcc_s can be found at run-time 2012-07-07 08:57:28 +02:00
Peter Simons
c870b80512 apache: add version 2.4 2012-07-07 08:47:19 +02:00
Eelco Dolstra
714f100970 httpd: Support building with another multi-processing module 2012-07-06 14:25:40 -04:00
Rickard Nilsson
ea74e1ea6d lighttpd 1.4.30.
svn path=/nixpkgs/trunk/; revision=34107
2012-05-15 14:14:33 +00:00
Rob Vermaas
49d0db04a3 update tomcat-connectors url
svn path=/nixpkgs/trunk/; revision=33982
2012-05-03 13:50:11 +00:00
Michael Raskin
de5fdd541a Fix line endings
svn path=/nixpkgs/trunk/; revision=33809
2012-04-17 13:05:57 +00:00