From 8b2dba9f7026e6d547bacc62dbefef50e79dbfbf Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Mon, 26 Sep 2022 15:26:10 +0200
Subject: [PATCH] Update phpactor, use fetchurl instead of fetchzip

Accordingly to help in https://discourse.nixos.org/t/fetchzip-results-in-do-not-know-how-to-unpack-source-archive-due-to-wrong-nix-store-path/22014
---
 home/packages/custom/build-phpactor/default.nix | 5 +++--
 home/programs/neovim/nix-plugins/phpactor.nix   | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/home/packages/custom/build-phpactor/default.nix b/home/packages/custom/build-phpactor/default.nix
index 0fc854c..55a852c 100644
--- a/home/packages/custom/build-phpactor/default.nix
+++ b/home/packages/custom/build-phpactor/default.nix
@@ -22,9 +22,10 @@ writeShellApplication {
     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-build
+    tar -czf "phpactor-$version.tar.gz" /tmp/phpactor-build/*
     rsync -vaz "phpactor-$version.tar.gz" daniel-siepmann.de:webs/daniel-siepmann.de/htdocs/public/fileadmin/
-    rm -rf /tmp/phpactor-build
+    rm -rf /tmp/phpactor-build "phpactor-$version.tar.gz"
   '';
 }
diff --git a/home/programs/neovim/nix-plugins/phpactor.nix b/home/programs/neovim/nix-plugins/phpactor.nix
index 7dcd88c..3aa1c76 100644
--- a/home/programs/neovim/nix-plugins/phpactor.nix
+++ b/home/programs/neovim/nix-plugins/phpactor.nix
@@ -1,6 +1,6 @@
 {
   vimUtils,
-  fetchzip,
+  fetchurl,
   makeWrapper,
   lib,
   php80,
@@ -10,10 +10,10 @@
 
 vimUtils.buildVimPluginFrom2Nix rec {
   pname = "phpactor";
-  version = "873fa51ae06eb3dd568ac02c111503b88b76e723";
-  src = fetchzip {
+  version = "3e7cb48b0ca429f92bcd57c236c39f170e9d23b1";
+  src = fetchurl {
     url = "https://daniel-siepmann.de/fileadmin/${pname}-${version}.tar.gz";
-    sha256 = "sha256-WTjxYD0iduV+oHyDCNnL8YOg9qTYGo9vZyDATx0O+no=";
+    sha256 = "sha256-JX6aLuzmJ4rrcG0FNgzt2zITmnRrpitUI591oPn+fhY=";
   };
 
   nativeBuildInputs = [