From f3e34484a4df1c10af4a58fbf66939c918d41cdf Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:03:33 +0100
Subject: [PATCH 1/2] grocy: switch to buildComposerProject2

---
 pkgs/by-name/gr/grocy/package.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix
index 0638854cf74d..e6e22f9b967a 100644
--- a/pkgs/by-name/gr/grocy/package.nix
+++ b/pkgs/by-name/gr/grocy/package.nix
@@ -8,7 +8,7 @@
   nixosTests,
 }:
 
-php.buildComposerProject (finalAttrs: {
+php.buildComposerProject2 (finalAttrs: {
   pname = "grocy";
   version = "4.2.0";
 
@@ -19,7 +19,7 @@ php.buildComposerProject (finalAttrs: {
     hash = "sha256-aX3DMy9Jv8rNp1/VIvUtNXYXGBrCgBMs5GsDf4XXSj0=";
   };
 
-  vendorHash = "sha256-KaYvA0Rd4pd1s/L8QbVUgkE+SjH+jv4+6RvIaGOpews=";
+  vendorHash = "sha256-W4pRJJYGaKYYO6BqhYZyP0VH7lcPXbByR0bBn+dfdIo=";
 
   offlineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
@@ -52,13 +52,10 @@ php.buildComposerProject (finalAttrs: {
     runHook postConfigure
   '';
 
-  installPhase = ''
-    runHook preInstall
-
+  postInstall = ''
+    chmod -R u+w $out/share
     mv $out/share/php/grocy/* $out
     rm -r $out/share
-
-    runHook postInstall
   '';
 
   passthru.tests = { inherit (nixosTests) grocy; };

From cfd3cd93d9eec12664bbd7fdfbe976682e9dde29 Mon Sep 17 00:00:00 2001
From: Piotr Kwiecinski <2151333+piotrkwiecinski@users.noreply.github.com>
Date: Fri, 7 Feb 2025 16:04:30 +0100
Subject: [PATCH 2/2] grocy: switch to tag

---
 pkgs/by-name/gr/grocy/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/gr/grocy/package.nix b/pkgs/by-name/gr/grocy/package.nix
index e6e22f9b967a..7773d3b37e64 100644
--- a/pkgs/by-name/gr/grocy/package.nix
+++ b/pkgs/by-name/gr/grocy/package.nix
@@ -15,7 +15,7 @@ php.buildComposerProject2 (finalAttrs: {
   src = fetchFromGitHub {
     owner = "grocy";
     repo = "grocy";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-aX3DMy9Jv8rNp1/VIvUtNXYXGBrCgBMs5GsDf4XXSj0=";
   };