From e3d8f4278a190b3f630c71be079486235ac7a750 Mon Sep 17 00:00:00 2001 From: Michael Alan Dorman Date: Wed, 9 Dec 2020 09:55:50 -0500 Subject: [PATCH] feedparser: keep 5.2.1 available for python-2.7 --- .../networking/feedreaders/rawdog/default.nix | 4 ++++ .../python-modules/feedparser/5.nix | 24 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/feedparser/5.nix diff --git a/pkgs/applications/networking/feedreaders/rawdog/default.nix b/pkgs/applications/networking/feedreaders/rawdog/default.nix index 9fdee56b99b..9435d995c35 100644 --- a/pkgs/applications/networking/feedreaders/rawdog/default.nix +++ b/pkgs/applications/networking/feedreaders/rawdog/default.nix @@ -11,6 +11,10 @@ python2Packages.buildPythonApplication rec { propagatedBuildInputs = with python2Packages; [ feedparser ]; + # Requested by @SuperSandro20001 + pythonImportsCheck = [ "feedparser" ]; + doCheck = false; + namePrefix = ""; meta = with stdenv.lib; { diff --git a/pkgs/development/python-modules/feedparser/5.nix b/pkgs/development/python-modules/feedparser/5.nix new file mode 100644 index 00000000000..31fc61053b9 --- /dev/null +++ b/pkgs/development/python-modules/feedparser/5.nix @@ -0,0 +1,24 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "feedparser"; + version = "5.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1ycva69bqssalhqg45rbrfipz3l6hmycszy26k0351fhq990c0xx"; + }; + + # lots of networking failures + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/kurtmckee/feedparser"; + description = "Universal feed parser"; + license = licenses.bsd2; + maintainers = with maintainers; [ domenkozar ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ff6441631c..ef2ff2edf68 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2070,7 +2070,10 @@ in { feedgenerator = callPackage ../development/python-modules/feedgenerator { inherit (pkgs) glibcLocales; }; - feedparser = callPackage ../development/python-modules/feedparser { }; + feedparser = if isPy3k then + callPackage ../development/python-modules/feedparser { } + else + callPackage ../development/python-modules/feedparser/5.nix { }; fenics = callPackage ../development/libraries/science/math/fenics { inherit (pkgs) pkg-config;