Michael Raskin
ca8d3de1d2
nginx: 1.11.7 -> 1.11.8
2017-01-02 20:18:50 +01:00
Corbin
ca2fa4416e
nginx: Allow GD to be optional.
...
This commit permits incantations like `pkgs.nginx.override { gd = null; }` to
produce a slimmed-down nginx.
When used, this functionality removes a pile of stuff from nginx's closure.
The resulting nginx's closure:
$ nix-store -q -R /nix/store/wk3h0a4dmdmjmxkbd0q09iw0wfq0yzpz-nginx-1.10.2 | wc -l
12
$ nix-store -q -R /nix/store/gpcx77anqrj05qz0mrwm7hf4wgxry5py-nginx-1.10.2 | wc -l
24
2016-12-26 10:24:58 -08:00
Franz Pletz
d3be9a50e0
nginxMainline: 1.11.6 -> 1.11.7
2016-12-13 21:39:31 +01:00
Franz Pletz
a04a4b2a6a
nginxMainline: 1.11.5 -> 1.11.6
2016-11-23 13:23:33 +01:00
Franz Pletz
323acff8e6
nginxMainline: 1.11.4 -> 1.11.5
2016-10-24 18:10:14 +02:00
Franz Pletz
4ae2189d8c
nginx: 1.10.1 -> 1.10.2
2016-10-24 18:10:14 +02:00
Tim Steinbach
f091686a18
nginxMainline: 1.11.3 -> 1.11.4
2016-09-23 08:20:03 -04:00
Matt Billenstein
cba2dd0044
nginx modules: update rtmp to 1.1.9 fixing build failures against 1.11.x
2016-09-08 16:21:13 -07:00
Matt Billenstein
6ce8575a2e
nginx modules: update ngx_devel_kit to 0.3.0
2016-09-08 16:20:27 -07:00
Matt Billenstein
ca60da8031
nginx module: update statsd to support 1.10.1 -- the zebrafishlabs github repo
...
seems dead
2016-09-08 15:59:11 -07:00
Matt Billenstein
a49133b07f
nginx module: add upstream check module
2016-09-08 12:02:15 -07:00
Robin Gloster
b7787d932e
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-08-12 09:46:53 +00:00
Michael Raskin
d1435913cf
nginx: 1.11.2 -> 1.11.3
2016-08-11 17:57:35 +02:00
Robin Gloster
203846b9de
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-07-19 10:37:02 +00:00
Franz Pletz
b5daad4268
nginx: refactor and add mainline version
...
Upstream calls the unstable version mainline.
2016-07-19 01:20:49 +02:00
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
Robin Gloster
8031cba2ab
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-06-10 09:27:04 +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
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
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
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
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
3f45f0948d
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
2016-03-15 01:44:24 +00:00
Luca Bruno
dcfca100ec
Merge pull request #12525 from knupfer/ngx_brotli
...
add nginxModules.brotli
2016-03-11 11:05:21 +01: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
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
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
ae74c356d9
Merge recent 'staging' into closure-size
...
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01: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
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
Christoph Hrdinka
a3e3b76363
nginxModules.lua: 0.9.19 -> 0.10.0
2016-01-16 16:35:07 +01:00
Michael Raskin
ab3277e68a
nginxUnstable: 1.9.7 -> 1.9.9
2016-01-01 12:30:17 +03: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