colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #320058 from savyajha/firefly-iii

Browse Source 
firefly-iii: 6.1.16 -> 6.1.17
This commit is contained in:
Pol Dellaiera 2024-06-15 19:08:40 +02:00 committed by GitHub
commit e78f505019
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nixos/tests/firefly-iii.nix
View File

@ -39,12 +39,13 @@ in
DB_DATABASE = "firefly";
DB_USERNAME = "firefly";
DB_PASSWORD_FILE = "/etc/postgres-pass";
PGSQL_SCHEMA = "firefly";
};
};
services.postgresql = {
enable = true;
package = pkgs.postgresql_15;
package = pkgs.postgresql_16;
authentication = ''
local all postgres peer
local firefly firefly password
@ -52,6 +53,7 @@ in
initialScript = pkgs.writeText "firefly-init.sql" ''
CREATE USER "firefly" WITH LOGIN PASSWORD '${db-pass}';
CREATE DATABASE "firefly" WITH OWNER "firefly";
\c firefly
CREATE SCHEMA AUTHORIZATION firefly;
'';
};

8
pkgs/by-name/fi/firefly-iii/package.nix
View File

@ -8,20 +8,20 @@
let
pname = "firefly-iii";
version = "6.1.16";
version = "6.1.17";
phpPackage = php83;
src = fetchFromGitHub {
owner = "firefly-iii";
repo = "firefly-iii";
rev = "v${version}";
hash = "sha256-1I4Wm10mmloqeWcpc4XloNATpvroiw6m8MiSVsoB6xo=";
hash = "sha256-KbTHbhv+8Lv5fk1Z8nxICySk6MK6Xc3TNATSIUnENa4=";
};
assets = buildNpmPackage {
pname = "${pname}-assets";
inherit version src;
npmDepsHash = "sha256-Ff7pDKoXvyj/gR+ljQsCjtyzxzJ7/zN6hRMEAderqOg=";
npmDepsHash = "sha256-Nlz+zsvUx9X70uofh8dWEvru8SAQzIh+XxGGOH5npyY=";
dontNpmBuild = true;
installPhase = ''
runHook preInstall
@ -36,7 +36,7 @@ in
phpPackage.buildComposerProject (finalAttrs: {
inherit pname src version;
vendorHash = "sha256-BanSEqE3KN46VtEZH0TVWUBrgPCwmd2TjheYq+e+lzo=";
vendorHash = "sha256-mDVmZUCER1eaTXhh8VIbGbPkkpOeE6fTBhq8UnTlWPc=";
passthru = {
inherit phpPackage;