Update phpactor

Also improve performance by ignoring diagnostics.
Remove unused files.
Shorten PATH setting.
Switching to PHP 82 as most recent version.
This commit is contained in:
Daniel Siepmann 2023-02-14 08:29:04 +01:00
parent dfe2038960
commit a10f010a43
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
3 changed files with 31 additions and 12 deletions

View file

@ -1,6 +1,7 @@
"code_transform.refactor.generate_accessor.prefix": "get" "code_transform.refactor.generate_accessor.prefix": "get"
"code_transform.refactor.generate_accessor.upper_case_first": true "code_transform.refactor.generate_accessor.upper_case_first": true
"language_server_completion.trim_leading_dollar": true "language_server_completion.trim_leading_dollar": true
"language_server.diagnostics_on_update": false
"language_server_phpstan.enabled": true "language_server_phpstan.enabled": true
"indexer.follow_symlinks": true "indexer.follow_symlinks": true
"indexer.exclude_patterns": "indexer.exclude_patterns":

View file

@ -1,7 +1,7 @@
{ {
writeShellApplication, writeShellApplication,
php80, php82,
php80Packages, php82Packages,
git git
}: }:
@ -9,8 +9,8 @@ writeShellApplication {
name = "custom-build-phpactor"; name = "custom-build-phpactor";
runtimeInputs = [ runtimeInputs = [
php80 php82
php80Packages.composer php82Packages.composer
git git
]; ];

View file

@ -3,27 +3,45 @@
fetchurl, fetchurl,
makeWrapper, makeWrapper,
lib, lib,
php80, php82,
php80Packages, php82Packages,
git git
}: }:
vimUtils.buildVimPluginFrom2Nix rec { let
pname = "phpactor"; pname = "phpactor";
version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1"; version = "4e89a6965fdaf42a536b56519c7f2e9fe35f90af";
in vimUtils.buildVimPluginFrom2Nix {
inherit pname version;
src = fetchurl { src = fetchurl {
url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz"; url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz";
sha256 = "sha256-JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY="; sha256 = "C548mTIa+J+LsnQPvGU5kKeWQaRizdv+zu0YgJn+wJA=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
]; ];
prePatch = ''
rm -rf .github/ tests/ \
.gitignore \
.php-cs-fixer.dist.php \
CHANGELOG.md \
composer.json \
LICENSE \
Makefile \
phpactor.schema.json \
phpbench.json \
phpstan-baseline.neon \
phpstan.neon \
phpunit.xml.dist \
README.md \
requirements.txt
'';
postInstall = '' postInstall = ''
wrapProgram $out/bin/phpactor \ wrapProgram $out/bin/phpactor \
--prefix PATH : ${lib.strings.makeBinPath [ php80 ]} \ --prefix PATH : ${lib.strings.makeBinPath [ php82 php82Packages.composer git]}
--prefix PATH : ${lib.strings.makeBinPath [ php80Packages.composer ]} \
--prefix PATH : ${lib.strings.makeBinPath [ git ]}
''; '';
} }