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
..
generic.nix	Merge branch 'master' into staging-next	2019-08-24 08:55:37 +02:00
mainline.nix	nginxMainline: 1.17.2 -> 1.17.3	2019-08-13 21:31:57 +03:00
mainline.upstream	nginx: refactor and add mainline version	2016-07-19 01:20:49 +02:00
modules.nix	nginxModules.lua: 0.10.14 -> 0.10.15	2019-05-13 12:37:14 +03:00
nix-etag-1.15.4.patch	nginx/etag-patch: Use Nix store dir from build env	2019-04-18 10:07:55 +02:00
stable.nix	nginxStable: 1.16.0 -> 1.16.1	2019-08-13 21:30:08 +03:00
stable.upstream	nginx: refactor and add mainline version	2016-07-19 01:20:49 +02:00