cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

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

Browse source 
freshrss: 1.21.0 -> 1.22.1
This commit is contained in:
Felix Bühler 2023-11-04 13:09:36 +01:00 committed by GitHub
commit 85f1ba3e51
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nixos/modules/services/web-apps/freshrss.nix
View file

@ -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";

12
pkgs/servers/web-apps/freshrss/default.nix
View file

@ -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; {