diff options
| author | maxine <35892750+amaxine@users.noreply.github.com> | 2024-02-09 22:12:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-02-09 22:12:17 +0100 |
| commit | fd9ca5192b0cb0a88abc72e742014cc1888b327f (patch) | |
| tree | e6179a1597a06a555327fe76a35ea59d02d2935e /pkgs/servers | |
| parent | 80409d0599b8b889fa5caaddc91296d7d621bdc4 (diff) | |
| parent | 2cdd5b48f669dbd03671e92accdbcbe694abc1a6 (diff) | |
| download | nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar.gz nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar.bz2 nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar.lz nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar.xz nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.tar.zst nixlib-fd9ca5192b0cb0a88abc72e742014cc1888b327f.zip | |
Merge pull request #286392 from SuperSandro2000/rss-bridge
rss-bridge: 2023-09-24 -> 2024-02-02
Diffstat (limited to 'pkgs/servers')
| -rw-r--r-- | pkgs/servers/web-apps/rss-bridge/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/web-apps/rss-bridge/paths.patch | 41 |
2 files changed, 20 insertions, 25 deletions
diff --git a/pkgs/servers/web-apps/rss-bridge/default.nix b/pkgs/servers/web-apps/rss-bridge/default.nix index e1c459541e84..e3936244e08b 100644 --- a/pkgs/servers/web-apps/rss-bridge/default.nix +++ b/pkgs/servers/web-apps/rss-bridge/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rss-bridge"; - version = "2023-09-24"; + version = "2024-02-02"; src = fetchFromGitHub { owner = "RSS-Bridge"; repo = "rss-bridge"; rev = version; - sha256 = "sha256-N1pbveOgJrB1M+WelKD07Jmv9Vz5NqT+IJf//L8UEnU="; + sha256 = "sha256-VycEgu7uHYwDnNE1eoVxgaWZAnC6mZLBxT8Le3PI4Rs="; }; patches = [ diff --git a/pkgs/servers/web-apps/rss-bridge/paths.patch b/pkgs/servers/web-apps/rss-bridge/paths.patch index b226676cb28a..21747a381bd6 100644 --- a/pkgs/servers/web-apps/rss-bridge/paths.patch +++ b/pkgs/servers/web-apps/rss-bridge/paths.patch @@ -1,8 +1,8 @@ diff --git a/lib/Configuration.php b/lib/Configuration.php -index c38d7cc9..d95e5174 100644 +index 63f67a3c..f0a53a24 100644 --- a/lib/Configuration.php +++ b/lib/Configuration.php -@@ -104,8 +104,8 @@ final class Configuration +@@ -81,8 +81,8 @@ public static function loadConfiguration(array $customConfig = [], array $env = } } @@ -13,31 +13,26 @@ index c38d7cc9..d95e5174 100644 if ($enabledBridges === '*') { self::setConfig('system', 'enabled_bridges', ['*']); } else { -diff --git a/lib/RssBridge.php b/lib/RssBridge.php -index 6ba952eb..a0bbaf03 100644 ---- a/lib/RssBridge.php -+++ b/lib/RssBridge.php -@@ -11,8 +11,8 @@ final class RssBridge - Configuration::verifyInstallation(); - - $customConfig = []; -- if (file_exists(__DIR__ . '/../config.ini.php')) { -- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); -+ if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { -+ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); - } - Configuration::loadConfiguration($customConfig, getenv()); - diff --git a/lib/bootstrap.php b/lib/bootstrap.php -index dc1c0f04..194a3f8f 100644 +index 6465f5f9..4605596f 100644 --- a/lib/bootstrap.php +++ b/lib/bootstrap.php -@@ -27,7 +27,7 @@ const PATH_LIB_CACHES = __DIR__ . '/../caches/'; - const PATH_LIB_ACTIONS = __DIR__ . '/../actions/'; +@@ -1,7 +1,7 @@ + <?php - /** Path to the cache folder */ + const PATH_LIB_CACHES = __DIR__ . '/../caches/'; -const PATH_CACHE = __DIR__ . '/../cache/'; +define('PATH_CACHE', getenv('RSSBRIDGE_DATA') . '/cache/'); - /** URL to the RSS-Bridge repository */ - const REPOSITORY = 'https://github.com/RSS-Bridge/rss-bridge/'; + // Allow larger files for simple_html_dom + // todo: extract to config (if possible) +@@ -43,7 +43,7 @@ + }); + + $customConfig = []; +-if (file_exists(__DIR__ . '/../config.ini.php')) { +- $customConfig = parse_ini_file(__DIR__ . '/../config.ini.php', true, INI_SCANNER_TYPED); ++if (file_exists(getenv('RSSBRIDGE_DATA') . '/config.ini.php')) { ++ $customConfig = parse_ini_file(getenv('RSSBRIDGE_DATA') . '/config.ini.php', true, INI_SCANNER_TYPED); + } + Configuration::loadConfiguration($customConfig, getenv()); |