From 6444c4420cd1b95b7d88368d2d160355d7bc4acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 3 Apr 2021 02:27:46 +0200 Subject: [PATCH] rss2email: 3.12.1 -> 3.13 (#118371) --- .../feedreaders/rss2email/default.nix | 23 +++++-------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rss2email/default.nix b/pkgs/applications/networking/feedreaders/rss2email/default.nix index 23b79dccd6d..9ecadd56f15 100644 --- a/pkgs/applications/networking/feedreaders/rss2email/default.nix +++ b/pkgs/applications/networking/feedreaders/rss2email/default.nix @@ -1,32 +1,19 @@ -{ pythonPackages, fetchurl, fetchpatch, lib, nixosTests }: +{ pythonPackages, fetchurl, lib, nixosTests }: with pythonPackages; buildPythonApplication rec { pname = "rss2email"; - version = "3.12.2"; + version = "3.13"; propagatedBuildInputs = [ feedparser html2text ]; checkInputs = [ beautifulsoup4 ]; src = fetchurl { url = "mirror://pypi/r/rss2email/${pname}-${version}.tar.gz"; - sha256 = "12w6x80wsw6xm17fxyymnl45aavsagg932zw621wcjz154vjghjr"; + sha256 = "09vp2y0ibv20y9yysniv6njzigif4h74pkj31l2a8xw5g19gclna"; }; - patches = [ - (fetchpatch { - name = "rss2email-feedparser6.patch"; - url = "https://github.com/rss2email/rss2email/pull/149/commits/338343c92f956c31ff5249ef4bcf7aeea81f687e.patch"; - sha256 = "0h8b3g9332vdrkqbh6lp00k97asrhmlxi13zghrgc78ia13czy3z"; - }) - (fetchpatch { - name = "rss2email-feedparser6-test.patch"; - url = "https://github.com/rss2email/rss2email/pull/149/commits/8c99651eced3f29f05ba2c0ca02abb8bb9a18967.patch"; - sha256 = "1scljak6xyqxlilg3j39v4qm9a9jks1bnvnrh62hyf3g53yw2xlg"; - }) - ]; - outputs = [ "out" "man" "doc" ]; postPatch = '' @@ -45,8 +32,10 @@ buildPythonApplication rec { cp AUTHORS COPYING CHANGELOG README.rst $doc/share/doc/rss2email/ ''; - postCheck = '' + checkPhase = '' + runHook preCheck env PATH=$out/bin:$PATH python ./test/test.py + runHook postCheck ''; meta = with lib; {