From bdb0bbef089df3b6b236aeef8ab9eb1212893160 Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Fri, 25 Jun 2021 16:34:32 -0400
Subject: [PATCH 1/7] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss:
 updated config.php creation

The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8.

The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337.
---
 nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++----------
 pkgs/servers/tt-rss/default.nix            |   6 +-
 2 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index b78487cc9281..b9feea7ffc5b 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -22,80 +22,6 @@ let
   tt-rss-config = pkgs.writeText "config.php" ''
     <?php
 
-      define('PHP_EXECUTABLE', '${pkgs.php}/bin/php');
-
-      define('LOCK_DIRECTORY', '${lockDir}');
-      define('CACHE_DIR', '${cacheDir}');
-      define('ICONS_DIR', '${feedIconsDir}');
-      define('ICONS_URL', '${feedIconsDir}');
-      define('SELF_URL_PATH', '${cfg.selfUrlPath}');
-
-      define('MYSQL_CHARSET', 'UTF8');
-
-      define('DB_TYPE', '${cfg.database.type}');
-      define('DB_HOST', '${optionalString (cfg.database.host != null) cfg.database.host}');
-      define('DB_USER', '${cfg.database.user}');
-      define('DB_NAME', '${cfg.database.name}');
-      define('DB_PASS', ${
-        if (cfg.database.password != null) then
-          "'${(escape ["'" "\\"] cfg.database.password)}'"
-        else if (cfg.database.passwordFile != null) then
-          "file_get_contents('${cfg.database.passwordFile}')"
-        else
-          "''"
-      });
-      define('DB_PORT', '${toString dbPort}');
-
-      define('AUTH_AUTO_CREATE', ${boolToString cfg.auth.autoCreate});
-      define('AUTH_AUTO_LOGIN', ${boolToString cfg.auth.autoLogin});
-
-      define('FEED_CRYPT_KEY', '${escape ["'" "\\"] cfg.feedCryptKey}');
-
-
-      define('SINGLE_USER_MODE', ${boolToString cfg.singleUserMode});
-
-      define('SIMPLE_UPDATE_MODE', ${boolToString cfg.simpleUpdateMode});
-
-      // Never check for updates - the running version of the code should be
-      // controlled entirely by the version of TT-RSS active in the current Nix
-      // profile. If TT-RSS updates itself to a version requiring a database
-      // schema upgrade, and then the SystemD tt-rss.service is restarted, the
-      // old code copied from the Nix store will overwrite the updated version,
-      // causing the code to detect the need for a schema "upgrade" (since the
-      // schema version in the database is different than in the code), but the
-      // update schema operation in TT-RSS will do nothing because the schema
-      // version in the database is newer than that in the code.
-      define('CHECK_FOR_UPDATES', false);
-
-      define('FORCE_ARTICLE_PURGE', ${toString cfg.forceArticlePurge});
-      define('SESSION_COOKIE_LIFETIME', ${toString cfg.sessionCookieLifetime});
-      define('ENABLE_GZIP_OUTPUT', ${boolToString cfg.enableGZipOutput});
-
-      define('PLUGINS', '${builtins.concatStringsSep "," cfg.plugins}');
-
-      define('LOG_DESTINATION', '${cfg.logDestination}');
-      define('CONFIG_VERSION', ${toString configVersion});
-
-
-      define('PUBSUBHUBBUB_ENABLED', ${boolToString cfg.pubSubHubbub.enable});
-      define('PUBSUBHUBBUB_HUB', '${cfg.pubSubHubbub.hub}');
-
-      define('SPHINX_SERVER', '${cfg.sphinx.server}');
-      define('SPHINX_INDEX', '${builtins.concatStringsSep "," cfg.sphinx.index}');
-
-      define('ENABLE_REGISTRATION', ${boolToString cfg.registration.enable});
-      define('REG_NOTIFY_ADDRESS', '${cfg.registration.notifyAddress}');
-      define('REG_MAX_USERS', ${toString cfg.registration.maxUsers});
-
-      define('SMTP_SERVER', '${cfg.email.server}');
-      define('SMTP_LOGIN', '${cfg.email.login}');
-      define('SMTP_PASSWORD', '${escape ["'" "\\"] cfg.email.password}');
-      define('SMTP_SECURE', '${cfg.email.security}');
-
-      define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}');
-      define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}');
-      define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}');
-
       ${cfg.extraConfig}
   '';
 
@@ -604,6 +530,9 @@ let
           ''}
           ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
           chmod -R 755 "${cfg.root}"
+          chmod -R 777 "${cfg.root}/${lockDir}"
+          chmod -R 777 "${cfg.root}/${cacheDir}"
+          chmod -R 777 "${cfg.root}/${feedIconsDir}"
         ''
 
         + (optionalString (cfg.database.type == "pgsql") ''
@@ -637,6 +566,85 @@ let
           SyslogIdentifier = "tt-rss";
         };
 
