mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-10-25 12:23:52 -04:00
7079e744d4
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 |
||
---|---|---|
.. | ||
4store | ||
apache-httpd | ||
apache-modules | ||
apt-cacher-ng | ||
couchdb | ||
darkhttpd | ||
gatling | ||
h2o | ||
hiawatha | ||
hyp | ||
jboss | ||
jetty | ||
lighttpd | ||
lwan | ||
micro-httpd | ||
mini-httpd | ||
myserver | ||
nginx | ||
nix-binary-cache | ||
openresty | ||
pshs | ||
redstore | ||
spawn-fcgi | ||
thttpd | ||
tomcat | ||
webfs | ||
winstone | ||
yaws |