Unverified Commit e78f5050 authored by Pol Dellaiera's avatar Pol Dellaiera Committed by GitHub
Browse files

Merge pull request #320058 from savyajha/firefly-iii 

firefly-iii: 6.1.16 -> 6.1.17
parents 3027ba73 b9e13e35

nixos/tests/firefly-iii.nix

+3 −1
Original line number Diff line number Diff line
@@ -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;

      '';

    };

pkgs/by-name/fi/firefly-iii/package.nix

+4 −4
Original line number Diff line number Diff line
@@ -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;