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] 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 000000000000..d36640e109b9
--- /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 2767185dcc9d..ad25468db540 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";