From 70338c53c99d06cc708f92a1050220d906ddc56a Mon Sep 17 00:00:00 2001 From: Milo Gertjejansen Date: Sun, 25 Jul 2021 15:40:33 -0400 Subject: [PATCH] Added release notes and broke date apart --- .../from_md/release-notes/rl-2111.section.xml | 10 +++++++++- nixos/doc/manual/release-notes/rl-2111.section.md | 2 ++ nixos/modules/services/web-apps/tt-rss.nix | 10 ++++++++-- pkgs/servers/tt-rss/default.nix | 13 ++++++++++++- 4 files changed, 31 insertions(+), 4 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index a95b1dd66b9..c0e8867ca0e 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -459,7 +459,7 @@ - + yggdrasil was upgraded to a new major @@ -468,6 +468,14 @@ changelog. + + + tt-rss was upgraded to the commit on + 2021-06-21, which has breaking changes, see + this + thread in the tt-rss forums for details. + +
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md index be46591dfa1..b0fbfc2bba7 100644 --- a/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/nixos/doc/manual/release-notes/rl-2111.section.md @@ -115,6 +115,8 @@ In addition to numerous new and upgraded packages, this release has the followin - `yggdrasil` was upgraded to a new major release with breaking changes, see [upstream changelog](https://github.com/yggdrasil-network/yggdrasil-go/releases/tag/v0.4.0). +- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes, see [this thread](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for details. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix index 0b23ba56cab..676683a557d 100644 --- a/nixos/modules/services/web-apps/tt-rss.nix +++ b/nixos/modules/services/web-apps/tt-rss.nix @@ -566,9 +566,14 @@ let "Z '${cfg.root}' 0755 ${cfg.user} tt_rss - -" ]; - systemd.services.tt-rss = - { + systemd.services = { + phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") { + restartTriggers = [ + cfg.root + ]; + }; + tt-rss = { description = "Tiny Tiny RSS feeds update daemon"; preStart = let @@ -645,6 +650,7 @@ let wantedBy = [ "multi-user.target" ]; requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service"; + }; }; services.mysql = mkIf mysqlLocal { diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index bd82f8d2890..39615a238e3 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,7 +2,10 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "2021-06-21"; + year = "21"; + month = "06"; + day = "21"; + version = "20${year}-${month}-${day}"; rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; src = fetchurl { @@ -11,8 +14,16 @@ stdenv.mkDerivation rec { }; installPhase = '' + runHook preInstall + mkdir $out cp -ra * $out/ + + # see the code of Config::get_version(). you can check that the version in + # the footer of the preferences pages is not UNKNOWN + echo "${year}.${month}" > $out/version_static.txt + + runHook postInstall ''; meta = with lib; {