From 355a7527cc9d8559a097715db7db7fa7477889b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:38:00 +0200 Subject: [PATCH 1/8] phpExtensions.datadog_trace: cleanup --- pkgs/development/php-packages/datadog_trace/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/datadog_trace/default.nix b/pkgs/development/php-packages/datadog_trace/default.nix index 9b91d85fefe5..38beba92e21e 100644 --- a/pkgs/development/php-packages/datadog_trace/default.nix +++ b/pkgs/development/php-packages/datadog_trace/default.nix @@ -7,7 +7,7 @@ buildPecl rec { src = fetchFromGitHub { owner = "DataDog"; repo = "dd-trace-php"; - rev = "${version}"; + rev = version; sha256 = "sha256-AYRBzE0Detg/IHXYutZUfPRMtfthxdkSjqD0M+VcTpY="; }; From 0b5af74cb6638fdc7f14393f0fbd06fadcd9a135 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:38:08 +0200 Subject: [PATCH 2/8] phpExtensions.event: cleanup description --- pkgs/development/php-packages/event/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/php-packages/event/default.nix b/pkgs/development/php-packages/event/default.nix index 9bdfaa3b4b2c..a497d934627a 100644 --- a/pkgs/development/php-packages/event/default.nix +++ b/pkgs/development/php-packages/event/default.nix @@ -23,10 +23,7 @@ buildPecl { internalDeps = [ php.extensions.sockets ]; meta = with lib; { - description = '' - This is an extension to efficiently schedule I/O, time and signal based - events using the best I/O notification mechanism available for specific platform. - ''; + description = "Efficiently schedule I/O, time and signal based events using the best I/O notification mechanism available"; license = licenses.php301; homepage = "https://bitbucket.org/osmanov/pecl-event/"; maintainers = teams.php.members; From e5ef9dc5bf3f037599970956ab3aee7b049f34d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:05 +0200 Subject: [PATCH 3/8] phpExtensions.openswoole: split longDescription on new lines --- pkgs/development/php-packages/openswoole/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/openswoole/default.nix b/pkgs/development/php-packages/openswoole/default.nix index d43ed40f8cee..414b144ba8ef 100644 --- a/pkgs/development/php-packages/openswoole/default.nix +++ b/pkgs/development/php-packages/openswoole/default.nix @@ -15,7 +15,11 @@ buildPecl { description = "Coroutine-based concurrency library and high performance programmatic server for PHP"; homepage = "https://www.openswoole.com/"; license = licenses.asl20; - longDescription = "Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines.\nIt offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL.\nYou can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process."; + longDescription = '' + Open Swoole allows you to build high-performance, async multi-tasking webservices and applications using an easy to use Coroutine API.\nOpen Swoole is a complete async solution that has built-in support for async programming via coroutines. + It offers a range of multi-threaded I/O modules (HTTP Server, WebSockets, TaskWorkers, Process Pools) out of the box and support for popular PHP clients like PDO for MySQL, and CURL. + You can use the sync or async, Coroutine API to write whole applications or create thousands of light weight Coroutines within one Linux process. + ''; maintainers = teams.php.members; }; } From 1592f4ca84871195b17695656f412f8c2aecdf93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:33 +0200 Subject: [PATCH 4/8] phpExtensions.php-cs-fixer: update homepage --- pkgs/development/php-packages/php-cs-fixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix index 0d297a35a83c..7085ea167796 100644 --- a/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -27,7 +27,7 @@ mkDerivation { meta = with lib; { description = "A tool to automatically fix PHP coding standards issues"; license = licenses.mit; - homepage = "http://cs.sensiolabs.org/"; + homepage = "https://cs.symfony.com/"; maintainers = with maintainers; [ jtojnar ] ++ teams.php.members; }; } From c276f24e2922e2cb31230cb4bb419918ff903ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:41 +0200 Subject: [PATCH 5/8] phpExtensions.pinba: replace version number --- pkgs/development/php-packages/pinba/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/php-packages/pinba/default.nix b/pkgs/development/php-packages/pinba/default.nix index 1649da7c6545..7d4e020f406b 100644 --- a/pkgs/development/php-packages/pinba/default.nix +++ b/pkgs/development/php-packages/pinba/default.nix @@ -1,13 +1,13 @@ { buildPecl, lib, fetchFromGitHub }: -buildPecl { +buildPecl rec { pname = "pinba"; version = "1.1.2"; src = fetchFromGitHub { owner = "tony2001"; repo = "pinba_extension"; - rev = "RELEASE_1_1_2"; + rev = "RELEASE_${lib.replaceStrings ["."] ["_"] version}"; sha256 = "0wqcqq6sb51wiawa37hbd1h9dbvmyyndzdvz87xqji7lpr9vn8jy"; }; From 2953d4b93203eb653008bb10c572c2b4761fdbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:51 +0200 Subject: [PATCH 6/8] phpExtensions.protobuf: format description --- pkgs/development/php-packages/protobuf/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/development/php-packages/protobuf/default.nix b/pkgs/development/php-packages/protobuf/default.nix index a5b22e97953a..de71b8c8000d 100644 --- a/pkgs/development/php-packages/protobuf/default.nix +++ b/pkgs/development/php-packages/protobuf/default.nix @@ -9,9 +9,7 @@ buildPecl { buildInputs = [ pcre2 ]; meta = with lib; { - description = '' - Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data. - ''; + description = "Google's language-neutral, platform-neutral, extensible mechanism for serializing structured data."; license = licenses.bsd3; homepage = "https://developers.google.com/protocol-buffers/"; maintainers = teams.php.members; From 8b63f7e1744b23ae5f6bc0e50d2cb1778fe82cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:40:56 +0200 Subject: [PATCH 7/8] phpExtensions.yaml: update homepage --- pkgs/development/php-packages/yaml/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/php-packages/yaml/default.nix b/pkgs/development/php-packages/yaml/default.nix index d4803c9d21ac..3a385e8f9bbf 100644 --- a/pkgs/development/php-packages/yaml/default.nix +++ b/pkgs/development/php-packages/yaml/default.nix @@ -13,7 +13,7 @@ buildPecl { meta = with lib; { description = "YAML-1.1 parser and emitter"; license = licenses.mit; - homepage = "http://bd808.com/pecl-file_formats-yaml/"; + homepage = "https://bd808.com/pecl-file_formats-yaml/"; maintainers = teams.php.members; }; } From 023798d172ea7a9c81b926dd56b214e2e97a79d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 27 Oct 2022 11:41:05 +0200 Subject: [PATCH 8/8] build-pecl: fetch via https --- pkgs/build-support/build-pecl.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/build-pecl.nix b/pkgs/build-support/build-pecl.nix index 8168c7a3de18..d30a073d2fb9 100644 --- a/pkgs/build-support/build-pecl.nix +++ b/pkgs/build-support/build-pecl.nix @@ -9,7 +9,7 @@ , postPhpize ? "" , makeFlags ? [ ] , src ? fetchurl { - url = "http://pecl.php.net/get/${pname}-${version}.tgz"; + url = "https://pecl.php.net/get/${pname}-${version}.tgz"; inherit (args) sha256; } , ...