+        environment = let
+          password =
+            if (cfg.database.password != null) then
+              "${(escape ["'" "\\"] cfg.database.password)}"
+            else if (cfg.database.passwordFile != null) then
+              "file_get_contents('${cfg.database.passwordFile}'"
+            else
+              ""
+            ;
+        in {
+          TTRSS_PHP_EXECUTABLE = "${pkgs.php}/bin/php";
+
+          TTRSS_LOCK_DIRECTORY = "${lockDir}";
+          TTRSS_CACHE_DIR = "${cacheDir}";
+          TTRSS_ICONS_DIR = "${feedIconsDir}";
+          TTRSS_ICONS_URL = "${feedIconsDir}";
+          TTRSS_SELF_URL_PATH = "${cfg.selfUrlPath}";
+
+          TTRSS_MYSQL_CHARSET = "UTF8";
+
+          TTRSS_DB_TYPE = "${cfg.database.type}";
+          TTRSS_DB_HOST = "${optionalString (cfg.database.host != null) cfg.database.host}";
+          TTRSS_DB_USER = "${cfg.database.user}";
+          TTRSS_DB_NAME = "${cfg.database.name}";
+          TTRSS_DB_PASS = "${password}";
+          TTRSS_DB_PORT = "${toString dbPort}";
+
+          TTRSS_AUTH_AUTO_CREATE = "${boolToString cfg.auth.autoCreate}";
+          TTRSS_AUTH_AUTO_LOGIN = "${boolToString cfg.auth.autoLogin}";
+
+          TTRSS_FEED_CRYPT_KEY = "${escape ["'" "\\"] cfg.feedCryptKey}";
+
+
+          TTRSS_SINGLE_USER_MODE = "${boolToString cfg.singleUserMode}";
+
+          TTRSS_SIMPLE_UPDATE_MODE = "${boolToString cfg.simpleUpdateMode}";
+
+          # Never check for updates - the running version of the code should
+          # be controlled entirely by the version of TT-RSS active in the
+          # current Nix profile. If TT-RSS updates itself to a version
+          # requiring a database schema upgrade, and then the SystemD
+          # tt-rss.service is restarted, the old code copied from the Nix
+          # store will overwrite the updated version, causing the code to
+          # detect the need for a schema "upgrade" (since the schema version
+          # in the database is different than in the code), but the update
+          # schema operation in TT-RSS will do nothing because the schema
+          # version in the database is newer than that in the code.
+          TTRSS_CHECK_FOR_UPDATES = "false";
+
+          TTRSS_FORCE_ARTICLE_PURGE = "${toString cfg.forceArticlePurge}";
+          TTRSS_SESSION_COOKIE_LIFETIME = "${toString cfg.sessionCookieLifetime}";
+          TTRSS_ENABLE_GZIP_OUTPUT = "${boolToString cfg.enableGZipOutput}";
+
+          TTRSS_PLUGINS = "${builtins.concatStringsSep "," cfg.plugins}";
+
+          TTRSS_LOG_DESTINATION = "${cfg.logDestination}";
+          TTRSS_CONFIG_VERSION = "${toString configVersion}";
+
+
+          TTRSS_PUBSUBHUBBUB_ENABLED = "${boolToString cfg.pubSubHubbub.enable}";
+          TTRSS_PUBSUBHUBBUB_HUB = "${cfg.pubSubHubbub.hub}";
+
+          TTRSS_SPHINX_SERVER = "${cfg.sphinx.server}";
+          TTRSS_SPHINX_INDEX = "${builtins.concatStringsSep "," cfg.sphinx.index}";
+
+          TTRSS_ENABLE_REGISTRATION = "${boolToString cfg.registration.enable}";
+          TTRSS_REG_NOTIFY_ADDRESS = "${cfg.registration.notifyAddress}";
+          TTRSS_REG_MAX_USERS = "${toString cfg.registration.maxUsers}";
+
+          TTRSS_SMTP_SERVER = "${cfg.email.server}";
+          TTRSS_SMTP_LOGIN = "${cfg.email.login}";
+          TTRSS_SMTP_PASSWORD = "${escape ["'" "\\"] cfg.email.password}";
+          TTRSS_SMTP_SECURE = "${cfg.email.security}";
+
+          TTRSS_SMTP_FROM_NAME = "${escape ["'" "\\"] cfg.email.fromName}";
+          TTRSS_SMTP_FROM_ADDRESS = "${escape ["'" "\\"] cfg.email.fromAddress}";
+          TTRSS_DIGEST_SUBJECT = "${escape ["'" "\\"] cfg.email.digestSubject}";
+        };
+
         wantedBy = [ "multi-user.target" ];
         requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
         after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index e91fed5ee160..bd82f8d28905 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tt-rss";
-  version = "2021-01-29";
-  rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe";
+  version = "2021-06-21";
+  rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270";
 
   src = fetchurl {
     url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz";
-    sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5";
+    sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm";
   };
 
   installPhase = ''

From 1a6a19509840fef43c52426fcae49cdd04969a58 Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Thu, 1 Jul 2021 15:38:04 -0400
Subject: [PATCH 2/7] Api didn't seem to work with the systemd envs

