Commit graph

142 commits

Author SHA1 Message Date
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
Christoph Hrdinka 1391ca3af1 nginxModules.lua: 0.9.16 -> 0.9.19 2015-12-02 23:06:34 +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
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
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
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
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
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
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
Michael Raskin ed145cb07f Update Nginx unstable 2015-06-14 11:22:23 +03: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
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
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
Michael Raskin 09e74005b0 update nginx unstable 2015-03-09 01:03:01 +03:00
Rickard Nilsson c7c917dfff nginx: Add set-misc-nginx-module 2015-01-21 12:38:34 +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 b51dec7b77 Nginx unstable: 1.7.8 -> 1.7.9 2014-12-31 20:53:58 +03:00
Michael Raskin 90b05b8d0e Nginx-unstable: 1.7.7 → 1.7.8 2014-12-21 11:14:25 +03: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
Michael Raskin b7f7341169 Add Nginx 1.7.7; RTMP module fails for some reason 2014-11-04 00:54:15 +03: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
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
Joel Taylor 3e8344d334 suitable clang stdenv 2014-09-09 13:54:24 -07:00
Patrick Mahoney 2559ea7138 nginx: add lua module 2014-08-30 12:08:58 -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
Mathijs Kwik 76c2c0c499 nginx: add echo module, fix aio on linux&freebsd 2014-06-16 22:43: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
Evgeny Egorochkin 431ff0f769 nginx: update from 1.4.6 to 1.4.7 2014-03-26 19:15:04 +02:00
Evgeny Egorochkin 20a2b1af93 nginx: update from 1.4.5 to 1.4.6 2014-03-05 05:10:32 +02:00
Domen Kožar aa6ddfb119 nginx: 1.4.4 -> 1.4.5 2014-02-12 19:13:36 +01: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
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
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
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
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
Eelco Dolstra 34ff91d602 nginx: Update to 1.2.4 2012-10-09 14:20:44 -04:00
Peter Simons 6492a0383d nginx: moved from sbin to bin, because it's useful for normal users too
Committed on behalf of Mathijs Kwik.

svn path=/nixpkgs/trunk/; revision=32407
2012-02-19 21:36:34 +00:00
Rob Vermaas edbae5f6c3 update nginx to 1.1.7
svn path=/nixpkgs/trunk/; revision=30144
2011-10-31 18:26:20 +00:00
Michael Raskin 13a1c3a69b Update Nginx
svn path=/nixpkgs/trunk/; revision=26813
2011-04-13 04:51:35 +00:00
Michael Raskin ff8fbd8a1a Fix remaining perl mention in buildInputs
svn path=/nixpkgs/trunk/; revision=20989
2010-04-09 11:37:38 +00:00
Michael Raskin e80351a49d Update nginx
svn path=/nixpkgs/trunk/; revision=20988
2010-04-09 11:26:54 +00:00
Michael Raskin 5c2fbcacd1 Update Nginx because of a vulnerability
svn path=/nixpkgs/trunk/; revision=17146
2009-09-15 07:05:32 +00:00
Marc Weber f7f938a1d1 big breaking change: renaming lib.getAttr to lib.attrByPath
getAttr was ambiguous. It's also a builtin function

fix

svn path=/nixpkgs/trunk/; revision=15692
2009-05-24 10:57:41 +00:00
Marc Weber 52647ea3b0 FullDepEntry -> fullDepEntry, PackEntry -> packEntry
svn path=/nixpkgs/trunk/; revision=15662
2009-05-19 23:25:58 +00:00
Michael Raskin 152e2f36ec Nginx update to 0.7.47
svn path=/nixpkgs/trunk/; revision=14896
2009-04-06 08:04:57 +00:00
Michael Raskin 8c90c64e94 Added nginx - lightweight http server
svn path=/nixpkgs/trunk/; revision=13518
2008-11-30 09:06:53 +00:00