Revert "Use upstream phpactor"

As the fetched version causes system crash and high cpu usage.

This reverts commit bd6c8adb7f.
This commit is contained in:
Daniel Siepmann 2023-04-11 08:38:39 +02:00
parent bd6c8adb7f
commit 71da7bc98f
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
4 changed files with 51 additions and 13 deletions

View file

@ -0,0 +1,32 @@
{
writeShellApplication,
php82,
php82Packages,
git
}:
writeShellApplication {
name = "custom-build-phpactor";
runtimeInputs = [
php82
php82Packages.composer
git
];
# TODO: Use nix build environment?!
text = ''
rm -rf /tmp/phpactor
mkdir /tmp/phpactor
cd /tmp/phpactor
git clone --depth 1 https://github.com/phpactor/phpactor.git .
composer install -o --no-dev
version=$(git show -s --format=%H)
rm -rf .git/
cd /tmp
tar -czf "phpactor-$version.tar.gz" phpactor
rsync -vaz "phpactor-$version.tar.gz" daniel-siepmann.de:webs/daniel-siepmann.de/htdocs/public/fileadmin/
cd /tmp
rm -rf /tmp/phpactor "phpactor-$version.tar.gz"
'';
}

View file

@ -9,6 +9,7 @@
(callPackage ./nextcloud-sync/from-local.nix { }) (callPackage ./nextcloud-sync/from-local.nix { })
(callPackage ./nextcloud-sync/from-remote.nix { }) (callPackage ./nextcloud-sync/from-remote.nix { })
(callPackage ./typo3-documentation-rendering { }) (callPackage ./typo3-documentation-rendering { })
(callPackage ./build-phpactor { })
(callPackage ./project { (callPackage ./project {
inherit ownLib; inherit ownLib;
}) })

View file

@ -308,7 +308,7 @@ in {
require('lspconfig').phpactor.setup({ require('lspconfig').phpactor.setup({
cmd = { cmd = {
'${pkgs.phpactor}/bin/phpactor', '${phpactor}/bin/phpactor',
'language-server', 'language-server',
}, },
}) })

View file

@ -1,18 +1,22 @@
{ {
vimUtils vimUtils,
, makeWrapper fetchurl,
, lib makeWrapper,
, phpactor lib,
, php82 php82,
, php82Packages php82Packages,
, git git
}: }:
vimUtils.buildVimPluginFrom2Nix rec { let
inherit (phpactor) version; pname = "phpactor";
version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1";
pname = "vim-phpactor"; in vimUtils.buildVimPluginFrom2Nix {
src = "${phpactor}/share/php/phpactor"; inherit pname version;
src = fetchurl {
url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz";
sha256 = "JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY=";
};
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
@ -35,6 +39,7 @@ vimUtils.buildVimPluginFrom2Nix rec {
requirements.txt requirements.txt
''; '';
postInstall = '' postInstall = ''
wrapProgram $out/bin/phpactor \ wrapProgram $out/bin/phpactor \
--prefix PATH : ${lib.strings.makeBinPath [ php82 php82Packages.composer git]} --prefix PATH : ${lib.strings.makeBinPath [ php82 php82Packages.composer git]}