diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 7c39ce48a3f..e37a4de9d07 100644 --- 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 index 1fed6a4d9bf..9fe952e5415 100644 --- 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 index 513abd94373..1e4ced24b6c 100644 --- 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 index 1092e0ecadd..fc3ff986734 100644 --- 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 index 3dd0964e60f..016dca81d52 100644 --- 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 index 2dada0082e2..1d6576b383c 100644 --- 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 = '' diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 35c0312e34d..0cda058459d 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -51,7 +51,7 @@ in description = "An application for building and managing Phars"; license = licenses.mit; homepage = "https://box-project.github.io/box2/"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -80,7 +80,7 @@ in description = "Dependency Manager for PHP"; license = licenses.mit; homepage = "https://getcomposer.org/"; - maintainers = with maintainers; [ offline ] ++ teams.php.members; + maintainers = with maintainers; [ globin offline ]; }; }; @@ -107,7 +107,7 @@ in description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; homepage = "http://cs.sensiolabs.org/"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -144,7 +144,7 @@ in description = "This tool check syntax of PHP files faster than serial check with fancier output"; license = licenses.bsd2; homepage = "https://github.com/JakubOnderka/PHP-Parallel-Lint"; - maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; + maintainers = with maintainers; [ jtojnar ]; }; }; @@ -171,7 +171,7 @@ in description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members; + maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; @@ -198,7 +198,7 @@ in description = "PHP coding standard tool"; license = licenses.bsd3; homepage = "https://squizlabs.github.io/PHP_CodeSniffer/"; - maintainers = with maintainers; [ javaguirre ] ++ teams.php.members; + maintainers = with maintainers; [ javaguirre etu ]; }; }; @@ -224,15 +224,15 @@ in meta = with pkgs.lib; { description = "PHP Static Analysis Tool"; longDescription = '' - PHPStan focuses on finding errors in your code without actually - running it. It catches whole classes of bugs even before you write - tests for the code. It moves PHP closer to compiled languages in the - sense that the correctness of each line of the code can be checked - before you run the actual line. - ''; + PHPStan focuses on finding errors in your code without actually running + it. It catches whole classes of bugs even before you write tests for the + code. It moves PHP closer to compiled languages in the sense that the + correctness of each line of the code can be checked before you run the + actual line. + ''; license = licenses.mit; homepage = "https://github.com/phpstan/phpstan"; - maintainers = teams.php.members; + maintainers = with maintainers; [ etu ]; }; }; @@ -259,7 +259,6 @@ in description = "A static analysis tool for finding errors in PHP applications"; license = licenses.mit; homepage = "https://github.com/vimeo/psalm"; - maintainers = teams.php.members; }; }; @@ -286,7 +285,7 @@ in description = "PsySH is a runtime developer console, interactive debugger and REPL for PHP."; license = licenses.mit; homepage = "https://psysh.org/"; - maintainers = with maintainers; [ caugner ] ++ teams.php.members; + maintainers = with maintainers; [ caugner ]; }; }; }; @@ -309,8 +308,6 @@ in checkFlagsArray = ["REPORT_EXIT_STATUS=1" "NO_INTERACTION=1"]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; }; apcu_bc = buildPecl { @@ -323,8 +320,6 @@ in php.extensions.apcu pcre' ]; - - meta.maintainers = lib.teams.php.members; }; ast = buildPecl { @@ -332,8 +327,6 @@ in pname = "ast"; sha256 = "16c5isldm4csjbcvz1qk2mmrhgvh24sxsp6w6f5a37xpa3vciawp"; - - meta.maintainers = lib.teams.php.members; }; couchbase = buildPecl rec { @@ -381,7 +374,6 @@ in '') ]; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -414,7 +406,6 @@ in ''; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; - maintainers = teams.php.members; }; }; @@ -427,8 +418,6 @@ in configureFlags = [ "--enable-igbinary" ]; makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - - meta.maintainers = lib.teams.php.members; }; imagick = buildPecl { @@ -440,8 +429,6 @@ in configureFlags = [ "--with-imagick=${pkgs.imagemagick.dev}" ]; nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; }; mailparse = buildPecl { @@ -453,8 +440,6 @@ in postConfigure = '' echo "#define HAVE_MBSTRING 1" >> config.h ''; - - meta.maintainers = lib.teams.php.members; }; maxminddb = buildPecl rec { @@ -474,7 +459,7 @@ in meta = with pkgs.lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; - maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; + maintainers = with maintainers; [ ajs124 das_j ]; }; }; @@ -501,8 +486,6 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl zlib ]; - - meta.maintainers = lib.teams.php.members; }; mongodb = buildPecl { @@ -520,8 +503,6 @@ in zlib pcre' ] ++ lib.optional (pkgs.stdenv.isDarwin) pkgs.darwin.apple_sdk.frameworks.Security; - - meta.maintainers = lib.teams.php.members; }; oci8 = buildPecl { @@ -535,8 +516,6 @@ in postPatch = '' sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 ''; - - meta.maintainers = lib.teams.php.members; }; pcov = buildPecl { @@ -546,8 +525,6 @@ in sha256 = "1psfwscrc025z8mziq69pcx60k4fbkqa5g2ia8lplb94mmarj0v1"; buildInputs = [ pcre' ]; - - meta.maintainers = lib.teams.php.members; }; pcs = buildPecl { @@ -556,7 +533,6 @@ in sha256 = "0d4p1gpl8gkzdiv860qzxfz250ryf0wmjgyc8qcaaqgkdyh5jy5p"; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp74; # Build error }; @@ -572,10 +548,8 @@ in internalDeps = [ php.extensions.pdo ]; postPatch = '' - sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 - ''; - - meta.maintainers = lib.teams.php.members; + sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${pkgs.oracle-instantclient.dev}/include"|' config.m4 + ''; }; pdo_sqlsrv = buildPecl { @@ -587,8 +561,6 @@ in internalDeps = [ php.extensions.pdo ]; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; }; php_excel = buildPecl rec { @@ -604,8 +576,6 @@ in }; configureFlags = [ "--with-excel" "--with-libxl-incdir=${pkgs.libxl}/include_c" "--with-libxl-libdir=${pkgs.libxl}/lib" ]; - - meta.maintainers = lib.teams.php.members; }; pinba = let @@ -631,7 +601,6 @@ in statistics server for PHP using MySQL as a read-only interface. ''; homepage = "http://pinba.org/"; - maintainers = teams.php.members; }; }; @@ -649,7 +618,6 @@ in ''; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; - maintainers = teams.php.members; }; }; @@ -685,8 +653,6 @@ in session ] ++ lib.optionals (lib.versionOlder php.version "7.4") [ hash ]; - - meta.maintainers = lib.teams.php.members; }; sqlsrv = buildPecl { @@ -696,8 +662,6 @@ in sha256 = "1kv4krk1w4hri99b0sdgwgy9c4y0yh217wx2y3irhkfi46kdrjnw"; buildInputs = [ pkgs.unixODBC ] ++ pkgs.lib.optionals pkgs.stdenv.isDarwin [ pkgs.libiconv ]; - - meta.maintainers = lib.teams.php.members; }; v8 = buildPecl { @@ -708,8 +672,6 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8=${pkgs.v8_6_x}" ]; - - meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -721,8 +683,6 @@ in buildInputs = [ pkgs.v8_6_x ]; configureFlags = [ "--with-v8js=${pkgs.v8_6_x}" ]; - - meta.maintainers = lib.teams.php.members; meta.broken = true; }; @@ -736,8 +696,6 @@ in checkTarget = "test"; zendExtension = true; - - meta.maintainers = lib.teams.php.members; }; yaml = buildPecl { @@ -751,8 +709,6 @@ in ]; nativeBuildInputs = [ pkgs.pkgconfig ]; - - meta.maintainers = lib.teams.php.members; }; zmq = buildPecl { @@ -767,7 +723,6 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; - meta.maintainers = lib.teams.php.members; meta.broken = isPhp73; }; } // (let @@ -827,8 +782,6 @@ in --prune-empty-dirs \ . $dev/include/ ''; - - meta.maintainers = lib.teams.php.members; }); # This list contains build instructions for different modules that one may