diff --git a/home/files/phpactor/phpactor.yml b/home/files/phpactor/phpactor.yml index d22a320..4138305 100644 --- a/home/files/phpactor/phpactor.yml +++ b/home/files/phpactor/phpactor.yml @@ -1,6 +1,7 @@ "code_transform.refactor.generate_accessor.prefix": "get" "code_transform.refactor.generate_accessor.upper_case_first": true "language_server_completion.trim_leading_dollar": true +"language_server.diagnostics_on_update": false "language_server_phpstan.enabled": true "indexer.follow_symlinks": true "indexer.exclude_patterns": diff --git a/home/packages/custom/build-phpactor/default.nix b/home/packages/custom/build-phpactor/default.nix index ba8cff1..72dcefe 100644 --- a/home/packages/custom/build-phpactor/default.nix +++ b/home/packages/custom/build-phpactor/default.nix @@ -1,7 +1,7 @@ { writeShellApplication, - php80, - php80Packages, + php82, + php82Packages, git }: @@ -9,8 +9,8 @@ writeShellApplication { name = "custom-build-phpactor"; runtimeInputs = [ - php80 - php80Packages.composer + php82 + php82Packages.composer git ]; diff --git a/home/programs/neovim/nix-plugins/phpactor.nix b/home/programs/neovim/nix-plugins/phpactor.nix index 3aa1c76..1fce263 100644 --- a/home/programs/neovim/nix-plugins/phpactor.nix +++ b/home/programs/neovim/nix-plugins/phpactor.nix @@ -3,27 +3,45 @@ fetchurl, makeWrapper, lib, - php80, - php80Packages, + php82, + php82Packages, git }: -vimUtils.buildVimPluginFrom2Nix rec { +let pname = "phpactor"; - version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1"; + version = "4e89a6965fdaf42a536b56519c7f2e9fe35f90af"; +in vimUtils.buildVimPluginFrom2Nix { + inherit pname version; src = fetchurl { url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz"; - sha256 = "sha256-JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY="; + sha256 = "C548mTIa+J+LsnQPvGU5kKeWQaRizdv+zu0YgJn+wJA="; }; nativeBuildInputs = [ 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 = '' wrapProgram $out/bin/phpactor \ - --prefix PATH : ${lib.strings.makeBinPath [ php80 ]} \ - --prefix PATH : ${lib.strings.makeBinPath [ php80Packages.composer ]} \ - --prefix PATH : ${lib.strings.makeBinPath [ git ]} + --prefix PATH : ${lib.strings.makeBinPath [ php82 php82Packages.composer git]} ''; }