diff options
| author | Felix Bühler <Stunkymonkey@users.noreply.github.com> | 2023-11-04 13:09:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-04 13:09:36 +0100 |
| commit | 85f1ba3e51676fa8cc604a3d863d729026a6b8eb (patch) | |
| tree | f0e1326c925e709357a552909af68ae78213a694 | |
| parent | b4c0c733b32c8b1bbe3ae7f12544947f82986a87 (diff) | |
| parent | 29d41b7fd2ccc09a103e401ab00699eb0cdbbd23 (diff) | |
| download | nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.gz nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.bz2 nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.lz nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.xz nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.tar.zst nixpkgs-85f1ba3e51676fa8cc604a3d863d729026a6b8eb.zip | |
Merge pull request #263173 from r-ryantm/auto-update/freshrss
freshrss: 1.21.0 -> 1.22.1
| -rw-r--r-- | nixos/modules/services/web-apps/freshrss.nix | 6 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/freshrss/default.nix | 12 |
2 files changed, 5 insertions, 13 deletions
diff --git a/nixos/modules/services/web-apps/freshrss.nix b/nixos/modules/services/web-apps/freshrss.nix index ffc05d0e41f..8b4ea2aa53c 100644 --- a/nixos/modules/services/web-apps/freshrss.nix +++ b/nixos/modules/services/web-apps/freshrss.nix @@ -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"; diff --git a/pkgs/servers/web-apps/freshrss/default.nix b/pkgs/servers/web-apps/freshrss/default.nix index 2aa727ca2d1..8a8502ad823 100644 --- a/pkgs/servers/web-apps/freshrss/default.nix +++ b/pkgs/servers/web-apps/freshrss/default.nix @@ -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; { |