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

pkgs/servers/web-apps/pgpkeyserver-lite/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, lib } : 
+{ stdenv, fetchFromGitHub }:
 
 stdenv.mkDerivation rec {
   pname = "pgpkeyserver-lite";
@@ -16,10 +16,10 @@ stdenv.mkDerivation rec {
     cp -R 404.html assets favicon.ico index.html robots.txt $out
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     homepage = https://github.com/mattrude/pgpkeyserver-lite;
     description = "A lightweight static front-end for a sks keyserver.";
-    license = lib.licenses.gpl3;
-    maintainers = [ lib.maintainers.calbrecht ];
+    license = licenses.gpl3;
+    maintainers = with maintainers; [ calbrecht globin ];
   };
 }