From 73a4e61349d1399b753ab3fc385fb80dd655d786 Mon Sep 17 00:00:00 2001 From: Smaug123 Date: Mon, 1 Aug 2022 09:05:12 +0100 Subject: [PATCH 1/3] tt-rss: 2021-06-21 -> 2022-08-01 Pull in a year of upstream changes. This update will involve two database migrations when logging in to the resulting service. --- .../from_md/release-notes/rl-2211.section.xml | 7 +++++++ .../doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/servers/tt-rss/default.nix | 16 +++++++--------- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 0fc9bdba99b1..d4c699921b75 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -1129,6 +1129,13 @@ systemd.oomd.enableUserServices. + + + The tt-rss service performs two database + migrations when you first use its web UI after upgrade. + Consider backing up its database before updating. + + The pass-secret-service package now diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index a5d0b2dbcf9d..391015c46660 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -346,6 +346,8 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). [systemd.oomd.enableRootSlice](options.html#opt-systemd.oomd.enableRootSlice), [systemd.oomd.enableSystemSlice](options.html#opt-systemd.oomd.enableSystemSlice), and [systemd.oomd.enableUserServices](options.html#opt-systemd.oomd.enableUserServices). + +- The `tt-rss` service performs two database migrations when you first use its web UI after upgrade. Consider backing up its database before updating. - The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 39615a238e35..7ec0f56f6192 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -1,16 +1,14 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchgit }: stdenv.mkDerivation rec { pname = "tt-rss"; - year = "21"; - month = "06"; - day = "21"; - version = "20${year}-${month}-${day}"; + version = "unstable-2022-08-01"; rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; - src = fetchurl { - url = "https://git.tt-rss.org/fox/tt-rss/archive/${rev}.tar.gz"; - sha256 = "1dpmzi7hknv5rk2g1iw13r8zcxcwrhkd5hhf292ml0dw3cwki0gm"; + src = fetchgit { + url = "https://git.tt-rss.org/fox/tt-rss.git"; + rev = "ed2cbeffcc456a86726b52d37c977a35b895968c"; + sha256 = "0ab1q316y4f432z2kwn86kc144awk529cild7b4jbffh2ydlj3r4"; }; installPhase = '' @@ -21,7 +19,7 @@ stdenv.mkDerivation rec { # 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 + echo "22.08" > $out/version_static.txt runHook postInstall ''; From 1438ed30c136366472db39fd26e6afbac3d6d4b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 30 Oct 2022 07:40:35 +0100 Subject: [PATCH 2/3] tt-rss: 2022-08-01 -> 2022-10-15 --- pkgs/servers/tt-rss/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/tt-rss/default.nix b/pkgs/servers/tt-rss/default.nix index 7ec0f56f6192..113dedf090cf 100644 --- a/pkgs/servers/tt-rss/default.nix +++ b/pkgs/servers/tt-rss/default.nix @@ -2,13 +2,12 @@ stdenv.mkDerivation rec { pname = "tt-rss"; - version = "unstable-2022-08-01"; - rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270"; + version = "unstable-2022-10-15"; src = fetchgit { url = "https://git.tt-rss.org/fox/tt-rss.git"; - rev = "ed2cbeffcc456a86726b52d37c977a35b895968c"; - sha256 = "0ab1q316y4f432z2kwn86kc144awk529cild7b4jbffh2ydlj3r4"; + rev = "602e8684258062937d7f554ab7889e8e02318c96"; + sha256 = "sha256-vgRaxo998Gx9rVeZZl52jppK1v11jpEK0J0NoDMT44I="; }; installPhase = '' @@ -19,7 +18,7 @@ stdenv.mkDerivation rec { # see the code of Config::get_version(). you can check that the version in # the footer of the preferences pages is not UNKNOWN - echo "22.08" > $out/version_static.txt + echo "22.10" > $out/version_static.txt runHook postInstall ''; From 52da2b9e7b845091bbaf960a23d7e3d895806811 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Mon, 31 Oct 2022 07:39:47 +0100 Subject: [PATCH 3/3] tt-rss-plugin-auth-ldap: 2.0.0 -> unstable-2022-10-31 --- pkgs/servers/tt-rss/plugin-auth-ldap/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix index 7bff424d9f7e..c057880b05d5 100644 --- a/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix +++ b/pkgs/servers/tt-rss/plugin-auth-ldap/default.nix @@ -2,19 +2,20 @@ stdenv.mkDerivation rec { pname = "tt-rss-plugin-auth-ldap"; - version = "2.0.0"; + version = "unstable-2022-10-31"; src = fetchFromGitHub { owner = "hydrian"; repo = "TTRSS-Auth-LDAP"; - rev = version; - sha256 = "1mg9jff2m0ajxql1vd1g7hsxfbv9smhrmjg4j2gvvjbii45ry0jh"; + rev = "0cc2a21441f99eef8368cfe0fbdbb78126e28d61"; + sha256 = "sha256-pJWyvRnC38Ov1awVLgFZfp8+haADPniP+/P/C74qpcA="; }; patches = [ + # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/47 (fetchpatch { - url = "https://github.com/Mic92/TTRSS-Auth-LDAP/commit/7534fa54babc377a070e05e326a46a252b5e3884.patch"; - sha256 = "1p7zas0n627z0g226dp5m5dg1ai2z3vi69n3xivp517iv3lch70l"; + url = "https://github.com/hydrian/TTRSS-Auth-LDAP/commit/003ca55bbd6e0a87fb729383e51eb269d918313d.patch"; + sha256 = "sha256-0YD33JPNOOPH2dpGwA/RbV3Kg4i2oKazBjP3hBcUIes="; }) # https://github.com/hydrian/TTRSS-Auth-LDAP/pull/40 (fetchpatch {