Merge staging-next into staging

pkgs/development/interpreters/elixir/generic-builder.nix

@@ -73,6 +73,6 @@ in
 
       license = licenses.epl10;
       platforms = platforms.unix;
-      maintainers = with maintainers; [ the-kenny havvy couchemar ankhers filalex77 ];
+      maintainers = with maintainers; [ havvy couchemar ankhers filalex77 ];
     };
   })

pkgs/development/interpreters/erlang/generic-builder.nix

@@ -122,7 +122,7 @@ in stdenv.mkDerivation ({
     '';
 
     platforms = platforms.unix;
-    maintainers = with maintainers; [ the-kenny sjmackenzie couchemar gleber ];
+    maintainers = with maintainers; [ sjmackenzie couchemar gleber ];
     license = licenses.asl20;
   } // meta);
 }

pkgs/development/interpreters/php/default.nix

@@ -113,7 +113,9 @@ let
                   unwrapped = php;
                   tests = nixosTests.php;
                   inherit (php-packages) packages extensions;
-                  inherit (php) meta;
+                  meta = php.meta // {
+                    outputsToInstall = [ "out" ];
+                  };
                 };
                 paths = [ php ];
                 postBuild = ''

pkgs/development/interpreters/scheme48/default.nix

@@ -6,7 +6,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = "http://s48.org/";
     description = "Scheme 48";
-    maintainers = with stdenv.lib.maintainers; [ the-kenny ];
     platforms = with stdenv.lib.platforms; unix;
     license = stdenv.lib.licenses.bsd3;
   };