Unverified Commit 85f1ba3e authored by Felix Bühler's avatar Felix Bühler Committed by GitHub
Browse files

Merge pull request #263173 from r-ryantm/auto-update/freshrss 

freshrss: 1.21.0 -> 1.22.1
parents b4c0c733 29d41b7f

nixos/modules/services/web-apps/freshrss.nix

+3 −3
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ in 
            "catch_workers_output" = true;

          };

          phpEnv = {

            FRESHRSS_DATA_PATH = "${cfg.dataDir}";

            DATA_PATH = "${cfg.dataDir}";

          };

        };

      };
@@ -267,7 +267,7 @@ in 
            WorkingDirectory = cfg.package;

          };

          environment = {

            FRESHRSS_DATA_PATH = cfg.dataDir;

            DATA_PATH = cfg.dataDir;

          };



          script =
@@ -302,7 +302,7 @@ in 
        wantedBy = [ "multi-user.target" ];

        startAt = "*:0/5";

        environment = {

          FRESHRSS_DATA_PATH = cfg.dataDir;

          DATA_PATH = cfg.dataDir;

        };

        serviceConfig = defaultServiceConfig //{

          ExecStart = "${cfg.package}/app/actualize_script.php";

pkgs/servers/web-apps/freshrss/default.nix

+2 −10
Original line number Diff line number Diff line
@@ -8,13 +8,13 @@ 


stdenvNoCC.mkDerivation rec {

  pname = "FreshRSS";

  version = "1.21.0";

  version = "1.22.1";



  src = fetchFromGitHub {

    owner = "FreshRSS";

    repo = "FreshRSS";

    rev = version;

    hash = "sha256-0+fMZ5ps0CkBbS+fcxlYrrkQi28tmrKTyl3kPuofqyI=";

    hash = "sha256-e4+ZkhncgDIWE5NH2eYun2FeWxz1suM//6T6P3V4nQU=";

  };



  passthru.tests = {
@@ -26,12 +26,6 @@ stdenvNoCC.mkDerivation rec { 
  # There's nothing to build.

  dontBuild = true;



  # the data folder is no in this package and thereby declared by an env-var

  overrideConfig = pkgs.writeText "constants.local.php" ''

    <?php

      define('DATA_PATH', getenv('FRESHRSS_DATA_PATH'));

  '';



  postPatch = ''

    patchShebangs cli/*.php app/actualize_script.php

  '';
@@ -39,8 +33,6 @@ stdenvNoCC.mkDerivation rec { 
  installPhase = ''

    mkdir -p $out

    cp -vr * $out/



    cp $overrideConfig $out/constants.local.php

  '';



  meta = with lib; {