Robin Gloster
5185bc1773
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-15 14:41:01 +00:00
Franz Pletz
9eec064355
nginx: 1.10.0 -> 1.10.1 (security)
...
Fixes CVE-2016-4450.
2016-07-10 10:48:11 +02:00
Franz Pletz
916cedb063
gatling: remove unused dependency on polarssl
2016-07-10 10:26:14 +02:00
Rickard Nilsson
5193c3e1b9
jetty: 9.3.9 -> 9.3.10
2016-06-26 05:58:35 +00:00
Eelco Dolstra
c51af01325
apache-httpd: 2.4.18 -> 2.4.20
...
CVE-2016-1546
2016-06-20 15:17:12 +02:00
Bjørn Forsman
bd01fad0ed
Captialize meta.description of all packages
...
In line with the Nixpkgs manual.
A mechanical change, done with this command:
find pkgs -name "*.nix" | \
while read f; do \
sed -e 's/description\s*=\s*"\([a-z]\)/description = "\u\1/' -i "$f"; \
done
I manually skipped some:
* Descriptions starting with an abbreviation, a user name or package name
* Frequently generated expressions (haskell-packages.nix)
2016-06-20 13:55:52 +02:00
zimbatm
a95229a963
Merge pull request #15677 from womfoo/mod_auth_mellon
...
mod_auth_mellon: init at 0.12.0 and dependency lasso: init at 2.5.1
2016-06-12 23:38:57 +01:00
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +00:00
Rickard Nilsson
b9922661b8
jetty: Remove obsolete versions and init new default to 9.3.9.v20160517
2016-06-10 07:59:59 +00:00
Teo Klestrup Röijezon
3f5186fd54
nginxModules.lua: 0.10.0 -> 0.10.5
2016-06-05 12:48:06 +02:00
Robin Gloster
2d382f3d98
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-30 19:39:34 +00:00
Kranium Gikos Mendoza
25fbac5b52
mod_auth_mellon: init at 0.12.0
2016-05-23 02:02:25 +08:00
Tuomas Tynkkynen
7fb29bfa73
treewide: Make explicit that 'dev' output of zlib is used
2016-05-19 10:04:38 +02:00
Tuomas Tynkkynen
d42e94472d
treewide: Make explicit that 'dev' output of pcre is used
2016-05-19 10:02:28 +02:00
Tuomas Tynkkynen
2a73de6e6c
treewide: Make explicit that 'dev' output of openssl is used
2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
d298b52fd3
treewide: Make explicit that 'dev' output of aprutil is used
2016-05-19 10:00:25 +02:00
Tuomas Tynkkynen
29694b43b6
treewide: Make explicit that 'dev' output of apr is used
2016-05-19 10:00:24 +02:00
Tuomas Tynkkynen
16cc4ac83b
treewide: Make explicit that 'dev' output of apacheHttpd is used
2016-05-19 10:00:23 +02:00
Franz Pletz
f8d481754c
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-05-18 17:10:02 +02:00
Peter Simons
8e462995ba
Bring my stdenv.lib.maintainers user name in line with my github nick.
2016-05-16 22:49:55 +02:00
Domen Kožar
0adf2b25a1
4store: 1.1.5 -> 1.1.6 (convert from builderDefsPackage)
2016-05-08 18:29:40 +01:00
Tobias Geerinckx-Rice
ab6e0861d4
nginx: restore .upstream files
...
07d9de713a
2016-05-06 15:37:22 +02:00
Tobias Geerinckx-Rice
b0f8349d95
nginxUnstable: alias to nginx until next unstable release
2016-05-06 13:47:36 +02:00
Tobias Geerinckx-Rice
07d9de713a
nginx: remove .upstream files
2016-05-06 13:47:12 +02:00
Tobias Geerinckx-Rice
959472a824
nginx: 1.8.1 -> 1.10.0
...
Changes: http://nginx.org/en/CHANGES-1.10
2016-05-03 20:05:57 +02:00
Franz Pletz
669cd2adbf
lighttpd: 1.4.37 -> 1.4.39
2016-05-03 16:15:20 +02:00
Robin Gloster
c92bca56f8
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-05-02 22:58:02 +00:00
Michael Raskin
e59151f3ef
nix-binary-cache: take into account Nix split (mulitple-outputs)
2016-04-22 00:57:43 +02:00
Eelco Dolstra
b4bf432709
nghttp2: 1.8.0 -> 1.9.2, unify with libnghttp2, and use multiple outputs
...
Note: I ignored the C++ libraries, but it appears we're not currently
using them. Once we do, we'll probably want to put them in a separate
output as well (to prevent non-C++ users from depending on Boost).
2016-04-18 21:13:18 +02:00
Robin Gloster
d020caa5b2
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-18 13:49:22 +00:00
Michael Raskin
c82272fdc0
nginxUnstable: 1.9.11 -> 1.9.14
2016-04-13 14:47:04 +02:00
Vladimír Čunát
30f14243c3
Merge branch 'master' into closure-size
...
Comparison to master evaluations on Hydra:
- 1255515 for nixos
- 1255502 for nixpkgs
2016-04-10 11:17:52 +02:00
Florian Steinel
2486191f39
thttpd: 2.26 -> 2.27
...
from http://www.acme.com/software/thttpd/#releasenotes
New in version 2.27:
- Stats syslogs changed from LOG_INFO to LOG_NOTICE.
- Use memmove() for self-overlapping string copies instead of strcpy().
- Couple of subroutine name changes for consistency.
2016-04-09 19:28:50 +02:00
Robin Gloster
3e68106afd
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-07 21:52:26 +00:00
Allan Espinosa
16b12fbd87
apt-cacher-ng: disable on OSX
...
fmemopen() doesn't exist on OSX. This causes the builds to fail.
2016-04-07 11:57:12 -05:00
Robin Gloster
bbbaccfa68
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-04-04 15:24:52 +00:00
Peter Simons
8e0f0776aa
mini-httpd: update to version 1.6
2016-04-04 15:06:32 +02:00
Tomasz Kontusz
36135033b6
mini-httpd: add -ansi to CFLAGS
2016-04-03 00:46:23 +02:00
Vladimír Čunát
ab15a62c68
Merge branch 'master' into closure-size
...
Beware that stdenv doesn't build. It seems something more will be needed
than just resolution of merge conflicts.
2016-04-01 10:06:01 +02:00
Robin Gloster
f60c9df0ba
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-28 15:16:29 +00:00
Joachim Fasting
c6d3a23cf6
apt-cacher-ng: 0.8.9 -> 0.9.1
...
Tested by doing sandboxed build & running the resulting
exectuable.
Note that sources for 0.8.9 are no longer available on
the Debian mirrors.
2016-03-17 15:59:39 +01:00
Robin Gloster
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
zimbatm
eac89788da
apacheHttpd: add support for HTTP/2
...
In NixOS you can enable HTTP/2 like this:
services.httpd.extraModules = [ "http2" ];
services.httpd.extraConfig = ''
Protocols h2 http/1.1
'';
2016-03-12 15:31:23 +00:00
Luca Bruno
dcfca100ec
Merge pull request #12525 from knupfer/ngx_brotli
...
add nginxModules.brotli
2016-03-11 11:05:21 +01:00
Allan Espinosa
59e12df957
apt-cacher-ng: 0.8.6 -> 0.8.9
2016-03-11 02:49:38 -06:00
Vladimír Čunát
09af15654f
Merge master into closure-size
...
The kde-5 stuff still didn't merge well.
I hand-fixed what I saw, but there may be more problems.
2016-03-08 09:58:19 +01:00
Franz Pletz
fedf31660d
nginx: Rmove custom hardening, now enabled by default
2016-03-08 00:39:07 +01:00
Franz Pletz
e9fc4e7db6
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-07 22:08:27 +01:00
Franz Pletz
c686f03305
tomcat: 6.0.44 -> 6.0.45, 7.0.62 -> 7.0.68, 8.0.23 -> 8.0.32
...
Fixes at least CVE-2015-5174, CVE-2015-5345, CVE-2015-5351, CVE-2016-0706,
CVE-2016-0714, CVE-2016-0763.
2016-03-07 03:34:44 +01:00
Franz Pletz
cb3d27df93
Merge remote-tracking branch 'origin/master' into hardened-stdenv
2016-03-05 18:55:30 +01:00
Franz Pletz
aff1f4ab94
Use general hardening flag toggle lists
...
The following parameters are now available:
* hardeningDisable
To disable specific hardening flags
* hardeningEnable
To enable specific hardening flags
Only the cc-wrapper supports this right now, but these may be reused by
other wrappers, builders or setup hooks.
cc-wrapper supports the following flags:
* fortify
* stackprotector
* pie (disabled by default)
* pic
* strictoverflow
* format
* relro
* bindnow
2016-03-05 18:55:26 +01:00
Michael Raskin
708c6094c5
nginx, nginxUnstable: hardening: only use when the compiler is gcc
2016-03-04 16:57:47 +01:00
Michael Raskin
7b9684a5b5
nginx, nginxUnstable: enable hardening. Flags as recommended by @arno01 (Andrey Arapov) in #7190
2016-03-04 16:54:37 +01:00
Robin Gloster
3b4765c9e5
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-02-28 16:32:57 +00:00
Michael Raskin
a08c8b12f0
Add Apache Jena Fuseki instead of obsolete and unavailable Jena Joseki
2016-02-28 10:39:33 +01:00
Robin Gloster
310fa56788
nginx: enable pie hardening
2016-02-26 16:38:26 +00:00
Michael Raskin
9e7c28cb56
nginxUnstable: 1.9.10 -> 1.9.11
2016-02-14 21:17:07 +01:00
Vladimír Čunát
54299b60c4
Merge #12779 : Mass replace pkg}/bin
-style strings
...
... to refer to correct outputs
2016-02-03 17:25:22 +01:00
Vladimír Čunát
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Tuomas Tynkkynen
e97e690244
treewide: Mass replace 'xz}/bin' to refer the 'bin' output
2016-02-01 20:46:28 +02:00
Tuomas Tynkkynen
13b3f3f246
treewide: Mass replace 'openssl}/bin' to refer the 'bin' output
2016-02-01 20:46:16 +02:00
Tuomas Tynkkynen
5f4a8de754
treewide: Mass replace 'bzip2}/bin' to refer the 'bin' output
2016-02-01 20:45:57 +02:00
Rok Garbas
cf40e86fb0
nginx: 1.8.0->1.8.1, 1.9.9->1.9.10
2016-01-26 18:12:01 +01:00
obadz
3a9983b45d
couchdb: add platform, remove maintainer that was added accidentally, fixes #12502
2016-01-24 14:39:47 +01:00
Benjamin Staffin
9bad9c8bf3
nginx: add statsd to the available modules
2016-01-23 17:25:49 -05:00
knupfer
8e604f7937
nginxModules.brotli: init at 788615e
2016-01-21 22:14:39 +01:00
Vladimír Čunát
716aac2519
Merge branch 'staging' into closure-size
2016-01-19 09:55:31 +01:00
Tobias Geerinckx-Rice
3f10b2874f
Merge pull request #12450 from eduarrrd/pshs
...
pshs: 0.2.6 -> 0.3
2016-01-18 04:55:25 +01:00
Eduard Bachmakov
f3ae60295f
pshs: 0.2.6 -> 0.3
2016-01-17 22:44:48 -05:00
Christoph Hrdinka
a3e3b76363
nginxModules.lua: 0.9.19 -> 0.10.0
2016-01-16 16:35:07 +01:00
Jakob Gillich
ff02a4e3c2
axis2: 1.6.3 -> 1.6.4
...
fixes CVE-2013-0248
2016-01-07 05:59:15 +01:00
Michael Raskin
ab3277e68a
nginxUnstable: 1.9.7 -> 1.9.9
2016-01-01 12:30:17 +03:00
Vladimír Čunát
f9f6f41bff
Merge branch 'master' into closure-size
...
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
566c06c5a7
apacheHttpd: 2.4.17 -> 2.4.18
2015-12-27 21:31:30 +00:00
Luca Bruno
5b0352a6a4
Merge branch 'master' into closure-size
2015-12-11 18:31:00 +01:00
Teo Klestrup Röijezon
53441bcc93
nginx: 1.9.4 -> 1.9.7, fixes #11515
2015-12-07 14:56:27 +01:00
Vladimír Čunát
6cc57be289
apache modules: fix build problems
...
pkgs.mod_evasive was removed, because that combination isn't supported
(according to an assertion).
2015-12-05 13:16:55 +01:00
Vladimír Čunát
2709a815e5
apache-httpd-2.2: fix build
...
It was broken by interaction with b81515c2
.
I should've tested both versions before pushing 34b5d193c0
.
2015-12-05 11:59:10 +01:00
Vladimír Čunát
34b5d193c0
apache*: don't change layout in $out WRT master
2015-12-04 15:27:32 +01:00
Christoph Hrdinka
1391ca3af1
nginxModules.lua: 0.9.16 -> 0.9.19
2015-12-02 23:06:34 +01:00
Luca Bruno
920b1d3591
Merge branch 'master' into closure-size
2015-11-29 16:50:26 +01:00
zimbatm
138a42dd11
webfs: fix mime types
...
Unfortunately the shared_mime_info format is not compatible with webfs.
Instead of pulling the whole httpd package I opted for just fetching the
mime.types file from the apache httpd project.
2015-11-28 14:24:21 +00:00
Luca Bruno
a412927924
Merge remote-tracking branch 'origin/master' into closure-size
2015-11-25 21:37:30 +01:00
Vladimír Čunát
333d69a5f0
Merge staging into closure-size
...
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Bob van der Linden
f65ebd022d
darkhttpd: init at 1.11
2015-11-19 14:51:14 +01:00
goibhniu
e9c31d9368
Merge pull request #11034 from zimbatm/webfs-1.21
...
webfs: init at 1.21
2015-11-18 19:19:28 +01:00
zimbatm
6a0ed9361b
webfs: init at 1.21
2015-11-16 17:29:40 +01:00
makefu
8db9408ac6
apt-cacher-ng: init at 0.8.6
2015-11-16 14:45:21 +01:00
Vladimír Čunát
dd71ccef28
gatling: fix meta evaluation
...
/cc maintainer @the-kenny.
2015-11-11 08:31:56 +01:00
Moritz Ulrich
af73b4cc2e
gatling: Init at 0.13.
2015-11-10 23:59:38 +01:00
Nikolay Amiantov
9265cc58c3
Merge pull request #10474 from abbradar/nginx-pam-modules
...
nginx: factor out modules into a separate file, add new "pam" module
2015-11-02 01:05:54 +03:00
Sander van der Burg
b054207813
axis2: bump to version 1.6.3
2015-10-28 10:24:29 +00:00
Tuomas Tynkkynen
f302d78d6c
apacheHttpd_2_4: Port multiple-output changes from 2.2
2015-10-28 10:23:03 +01:00
Tuomas Tynkkynen
7a68c25baf
apacheHttpd_2_2: Remove obsolete cruft
2015-10-28 10:23:02 +01:00
Tuomas Tynkkynen
b81515c2d4
apacheHttpd_2_2: Fix setting installbuilddir
...
Otherwise mod_dnssd doesn't build.
Also move apxs to $dev.
2015-10-28 10:23:02 +01:00
Jude Taylor
f35f421d60
apache-httpd: add libiconv for darwin
2015-10-23 10:57:43 -07:00
aszlig
f15420b0fe
thttpd: Fix SHA256 of the upstream tarball.
...
It's a bit unfortunate to see this, but while looking online to download
the old version of the file I found that MacPorts and FreeBSD had the
same issue:
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=199562
I've checked the diff as well and found no big functional changes,
except a function rename, copyright updates and changed syslog
priorities:
https://bz-attachments.freebsd.org/attachment.cgi?id=155775
Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-10-21 17:15:18 +02:00
Nikolay Amiantov
d2fc6e6a02
nginxModules.pam: init at 1.4
2015-10-19 16:46:09 +03:00
Nikolay Amiantov
9424238d14
nginx: factor out modules in a separate file
2015-10-19 16:46:02 +03:00
Robin Gloster
8521bc097c
apacheHttpd: 2.4.16 -> 2.4.17
2015-10-18 17:42:55 +00:00
Vladimír Čunát
38313d5d87
libxml2,libxslt: split into multiple outputs
...
Fixed all references, hopefully.
libxml2Python is slightly hacky now, but it seems to work.
2015-10-05 13:44:16 +02:00
Tuomas Tynkkynen
7cd13b9003
apache-httpd: Enable SSL via buildInputs
...
The old approach doesn't seem to work with multiple outputs.
2015-10-03 14:08:53 +02:00
Vladimír Čunát
5227fb1dd5
Merge commit staging+systemd into closure-size
...
Many non-conflict problems weren't (fully) resolved in this commit yet.
2015-10-03 13:33:37 +02:00
Peter Simons
3018739223
mini-httpd: update to version 1.5
2015-10-02 22:13:49 +02:00
Arseniy Seroka
b752952a33
Merge pull request #10132 from matthiasbeyer/update-jetty
...
jetty: 5.1.4 -> 6.1.4
2015-10-01 14:21:38 +03:00
Jaka Hudoklin
ea4850ca64
Merge pull request #10023 from offlinehacker/pkgs/modsecurity/add
...
modsecurity: add modsecurity, and create nginx plugin
2015-09-30 00:19:38 +02:00
Matthias Beyer
e547393fac
jetty: 5.1.4 -> 6.1.4
2015-09-29 10:41:26 +02:00
Jaka Hudoklin
46828582ab
nginx: add support for modescurity
2015-09-23 20:35:28 +02:00
Hoang Xuan Phu
4ac4f2dcd9
nginx: add an option to build the stream module
2015-09-22 13:09:11 +08:00
Hoang Xuan Phu
942d2798c5
nginx: bump lua module to fix build error
...
(https://github.com/openresty/lua-nginx-module/pull/500 )
2015-09-22 13:08:42 +08:00
Bjørn Forsman
0b9d83737c
lighttpd: 1.4.35 -> 1.4.37
2015-09-16 07:46:34 +02:00
William A. Kennington III
b68e45dfa7
mini-httpd: Boost 1.59 compat
2015-09-04 11:21:37 -07:00
Austin Seipp
4068869d62
nixpkgs: openresty 1.7.10.1 -> 1.9.3.1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:18:13 -05:00
Austin Seipp
860d720940
nixpkgs: nginxUnstable 1.9.3 -> 1.9.4
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-08-31 03:17:17 -05:00
Cillian de Róiste
f63fd63eb1
yaws: update from 1.99 to 2.0
2015-08-05 10:29:47 +02:00
Eelco Dolstra
277a85b15c
Merge pull request #8985 from Beauhurst/newapaches
...
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
2015-07-27 17:30:18 +02:00
Robert Scott
1dca2fba7f
apache-httpd: update minor versions of both 2.2 and 2.4 for security-related fixes
2015-07-25 15:40:29 +01:00
Austin Seipp
131e41191b
nixpkgs: nginxUnstable 1.9.2 -> 1.9.3
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-07-20 13:52:33 -05:00
Rickard Nilsson
7e021a0fd6
nginx package: Allow adding arbitrary modules
2015-07-12 00:49:18 +02:00
Rickard Nilsson
ef5dafd66d
lua-nginx-module: Update from v0.9.16rc1 to v0.9.16
2015-07-12 00:49:18 +02:00
Michael Raskin
7c5129706f
nginx unstable: update 1.9.1 -> 1.9.2
2015-07-05 00:32:53 +03:00
Shea Levy
145768bf9b
Unmaintain a bunch of packages
2015-07-01 08:11:05 -04:00
Pascal Wittmann
f4d7b23a68
tomcat-connectors: update from 1.2.40 to 1.2.41-dev, fixes CVE-2014-8111
...
Using the prerelease version, because there was no response on when a
new official release will happen, see
http://tomcat.10.x6.nabble.com/Release-of-tomcat-connectors-1-2-41-td5035487.html
2015-06-15 11:07:02 +02:00
Michael Raskin
ed145cb07f
Update Nginx unstable
2015-06-14 11:22:23 +03:00
Rickard Nilsson
8a7c23456d
jetty: Update from 9.2.5 to 9.2.11
2015-06-11 13:33:32 +02:00
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
Vladimír Čunát
3b9ef2c71b
fix "libc}/lib" and similar references
...
Done mostly without any verification.
I didn't bother with libc}/include, as the path is still correct.
2015-05-05 11:52:08 +02:00
Vladimír Čunát
375bc8def7
Merge staging into closure-size
2015-05-05 11:49:03 +02:00
William A. Kennington III
6e2dde7b78
nginx: 1.6.3 -> 1.8.0
2015-04-22 15:28:10 -07:00
Vladimír Čunát
bf414c9d4f
Merge 'staging' into closure-size
...
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes
Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
2015-04-18 11:22:20 +02: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
Michael Raskin
b7f7341169
Add Nginx 1.7.7; RTMP module fails for some reason
2014-11-04 00:54:15 +03:00
Bjørn Forsman
e8dc583eb4
tomcat: set meta.platforms
2014-10-27 18:44:25 +01:00
Longrin Wischnewski
6e7de2155b
change md5sum to sha256sum for a few packages
2014-10-12 16:13:21 +02:00
Eelco Dolstra
811de3bfaa
Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
...
Conflicts:
pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
Aristid Breitkreuz
7a9bf3540e
thttpd: update from 2.25b to 2.26, potentially fixes CVE-2013-0348
2014-10-08 20:23:26 +02:00
Aristid Breitkreuz
4d133363d4
couchdb: update from 1.6.0 to 1.6.1
2014-10-06 22:03:42 +02:00
Eelco Dolstra
8e40703f6c
apache-httpd: Update to 2.2.29
...
CVE-2014-0118, CVE-2014-0231, CVE-2014-0226, CVE-2013-5704.
2014-09-24 21:04:24 +02:00
Eelco Dolstra
cd71f7a2e6
Merge branch 'darwin-stdenv' of github.com:joelteon/nixpkgs into staging
...
Conflicts:
pkgs/development/interpreters/ruby/ruby-19.nix
pkgs/development/libraries/libc++/default.nix
pkgs/development/libraries/libc++abi/default.nix
pkgs/tools/text/sgml/opensp/default.nix
2014-09-23 11:27:53 +02:00
William A. Kennington III
f327e9c922
boostHeaders: regular boost package now only contains headers
2014-09-21 15:18:16 -07:00
Austin Seipp
9f15333589
openresty: 1.7.4.1rc1 -> 1.7.4.1rc2
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-09-20 08:21:11 -05:00
William A. Kennington III
0001e4819e
nginx: 1.6.1 -> 1.6.2
...
Additionally, update all extensions and convert them to fetchFromGitHub
2014-09-19 16:42:04 -07:00
Pascal Wittmann
7bcd577bd1
mod-wsgi: update from 3.4 to 3.5, fixes CVE-2014-0240
2014-09-13 20:32:26 +02:00
Joel Taylor
3e8344d334
suitable clang stdenv
2014-09-09 13:54:24 -07:00
Michael Raskin
d3c5e960b4
Merge pull request #3878 from pmahoney/ngx_lua
...
nginx: add lua module
2014-09-03 21:37:18 +04:00
Michael Raskin
3ad91106f1
Merge pull request #3704 from sfultong/upstream-master
...
tomcat: update to upstream master
2014-09-02 02:09:18 +04:00
Vladimír Čunát
8da52a642a
Merge branch 'staging' into v/modular
...
Conflicts (easy):
pkgs/development/interpreters/perl/5.10/setup-hook.sh
pkgs/development/interpreters/perl/5.8/setup-hook.sh
pkgs/development/libraries/gtk+/2.x.nix
2014-08-31 12:23:18 +02:00
Vladimír Čunát
381dcb1d98
various packages fixed
2014-08-30 23:30:31 +02:00
Patrick Mahoney
2559ea7138
nginx: add lua module
2014-08-30 12:08:58 -05:00
Bjørn Forsman
c9baba9212
Fix many package descriptions
...
(My OCD kicked in today...)
Remove repeated package names, capitalize first word, remove trailing
periods and move overlong descriptions to longDescription.
I also simplified some descriptions as well, when they were particularly
long or technical, often based on Arch Linux' package descriptions.
I've tried to stay away from generated expressions (and I think I
succeeded).
Some specifics worth mentioning:
* cron, has "Vixie Cron" in its description. The "Vixie" part is not
mentioned anywhere else. I kept it in a parenthesis at the end of the
description.
* ctags description started with "Exuberant Ctags ...", and the
"exuberant" part is not mentioned elsewhere. Kept it in a parenthesis
at the end of description.
* nix has the description "The Nix Deployment System". Since that
doesn't really say much what it is/does (especially after removing
the package name!), I changed that to "Powerful package manager that
makes package management reliable and reproducible" (borrowed from
nixos.org).
* Tons of "GNU Foo, Foo is a [the important bits]" descriptions
is changed to just [the important bits]. If the package name doesn't
contain GNU I don't think it's needed to say it in the description
either.
2014-08-24 22:31:37 +02:00
Vladimír Čunát
96cec2a7bd
Merge 'staging' into multiple-outputs
...
Conflicts:
pkgs/applications/audio/flac/default.nix
pkgs/build-support/gcc-wrapper/builder.sh
pkgs/development/libraries/apr-util/default.nix
pkgs/development/libraries/apr/default.nix
pkgs/development/libraries/atk/default.nix
pkgs/development/libraries/freetype/default.nix
pkgs/development/libraries/gdk-pixbuf/default.nix
pkgs/development/libraries/glib/default.nix
pkgs/development/libraries/glibc/2.17/builder.sh
pkgs/development/libraries/glibc/2.17/locales.nix
pkgs/development/libraries/libjpeg/default.nix
pkgs/development/libraries/libogg/default.nix
pkgs/development/libraries/libsamplerate/default.nix
pkgs/development/libraries/libtiff/default.nix
pkgs/development/libraries/libvorbis/default.nix
pkgs/development/libraries/mesa/default.nix
pkgs/development/libraries/pango/default.nix
pkgs/development/web/nodejs/default.nix
pkgs/os-specific/linux/pam/default.nix
pkgs/os-specific/linux/systemd/default.nix
pkgs/stdenv/generic/setup.sh
pkgs/stdenv/linux/default.nix
pkgs/top-level/all-packages.nix
pkgs/top-level/release-small.nix
2014-08-23 16:04:53 +02:00
Eelco Dolstra
ce6b86cc68
Fix various evaluation problems
...
http://hydra.nixos.org/build/13616685
2014-08-22 11:57:40 +02:00
Michael Raskin
b6a2f8eaa8
Fix a strange openresty build error
2014-08-21 08:42:00 +04:00
Sam Griffin
219983d6ad
adding tomcat version 8
2014-08-20 23:23:44 -04:00
sfultong
c54a8ed1d0
Merge pull request #1 from sfultongv/sfultong-14.04
...
updating tomcat to version 7
2014-08-20 23:08:39 -04:00
Austin Seipp
47c443bede
nixpkgs: openresty 1.7.4.1rc1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-20 00:38:49 -05:00
Austin Seipp
ec42370aee
nginx: 1.6.0 -> 1.6.1
...
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2014-08-17 06:35:40 -05:00
Vladimír Čunát
52d9c93abe
Merge 'staging' into master
2014-08-08 20:13:23 +02:00
Eelco Dolstra
8a7f3c3618
Mark a bunch of packages as broken or not supported on Darwin
2014-08-08 17:59:02 +02:00
Peter Simons
2d326e5032
Merge remote-tracking branch 'origin/master' into staging.
...
Conflicts:
pkgs/desktops/e18/enlightenment.nix
2014-08-04 16:51:47 +02:00
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