From 2902189a439b26d70965f5aaa18c287918165821 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 19 Dec 2024 20:13:36 +0530
Subject: [PATCH 1/2] firefly-iii: 6.1.24 -> 6.1.25

(cherry picked from commit 5c3b9ec008a751f1ea2a2b27a35362f9a03d94f4)
---
 pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index 70b8da259218a..22b3b9447dde7 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.1.24";
+  version = "6.1.25";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZB0yaGHL1AI67i2ixUzuWyiBjXJNlDV4APBahDuNObI=";
+    hash = "sha256-6DZwTk67bKvgB+Zf7aPakrWWYCAjkYggrRiaFKgsMkk=";
   };
 
   buildInputs = [ php83 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-6sOmW+CFuNEBVHpZwh/wjrIINPdcPJUvosmdLaCvZlw=";
+  vendorHash = "sha256-5uUjb5EPcoEBuFbWGb1EIC/U/VaSUsRp09S9COIx25E=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-W3lV0LbmOPfIwStNf4IwBVorSFHIlpyuIk+17/V/Y2Y=";
+    hash = "sha256-j49iltvW7xGOCV+FIB4f+ECfQo50U+wTugyaK9JGN3A=";
   };
 
   composerRepository = php83.mkComposerRepository {

From 3a0096551c7293d0922c12ea5155b0044e2111d1 Mon Sep 17 00:00:00 2001
From: Savyasachee Jha <genghizkhan91@hawkradius.com>
Date: Thu, 19 Dec 2024 20:13:58 +0530
Subject: [PATCH 2/2] nixos/firefly-iii: Improved cache clearing

(cherry picked from commit 51bed7030fea8f3242a05e0d7f385152e7740d64)
---
 nixos/modules/services/web-apps/firefly-iii.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/web-apps/firefly-iii.nix b/nixos/modules/services/web-apps/firefly-iii.nix
index bc1fcdfc9c0fe..30c4ea91a197c 100644
--- a/nixos/modules/services/web-apps/firefly-iii.nix
+++ b/nixos/modules/services/web-apps/firefly-iii.nix
@@ -31,6 +31,7 @@ let
     ${lib.optionalString (
       cfg.settings.DB_CONNECTION == "sqlite"
     ) "touch ${cfg.dataDir}/storage/database/database.sqlite"}
+    ${artisan} optimize:clear
     rm ${cfg.dataDir}/cache/*.php
     ${artisan} package:discover
     ${artisan} firefly-iii:upgrade-database
@@ -318,6 +319,7 @@ in
       } // commonServiceConfig;
       unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";
       restartTriggers = [ cfg.package ];
+      partOf = [ "phpfpm-firefly-iii.service" ];
     };
 
     systemd.services.firefly-iii-cron = {