diff options
author | Léo Gaspard <leo@gaspard.io> | 2019-09-01 01:56:28 +0200 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2019-09-09 18:03:17 +0200 |
commit | a80eef922da258598565c55c5ae10240109139b7 (patch) | |
tree | 7509addfffaf32698578a2ca4ede541aa587268f | |
parent | 404caba16b7a5da716a133f00f7432a83c5804bc (diff) | |
download | nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar.gz nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar.bz2 nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar.lz nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar.xz nixpkgs-a80eef922da258598565c55c5ae10240109139b7.tar.zst nixpkgs-a80eef922da258598565c55c5ae10240109139b7.zip |
rss2email: 3.9 -> 3.10
-rw-r--r-- | nixos/modules/services/mail/rss2email.nix | 5 | ||||
-rw-r--r-- | pkgs/applications/networking/feedreaders/rss2email/default.nix | 16 |
2 files changed, 8 insertions, 13 deletions
diff --git a/nixos/modules/services/mail/rss2email.nix b/nixos/modules/services/mail/rss2email.nix index df454abc826..c1e5964c453 100644 --- a/nixos/modules/services/mail/rss2email.nix +++ b/nixos/modules/services/mail/rss2email.nix @@ -43,9 +43,8 @@ in { <literal>[DEFAULT]</literal> block along with the <literal>to</literal> parameter. - See - <literal>https://github.com/rss2email/rss2email/blob/master/r2e.1</literal> - for more information on which parameters are accepted. + See <literal>man r2e</literal> for more information on which + parameters are accepted. ''; }; diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 67346d45b9f..89eef9cae4c 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -4,15 +4,13 @@ with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.9"; # TODO: on next bump, the manpage will be updated. - # Update nixos/modules/services/mail/rss2email.nix to point to it instead of - # to the online r2e.1 + version = "3.10"; propagatedBuildInputs = [ feedparser beautifulsoup4 html2text ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "02wj9zhmc2ym8ba1i0z9pm1c622z2fj7fxwagnxbvpr1402ahmr5"; + sha256 = "1yjgbgpq9jjmpywwk6n4lzb2k7mqgdgfgm4jckv4zy0fn595pih1"; }; outputs = [ "out" "man" "doc" ]; @@ -30,14 +28,12 @@ buildPythonApplication rec { # copy documentation mkdir -p $doc/share/doc/rss2email - cp AUTHORS COPYING CHANGELOG README $doc/share/doc/rss2email/ + cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/ ''; - # The tests currently fail, see - # https://github.com/rss2email/rss2email/issues/14 - # postCheck = '' - # env PYTHONPATH=.:$PYTHONPATH python ./test/test.py - # ''; + postCheck = '' + env PATH=$out/bin:$PATH python ./test/test.py + ''; meta = with lib; { description = "A tool that converts RSS/Atom newsfeeds to email."; |