3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

28 commits

Author SHA1 Message Date
Franz Pletz de85797565
Merge remote-tracking branch 'origin/master' into gcc-8 2019-09-03 22:15:07 +02:00
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
Franz Pletz c051374da2
nginx: fix build with gcc8 2019-06-17 07:06:02 +02: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
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
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
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
Jörg Thalheim 8871ffccff nginx: fix cross-build 2018-12-11 18:13:21 +01:00
Daiderd Jordan 6d71316410
nginx: init ngx_aws_auth at 2.1.1 2018-11-08 20:02:44 +01:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00: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
John Ericson eeb8419c6a ceph: Fix --with-file-aio logic for new meta.platforms and cross 2018-03-12 18:55:41 -04:00
Daiderd Jordan 734788b71d
nginx: disable pie on darwin 2017-09-12 22:42:04 +02:00
Pascal Bach ec779fb2c3 nginx: enable stream support by default
TCP proxying should be a default feature of nginx
2017-08-21 20:30:41 +02:00
Pascal Bach 6de00c1cb2 nginx: add possibility to compile reverse proxy with mail support 2017-08-21 20:30:41 +02:00
Pascal Bach 1d8412d17a nginx: add additional features when streams are enabled
This allows nginx to work as a TCP load balancer including
TLS and geo IP routing support
2017-08-21 20:30:41 +02:00
Pascal Bach e309c318c6 nginx: enable additional compile flags
These flags can increase performance.

They are also enabled by default on Debian and Archlinux
2017-08-21 20:30:41 +02:00
Pascal Bach 12e0e9d31c nginx: remove deprecated ipv6 compile flag
The build process for both mainline and stable print a warning that
"--with-ipv6" is deprecated
2017-08-21 20:30:41 +02:00
Franz Pletz c13922f012
nginx: explicitly use stable version
Also updates the documention of the NixOS option `services.nginx.package`
that upstream recommends using the mainline version instead.

Fixes #21665.
2017-03-20 20:04:09 +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
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
Renamed from pkgs/servers/http/nginx/default.nix (Browse further)