Unverified Commit 88130cec authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #321097 from PatrickDaG/firefly-6.1.18 

firefly-iii: 6.1.17 -> 6.1.18
parents d7c01adb 61542794

nixos/modules/services/web-apps/firefly-iii.nix

+1 −3
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ let 


    ${optionalString (cfg.settings.DB_CONNECTION == "sqlite")

      "touch ${cfg.dataDir}/storage/database/database.sqlite"}

    ${artisan} cache:clear

    ${artisan} package:discover

    ${artisan} firefly-iii:upgrade-database

    ${artisan} firefly-iii:laravel-passport-keys

    ${artisan} cache:clear

    ${artisan} view:cache

    ${artisan} route:cache

    ${artisan} config:cache
@@ -283,8 +283,6 @@ in { 
      before = [ "phpfpm-firefly-iii.service" ];

      serviceConfig = {

        ExecStart = firefly-iii-maintenance;

        RuntimeDirectory = "phpfpm";

        RuntimeDirectoryPreserve = true;

        RemainAfterExit = true;

      } // commonServiceConfig;

      unitConfig.JoinsNamespaceOf = "phpfpm-firefly-iii.service";

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.17";

  version = "6.1.18";

  phpPackage = php83;



  src = fetchFromGitHub {

    owner = "firefly-iii";

    repo = "firefly-iii";

    rev = "v${version}";

    hash = "sha256-KbTHbhv+8Lv5fk1Z8nxICySk6MK6Xc3TNATSIUnENa4=";

    hash = "sha256-mA7gvKhHouUUz1Aix7253O/+VcufoEFwdcJeZxnazEo=";

  };



  assets = buildNpmPackage {

    pname = "${pname}-assets";

    inherit version src;

    npmDepsHash = "sha256-Nlz+zsvUx9X70uofh8dWEvru8SAQzIh+XxGGOH5npyY=";

    npmDepsHash = "sha256-MoxkNxfVeIFkiNVzfehQ9FpC65kBj8ZmvwaRf4MVRIg=";

    dontNpmBuild = true;

    installPhase = ''

      runHook preInstall
@@ -36,7 +36,7 @@ in 
phpPackage.buildComposerProject (finalAttrs: {

  inherit pname src version;



  vendorHash = "sha256-mDVmZUCER1eaTXhh8VIbGbPkkpOeE6fTBhq8UnTlWPc=";

  vendorHash = "sha256-EpMypgj6lZDz6T94bGoCUH9IVwh7VB4Ds08AcCsreRw=";



  passthru = {

    inherit phpPackage;