Migrate to upstream phpactor
This got merged upstream and I'll use the official version now.
This commit is contained in:
parent
23d3d8f576
commit
8abf04faa2
|
@ -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"
|
|
||||||
'';
|
|
||||||
}
|
|
|
@ -9,7 +9,6 @@
|
||||||
(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;
|
||||||
})
|
})
|
||||||
|
|
|
@ -119,8 +119,6 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
phpactor = pkgs.callPackage ./neovim/nix-plugins/phpactor.nix { };
|
|
||||||
|
|
||||||
neoterm = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
|
neoterm = pkgs.vimUtils.buildVimPluginFrom2Nix rec {
|
||||||
pname = "neoterm";
|
pname = "neoterm";
|
||||||
version = "e78179a9ceb98de8d0c37bdda435a5deab4d5e71";
|
version = "e78179a9ceb98de8d0c37bdda435a5deab4d5e71";
|
||||||
|
@ -308,7 +306,7 @@ in {
|
||||||
|
|
||||||
require('lspconfig').phpactor.setup({
|
require('lspconfig').phpactor.setup({
|
||||||
cmd = {
|
cmd = {
|
||||||
'${phpactor}/bin/phpactor',
|
'${pkgs.phpactor}/bin/phpactor',
|
||||||
'language-server',
|
'language-server',
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
|
@ -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]}
|
|
||||||
'';
|
|
||||||
}
|
|
Loading…
Reference in a new issue