From 03da79bc41a31dc35be32ee11cf7bf3605ed4d38 Mon Sep 17 00:00:00 2001 From: Daniel Siepmann Date: Mon, 13 Jun 2022 08:15:32 +0200 Subject: [PATCH] Update phpactor to stay compatible Mainly switch to php8.0 as this is still supported by nix. Also add git to path (just to be sure it is there) And update phpactor itself. --- home/programs/neovim.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/home/programs/neovim.nix b/home/programs/neovim.nix index 1dbeea8..76ba0c0 100644 --- a/home/programs/neovim.nix +++ b/home/programs/neovim.nix @@ -121,10 +121,10 @@ let phpactor = pkgs.vimUtils.buildVimPluginFrom2Nix rec { pname = "phpactor"; - version = "037eb96d63603a780ec28663edc86e7c837d1406"; + version = "3dadcf86a19dc6c16c8ceca2cc9c0be62867f874"; src = pkgs.fetchzip { url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz"; - sha256 = "sha256-MYpXjn3qHdHfDFtJWtpdxpQvEayyAKXwcL/Bdw7fmos="; + sha256 = "sha256-voiorqXRRvPIL5Nl4V5BSr0MJjI4v/1QgvC98DI8of0="; }; nativeBuildInputs = [ @@ -133,8 +133,9 @@ let postInstall = '' wrapProgram $out/bin/phpactor \ - --prefix PATH : ${pkgs.lib.strings.makeBinPath [ pkgs.php74 ]} \ - --prefix PATH : ${pkgs.lib.strings.makeBinPath [ pkgs.php74Packages.composer ]} + --prefix PATH : ${pkgs.lib.strings.makeBinPath [ pkgs.php80 ]} \ + --prefix PATH : ${pkgs.lib.strings.makeBinPath [ pkgs.php80Packages.composer ]} \ + --prefix PATH : ${pkgs.lib.strings.makeBinPath [ pkgs.git ]} ''; };