Migrate to upstream phpactor

This got merged upstream and I'll use the official version now.
This commit is contained in:
Daniel Siepmann 2023-06-19 07:11:35 +02:00
parent 23d3d8f576
commit 8abf04faa2
Signed by: Daniel Siepmann
GPG key ID: 33D6629915560EF4
4 changed files with 1 additions and 83 deletions

View file

@ -1,32 +0,0 @@
{
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,7 +9,6 @@
(callPackage ./nextcloud-sync/from-local.nix { })
(callPackage ./nextcloud-sync/from-remote.nix { })
(callPackage ./typo3-documentation-rendering { })
(callPackage ./build-phpactor { })
(callPackage ./project {
inherit ownLib;
})

View file

@ -119,8 +119,6 @@ let
};
};
phpactor = pkgs.callPackage ./neovim/nix-plugins/phpactor.nix { };
neoterm = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
pname = "neoterm";
version = "e78179a9ceb98de8d0c37bdda435a5deab4d5e71";
@ -308,7 +306,7 @@ in {
require('lspconfig').phpactor.setup({
cmd = {
'${phpactor}/bin/phpactor',
'${pkgs.phpactor}/bin/phpactor',
'language-server',
},
})

View file

@ -1,47 +0,0 @@
{
vimUtils,
fetchurl,
makeWrapper,
lib,
php82,
php82Packages,
git
}:
let
pname = "phpactor";
version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1";
in vimUtils.buildVimPluginFrom2Nix {
inherit pname version;
src = fetchurl {
url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz";
sha256 = "JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY=";
};
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 [ php82 php82Packages.composer git]}
'';
}