From 5c8e29da49a08631c2bda58d35df2f4da53e2f89 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:33:54 +0200
Subject: [PATCH 01/11] phpPackages.box: Move to separate directory

---
 pkgs/development/php-packages/box/default.nix | 30 ++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 31 +++----------------
 2 files changed, 35 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/box/default.nix

diff --git a/pkgs/development/php-packages/box/default.nix b/pkgs/development/php-packages/box/default.nix
new file mode 100644
index 00000000000..8d6bba3e460
--- /dev/null
+++ b/pkgs/development/php-packages/box/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "box";
+  version = "2.7.5";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar";
+    sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/box/box.phar
+    makeWrapper ${php}/bin/php $out/bin/box \
+      --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar"
+  '';
+
+  meta = with lib; {
+    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;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1e915f93851..1713d1b777f 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -23,38 +23,17 @@ let
   isPhp74 = pkgs.lib.versionAtLeast php.version "7.4";
 
   pcre' = if (lib.versionAtLeast php.version "7.3") then pcre2 else pcre;
+
+  callPackage = pkgs.newScope {
+    inherit mkDerivation php isPhp73 isPhp74 buildPecl pcre';
+  };
 in
 {
   inherit buildPecl;
 
   # This is a set of interactive tools based on PHP.
   packages = {
-    box = mkDerivation rec {
-      version = "2.7.5";
-      pname = "box";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/box-project/box2/releases/download/${version}/box-${version}.phar";
-        sha256 = "1zmxdadrv0i2l8cz7xb38gnfmfyljpsaz2nnkjzqzksdmncbgd18";
-      };
-
-      phases = [ "installPhase" ];
-      buildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/box/box.phar
-        makeWrapper ${php}/bin/php $out/bin/box \
-          --add-flags "-d phar.readonly=0 $out/libexec/box/box.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        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;
-      };
-    };
+    box = callPackage ../development/php-packages/box { };
 
     composer = mkDerivation rec {
       version = "1.10.13";

From a149fe969ced4049edc54c7630c19bce8234b04e Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:37:09 +0200
Subject: [PATCH 02/11] phpPackages.composer: Move to separate directory

---
 .../php-packages/composer/default.nix         | 32 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 29 +----------------
 2 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/php-packages/composer/default.nix

diff --git a/pkgs/development/php-packages/composer/default.nix b/pkgs/development/php-packages/composer/default.nix
new file mode 100644
index 00000000000..4f6cbe4c7d3
--- /dev/null
+++ b/pkgs/development/php-packages/composer/default.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "composer";
+  version = "1.10.13";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://getcomposer.org/download/${version}/composer.phar";
+    sha256 = "13vhfdlkmpvmk1h30f1i688xk7sdgfj0b82am32jgpa8zmf499sw";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/composer/composer.phar
+    makeWrapper ${php}/bin/php $out/bin/composer \
+      --add-flags "$out/libexec/composer/composer.phar" \
+      --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Dependency Manager for PHP";
+    license = licenses.mit;
+    homepage = "https://getcomposer.org/";
+    maintainers = with maintainers; [ offline ] ++ teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 1713d1b777f..7ba2c2d86aa 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -35,34 +35,7 @@ in
   packages = {
     box = callPackage ../development/php-packages/box { };
 
-    composer = mkDerivation rec {
-      version = "1.10.13";
-      pname = "composer";
-
-      src = pkgs.fetchurl {
-        url = "https://getcomposer.org/download/${version}/composer.phar";
-        sha256 = "13vhfdlkmpvmk1h30f1i688xk7sdgfj0b82am32jgpa8zmf499sw";
-      };
-
-      dontUnpack = true;
-
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/composer/composer.phar
-        makeWrapper ${php}/bin/php $out/bin/composer \
-          --add-flags "$out/libexec/composer/composer.phar" \
-          --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
-      '';
-
-      meta = with pkgs.lib; {
-        description = "Dependency Manager for PHP";
-        license = licenses.mit;
-        homepage = "https://getcomposer.org/";
-        maintainers = with maintainers; [ offline ] ++ teams.php.members;
-      };
-    };
+    composer = callPackage ../development/php-packages/composer { };
 
     composer2 = mkDerivation rec {
       version = "2.0.0-RC1";

From e9a9b9ba821a8e38a7ada93c29ddabc2d2a65116 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:38:09 +0200
Subject: [PATCH 03/11] phpPackages.composer2: Move to separate directory

---
 .../development/php-packages/composer/2.0.nix | 32 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 29 +----------------
 2 files changed, 33 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/php-packages/composer/2.0.nix

diff --git a/pkgs/development/php-packages/composer/2.0.nix b/pkgs/development/php-packages/composer/2.0.nix
new file mode 100644
index 00000000000..ac9fd527191
--- /dev/null
+++ b/pkgs/development/php-packages/composer/2.0.nix
@@ -0,0 +1,32 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "composer";
+  version = "2.0.0-RC1";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://getcomposer.org/download/${version}/composer.phar";
+    sha256 = "0wzr360gaa59cbjpa3vw9yrpc55a4fmdv68q0rn7vj0mjnz60fhd";
+  };
+
+  dontUnpack = true;
+
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/composer/composer.phar
+    makeWrapper ${php}/bin/php $out/bin/composer \
+      --add-flags "$out/libexec/composer/composer.phar" \
+      --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Dependency Manager for PHP";
+    license = licenses.mit;
+    homepage = "https://getcomposer.org/";
+    maintainers = with maintainers; [ offline ] ++ teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 7ba2c2d86aa..00b6a6b3893 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -37,34 +37,7 @@ in
 
     composer = callPackage ../development/php-packages/composer { };
 
-    composer2 = mkDerivation rec {
-      version = "2.0.0-RC1";
-      pname = "composer";
-
-      src = pkgs.fetchurl {
-        url = "https://getcomposer.org/download/${version}/composer.phar";
-        sha256 = "0wzr360gaa59cbjpa3vw9yrpc55a4fmdv68q0rn7vj0mjnz60fhd";
-      };
-
-      dontUnpack = true;
-
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/composer/composer.phar
-        makeWrapper ${php}/bin/php $out/bin/composer \
-          --add-flags "$out/libexec/composer/composer.phar" \
-          --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.unzip ]}
-      '';
-
-      meta = with pkgs.lib; {
-        description = "Dependency Manager for PHP";
-        license = licenses.mit;
-        homepage = "https://getcomposer.org/";
-        maintainers = with maintainers; [ offline ] ++ teams.php.members;
-      };
-    };
+    composer2 = callPackage ../development/php-packages/composer/2.0.nix { };
 
     php-cs-fixer = mkDerivation rec {
       version = "2.16.4";

From 47aa265985ae8189a3ff92c114948bdc60fa5390 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:39:33 +0200
Subject: [PATCH 04/11] phpPackages.php-cs-fixer: Move to separate directory

---
 .../php-packages/php-cs-fixer/default.nix     | 30 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 27 +----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/php-cs-fixer/default.nix

diff --git a/pkgs/development/php-packages/php-cs-fixer/default.nix b/pkgs/development/php-packages/php-cs-fixer/default.nix
new file mode 100644
index 00000000000..48d45cc4ea9
--- /dev/null
+++ b/pkgs/development/php-packages/php-cs-fixer/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "php-cs-fixer";
+  version = "2.16.4";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
+    sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar
+    makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \
+      --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    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;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 00b6a6b3893..c4a9b7188de 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -39,32 +39,7 @@ in
 
     composer2 = callPackage ../development/php-packages/composer/2.0.nix { };
 
-    php-cs-fixer = mkDerivation rec {
-      version = "2.16.4";
-      pname = "php-cs-fixer";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar";
-        sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8";
-      };
-
-      phases = [ "installPhase" ];
-      buildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/php-cs-fixer/php-cs-fixer.phar
-        makeWrapper ${php}/bin/php $out/bin/php-cs-fixer \
-          --add-flags "$out/libexec/php-cs-fixer/php-cs-fixer.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        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;
-      };
-    };
+    php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
 
     php-parallel-lint = mkDerivation rec {
       version = "1.0.0";

From 5d0cc8d156b035b91df2025c8cef5cbba6f07f6d Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:41:30 +0200
Subject: [PATCH 05/11] phpPackages.php-parallel-lint: Move to separate
 directory

---
 .../php-parallel-lint/default.nix             | 40 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 37 +----------------
 2 files changed, 41 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/development/php-packages/php-parallel-lint/default.nix

diff --git a/pkgs/development/php-packages/php-parallel-lint/default.nix b/pkgs/development/php-packages/php-parallel-lint/default.nix
new file mode 100644
index 00000000000..f479581fb2e
--- /dev/null
+++ b/pkgs/development/php-packages/php-parallel-lint/default.nix
@@ -0,0 +1,40 @@
+{ mkDerivation, fetchFromGitHub, pkgs, lib, php }:
+let
+  pname = "php-parallel-lint";
+  version = "1.0.0";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchFromGitHub {
+    owner = "JakubOnderka";
+    repo = "PHP-Parallel-Lint";
+    rev = "v${version}";
+    sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw";
+  };
+
+  nativeBuildInputs = [
+    pkgs.makeWrapper
+    php.packages.composer
+    php.packages.box
+  ];
+
+  buildPhase = ''
+    composer dump-autoload
+    box build
+  '';
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar
+    makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \
+      --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "Tool to 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;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index c4a9b7188de..975f94f0dd3 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -41,42 +41,7 @@ in
 
     php-cs-fixer = callPackage ../development/php-packages/php-cs-fixer { };
 
-    php-parallel-lint = mkDerivation rec {
-      version = "1.0.0";
-      pname = "php-parallel-lint";
-
-      src = pkgs.fetchFromGitHub {
-        owner = "JakubOnderka";
-        repo = "PHP-Parallel-Lint";
-        rev = "v${version}";
-        sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw";
-      };
-
-      buildInputs = [
-        pkgs.makeWrapper
-        php.packages.composer
-        php.packages.box
-      ];
-
-      buildPhase = ''
-        composer dump-autoload
-        box build
-      '';
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D parallel-lint.phar $out/libexec/php-parallel-lint/php-parallel-lint.phar
-        makeWrapper ${php}/bin/php $out/bin/php-parallel-lint \
-          --add-flags "$out/libexec/php-parallel-lint/php-parallel-lint.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        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;
-      };
-    };
+    php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
 
     phpcbf = mkDerivation rec {
       version = "3.5.5";

From c8f859fd57ce45e0a32aaf11f7a8c7f859ede0de Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:42:35 +0200
Subject: [PATCH 06/11] phpPackages.phpcbf: Move to separate directory

---
 .../php-packages/phpcbf/default.nix           | 30 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 27 +----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/phpcbf/default.nix

diff --git a/pkgs/development/php-packages/phpcbf/default.nix b/pkgs/development/php-packages/phpcbf/default.nix
new file mode 100644
index 00000000000..265c33b4ea0
--- /dev/null
+++ b/pkgs/development/php-packages/phpcbf/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "phpcbf";
+  version = "3.5.5";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
+    sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/phpcbf/phpcbf.phar
+    makeWrapper ${php}/bin/php $out/bin/phpcbf \
+      --add-flags "$out/libexec/phpcbf/phpcbf.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "PHP coding standard beautifier and fixer";
+    license = licenses.bsd3;
+    homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
+    maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 975f94f0dd3..c253e51246c 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -43,32 +43,7 @@ in
 
     php-parallel-lint = callPackage ../development/php-packages/php-parallel-lint { };
 
-    phpcbf = mkDerivation rec {
-      version = "3.5.5";
-      pname = "phpcbf";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar";
-        sha256 = "0hgagn70gl46migm6zpwcr39dxal07f5cdpnasrafgz5vq0gwr3g";
-      };
-
-      phases = [ "installPhase" ];
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/phpcbf/phpcbf.phar
-        makeWrapper ${php}/bin/php $out/bin/phpcbf \
-          --add-flags "$out/libexec/phpcbf/phpcbf.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        description = "PHP coding standard beautifier and fixer";
-        license = licenses.bsd3;
-        homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
-        maintainers = with maintainers; [ cmcdragonkai ] ++ teams.php.members;
-      };
-    };
+    phpcbf = callPackage ../development/php-packages/phpcbf { };
 
     phpcs = mkDerivation rec {
       version = "3.5.5";

From 9055c588c26d13a02b7179086f09a7f9ebe1d399 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:43:44 +0200
Subject: [PATCH 07/11] phpPackages.phpcs: Move to separate directory

---
 .../php-packages/phpcs/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 27 +----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/phpcs/default.nix

diff --git a/pkgs/development/php-packages/phpcs/default.nix b/pkgs/development/php-packages/phpcs/default.nix
new file mode 100644
index 00000000000..9b3d8c2bd19
--- /dev/null
+++ b/pkgs/development/php-packages/phpcs/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "phpcs";
+  version = "3.5.5";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
+    sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/phpcs/phpcs.phar
+    makeWrapper ${php}/bin/php $out/bin/phpcs \
+      --add-flags "$out/libexec/phpcs/phpcs.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "PHP coding standard tool";
+    license = licenses.bsd3;
+    homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
+    maintainers = with maintainers; [ javaguirre ] ++ teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index c253e51246c..f70440519f5 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -45,32 +45,7 @@ in
 
     phpcbf = callPackage ../development/php-packages/phpcbf { };
 
-    phpcs = mkDerivation rec {
-      version = "3.5.5";
-      pname = "phpcs";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar";
-        sha256 = "0jl038l55cmzn5ml61qkv4z1w4ri0h3v7h00pcb04xhz3gznlbsa";
-      };
-
-      phases = [ "installPhase" ];
-      buildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/phpcs/phpcs.phar
-        makeWrapper ${php}/bin/php $out/bin/phpcs \
-          --add-flags "$out/libexec/phpcs/phpcs.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        description = "PHP coding standard tool";
-        license = licenses.bsd3;
-        homepage = "https://squizlabs.github.io/PHP_CodeSniffer/";
-        maintainers = with maintainers; [ javaguirre ] ++ teams.php.members;
-      };
-    };
+    phpcs = callPackage ../development/php-packages/phpcs { };
 
     phpmd = mkDerivation rec {
       version = "2.8.2";

From b3f36d7cd7765cc70aac7f28b05957f2c9ad9e92 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:44:31 +0200
Subject: [PATCH 08/11] phpPackages.phpmd: Move to separate directory

---
 .../php-packages/phpmd/default.nix            | 31 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 28 +----------------
 2 files changed, 32 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/development/php-packages/phpmd/default.nix

diff --git a/pkgs/development/php-packages/phpmd/default.nix b/pkgs/development/php-packages/phpmd/default.nix
new file mode 100644
index 00000000000..ffdb877d76e
--- /dev/null
+++ b/pkgs/development/php-packages/phpmd/default.nix
@@ -0,0 +1,31 @@
+{ mkDerivation, fetchurl, pkgs, lib, php, isPhp74 }:
+let
+  pname = "phpmd";
+  version = "2.8.2";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar";
+    sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/phpmd/phpmd.phar
+    makeWrapper ${php}/bin/php $out/bin/phpmd \
+      --add-flags "$out/libexec/phpmd/phpmd.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "PHP code quality analyzer";
+    license = licenses.bsd3;
+    homepage = "https://phpmd.org/";
+    maintainers = teams.php.members;
+    broken = !isPhp74;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index f70440519f5..226d5722a11 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -47,33 +47,7 @@ in
 
     phpcs = callPackage ../development/php-packages/phpcs { };
 
-    phpmd = mkDerivation rec {
-      version = "2.8.2";
-      pname = "phpmd";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/phpmd/phpmd/releases/download/${version}/phpmd.phar";
-        sha256 = "1i8qgzxniw5d8zjpypalm384y7qfczapfq70xmg129laq6xiqlqb";
-      };
-
-      phases = [ "installPhase" ];
-      buildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/phpmd/phpmd.phar
-        makeWrapper ${php}/bin/php $out/bin/phpmd \
-          --add-flags "$out/libexec/phpmd/phpmd.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        description = "PHP code quality analyzer";
-        license = licenses.bsd3;
-        homepage = "https://phpmd.org/";
-        maintainers = teams.php.members;
-        broken = !isPhp74;
-      };
-    };
+    phpmd = callPackage ../development/php-packages/phpmd { };
 
     phpstan = mkDerivation rec {
       version = "0.12.48";

From 2defaa83c0c39f88cbeaf40194f9192748e43f11 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:45:34 +0200
Subject: [PATCH 09/11] phpPackages.phpstan: Move to separate directory

---
 .../php-packages/phpstan/default.nix          | 37 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 34 +----------------
 2 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 pkgs/development/php-packages/phpstan/default.nix

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
new file mode 100644
index 00000000000..2e4b55a58f9
--- /dev/null
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -0,0 +1,37 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "phpstan";
+  version = "0.12.48";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = pkgs.fetchurl {
+    url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
+    sha256 = "170yzz23lyipyckv8y2x9masv5qdmbskwwlbfc8750xb3g2q7pzl";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/phpstan/phpstan.phar
+    makeWrapper ${php}/bin/php $out/bin/phpstan \
+      --add-flags "$out/libexec/phpstan/phpstan.phar"
+  '';
+
+  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.
+    '';
+    license = licenses.mit;
+    homepage = "https://github.com/phpstan/phpstan";
+    maintainers = teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 226d5722a11..2767185dcc9 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -49,39 +49,7 @@ in
 
     phpmd = callPackage ../development/php-packages/phpmd { };
 
-    phpstan = mkDerivation rec {
-      version = "0.12.48";
-      pname = "phpstan";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar";
-        sha256 = "170yzz23lyipyckv8y2x9masv5qdmbskwwlbfc8750xb3g2q7pzl";
-      };
-
-      phases = [ "installPhase" ];
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/phpstan/phpstan.phar
-        makeWrapper ${php}/bin/php $out/bin/phpstan \
-          --add-flags "$out/libexec/phpstan/phpstan.phar"
-      '';
-
-      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.
-        '';
-        license = licenses.mit;
-        homepage = "https://github.com/phpstan/phpstan";
-        maintainers = teams.php.members;
-      };
-    };
+    phpstan = callPackage ../development/php-packages/phpstan { };
 
     psalm = mkDerivation rec {
       version = "3.11.2";

From 8473816508236f95d8e9ee72c0554d5ca3a4f613 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:46:30 +0200
Subject: [PATCH 10/11] phpPackages.psalm: Move to separate directory

---
 .../php-packages/psalm/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 27 +----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/psalm/default.nix

diff --git a/pkgs/development/php-packages/psalm/default.nix b/pkgs/development/php-packages/psalm/default.nix
new file mode 100644
index 00000000000..d36640e109b
--- /dev/null
+++ b/pkgs/development/php-packages/psalm/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "psalm";
+  version = "3.11.2";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
+    sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    install -D $src $out/libexec/psalm/psalm.phar
+    makeWrapper ${php}/bin/php $out/bin/psalm \
+      --add-flags "$out/libexec/psalm/psalm.phar"
+  '';
+
+  meta = with pkgs.lib; {
+    description = "A static analysis tool for finding errors in PHP applications";
+    license = licenses.mit;
+    homepage = "https://github.com/vimeo/psalm";
+    maintainers = teams.php.members;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 2767185dcc9..ad25468db54 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -51,32 +51,7 @@ in
 
     phpstan = callPackage ../development/php-packages/phpstan { };
 
-    psalm = mkDerivation rec {
-      version = "3.11.2";
-      pname = "psalm";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar";
-        sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0";
-      };
-
-      phases = [ "installPhase" ];
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        install -D $src $out/libexec/psalm/psalm.phar
-        makeWrapper ${php}/bin/php $out/bin/psalm \
-          --add-flags "$out/libexec/psalm/psalm.phar"
-      '';
-
-      meta = with pkgs.lib; {
-        description = "A static analysis tool for finding errors in PHP applications";
-        license = licenses.mit;
-        homepage = "https://github.com/vimeo/psalm";
-        maintainers = teams.php.members;
-      };
-    };
+    psalm = callPackage ../development/php-packages/psalm { };
 
     psysh = mkDerivation rec {
       version = "0.10.3";

From 13c197085f1eb7c0996f54d51811397521334163 Mon Sep 17 00:00:00 2001
From: Elis Hirwing <elis@hirwing.se>
Date: Sun, 11 Oct 2020 16:46:49 +0200
Subject: [PATCH 11/11] phpPackages.psysh: Move to separate directory and be
 version specific

---
 .../php-packages/psysh/default.nix            | 30 +++++++++++++++++++
 pkgs/top-level/php-packages.nix               | 27 +----------------
 2 files changed, 31 insertions(+), 26 deletions(-)
 create mode 100644 pkgs/development/php-packages/psysh/default.nix

diff --git a/pkgs/development/php-packages/psysh/default.nix b/pkgs/development/php-packages/psysh/default.nix
new file mode 100644
index 00000000000..f871bbb5baa
--- /dev/null
+++ b/pkgs/development/php-packages/psysh/default.nix
@@ -0,0 +1,30 @@
+{ mkDerivation, fetchurl, pkgs, lib, php }:
+let
+  pname = "psysh";
+  version = "0.10.3";
+in
+mkDerivation {
+  inherit pname version;
+
+  src = fetchurl {
+    url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
+    sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71";
+  };
+
+  phases = [ "installPhase" ];
+  nativeBuildInputs = [ pkgs.makeWrapper ];
+
+  installPhase = ''
+    mkdir -p $out/bin
+    tar -xzf $src -C $out/bin
+    chmod +x $out/bin/psysh
+    wrapProgram $out/bin/psysh --prefix PATH : "${lib.makeBinPath [ php ]}"
+  '';
+
+  meta = with pkgs.lib; {
+    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;
+  };
+}
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index ad25468db54..be440a31477 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -53,32 +53,7 @@ in
 
     psalm = callPackage ../development/php-packages/psalm { };
 
-    psysh = mkDerivation rec {
-      version = "0.10.3";
-      pname = "psysh";
-
-      src = pkgs.fetchurl {
-        url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
-        sha256 = "0glply451fy0g7zbasyp350qvmk2aglrlcrcdd7w0igylgwfkg71";
-      };
-
-      phases = [ "installPhase" ];
-      nativeBuildInputs = [ pkgs.makeWrapper ];
-
-      installPhase = ''
-        mkdir -p $out/bin
-        tar -xzf $src -C $out/bin
-        chmod +x $out/bin/psysh
-        wrapProgram $out/bin/psysh
-      '';
-
-      meta = with pkgs.lib; {
-        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;
-      };
-    };
+    psysh = callPackage ../development/php-packages/psysh { };
   };