From e76ccc6b2798e50ef959a8cf830035d76a92106b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 8 Jun 2021 11:50:05 +0200 Subject: [PATCH 1/2] php.extensions: Add missing meta info --- pkgs/development/php-packages/apcu/default.nix | 7 ++++++- pkgs/development/php-packages/apcu_bc/default.nix | 9 +++++++-- pkgs/development/php-packages/ast/default.nix | 7 ++++++- pkgs/development/php-packages/couchbase/default.nix | 9 +++++++-- pkgs/development/php-packages/igbinary/default.nix | 7 ++++++- pkgs/development/php-packages/imagick/default.nix | 7 ++++++- pkgs/development/php-packages/mailparse/default.nix | 7 ++++++- pkgs/development/php-packages/maxminddb/default.nix | 1 + pkgs/development/php-packages/memcached/default.nix | 7 ++++++- pkgs/development/php-packages/mongodb/default.nix | 7 ++++++- pkgs/development/php-packages/oci8/default.nix | 7 ++++++- pkgs/development/php-packages/pcov/default.nix | 7 ++++++- pkgs/development/php-packages/pdlib/default.nix | 1 + pkgs/development/php-packages/pdo_sqlsrv/default.nix | 7 ++++++- pkgs/development/php-packages/php_excel/default.nix | 9 +++++++-- pkgs/development/php-packages/phpmd/default.nix | 4 +--- pkgs/development/php-packages/pinba/default.nix | 1 + pkgs/development/php-packages/rdkafka/default.nix | 1 + pkgs/development/php-packages/redis/default.nix | 7 ++++++- pkgs/development/php-packages/smbclient/default.nix | 7 ++++++- pkgs/development/php-packages/sqlsrv/default.nix | 7 ++++++- pkgs/development/php-packages/xdebug/default.nix | 7 ++++++- pkgs/development/php-packages/yaml/default.nix | 7 ++++++- 23 files changed, 116 insertions(+), 24 deletions(-) diff --git a/pkgs/development/php-packages/apcu/default.nix b/pkgs/development/php-packages/apcu/default.nix index 5aa8b2b4f9b..0cfc7b4b44f 100644 --- a/pkgs/development/php-packages/apcu/default.nix +++ b/pkgs/development/php-packages/apcu/default.nix @@ -13,5 +13,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Userland cache for PHP"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/APCu"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/apcu_bc/default.nix b/pkgs/development/php-packages/apcu_bc/default.nix index 448c25bee64..e487a075dbd 100644 --- a/pkgs/development/php-packages/apcu_bc/default.nix +++ b/pkgs/development/php-packages/apcu_bc/default.nix @@ -14,6 +14,11 @@ buildPecl { mv $out/lib/php/extensions/apc.so $out/lib/php/extensions/apcu_bc.so ''; - meta.maintainers = lib.teams.php.members; - meta.broken = lib.versionAtLeast php.version "8"; + meta = with lib; { + description = "APCu Backwards Compatibility Module"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/apcu_bc"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8"; + }; } diff --git a/pkgs/development/php-packages/ast/default.nix b/pkgs/development/php-packages/ast/default.nix index fb609b9f04f..03cd439867a 100644 --- a/pkgs/development/php-packages/ast/default.nix +++ b/pkgs/development/php-packages/ast/default.nix @@ -6,5 +6,10 @@ buildPecl { version = "1.0.10"; sha256 = "13s5r1szd80g1mqickghdd38mvjkwss221322mmbrykcfgp4fs30"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Exposes the abstract syntax tree generated by PHP"; + license = licenses.bsd3; + homepage = "https://pecl.php.net/package/ast"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/couchbase/default.nix b/pkgs/development/php-packages/couchbase/default.nix index 6d6bdf76e40..0b34ffe780a 100644 --- a/pkgs/development/php-packages/couchbase/default.nix +++ b/pkgs/development/php-packages/couchbase/default.nix @@ -44,6 +44,11 @@ buildPecl { '') ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Couchbase Server PHP extension"; + license = licenses.asl20; + homepage = "https://docs.couchbase.com/php-sdk/current/project-docs/sdk-release-notes.html"; + maintainers = teams.php.members; + broken = versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/igbinary/default.nix b/pkgs/development/php-packages/igbinary/default.nix index 7a321cc90b4..9e710f3c3d1 100644 --- a/pkgs/development/php-packages/igbinary/default.nix +++ b/pkgs/development/php-packages/igbinary/default.nix @@ -10,5 +10,10 @@ buildPecl { makeFlags = [ "phpincludedir=$(dev)/include" ]; outputs = [ "out" "dev" ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Binary serialization for PHP"; + license = licenses.bsd3; + homepage = "https://github.com/igbinary/igbinary/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/imagick/default.nix b/pkgs/development/php-packages/imagick/default.nix index 744ba2302f7..1af4f1a23b4 100644 --- a/pkgs/development/php-packages/imagick/default.nix +++ b/pkgs/development/php-packages/imagick/default.nix @@ -23,5 +23,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Imagick is a native php extension to create and modify images using the ImageMagick API"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/imagick"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mailparse/default.nix b/pkgs/development/php-packages/mailparse/default.nix index 820bbbdbad6..1981b3d6aea 100644 --- a/pkgs/development/php-packages/mailparse/default.nix +++ b/pkgs/development/php-packages/mailparse/default.nix @@ -11,5 +11,10 @@ buildPecl { echo "#define HAVE_MBSTRING 1" >> config.h ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Mailparse is an extension for parsing and working with email messages"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/mailparse"; + maintainers = lib.teams.php.members; + }; } diff --git a/pkgs/development/php-packages/maxminddb/default.nix b/pkgs/development/php-packages/maxminddb/default.nix index 9a5a96e15c2..ae7ef3d0602 100644 --- a/pkgs/development/php-packages/maxminddb/default.nix +++ b/pkgs/development/php-packages/maxminddb/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "C extension that is a drop-in replacement for MaxMind\\Db\\Reader"; license = with licenses; [ asl20 ]; + homepage = "https://github.com/maxmind/MaxMind-DB-Reader-php"; maintainers = with maintainers; [ ajs124 das_j ] ++ teams.php.members; }; } diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix index 4880e08e062..0aea58572cb 100644 --- a/pkgs/development/php-packages/memcached/default.nix +++ b/pkgs/development/php-packages/memcached/default.nix @@ -26,5 +26,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ cyrus_sasl zlib ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with memcached via libmemcached library"; + license = licenses.php301; + homepage = "https://github.com/php-memcached-dev/php-memcached"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/mongodb/default.nix b/pkgs/development/php-packages/mongodb/default.nix index d0e5e545f6b..f8cd990d267 100644 --- a/pkgs/development/php-packages/mongodb/default.nix +++ b/pkgs/development/php-packages/mongodb/default.nix @@ -17,5 +17,10 @@ buildPecl { pcre2 ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Security; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "MongoDB driver for PHP"; + license = licenses.asl20; + homepage = "https://docs.mongodb.com/drivers/php/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/oci8/default.nix b/pkgs/development/php-packages/oci8/default.nix index eeaffb4b7fc..eb65b5a27cd 100644 --- a/pkgs/development/php-packages/oci8/default.nix +++ b/pkgs/development/php-packages/oci8/default.nix @@ -11,5 +11,10 @@ buildPecl { sed -i -e 's|OCISDKMANINC=`.*$|OCISDKMANINC="${oracle-instantclient.dev}/include"|' config.m4 ''; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Extension for Oracle Database"; + license = licenses.php301; + homepage = "https://pecl.php.net/package/oci8"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pcov/default.nix b/pkgs/development/php-packages/pcov/default.nix index 0583f776e56..8511ccbebc5 100644 --- a/pkgs/development/php-packages/pcov/default.nix +++ b/pkgs/development/php-packages/pcov/default.nix @@ -8,5 +8,10 @@ buildPecl { buildInputs = [ pcre2 ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "A self contained php-code-coverage compatible driver for PHP."; + license = licenses.php301; + homepage = "https://github.com/krakjoe/pcov"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/pdlib/default.nix b/pkgs/development/php-packages/pdlib/default.nix index e217edd29ef..5a1e431d52d 100644 --- a/pkgs/development/php-packages/pdlib/default.nix +++ b/pkgs/development/php-packages/pdlib/default.nix @@ -19,6 +19,7 @@ buildPecl { meta = with lib; { description = "A PHP extension for Dlib"; license = with licenses; [ mit ]; + homepage = "https://github.com/goodspb/pdlib"; maintainers = lib.teams.php.members; }; } diff --git a/pkgs/development/php-packages/pdo_sqlsrv/default.nix b/pkgs/development/php-packages/pdo_sqlsrv/default.nix index d80944ada09..ab7e6e71fea 100644 --- a/pkgs/development/php-packages/pdo_sqlsrv/default.nix +++ b/pkgs/development/php-packages/pdo_sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { buildInputs = [ unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/php_excel/default.nix b/pkgs/development/php-packages/php_excel/default.nix index 4effddaed49..0930926a06e 100644 --- a/pkgs/development/php-packages/php_excel/default.nix +++ b/pkgs/development/php-packages/php_excel/default.nix @@ -20,6 +20,11 @@ buildPecl { "--with-libxl-libdir=${libxl}/lib" ]; - meta.broken = lib.versionAtLeast php.version "8.0"; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP Extension interface to the Excel writing/reading library"; + license = licenses.php301; + homepage = "https://github.com/iliaal/php_excel"; + maintainers = lib.teams.php.members; + broken = lib.versionAtLeast php.version "8.0"; + }; } diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix index fde674701eb..bf6979f88ea 100644 --- a/pkgs/development/php-packages/phpmd/default.nix +++ b/pkgs/development/php-packages/phpmd/default.nix @@ -2,8 +2,6 @@ let pname = "phpmd"; version = "2.8.2"; - - isPhp74 = lib.versionAtLeast php.version "7.4"; in mkDerivation { inherit pname version; @@ -28,6 +26,6 @@ mkDerivation { license = licenses.bsd3; homepage = "https://phpmd.org/"; maintainers = teams.php.members; - broken = !isPhp74; + broken = versionAtLeast php.version "7.4"; }; } diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 4c1b42183ba..0373e74d9fc 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -17,6 +17,7 @@ buildPecl { Pinba is a MySQL storage engine that acts as a realtime monitoring and statistics server for PHP using MySQL as a read-only interface. ''; + license = licenses.lgpl2Plus; homepage = "http://pinba.org/"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/rdkafka/default.nix b/pkgs/development/php-packages/rdkafka/default.nix index c8dea9463d6..1b963a01ad5 100644 --- a/pkgs/development/php-packages/rdkafka/default.nix +++ b/pkgs/development/php-packages/rdkafka/default.nix @@ -15,6 +15,7 @@ buildPecl { meta = with lib; { description = "Kafka client based on librdkafka"; + license = licenses.mit; homepage = "https://github.com/arnaud-lb/php-rdkafka"; maintainers = teams.php.members; }; diff --git a/pkgs/development/php-packages/redis/default.nix b/pkgs/development/php-packages/redis/default.nix index fedc7a7ffde..35e9a909b37 100644 --- a/pkgs/development/php-packages/redis/default.nix +++ b/pkgs/development/php-packages/redis/default.nix @@ -14,5 +14,10 @@ buildPecl { hash ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP extension for interfacing with Redis"; + license = licenses.php301; + homepage = "https://github.com/phpredis/phpredis/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/smbclient/default.nix b/pkgs/development/php-packages/smbclient/default.nix index 0b485e04805..65cfad9ea3a 100644 --- a/pkgs/development/php-packages/smbclient/default.nix +++ b/pkgs/development/php-packages/smbclient/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; buildInputs = [ samba ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "PHP wrapper for libsmbclient"; + license = licenses.bsd2; + homepage = "https://github.com/eduardok/libsmbclient-php"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/sqlsrv/default.nix b/pkgs/development/php-packages/sqlsrv/default.nix index 4522129b2aa..37ff1cb187e 100644 --- a/pkgs/development/php-packages/sqlsrv/default.nix +++ b/pkgs/development/php-packages/sqlsrv/default.nix @@ -10,5 +10,10 @@ buildPecl { unixODBC ] ++ lib.optionals stdenv.isDarwin [ libiconv ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Microsoft Drivers for PHP for SQL Server"; + license = licenses.mit; + homepage = "https://github.com/Microsoft/msphpsql"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix index 56341be436a..eaadb4b1f54 100644 --- a/pkgs/development/php-packages/xdebug/default.nix +++ b/pkgs/development/php-packages/xdebug/default.nix @@ -11,5 +11,10 @@ buildPecl { zendExtension = true; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "Provides functions for function traces and profiling"; + license = licenses.php301; + homepage = "https://xdebug.org/"; + maintainers = teams.php.members; + }; } diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index 9bd30ff4e3c..ef58b315fae 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -10,5 +10,10 @@ buildPecl { nativeBuildInputs = [ pkg-config ]; - meta.maintainers = lib.teams.php.members; + meta = with lib; { + description = "YAML-1.1 parser and emitter"; + license = licenses.mit; + homepage = "http://bd808.com/pecl-file_formats-yaml/"; + maintainers = teams.php.members; + }; } From 5da1daec6c8b9933a834f903a42f6680fee246db Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 8 Jun 2021 11:53:52 +0200 Subject: [PATCH 2/2] codeowners: Add all @NixOS/php team members to codeowners list --- .github/CODEOWNERS | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 597978aa53b..2f5c5950cdb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -196,12 +196,12 @@ /nixos/tests/prometheus-exporters.nix @WilliButz # PHP interpreter, packages, extensions, tests and documentation -/doc/languages-frameworks/php.section.md @NixOS/php -/nixos/tests/php @NixOS/php -/pkgs/build-support/build-pecl.nix @NixOS/php -/pkgs/development/interpreters/php @NixOS/php @jtojnar -/pkgs/development/php-packages @NixOS/php -/pkgs/top-level/php-packages.nix @NixOS/php @jtojnar +/doc/languages-frameworks/php.section.md @NixOS/php @aanderse @etu @globin @ma27 @talyz +/nixos/tests/php @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/build-support/build-pecl.nix @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/interpreters/php @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/development/php-packages @NixOS/php @aanderse @etu @globin @ma27 @talyz +/pkgs/top-level/php-packages.nix @jtojnar @NixOS/php @aanderse @etu @globin @ma27 @talyz # Podman, CRI-O modules and related /nixos/modules/virtualisation/containers.nix @NixOS/podman @zowoq