3
0
Fork 0
forked from mirrors/nixpkgs
nixpkgs/pkgs/servers/http
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
..
4store treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
apache-httpd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
apache-modules treewide: name -> pname 2019-08-17 10:54:38 +00:00
apt-cacher-ng treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
couchdb Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
darkhttpd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
gatling treewide: name -> pname 2019-08-17 10:54:38 +00:00
h2o Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
hiawatha treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
hyp
jboss
jetty treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
lighttpd lighttpd: 1.4.53 -> 1.4.54 2019-06-02 10:21:14 +02:00
lwan treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
micro-httpd
mini-httpd
myserver treewide: name -> pname 2019-08-17 10:54:38 +00:00
nginx Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
nix-binary-cache treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
openresty treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
pshs treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
redstore
showoff bundlerUpdateScript: init and use (#64822) 2019-07-22 12:02:47 +00:00
spawn-fcgi treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
tengine treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
thttpd treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
tomcat treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
unit Merge branch 'master' into staging-next 2019-08-24 08:55:37 +02:00
webfs treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
webhook treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00
yaws treewide: name -> pname (easy cases) (#66585) 2019-08-15 13:41:18 +01:00