diff options
6 files changed, 14 insertions, 34 deletions
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix index 2e96266fd7372..91ef3270dc455 100644 --- a/pkgs/applications/networking/browsers/qutebrowser/default.nix +++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix @@ -61,7 +61,7 @@ in mkDerivationWith python3Packages.buildPythonApplication rec { pyyaml backendPackage jinja2 pygments # scripts and userscripts libs tldextract beautifulsoup4 - pyreadability pykeepass stem + readability-lxml pykeepass stem pynacl # extensive ad blocking adblock diff --git a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix index 633c1e744bb6d..f80be45ebd1f7 100644 --- a/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix +++ b/pkgs/applications/networking/feedreaders/gnome-feeds/default.nix @@ -61,7 +61,7 @@ python3.pkgs.buildPythonApplication rec { pillow pygments pygobject3 - pyreadability + readability-lxml pytz requests ]; diff --git a/pkgs/development/python-modules/pyreadability/default.nix b/pkgs/development/python-modules/pyreadability/default.nix deleted file mode 100644 index 9aa87d238ec94..0000000000000 --- a/pkgs/development/python-modules/pyreadability/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, fetchPypi, buildPythonPackage -, requests, chardet, cssselect, lxml -}: - -buildPythonPackage rec { - pname = "PyReadability"; - version = "0.4.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "1k6fq416pdmjcdqh6gdxl0y0k8kj1zlpzwp5574xsvsha18p2zpn"; - }; - - propagatedBuildInputs = [ requests chardet cssselect lxml ]; - - # ModuleNotFoundError: No module named 'tests' - doCheck = false; - - meta = { - homepage = "https://github.com/hyperlinkapp/python-readability"; - description = "fast python port of arc90's readability tool, updated to match latest readability.js!"; - license = lib.licenses.asl20; - }; - -} diff --git a/pkgs/development/python-modules/readability-lxml/default.nix b/pkgs/development/python-modules/readability-lxml/default.nix index e012bf75fe582..8313b63d37e18 100644 --- a/pkgs/development/python-modules/readability-lxml/default.nix +++ b/pkgs/development/python-modules/readability-lxml/default.nix @@ -1,19 +1,22 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , chardet , cssselect , lxml +, timeout-decorator }: buildPythonPackage rec { pname = "readability-lxml"; version = "0.8.1"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-5R/qVrWQmq+IbTB9SOeeCWKTJVr6Vnt9CLypTSWxpOE="; + src = fetchFromGitHub { + owner = "buriy"; + repo = "python-readability"; + rev = "v${version}"; + hash = "sha256-MKdQRety24qOG9xgIdaCJ72XEImP42SlMG6tC7bwzo4="; }; propagatedBuildInputs = [ chardet cssselect lxml ]; @@ -22,7 +25,10 @@ buildPythonPackage rec { substituteInPlace setup.py --replace 'sys.platform == "darwin"' "False" ''; - doCheck = false; + checkInputs = [ + pytestCheckHook + timeout-decorator + ]; meta = with lib; { description = "Fast python port of arc90's readability tool"; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0457def9b0102..325b5e69b0c78 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -108,6 +108,7 @@ mapAliases ({ pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 + pyreadability = readability-lxml; # added 2022-05-24 pysmart-smartx = pysmart; # added 2021-10-22 pytest_6 = pytest; # added 2022-02-10 pytestcov = pytest-cov; # added 2021-01-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c29b79bf26557..d52179d4b1a50 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7802,8 +7802,6 @@ in { pyramid_multiauth = callPackage ../development/python-modules/pyramid_multiauth { }; - pyreadability = callPackage ../development/python-modules/pyreadability { }; - pyrealsense2 = toPythonModule (pkgs.librealsense.override { enablePython = true; pythonPackages = self; |