From b018ad68c089f7284c643a14776180fdc01a7b8a Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:36:04 +0200 Subject: [PATCH 1/2] phpactor: simplify shell completion installation --- pkgs/by-name/ph/phpactor/package.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index 56574c10ea1f..eb9532d3d20e 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -19,13 +19,9 @@ php.buildComposerProject (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - postPatch = '' - patchShebangs bin/phpactor - ''; - postInstall = '' installShellCompletion --cmd phpactor \ - --bash <($out/bin/phpactor completion bash) + --bash <(php $out/bin/phpactor completion bash) ''; meta = { From 67dc98c20d4e37ccc1fd07b00b1b0cb39eeb0da1 Mon Sep 17 00:00:00 2001 From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com> Date: Mon, 12 Aug 2024 13:45:00 +0200 Subject: [PATCH 2/2] phpactor: format with nixfmt-rfc-style --- pkgs/by-name/ph/phpactor/package.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/ph/phpactor/package.nix b/pkgs/by-name/ph/phpactor/package.nix index eb9532d3d20e..97a02d0e2cb5 100644 --- a/pkgs/by-name/ph/phpactor/package.nix +++ b/pkgs/by-name/ph/phpactor/package.nix @@ -1,7 +1,8 @@ -{ lib -, fetchFromGitHub -, installShellFiles -, php +{ + lib, + fetchFromGitHub, + installShellFiles, + php, }: php.buildComposerProject (finalAttrs: { @@ -21,7 +22,7 @@ php.buildComposerProject (finalAttrs: { postInstall = '' installShellCompletion --cmd phpactor \ - --bash <(php $out/bin/phpactor completion bash) + --bash <(php $out/bin/phpactor completion bash) ''; meta = {