I am not sure why it was working for me, but after restarting
phpfpm-tt-rss it quit working.
---
 nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++-----------
 1 file changed, 77 insertions(+), 80 deletions(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index b9feea7ffc5b..0b23ba56cabd 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -19,8 +19,84 @@ let
   mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
   pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
 
-  tt-rss-config = pkgs.writeText "config.php" ''
+  tt-rss-config = let
+    password =
+      if (cfg.database.password != null) then
+        "${(escape ["'" "\\"] cfg.database.password)}"
+      else if (cfg.database.passwordFile != null) then
+        "file_get_contents('${cfg.database.passwordFile}'"
+      else
+        ""
+      ;
+  in pkgs.writeText "config.php" ''
     <?php
+      putenv('TTRSS_PHP_EXECUTABLE=${pkgs.php}/bin/php');
+
+      putenv('TTRSS_LOCK_DIRECTORY=${lockDir}');
+      putenv('TTRSS_CACHE_DIR=${cacheDir}');
+      putenv('TTRSS_ICONS_DIR=${feedIconsDir}');
+      putenv('TTRSS_ICONS_URL=${feedIconsDir}');
+      putenv('TTRSS_SELF_URL_PATH=${cfg.selfUrlPath}');
+
+      putenv('TTRSS_MYSQL_CHARSET=UTF8');
+
+      putenv('TTRSS_DB_TYPE=${cfg.database.type}');
+      putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}');
+      putenv('TTRSS_DB_USER=${cfg.database.user}');
+      putenv('TTRSS_DB_NAME=${cfg.database.name}');
+      putenv('TTRSS_DB_PASS=${password}');
+      putenv('TTRSS_DB_PORT=${toString dbPort}');
+
+      putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}');
+      putenv('TTRSS_AUTH_AUTO_LOGIN=${boolToString cfg.auth.autoLogin}');
+
+      putenv('TTRSS_FEED_CRYPT_KEY=${escape ["'" "\\"] cfg.feedCryptKey}');
+
+
+      putenv('TTRSS_SINGLE_USER_MODE=${boolToString cfg.singleUserMode}');
+
+      putenv('TTRSS_SIMPLE_UPDATE_MODE=${boolToString cfg.simpleUpdateMode}');
+
+      # Never check for updates - the running version of the code should
+      # be controlled entirely by the version of TT-RSS active in the
+      # current Nix profile. If TT-RSS updates itself to a version
+      # requiring a database schema upgrade, and then the SystemD
+      # tt-rss.service is restarted, the old code copied from the Nix
+      # store will overwrite the updated version, causing the code to
+      # detect the need for a schema "upgrade" (since the schema version
+      # in the database is different than in the code), but the update
+      # schema operation in TT-RSS will do nothing because the schema
+      # version in the database is newer than that in the code.
+      putenv('TTRSS_CHECK_FOR_UPDATES=false');
+
+      putenv('TTRSS_FORCE_ARTICLE_PURGE=${toString cfg.forceArticlePurge}');
+      putenv('TTRSS_SESSION_COOKIE_LIFETIME=${toString cfg.sessionCookieLifetime}');
+      putenv('TTRSS_ENABLE_GZIP_OUTPUT=${boolToString cfg.enableGZipOutput}');
+
+      putenv('TTRSS_PLUGINS=${builtins.concatStringsSep "," cfg.plugins}');
+
+      putenv('TTRSS_LOG_DESTINATION=${cfg.logDestination}');
+      putenv('TTRSS_CONFIG_VERSION=${toString configVersion}');
+
+
+      putenv('TTRSS_PUBSUBHUBBUB_ENABLED=${boolToString cfg.pubSubHubbub.enable}');
+      putenv('TTRSS_PUBSUBHUBBUB_HUB=${cfg.pubSubHubbub.hub}');
+
+      putenv('TTRSS_SPHINX_SERVER=${cfg.sphinx.server}');
+      putenv('TTRSS_SPHINX_INDEX=${builtins.concatStringsSep "," cfg.sphinx.index}');
+
+      putenv('TTRSS_ENABLE_REGISTRATION=${boolToString cfg.registration.enable}');
+      putenv('TTRSS_REG_NOTIFY_ADDRESS=${cfg.registration.notifyAddress}');
+      putenv('TTRSS_REG_MAX_USERS=${toString cfg.registration.maxUsers}');
+
+      putenv('TTRSS_SMTP_SERVER=${cfg.email.server}');
+      putenv('TTRSS_SMTP_LOGIN=${cfg.email.login}');
+      putenv('TTRSS_SMTP_PASSWORD=${escape ["'" "\\"] cfg.email.password}');
+      putenv('TTRSS_SMTP_SECURE=${cfg.email.security}');
+
+      putenv('TTRSS_SMTP_FROM_NAME=${escape ["'" "\\"] cfg.email.fromName}');
+      putenv('TTRSS_SMTP_FROM_ADDRESS=${escape ["'" "\\"] cfg.email.fromAddress}');
+      putenv('TTRSS_DIGEST_SUBJECT=${escape ["'" "\\"] cfg.email.digestSubject}');
 
       ${cfg.extraConfig}
   '';
@@ -566,85 +642,6 @@ let
           SyslogIdentifier = "tt-rss";
         };
 
-        environment = let
-          password =
-            if (cfg.database.password != null) then
-              "${(escape ["'" "\\"] cfg.database.password)}"
-            else if (cfg.database.passwordFile != null) then
-              "file_get_contents('${cfg.database.passwordFile}'"
-            else
-              ""
-            ;
-        in {
-          TTRSS_PHP_EXECUTABLE = "${pkgs.php}/bin/php";
-
-          TTRSS_LOCK_DIRECTORY = "${lockDir}";
-          TTRSS_CACHE_DIR = "${cacheDir}";
-          TTRSS_ICONS_DIR = "${feedIconsDir}";
-          TTRSS_ICONS_URL = "${feedIconsDir}";
-          TTRSS_SELF_URL_PATH = "${cfg.selfUrlPath}";
-
-          TTRSS_MYSQL_CHARSET = "UTF8";
-
-          TTRSS_DB_TYPE = "${cfg.database.type}";
-          TTRSS_DB_HOST = "${optionalString (cfg.database.host != null) cfg.database.host}";
-          TTRSS_DB_USER = "${cfg.database.user}";
-          TTRSS_DB_NAME = "${cfg.database.name}";
-          TTRSS_DB_PASS = "${password}";
-          TTRSS_DB_PORT = "${toString dbPort}";
-
-          TTRSS_AUTH_AUTO_CREATE = "${boolToString cfg.auth.autoCreate}";
-          TTRSS_AUTH_AUTO_LOGIN = "${boolToString cfg.auth.autoLogin}";
-
-          TTRSS_FEED_CRYPT_KEY = "${escape ["'" "\\"] cfg.feedCryptKey}";
-
-
-          TTRSS_SINGLE_USER_MODE = "${boolToString cfg.singleUserMode}";
-
-          TTRSS_SIMPLE_UPDATE_MODE = "${boolToString cfg.simpleUpdateMode}";
-
-          # Never check for updates - the running version of the code should
-          # be controlled entirely by the version of TT-RSS active in the
-          # current Nix profile. If TT-RSS updates itself to a version
-          # requiring a database schema upgrade, and then the SystemD
-          # tt-rss.service is restarted, the old code copied from the Nix
-          # store will overwrite the updated version, causing the code to
-          # detect the need for a schema "upgrade" (since the schema version
-          # in the database is different than in the code), but the update
-          # schema operation in TT-RSS will do nothing because the schema
-          # version in the database is newer than that in the code.
-          TTRSS_CHECK_FOR_UPDATES = "false";
-
-          TTRSS_FORCE_ARTICLE_PURGE = "${toString cfg.forceArticlePurge}";
-          TTRSS_SESSION_COOKIE_LIFETIME = "${toString cfg.sessionCookieLifetime}";
-          TTRSS_ENABLE_GZIP_OUTPUT = "${boolToString cfg.enableGZipOutput}";
-
-          TTRSS_PLUGINS = "${builtins.concatStringsSep "," cfg.plugins}";
-
-          TTRSS_LOG_DESTINATION = "${cfg.logDestination}";
-          TTRSS_CONFIG_VERSION = "${toString configVersion}";
-
-
-          TTRSS_PUBSUBHUBBUB_ENABLED = "${boolToString cfg.pubSubHubbub.enable}";
-          TTRSS_PUBSUBHUBBUB_HUB = "${cfg.pubSubHubbub.hub}";
-
-          TTRSS_SPHINX_SERVER = "${cfg.sphinx.server}";
-          TTRSS_SPHINX_INDEX = "${builtins.concatStringsSep "," cfg.sphinx.index}";
-
-          TTRSS_ENABLE_REGISTRATION = "${boolToString cfg.registration.enable}";
-          TTRSS_REG_NOTIFY_ADDRESS = "${cfg.registration.notifyAddress}";
-          TTRSS_REG_MAX_USERS = "${toString cfg.registration.maxUsers}";
-
-          TTRSS_SMTP_SERVER = "${cfg.email.server}";
-          TTRSS_SMTP_LOGIN = "${cfg.email.login}";
-          TTRSS_SMTP_PASSWORD = "${escape ["'" "\\"] cfg.email.password}";
-          TTRSS_SMTP_SECURE = "${cfg.email.security}";
-
-          TTRSS_SMTP_FROM_NAME = "${escape ["'" "\\"] cfg.email.fromName}";
-          TTRSS_SMTP_FROM_ADDRESS = "${escape ["'" "\\"] cfg.email.fromAddress}";
-          TTRSS_DIGEST_SUBJECT = "${escape ["'" "\\"] cfg.email.digestSubject}";
-        };
-
         wantedBy = [ "multi-user.target" ];
         requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
         after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";

From 97cb387fb97a41ee455c129935ce12e38c789d55 Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Fri, 25 Jun 2021 16:34:32 -0400
Subject: [PATCH 3/7] tt-rss: 2021-01-29 -> 2021-06-23 and modules/tt-rss:
 updated config.php creation

The version of tt-rss in nixpkgs was pre-php 8. This updates tt-rss to the most recent version, which uses php 8.

The updates to the module are required changes, per https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337.
---
 nixos/modules/services/web-apps/tt-rss.nix | 156 +++++++++++----------
 pkgs/servers/tt-rss/default.nix            |   6 +-
 2 files changed, 85 insertions(+), 77 deletions(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index b78487cc9281..b9feea7ffc5b 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -22,80 +22,6 @@ let
   tt-rss-config = pkgs.writeText "config.php" ''
     <?php
 
-      define('PHP_EXECUTABLE', '${pkgs.php}/bin/php');
-
-      define('LOCK_DIRECTORY', '${lockDir}');
-      define('CACHE_DIR', '${cacheDir}');
-      define('ICONS_DIR', '${feedIconsDir}');
-      define('ICONS_URL', '${feedIconsDir}');
-      define('SELF_URL_PATH', '${cfg.selfUrlPath}');
-
-      define('MYSQL_CHARSET', 'UTF8');
-
-      define('DB_TYPE', '${cfg.database.type}');
-      define('DB_HOST', '${optionalString (cfg.database.host != null) cfg.database.host}');
-      define('DB_USER', '${cfg.database.user}');
-      define('DB_NAME', '${cfg.database.name}');
-      define('DB_PASS', ${
-        if (cfg.database.password != null) then
-          "'${(escape ["'" "\\"] cfg.database.password)}'"
-        else if (cfg.database.passwordFile != null) then
-          "file_get_contents('${cfg.database.passwordFile}')"
-        else
-          "''"
-      });
-      define('DB_PORT', '${toString dbPort}');
-
-      define('AUTH_AUTO_CREATE', ${boolToString cfg.auth.autoCreate});
-      define('AUTH_AUTO_LOGIN', ${boolToString cfg.auth.autoLogin});
-
-      define('FEED_CRYPT_KEY', '${escape ["'" "\\"] cfg.feedCryptKey}');
-
-
-      define('SINGLE_USER_MODE', ${boolToString cfg.singleUserMode});
-
-      define('SIMPLE_UPDATE_MODE', ${boolToString cfg.simpleUpdateMode});
-
-      // Never check for updates - the running version of the code should be
-      // controlled entirely by the version of TT-RSS active in the current Nix
-      // profile. If TT-RSS updates itself to a version requiring a database
-      // schema upgrade, and then the SystemD tt-rss.service is restarted, the
-      // old code copied from the Nix store will overwrite the updated version,
-      // causing the code to detect the need for a schema "upgrade" (since the
-      // schema version in the database is different than in the code), but the
-      // update schema operation in TT-RSS will do nothing because the schema
-      // version in the database is newer than that in the code.
-      define('CHECK_FOR_UPDATES', false);
-
-      define('FORCE_ARTICLE_PURGE', ${toString cfg.forceArticlePurge});
-      define('SESSION_COOKIE_LIFETIME', ${toString cfg.sessionCookieLifetime});
-      define('ENABLE_GZIP_OUTPUT', ${boolToString cfg.enableGZipOutput});
-
-      define('PLUGINS', '${builtins.concatStringsSep "," cfg.plugins}');
-
-      define('LOG_DESTINATION', '${cfg.logDestination}');
-      define('CONFIG_VERSION', ${toString configVersion});
-
-
-      define('PUBSUBHUBBUB_ENABLED', ${boolToString cfg.pubSubHubbub.enable});
-      define('PUBSUBHUBBUB_HUB', '${cfg.pubSubHubbub.hub}');
-
-      define('SPHINX_SERVER', '${cfg.sphinx.server}');
-      define('SPHINX_INDEX', '${builtins.concatStringsSep "," cfg.sphinx.index}');
-
-      define('ENABLE_REGISTRATION', ${boolToString cfg.registration.enable});
-      define('REG_NOTIFY_ADDRESS', '${cfg.registration.notifyAddress}');
-      define('REG_MAX_USERS', ${toString cfg.registration.maxUsers});
-
-      define('SMTP_SERVER', '${cfg.email.server}');
-      define('SMTP_LOGIN', '${cfg.email.login}');
-      define('SMTP_PASSWORD', '${escape ["'" "\\"] cfg.email.password}');
-      define('SMTP_SECURE', '${cfg.email.security}');
-
-      define('SMTP_FROM_NAME', '${escape ["'" "\\"] cfg.email.fromName}');
-      define('SMTP_FROM_ADDRESS', '${escape ["'" "\\"] cfg.email.fromAddress}');
-      define('DIGEST_SUBJECT', '${escape ["'" "\\"] cfg.email.digestSubject}');
-
       ${cfg.extraConfig}
   '';
 
@@ -604,6 +530,9 @@ let
           ''}
           ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
           chmod -R 755 "${cfg.root}"
+          chmod -R 777 "${cfg.root}/${lockDir}"
+          chmod -R 777 "${cfg.root}/${cacheDir}"
+          chmod -R 777 "${cfg.root}/${feedIconsDir}"
         ''
 
         + (optionalString (cfg.database.type == "pgsql") ''
@@ -637,6 +566,85 @@ let
           SyslogIdentifier = "tt-rss";
         };
 
+        environment = let
+          password =
+            if (cfg.database.password != null) then
+              "${(escape ["'" "\\"] cfg.database.password)}"
+            else if (cfg.database.passwordFile != null) then
+              "file_get_contents('${cfg.database.passwordFile}'"
+            else
+              ""
+            ;
+        in {
+          TTRSS_PHP_EXECUTABLE = "${pkgs.php}/bin/php";
+
+          TTRSS_LOCK_DIRECTORY = "${lockDir}";
+          TTRSS_CACHE_DIR = "${cacheDir}";
+          TTRSS_ICONS_DIR = "${feedIconsDir}";
+          TTRSS_ICONS_URL = "${feedIconsDir}";
+          TTRSS_SELF_URL_PATH = "${cfg.selfUrlPath}";
+
+          TTRSS_MYSQL_CHARSET = "UTF8";
+
+          TTRSS_DB_TYPE = "${cfg.database.type}";
+          TTRSS_DB_HOST = "${optionalString (cfg.database.host != null) cfg.database.host}";
+          TTRSS_DB_USER = "${cfg.database.user}";
+          TTRSS_DB_NAME = "${cfg.database.name}";
+          TTRSS_DB_PASS = "${password}";
+          TTRSS_DB_PORT = "${toString dbPort}";
+
+          TTRSS_AUTH_AUTO_CREATE = "${boolToString cfg.auth.autoCreate}";
+          TTRSS_AUTH_AUTO_LOGIN = "${boolToString cfg.auth.autoLogin}";
+
+          TTRSS_FEED_CRYPT_KEY = "${escape ["'" "\\"] cfg.feedCryptKey}";
+
+
+          TTRSS_SINGLE_USER_MODE = "${boolToString cfg.singleUserMode}";
+
+          TTRSS_SIMPLE_UPDATE_MODE = "${boolToString cfg.simpleUpdateMode}";
+
+          # Never check for updates - the running version of the code should
+          # be controlled entirely by the version of TT-RSS active in the
+          # current Nix profile. If TT-RSS updates itself to a version
+          # requiring a database schema upgrade, and then the SystemD
+          # tt-rss.service is restarted, the old code copied from the Nix
+          # store will overwrite the updated version, causing the code to
+          # detect the need for a schema "upgrade" (since the schema version
+          # in the database is different than in the code), but the update
+          # schema operation in TT-RSS will do nothing because the schema
+          # version in the database is newer than that in the code.
+          TTRSS_CHECK_FOR_UPDATES = "false";
+
+          TTRSS_FORCE_ARTICLE_PURGE = "${toString cfg.forceArticlePurge}";
+          TTRSS_SESSION_COOKIE_LIFETIME = "${toString cfg.sessionCookieLifetime}";
+          TTRSS_ENABLE_GZIP_OUTPUT = "${boolToString cfg.enableGZipOutput}";
+
+          TTRSS_PLUGINS = "${builtins.concatStringsSep "," cfg.plugins}";
+
+          TTRSS_LOG_DESTINATION = "${cfg.logDestination}";
+          TTRSS_CONFIG_VERSION = "${toString configVersion}";
+
+
+          TTRSS_PUBSUBHUBBUB_ENABLED = "${boolToString cfg.pubSubHubbub.enable}";
+          TTRSS_PUBSUBHUBBUB_HUB = "${cfg.pubSubHubbub.hub}";
+
+          TTRSS_SPHINX_SERVER = "${cfg.sphinx.server}";
+          TTRSS_SPHINX_INDEX = "${builtins.concatStringsSep "," cfg.sphinx.index}";
+
+          TTRSS_ENABLE_REGISTRATION = "${boolToString cfg.registration.enable}";
+          TTRSS_REG_NOTIFY_ADDRESS = "${cfg.registration.notifyAddress}";
+          TTRSS_REG_MAX_USERS = "${toString cfg.registration.maxUsers}";
+
+          TTRSS_SMTP_SERVER = "${cfg.email.server}";
+          TTRSS_SMTP_LOGIN = "${cfg.email.login}";
+          TTRSS_SMTP_PASSWORD = "${escape ["'" "\\"] cfg.email.password}";
+          TTRSS_SMTP_SECURE = "${cfg.email.security}";
+
+          TTRSS_SMTP_FROM_NAME = "${escape ["'" "\\"] cfg.email.fromName}";
+          TTRSS_SMTP_FROM_ADDRESS = "${escape ["'" "\\"] cfg.email.fromAddress}";
+          TTRSS_DIGEST_SUBJECT = "${escape ["'" "\\"] cfg.email.digestSubject}";
+        };
+
         wantedBy = [ "multi-user.target" ];
         requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
         after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix
index e91fed5ee160..bd82f8d28905 100644
--- a/pkgs/servers/tt-rss/default.nix
+++ b/pkgs/servers/tt-rss/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "tt-rss";
-  version = "2021-01-29";
-  rev = "6d8f2221b82b6a31becbeed8baf5e05ad9e053fe";
+  version = "2021-06-21";
+  rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270";
 
   src = fetchurl {
     url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz";
-    sha256 = "124c62hck631xlq5aa1miz9rbg711ygk7z1yx92m5dfcy630l7x5";
+    sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm";
   };
 
   installPhase = ''

From b1dd02d2128f504958605be0b9e4a04a1d22d48d Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Thu, 1 Jul 2021 15:38:04 -0400
Subject: [PATCH 4/7] Api didn't seem to work with the systemd envs

I am not sure why it was working for me, but after restarting
phpfpm-tt-rss it quit working.
---
 nixos/modules/services/web-apps/tt-rss.nix | 157 ++++++++++-----------
 1 file changed, 77 insertions(+), 80 deletions(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index b9feea7ffc5b..0b23ba56cabd 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -19,8 +19,84 @@ let
   mysqlLocal = cfg.database.createLocally && cfg.database.type == "mysql";
   pgsqlLocal = cfg.database.createLocally && cfg.database.type == "pgsql";
 
-  tt-rss-config = pkgs.writeText "config.php" ''
+  tt-rss-config = let
+    password =
+      if (cfg.database.password != null) then
+        "${(escape ["'" "\\"] cfg.database.password)}"
+      else if (cfg.database.passwordFile != null) then
+        "file_get_contents('${cfg.database.passwordFile}'"
+      else
+        ""
+      ;
+  in pkgs.writeText "config.php" ''
     <?php
+      putenv('TTRSS_PHP_EXECUTABLE=${pkgs.php}/bin/php');
+
+      putenv('TTRSS_LOCK_DIRECTORY=${lockDir}');
+      putenv('TTRSS_CACHE_DIR=${cacheDir}');
+      putenv('TTRSS_ICONS_DIR=${feedIconsDir}');
+      putenv('TTRSS_ICONS_URL=${feedIconsDir}');
+      putenv('TTRSS_SELF_URL_PATH=${cfg.selfUrlPath}');
+
+      putenv('TTRSS_MYSQL_CHARSET=UTF8');
+
+      putenv('TTRSS_DB_TYPE=${cfg.database.type}');
+      putenv('TTRSS_DB_HOST=${optionalString (cfg.database.host != null) cfg.database.host}');
+      putenv('TTRSS_DB_USER=${cfg.database.user}');
+      putenv('TTRSS_DB_NAME=${cfg.database.name}');
+      putenv('TTRSS_DB_PASS=${password}');
+      putenv('TTRSS_DB_PORT=${toString dbPort}');
+
+      putenv('TTRSS_AUTH_AUTO_CREATE=${boolToString cfg.auth.autoCreate}');
+      putenv('TTRSS_AUTH_AUTO_LOGIN=${boolToString cfg.auth.autoLogin}');
+
+      putenv('TTRSS_FEED_CRYPT_KEY=${escape ["'" "\\"] cfg.feedCryptKey}');
+
+
+      putenv('TTRSS_SINGLE_USER_MODE=${boolToString cfg.singleUserMode}');
+
+      putenv('TTRSS_SIMPLE_UPDATE_MODE=${boolToString cfg.simpleUpdateMode}');
+
+      # Never check for updates - the running version of the code should
+      # be controlled entirely by the version of TT-RSS active in the
+      # current Nix profile. If TT-RSS updates itself to a version
+      # requiring a database schema upgrade, and then the SystemD
+      # tt-rss.service is restarted, the old code copied from the Nix
+      # store will overwrite the updated version, causing the code to
+      # detect the need for a schema "upgrade" (since the schema version
+      # in the database is different than in the code), but the update
+      # schema operation in TT-RSS will do nothing because the schema
+      # version in the database is newer than that in the code.
+      putenv('TTRSS_CHECK_FOR_UPDATES=false');
+
+      putenv('TTRSS_FORCE_ARTICLE_PURGE=${toString cfg.forceArticlePurge}');
+      putenv('TTRSS_SESSION_COOKIE_LIFETIME=${toString cfg.sessionCookieLifetime}');
+      putenv('TTRSS_ENABLE_GZIP_OUTPUT=${boolToString cfg.enableGZipOutput}');
+
+      putenv('TTRSS_PLUGINS=${builtins.concatStringsSep "," cfg.plugins}');
+
+      putenv('TTRSS_LOG_DESTINATION=${cfg.logDestination}');
+      putenv('TTRSS_CONFIG_VERSION=${toString configVersion}');
+
+
+      putenv('TTRSS_PUBSUBHUBBUB_ENABLED=${boolToString cfg.pubSubHubbub.enable}');
+      putenv('TTRSS_PUBSUBHUBBUB_HUB=${cfg.pubSubHubbub.hub}');
+
+      putenv('TTRSS_SPHINX_SERVER=${cfg.sphinx.server}');
+      putenv('TTRSS_SPHINX_INDEX=${builtins.concatStringsSep "," cfg.sphinx.index}');
+
+      putenv('TTRSS_ENABLE_REGISTRATION=${boolToString cfg.registration.enable}');
+      putenv('TTRSS_REG_NOTIFY_ADDRESS=${cfg.registration.notifyAddress}');
+      putenv('TTRSS_REG_MAX_USERS=${toString cfg.registration.maxUsers}');
+
+      putenv('TTRSS_SMTP_SERVER=${cfg.email.server}');
+      putenv('TTRSS_SMTP_LOGIN=${cfg.email.login}');
+      putenv('TTRSS_SMTP_PASSWORD=${escape ["'" "\\"] cfg.email.password}');
+      putenv('TTRSS_SMTP_SECURE=${cfg.email.security}');
+
+      putenv('TTRSS_SMTP_FROM_NAME=${escape ["'" "\\"] cfg.email.fromName}');
+      putenv('TTRSS_SMTP_FROM_ADDRESS=${escape ["'" "\\"] cfg.email.fromAddress}');
+      putenv('TTRSS_DIGEST_SUBJECT=${escape ["'" "\\"] cfg.email.digestSubject}');
 
       ${cfg.extraConfig}
   '';
@@ -566,85 +642,6 @@ let
           SyslogIdentifier = "tt-rss";
         };
 
-        environment = let
-          password =
-            if (cfg.database.password != null) then
-              "${(escape ["'" "\\"] cfg.database.password)}"
-            else if (cfg.database.passwordFile != null) then
-              "file_get_contents('${cfg.database.passwordFile}'"
-            else
-              ""
-            ;
-        in {
-          TTRSS_PHP_EXECUTABLE = "${pkgs.php}/bin/php";
-
-          TTRSS_LOCK_DIRECTORY = "${lockDir}";
-          TTRSS_CACHE_DIR = "${cacheDir}";
-          TTRSS_ICONS_DIR = "${feedIconsDir}";
-          TTRSS_ICONS_URL = "${feedIconsDir}";
-          TTRSS_SELF_URL_PATH = "${cfg.selfUrlPath}";
-
-          TTRSS_MYSQL_CHARSET = "UTF8";
-
-          TTRSS_DB_TYPE = "${cfg.database.type}";
-          TTRSS_DB_HOST = "${optionalString (cfg.database.host != null) cfg.database.host}";
-          TTRSS_DB_USER = "${cfg.database.user}";
-          TTRSS_DB_NAME = "${cfg.database.name}";
-          TTRSS_DB_PASS = "${password}";
-          TTRSS_DB_PORT = "${toString dbPort}";
-
-          TTRSS_AUTH_AUTO_CREATE = "${boolToString cfg.auth.autoCreate}";
-          TTRSS_AUTH_AUTO_LOGIN = "${boolToString cfg.auth.autoLogin}";
-
-          TTRSS_FEED_CRYPT_KEY = "${escape ["'" "\\"] cfg.feedCryptKey}";
-
-
-          TTRSS_SINGLE_USER_MODE = "${boolToString cfg.singleUserMode}";
-
-          TTRSS_SIMPLE_UPDATE_MODE = "${boolToString cfg.simpleUpdateMode}";
-
-          # Never check for updates - the running version of the code should
-          # be controlled entirely by the version of TT-RSS active in the
-          # current Nix profile. If TT-RSS updates itself to a version
-          # requiring a database schema upgrade, and then the SystemD
-          # tt-rss.service is restarted, the old code copied from the Nix
-          # store will overwrite the updated version, causing the code to
-          # detect the need for a schema "upgrade" (since the schema version
-          # in the database is different than in the code), but the update
-          # schema operation in TT-RSS will do nothing because the schema
-          # version in the database is newer than that in the code.
-          TTRSS_CHECK_FOR_UPDATES = "false";
-
-          TTRSS_FORCE_ARTICLE_PURGE = "${toString cfg.forceArticlePurge}";
-          TTRSS_SESSION_COOKIE_LIFETIME = "${toString cfg.sessionCookieLifetime}";
-          TTRSS_ENABLE_GZIP_OUTPUT = "${boolToString cfg.enableGZipOutput}";
-
-          TTRSS_PLUGINS = "${builtins.concatStringsSep "," cfg.plugins}";
-
-          TTRSS_LOG_DESTINATION = "${cfg.logDestination}";
-          TTRSS_CONFIG_VERSION = "${toString configVersion}";
-
-
-          TTRSS_PUBSUBHUBBUB_ENABLED = "${boolToString cfg.pubSubHubbub.enable}";
-          TTRSS_PUBSUBHUBBUB_HUB = "${cfg.pubSubHubbub.hub}";
-
-          TTRSS_SPHINX_SERVER = "${cfg.sphinx.server}";
-          TTRSS_SPHINX_INDEX = "${builtins.concatStringsSep "," cfg.sphinx.index}";
-
-          TTRSS_ENABLE_REGISTRATION = "${boolToString cfg.registration.enable}";
-          TTRSS_REG_NOTIFY_ADDRESS = "${cfg.registration.notifyAddress}";
-          TTRSS_REG_MAX_USERS = "${toString cfg.registration.maxUsers}";
-
-          TTRSS_SMTP_SERVER = "${cfg.email.server}";
-          TTRSS_SMTP_LOGIN = "${cfg.email.login}";
-          TTRSS_SMTP_PASSWORD = "${escape ["'" "\\"] cfg.email.password}";
-          TTRSS_SMTP_SECURE = "${cfg.email.security}";
-
-          TTRSS_SMTP_FROM_NAME = "${escape ["'" "\\"] cfg.email.fromName}";
-          TTRSS_SMTP_FROM_ADDRESS = "${escape ["'" "\\"] cfg.email.fromAddress}";
-          TTRSS_DIGEST_SUBJECT = "${escape ["'" "\\"] cfg.email.digestSubject}";
-        };
-
         wantedBy = [ "multi-user.target" ];
         requires = optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";
         after = [ "network.target" ] ++ optional mysqlLocal "mysql.service" ++ optional pgsqlLocal "postgresql.service";

From 70338c53c99d06cc708f92a1050220d906ddc56a Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Sun, 25 Jul 2021 15:40:33 -0400
Subject: [PATCH 5/7] 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 a95b1dd66b96..c0e8867ca0e9 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 @@
         </itemizedlist>
       </listitem>
     </itemizedlist>
-    <itemizedlist spacing="compact">
+    <itemizedlist>
       <listitem>
         <para>
           <literal>yggdrasil</literal> was upgraded to a new major
@@ -468,6 +468,14 @@
           changelog</link>.
         </para>
       </listitem>
+      <listitem>
+        <para>
+          <literal>tt-rss</literal> was upgraded to the commit on
+          2021-06-21, which has breaking changes, see
+          <link xlink:href="https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337">this
+          thread</link> in the tt-rss forums for details.
+        </para>
+      </listitem>
     </itemizedlist>
   </section>
   <section xml:id="sec-release-21.11-notable-changes">
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index be46591dfa16..b0fbfc2bba70 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 0b23ba56cabd..676683a557db 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 bd82f8d28905..39615a238e35 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; {

From 7aa2bf302ae563453b010cc27ea66affb055b26e Mon Sep 17 00:00:00 2001
From: Milo Gertjejansen <milo@milogert.com>
Date: Wed, 28 Jul 2021 20:53:38 -0400
Subject: [PATCH 6/7] Added more detail to changelog, updated permissions in
 directory, and changed restartTriggers

---
 .../manual/from_md/release-notes/rl-2111.section.xml   |  7 +++++--
 nixos/doc/manual/release-notes/rl-2111.section.md      |  2 +-
 nixos/modules/services/web-apps/tt-rss.nix             | 10 ++++------
 3 files changed, 10 insertions(+), 9 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 31031a2d2e7b..c78c99cb6476 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
@@ -558,9 +558,12 @@
       <listitem>
         <para>
           <literal>tt-rss</literal> was upgraded to the commit on
-          2021-06-21, which has breaking changes, see
+          2021-06-21, which has breaking changes. If you use
+          <literal>services.tt-rss.extraConfig</literal> you should
+          migrate to the <literal>putenv</literal>-style configuration.
+          See
           <link xlink:href="https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337">this
-          thread</link> in the tt-rss forums for details.
+          Discourse post</link> in the tt-rss forums for more details.
         </para>
       </listitem>
     </itemizedlist>
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 5a6bf727c03a..eb45c9bf747d 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -142,7 +142,7 @@ pt-services.clipcat.enable).
 
 - the `mingw-64` package has been upgraded from 6.0.0 to 9.0.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.
+- `tt-rss` was upgraded to the commit on 2021-06-21, which has breaking changes. If you use `services.tt-rss.extraConfig` you should migrate to the `putenv`-style configuration. See [this Discourse post](https://community.tt-rss.org/t/rip-config-php-hello-classes-config-php/4337) in the tt-rss forums for more details.
 
 ## Other Notable Changes {#sec-release-21.11-notable-changes}
 
diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 676683a557db..7a6dc5f0a4ef 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -568,9 +568,7 @@ let
 
     systemd.services = {
       phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") {
-        restartTriggers = [
-          cfg.root
-        ];
+        restartTriggers = [ tt-rss-config tt-rss ];
       };
 
       tt-rss = {
@@ -611,9 +609,9 @@ let
           ''}
           ln -sf "${tt-rss-config}" "${cfg.root}/config.php"
           chmod -R 755 "${cfg.root}"
-          chmod -R 777 "${cfg.root}/${lockDir}"
-          chmod -R 777 "${cfg.root}/${cacheDir}"
-          chmod -R 777 "${cfg.root}/${feedIconsDir}"
+          chmod -R ug+rwX "${cfg.root}/${lockDir}"
+          chmod -R ug+rwX "${cfg.root}/${cacheDir}"
+          chmod -R ug+rwX "${cfg.root}/${feedIconsDir}"
         ''
 
         + (optionalString (cfg.database.type == "pgsql") ''

From 256af6b7422e99e7dba850718c0618905375c617 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien@users.noreply.github.com>
Date: Sat, 31 Jul 2021 15:19:00 +0000
Subject: [PATCH 7/7] nixos/tt-rss: fix eval

---
 nixos/modules/services/web-apps/tt-rss.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/tt-rss.nix b/nixos/modules/services/web-apps/tt-rss.nix
index 7a6dc5f0a4ef..ed13845915c4 100644
--- a/nixos/modules/services/web-apps/tt-rss.nix
+++ b/nixos/modules/services/web-apps/tt-rss.nix
@@ -568,7 +568,7 @@ let
 
     systemd.services = {
       phpfpm-tt-rss = mkIf (cfg.pool == "${poolName}") {
-        restartTriggers = [ tt-rss-config tt-rss ];
+        restartTriggers = [ tt-rss-config pkgs.tt-rss ];
       };
 
       tt-rss = {