diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 37dab65d2eba..cbd051dbeb54 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -463,6 +463,8 @@ - `networking.wireguard` now has an optional networkd backend. It is enabled by default when `networking.useNetworkd` is enabled, and it can be enabled alongside scripted networking with `networking.wireguard.useNetworkd`. Some `networking.wireguard` options have slightly different behavior with the networkd and script-based backends, documented in each option. +- `services.rss-bridge` now has a `package` option. + - `services.avahi.ipv6` now defaults to true. - The Home Assistant module has new options {option}`services.home-assistant.blueprints.automation`, `services.home-assistant.blueprints.script`, and {option}`services.home-assistant.blueprints.template` that allow for the declarative installation of [blueprints](https://www.home-assistant.io/docs/blueprint/) into the appropriate configuration directories. diff --git a/nixos/modules/services/web-apps/rss-bridge.nix b/nixos/modules/services/web-apps/rss-bridge.nix index 3e0ff0207f63..fff760b0199b 100644 --- a/nixos/modules/services/web-apps/rss-bridge.nix +++ b/nixos/modules/services/web-apps/rss-bridge.nix @@ -11,6 +11,7 @@ let mkEnableOption mkIf mkOption + mkPackageOption mkRenamedOptionModule types ; @@ -74,6 +75,8 @@ in ''; }; + package = mkPackageOption pkgs "rss-bridge" { }; + pool = mkOption { type = types.nullOr types.str; default = "rss-bridge"; @@ -173,7 +176,7 @@ in enable = true; virtualHosts = { ${cfg.virtualHost} = { - root = "${pkgs.rss-bridge}"; + root = "${cfg.package}"; locations."/" = { tryFiles = "$uri /index.php$is_args$args";