Revert "PHP maintainer team"

NixOS · Apr 29, 2020 · 410c38f · 410c38f
1 parent 3b21abb
commit 410c38f
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 87 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -176,7 +176,6 @@
 
 # PHP
 /doc/languages-frameworks/php.section.md @etu
-/nixos/tests/php                         @etu
-/pkgs/build-support/build-pecl.nix       @etu
 /pkgs/development/interpreters/php       @etu
 /pkgs/top-level/php-packages.nix         @etu
+/pkgs/build-support/build-pecl.nix       @etu
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
@@ -43,17 +43,6 @@ with lib.maintainers; {
     scope = "Maintain GNOME desktop environment and platform.";
   };
 
-  php = {
-    members = [
-      aanderse
-      etu
-      globin
-      ma27
-      talyz
-    ];
-    scope = "Maintain PHP related packages and extensions.";
-  };
-
   podman = {
     members = [
       adisbladis

diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix
@@ -1,6 +1,6 @@
-import ../make-test-python.nix ({pkgs, lib, ...}: {
+import ../make-test-python.nix ({pkgs, ...}: {
   name = "php-fpm-nginx-test";
-  meta.maintainers = lib.teams.php.members;
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ];
 
   machine = { config, lib, pkgs, ... }: {
     services.nginx = {

diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix
@@ -1,6 +1,6 @@
-import ../make-test-python.nix ({pkgs, lib, ...}: {
+import ../make-test-python.nix ({pkgs, ...}: {
   name = "php-httpd-test";
-  meta.maintainers = lib.teams.php.members;
+  meta.maintainers = with pkgs.stdenv.lib.maintainers; [ etu ];
 
   machine = { config, lib, pkgs, ... }: {
     services.httpd = {

diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix
@@ -1,9 +1,7 @@
 let
   testString = "can-use-subgroups";
-in import ../make-test-python.nix ({lib, ...}: {
+in import ../make-test-python.nix ({ ...}: {
   name = "php-httpd-pcre-jit-test";
-  meta.maintainers = lib.teams.php.members;
-
   machine = { lib, pkgs, ... }: {
     time.timeZone = "UTC";
     services.httpd = {

diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix
@@ -138,9 +138,9 @@ let
 
     meta = with stdenv.lib; {
       description = "An HTML-embedded scripting language";
-      homepage = "https://www.php.net";
+      homepage = "https://www.php.net/";
       license = licenses.php301;
-      maintainers = teams.php.members;
+      maintainers = with maintainers; [ globin etu ma27 ];
       platforms = platforms.all;
       outputsToInstall = [ "out" "dev" ];
     };
@@ -194,7 +194,6 @@ let
             passthru = {
               inherit buildEnv withExtensions enabledExtensions;
               inherit (php-packages) packages extensions;
-              inherit (php) meta;
             };
             paths = [ php ];
             postBuild = ''