@@ -7,6 +7,12 @@ let
77 inherit (pkgs) stdenv autoreconfHook fetchurl;
88 };
99
10+ # Wrap mkDerivation to prepend pname with "php-" to make names consistent
11+ # with how buildPecl does it and make the file easier to overview.
12+ mkDerivation = { pname, ... }@args: pkgs.stdenv.mkDerivation (args // {
13+ pname = "php-${pname}";
14+ });
15+
1016 isPhp73 = pkgs.lib.versionAtLeast php.version "7.3";
1117
1218 apcu = buildPecl rec {
@@ -39,9 +45,9 @@ let
3945 sha256 = "0ja74k2lmxwhhvp9y9kc7khijd7s2dqma5x8ghbhx9ajkn0wg8iq";
4046 };
4147
42− box = pkgs.stdenv.mkDerivation rec {
48+ box = mkDerivation rec {
4349 version = "2.7.5";
44− pname = "php-box";
50+ pname = "box";
4551
4652 src = pkgs.fetchurl {
4753 url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar";
@@ -66,9 +72,9 @@ let
6672 };
6773 };
6874
69− composer = pkgs.stdenv.mkDerivation rec {
75+ composer = mkDerivation rec {
7076 version = "1.8.5";
71− pname = "php-composer";
77+ pname = "composer";
7278
7379 src = pkgs.fetchurl {
7480 url = "https://getcomposer.org/download/${version}/composer.phar";
@@ -210,7 +216,7 @@ let
210216 buildInputs = [ pkgs.unixODBC ];
211217 };
212218
213− php-cs-fixer = pkgs.stdenv.mkDerivation rec {
219+ php-cs-fixer = mkDerivation rec {
214220 version = "2.14.2";
215221 pname = "php-cs-fixer";
216222
@@ -237,7 +243,7 @@ let
237243 };
238244 };
239245
240− php-parallel-lint = pkgs.stdenv.mkDerivation rec {
246+ php-parallel-lint = mkDerivation rec {
241247 version = "1.0.0";
242248 pname = "php-parallel-lint";
243249
@@ -286,9 +292,9 @@ let
286292 meta.broken = true;
287293 };
288294
289− phpcbf = pkgs.stdenv.mkDerivation rec {
295+ phpcbf = mkDerivation rec {
290296 version = "3.4.2";
291− pname = "php-phpcbf";
297+ pname = "phpcbf";
292298
293299 src = pkgs.fetchurl {
294300 url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
@@ -313,9 +319,9 @@ let
313319 };
314320 };
315321
316− phpcs = pkgs.stdenv.mkDerivation rec {
322+ phpcs = mkDerivation rec {
317323 version = "3.4.2";
318− pname = "php-phpcs";
324+ pname = "phpcs";
319325
320326 src = pkgs.fetchurl {
321327 url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
@@ -340,9 +346,9 @@ let
340346 };
341347 };
342348
343− phpstan = pkgs.stdenv.mkDerivation rec {
349+ phpstan = mkDerivation rec {
344350 version = "0.11.5";
345− pname = "php-phpstan";
351+ pname = "phpstan";
346352
347353 src = pkgs.fetchurl {
348354 url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
@@ -374,9 +380,9 @@ let
374380 };
375381 };
376382
377− psysh = pkgs.stdenv.mkDerivation rec {
383+ psysh = mkDerivation rec {
378384 version = "0.9.9";
379− pname = "php-psysh";
385+ pname = "psysh";
380386
381387 src = pkgs.fetchurl {
382388 url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";