pyrox.dev
firefly-iii: 6.1.24 -> 6.1.25, nixos/firefly-iii: Improved cache clearing (#366564)
authored by Arne Keller and committed by GitHub dab5c03a db08c9d4
+2
nixos/modules/services/web-apps/firefly-iii.nix
+2
nixos/modules/services/web-apps/firefly-iii.nix
···
31
${lib.optionalString (
32
cfg.settings.DB_CONNECTION == "sqlite"
33
) "touch ${cfg.dataDir}/storage/database/database.sqlite"}
34
rm ${cfg.dataDir}/cache/*.php
35
${artisan} package:discover
36
${artisan} firefly-iii:upgrade-database
···
318
} // commonServiceConfig;
319
unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";
320
restartTriggers = [ cfg.package ];
321
};
322
323
systemd.services.firefly-iii-cron = {
···
31
${lib.optionalString (
32
cfg.settings.DB_CONNECTION == "sqlite"
33
) "touch ${cfg.dataDir}/storage/database/database.sqlite"}
34
+
${artisan} optimize:clear
35
rm ${cfg.dataDir}/cache/*.php
36
${artisan} package:discover
37
${artisan} firefly-iii:upgrade-database
···
319
} // commonServiceConfig;
320
unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";
321
restartTriggers = [ cfg.package ];
322
+
partOf = [ "phpfpm-firefly-iii.service" ];
323
};
324
325
systemd.services.firefly-iii-cron = {
+4
-4
pkgs/by-name/fi/firefly-iii/package.nix
+4
-4
pkgs/by-name/fi/firefly-iii/package.nix
···
13
14
stdenvNoCC.mkDerivation (finalAttrs: {
15
pname = "firefly-iii";
16
-
version = "6.1.24";
17
18
src = fetchFromGitHub {
19
owner = "firefly-iii";
20
repo = "firefly-iii";
21
rev = "v${finalAttrs.version}";
22
-
hash = "sha256-ZB0yaGHL1AI67i2ixUzuWyiBjXJNlDV4APBahDuNObI=";
23
};
24
25
buildInputs = [ php83 ];
···
38
composerStrictValidation = true;
39
strictDeps = true;
40
41
-
vendorHash = "sha256-6sOmW+CFuNEBVHpZwh/wjrIINPdcPJUvosmdLaCvZlw=";
42
43
npmDeps = fetchNpmDeps {
44
inherit (finalAttrs) src;
45
name = "${finalAttrs.pname}-npm-deps";
46
-
hash = "sha256-W3lV0LbmOPfIwStNf4IwBVorSFHIlpyuIk+17/V/Y2Y=";
47
};
48
49
composerRepository = php83.mkComposerRepository {
···
13
14
stdenvNoCC.mkDerivation (finalAttrs: {
15
pname = "firefly-iii";
16
+
version = "6.1.25";
17
18
src = fetchFromGitHub {
19
owner = "firefly-iii";
20
repo = "firefly-iii";
21
rev = "v${finalAttrs.version}";
22
+
hash = "sha256-6DZwTk67bKvgB+Zf7aPakrWWYCAjkYggrRiaFKgsMkk=";
23
};
24
25
buildInputs = [ php83 ];
···
38
composerStrictValidation = true;
39
strictDeps = true;
40
41
+
vendorHash = "sha256-5uUjb5EPcoEBuFbWGb1EIC/U/VaSUsRp09S9COIx25E=";
42
43
npmDeps = fetchNpmDeps {
44
inherit (finalAttrs) src;
45
name = "${finalAttrs.pname}-npm-deps";
46
+
hash = "sha256-j49iltvW7xGOCV+FIB4f+ECfQo50U+wTugyaK9JGN3A=";
47
};
48
49
composerRepository = php83.mkComposerRepository {