Merge pull request #198748 from Mic92/tt-rss

tt-rss: 2021-06-21 -> 2022-10-15
This commit is contained in:
ajs124 2022-11-03 20:48:34 +01:00 committed by GitHub
commit bdcc05301a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 22 additions and 15 deletions

View file

@ -1153,6 +1153,13 @@
<link xlink:href="options.html#opt-systemd.oomd.enableUserServices">systemd.oomd.enableUserServices</link>.
</para>
</listitem>
<listitem>
<para>
The <literal>tt-rss</literal> service performs two database
migrations when you first use its web UI after upgrade.
Consider backing up its database before updating.
</para>
</listitem>
<listitem>
<para>
The <literal>pass-secret-service</literal> package now

View file

@ -352,6 +352,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.

View file

@ -1,16 +1,13 @@
{ lib, stdenv, fetchurl }:
{ lib, stdenv, fetchgit }:
stdenv.mkDerivation rec {
pname = "tt-rss";
year = "21";
month = "06";
day = "21";
version = "20${year}-${month}-${day}";
rev = "cd26dbe64c9b14418f0b2d826a38a35c6bf8a270";
version = "unstable-2022-10-15";
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 = "602e8684258062937d7f554ab7889e8e02318c96";
sha256 = "sha256-vgRaxo998Gx9rVeZZl52jppK1v11jpEK0J0NoDMT44I=";
};
installPhase = ''
@ -21,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 "${year}.${month}" > $out/version_static.txt
echo "22.10" > $out/version_static.txt
runHook postInstall
'';

View file

@ -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 {