Robin Gloster
616b8343c4
Merge remote-tracking branch 'upstream/master' into gcc-8
2019-08-25 18:55:46 +02:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
4e60b0efae
treewide: update globin's maintained drvs
2019-08-20 19:36:05 +02:00
volth
c814d72b51
treewide: name -> pname
2019-08-17 10:54:38 +00:00
Izorkin
83381bec9c
nginxMainline: 1.17.2 -> 1.17.3
2019-08-13 21:31:57 +03:00
Izorkin
aec55db737
nginxStable: 1.16.0 -> 1.16.1
2019-08-13 21:30:08 +03:00
Izorkin
293e5d8365
nginxMainline: 1.16.0 -> 1.17.2
2019-07-24 21:09:22 +03:00
Franz Pletz
c051374da2
nginx: fix build with gcc8
2019-06-17 07:06:02 +02:00
Izorkin
872f056bb4
nginxModules.lua: 0.10.14 -> 0.10.15
2019-05-13 12:37:14 +03:00
Izorkin
fa3f68edab
nginxModules.http_proxy_connect_module: 16.04.2019 -> 06.05.2019
2019-05-13 12:37:10 +03:00
Jörg Thalheim
0816c69173
nginxModules: update and add nginx modules ( #59949 )
...
nginxModules: update and add nginx modules
2019-05-13 10:15:09 +01:00
Izorkin
619aa5c97f
nginxMainline: 1.15.12 -> 1.16.0
2019-04-30 07:56:29 +03:00
Izorkin
65a736064a
nginxStable: 1.14.2 -> 1.16.0
2019-04-30 07:56:23 +03:00
Yurii Izorkin
5ba8811758
nginxMainline: 1.15.10 -> 1.15.12 ( #59950 )
2019-04-22 00:08:08 +02:00
Izorkin
452cf0b3e2
nginxModules.naxsi: init at 0.56
2019-04-21 11:10:49 +03:00
Izorkin
6600d00ed1
nginxModules.video-thumbextractor: init at 0.9.0
2019-04-21 10:32:46 +03:00
Izorkin
f6525448a5
nginxModules.sorted-querystring: init at 0.3
2019-04-21 10:30:29 +03:00
Izorkin
b329187524
nginxModules.limit-speed: init at 21.05.2014
2019-04-21 10:27:31 +03:00
Izorkin
13c938ac1e
nginxModules.subsFilter: 0.6.4 -> 13.04.2016
2019-04-21 10:21:44 +03:00
Izorkin
d1dff5a9ec
nginxModules.upstream-tarantool: 2.7 -> 2.7.1
2019-04-20 23:11:08 +03:00
Izorkin
6a154d00c3
nginxModules.upstream-check: 10.11.2017 -> 12.08.2018
2019-04-20 23:08:55 +03:00
Izorkin
d66b94da62
nginxModules.coolkit: init at 0.2
2019-04-20 22:35:55 +03:00
Izorkin
80666e68b2
nginxModules.slowfs-cache: init at 1.10
2019-04-20 22:29:29 +03:00
Izorkin
8c1131ef28
nginxModules.lua: 0.10.13 -> 0.10.14
2019-04-20 22:29:29 +03:00
Izorkin
89a73423ab
nginxModules.mpeg-ts: init at 0.1.1
2019-04-20 22:29:24 +03:00
Izorkin
c940a7caa0
nginxModules.live: init at 18.11.2018
2019-04-20 21:46:45 +03:00
Izorkin
b0dc2d6106
nginxModules.dav: 0.1.0 -> 3.0.0
2019-04-20 21:40:09 +03:00
Izorkin
7a5d938067
nginxModules.http_proxy_connect_module: 05.09.2018 -> 16.04.2019
2019-04-20 21:33:18 +03:00
aszlig
1f24685d93
nginx/etag-patch: Use Nix store dir from build env
...
So far, the Nix store directory was hardcoded and if someone uses a
different Nix store directory the patch won't work. Of course, this is
pretty uncommon, but by not only substituting the store directory but
also the length of it we also save a few calls to ngx_strlen(), which
should save us a few cycles.
Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 10:07:55 +02:00
aszlig
af5a3ce474
nginx: Fix memleak in nix-etag patch
...
The original patch introduced a new "real" variable which gets populated
(and allocated) via ngx_realpath(). It's properly freed in error
conditions but it won't be freed if ngx_http_set_etag returns
successfully.
Adding another ngx_free() just before returning fixes that memory leak.
I also fixed a small indentation issue along the way.
Signed-off-by: aszlig <aszlig@nix.build>
2019-04-18 09:40:13 +02:00
Yegor Timoshenko
1da8eec00f
nginx: handle impure symlinks in ETag patch
2019-04-18 09:40:11 +02:00
Yegor Timoshenko
f03302b636
nginx: check for realpath() == NULL in ETag patch
...
Thanks to Gabriel Ebner!
2019-04-18 09:40:09 +02:00
Yegor Timoshenko
135d54f535
nginx: if root is in Nix store, use path's hash as ETag
...
Resolves #25485 . Usage example:
$ realpath /var/www
/nix/store/wnrhnnpdj3x50j5xz38zp1qxs1ygwccw-site
$ curl --head localhost
HTTP/1.1 200 OK
Server: nginx
Date: Fri, 28 Sep 2018 06:09:25 GMT
Content-Type: text/html
Content-Length: 50
Last-Modified: Thu, 01 Jan 1970 00:00:01 GMT
Connection: keep-alive
ETag: "wnrhnnpdj3x50j5xz38zp1qxs1ygwccw"
Accept-Ranges: bytes
2019-04-18 09:40:06 +02:00
Franz Pletz
4c0d1ae7be
nginxMainline: 1.15.9 -> 1.15.10
2019-04-02 12:02:39 +02:00
Maximilian Bosch
37867dba74
nginxModules.http_proxy_connect_module: init
...
This adds the nginx module `ngx_http_proxy_connect_module` which allows
to tunnel HTTPS through an nginx proxy[1].
As this module contained patches for several nginx version, some minor
adjustments were needed:
* Allowed each entry in `nginxModules` to provide patches.
* Added an optional `supports` attribute to ensure that each module can
determine if it supports the currently built nginx version (e.g. stable
1.14 ATM or mainline 1.15 ATM).
[1] https://github.com/chobits/ngx_http_proxy_connect_module
2019-03-29 23:53:09 +01:00
Benjamin Smith
f4d24273e5
nginx: add http subs filter module ( #56546 )
2019-03-13 02:16:40 +02:00
Alyssa Ross
2576d09716
nginxMainline: 1.15.8 -> 1.15.9 ( #56416 )
2019-02-28 22:13:35 +01:00
Vincent Bernat
33802e9ed8
nginx: expose list of additional modules ( #53897 )
...
Currently, it seems there is no easy way to override package to add
modules. For example, if we want to add the `ipscrub` module, we can
do:
pkgs.nginxStable.override {
modules = [ pkgs.nginxModules.ipscrub ];
};
But, then, we loose `rtmp`, `dav` and `moreheaders` which are defined
in `all-packages.nix`. With this modification, we can now do:
pkgs.nginxStable.override {
modules = pkg.nginxStable.passthru.modules ++ [ pkgs.nginxModules.ipscrub ];
};
2019-01-31 02:15:14 +02:00
Franz Pletz
9ea5b2c052
nginxMainline: 1.15.7 -> 1.15.8
2019-01-11 07:55:25 +01:00
Jörg Thalheim
8871ffccff
nginx: fix cross-build
2018-12-11 18:13:21 +01:00
Alyssa Ross
703827f36c
nginx: 1.14.1 -> 1.14.2
2018-12-05 10:56:06 -06:00
Alyssa Ross
dcae76862b
nginxMainline: 1.15.6 -> 1.15.7
2018-11-27 21:28:49 +00:00
Alyssa Ross
de9026de6e
nginxMainline: 1.15.5 -> 1.15.6
...
CVE-2018-16843, CVE-2018-16844
https://nginx.org/en/security_advisories.html
2018-11-15 17:52:05 +00:00
Alyssa Ross
1908322d10
nginxStable: 1.14.0 -> 1.14.1
...
CVE-2018-16843, CVE-2018-16844
https://nginx.org/en/security_advisories.html
2018-11-15 17:51:51 +00:00
Daiderd Jordan
6d71316410
nginx: init ngx_aws_auth at 2.1.1
2018-11-08 20:02:44 +01:00
Rob Vermaas
75167083e5
nginx-opentracing: init at 0.7.0
...
(cherry picked from commit 9d6184f1bc
)
2018-10-23 18:08:01 +02:00
Thilo Uttendorfer
205b3d94e1
nginxMainline: 1.15.3 -> 1.15.5 ( #48127 )
2018-10-10 00:18:54 +02:00
Franz Pletz
647b5b1a29
nginxMainline: 1.15.2 -> 1.15.3
2018-08-31 14:42:14 +02:00
xeji
176891c0ad
Merge pull request #44467 from Izorkin/nginx-modules
...
Nginx modules
2018-08-05 22:20:05 +02:00
Johannes Frankenau
c481117673
nginxMainline: 1.15.1 -> 1.15.2 ( #44431 )
2018-08-04 21:06:35 +02:00
Izorkin
e0de8354b9
nginxModules.lua-upstream: init at v0.07
2018-08-04 20:54:36 +03:00
Izorkin
29b3e11541
nginxModules.url: init at rev 9299816
2018-08-04 20:54:36 +03:00
Izorkin
a5674cebb9
nginxModules.sysguard: init at rev e512897
2018-08-04 20:54:35 +03:00
Izorkin
9100091f3f
nginxModules.stream-sts: init at v0.1.1
2018-08-04 20:54:35 +03:00
Izorkin
9958868dfd
nginxModules.sts: init at v0.1.1
2018-08-04 20:54:35 +03:00
Izorkin
07e7966d3b
nginxModules.upstream-tarantool: init at v2.7
2018-07-29 14:54:55 +03:00
Izorkin
ca37481d25
nginxModules.push-stream: init at v0.5.4
2018-07-29 14:54:47 +03:00
Izorkin
aa68f56c0a
nginxModules.vts: init at v0.1.18
2018-07-29 14:54:08 +03:00
volth
52f53c69ce
pkgs/*: remove unreferenced function arguments
2018-07-21 02:48:04 +00:00
Izorkin
e76f382c75
nginxModules: sorting of modules alphabetically
2018-07-16 03:44:32 +00:00
Franz Pletz
0a5186a7cb
Merge pull request #43580 from Izorkin/nginx-modules
...
Update nginx modules
2018-07-15 21:56:09 +00:00
Izorkin
3a5d104a33
nginxModules.develkit: update to v0.3.1rc1
2018-07-16 00:25:36 +03:00
Izorkin
75b2940145
nginxModules.upstream-check: update to rev 9aecf15
2018-07-16 00:25:20 +03:00
Izorkin
c96d49733a
nginxModules.statsd: update to rev b970e40
2018-07-16 00:25:01 +03:00
Izorkin
04eb0731fb
nginxModules.pam: update to v1.5.1
2018-07-16 00:24:45 +03:00
Izorkin
eff0def7dc
nginxModules.set-misc: update to v0.32
2018-07-16 00:24:27 +03:00
Izorkin
ea52907348
nginxModules.lua: update to v0.10.13
2018-07-16 00:24:14 +03:00
Izorkin
8584845aa1
nginxModules.moreheaders: update to v0.33
2018-07-16 00:23:41 +03:00
Izorkin
a16eee878f
nginxModules.ipscrub: update to v1.0.1
2018-07-16 00:22:54 +03:00
Izorkin
11653f8e6b
nginxModules.sla: init at 7778f01
2018-07-15 20:29:57 +00:00
Franz Pletz
3239ef84ea
nginxMainline: 1.13.12 -> 1.15.1
2018-07-15 21:41:45 +02:00
Izorkin
bfb393f55e
nginx-fancyindex: init at 0.4.3
2018-07-15 20:07:34 +03:00
Matthew Bauer
af56538c89
Merge pull request #42687 from nh2/nginx-debug-build
...
nginx: Flag to build with debugging and parallel builds
2018-07-05 22:11:51 -04:00
Silvan Mosberger
57bccb3cb8
treewide: http -> https sources ( #42676 )
...
* treewide: http -> https sources
This updates the source urls of all top-level packages from http to
https where possible.
* buildtorrent: fix url and tab -> spaces
2018-06-28 20:43:35 +02:00
Niklas Hambüchen
c834fb39c3
nginx: Enable parallel building
2018-06-28 01:35:41 +02:00
Niklas Hambüchen
94d97fe290
nginx: Add withDebug
argument
2018-06-28 01:35:41 +02:00
Will Dietz
516c5f54ed
ngx_brotli: 0.1.1 -> 0.1.2
...
Fixes socket closing issues
(only happened in some circumstances AFAICT).
2018-06-18 10:41:24 -05:00
Johannes Frankenau
db5ab167df
nginxModules.ipscrub: init at 99230f6
2018-05-13 17:31:54 +02:00
Michael Raskin
36f9b216eb
nginxStable: 1.12.2 -> 1.14.0
2018-05-02 02:46:52 +02:00
Michael Raskin
18d73458c8
nginxMainline: 1.13.9 -> 1.13.12
2018-05-02 02:46:52 +02:00
Will Dietz
bec9726946
ngx_brotli: -> 0.1.1
2018-04-24 12:55:16 -05:00
Will Dietz
0fdc4cb94b
ngx_brotli: update for fixes, zero copy.
2018-03-21 15:15:50 -05:00
Tuomas Tynkkynen
2fec9c6e29
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
John Ericson
eeb8419c6a
ceph: Fix --with-file-aio logic for new meta.platforms and cross
2018-03-12 18:55:41 -04:00
Jan Malakhovski
7079e744d4
Merge branch 'master' into staging
...
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):
pkgs/development/libraries/epoxy/default.nix
pkgs/development/libraries/gtk+/3.x.nix
pkgs/development/python-modules/asgiref/default.nix
pkgs/development/python-modules/daphne/default.nix
pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Franz Pletz
94db63f5d4
nginxMainline: 1.13.8 -> 1.13.9
2018-03-05 15:49:07 +01:00
Will Dietz
40b14109d3
nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule
...
We have it use our system copy regardless, but might as well.
(yes, hash does not change, since we don't fetch submodule here)
2018-02-20 14:08:22 -06:00
Will Dietz
df9ebaf8c7
nginx/modules: use eustas' brotli module, google one is abandoned
...
This fork is also used by FreeBSD as of Dec 2017:
https://svnweb.freebsd.org/ports?view=revision&revision=455560
See also:
https://github.com/google/ngx_brotli/issues/62
2018-02-20 14:01:18 -06:00
Will Dietz
06e50006d4
nginxModules.pagespeed: be consistent about rev
...
Yes hash doesn't change, stable is copy of beta used previously.
2018-02-13 15:17:21 -06:00
Will Dietz
75068a6770
psol, ngx_pagespeed: 1.13.35.1 -> 1.13.35.2
2018-01-31 05:46:52 +09:00
adisbladis
67906744ec
Merge pull request #33658 from dtzWill/update/ngx_pagespeed
...
ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1
2018-01-10 20:04:59 +08:00
Will Dietz
be2e01f8a0
ngx_pagespeed, psol: 1.11.33.4 -> 1.13.35.1
...
Fixes build when used with nginxMainline.
(FWIW, 1.11.33.4 is from 2016-09-15)
2018-01-09 10:57:17 -06:00
Will Dietz
0bbcfb0d6d
nginxMainline: 1.13.6 -> 1.13.8
...
See http://nginx.org/en/CHANGES
2018-01-09 10:55:52 -06:00
Izorkin
37d66db7f9
modsecurity-nginx: 2017-08-23 -> 1.0.0 Stable
2017-12-21 23:41:38 +03:00
Jörg Thalheim
bc97af0b31
Merge pull request #32449 from Izorkin/ModSecurity-nginx
...
nginxModules.ModSecurity-beta: 2017-06-17 -> 2017-08-23
2017-12-16 23:21:12 -08:00
Izorkin
2c7912ce49
ModSecurity-nginx: update revision
2017-12-09 23:03:12 +03:00
Andreas Rammhold
a004f9f806
nginxModules.rtmp: v1.1.11 -> v1.2.1
...
adds support for gcc-7 and fixes nginx for #31747
2017-12-04 16:52:39 +01:00
Orivej Desh
6de0380378
nginxModules.brotli: 2015-11-18 -> 2016-12-02
...
This version bundles brotli.
2017-11-29 00:59:46 +00:00
Izorkin
cf6e90c104
nginx: add ModSecurity Nginx Connector ( #28545 )
...
nginx: add ModSecurity Nginx Connector
2017-11-26 07:57:19 -05:00
Vladimír Čunát
f90c468ea5
nginxModules.moreheaders: fix source hash
...
An amended git tag, apparently. There are only changes in documentation
and whitespace changes in code. Sigh. Uncovered by c3255fe8ec
.
2017-10-31 23:03:34 +01:00