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] 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 { };
   };