From 84ec639467124592e3581492678685e51d859876 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 16 Aug 2020 19:48:01 -0700 Subject: [PATCH] linkchecker: 9.4.0 -> unstable-2020-08-16, use python3 10.0 release seems to have stalled https://github.com/linkchecker/linkchecker/issues/359 --- pkgs/tools/networking/linkchecker/default.nix | 26 ++++++++----------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/pkgs/tools/networking/linkchecker/default.nix b/pkgs/tools/networking/linkchecker/default.nix index 6f94e0c63c50..e4f2f1685763 100644 --- a/pkgs/tools/networking/linkchecker/default.nix +++ b/pkgs/tools/networking/linkchecker/default.nix @@ -1,27 +1,30 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, gettext }: +{ stdenv, lib, fetchFromGitHub, python3Packages, gettext }: -python2Packages.buildPythonApplication rec { +with python3Packages; + +buildPythonApplication rec { pname = "linkchecker"; - version = "9.4.0"; + version = "unstable-2020-08-15"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "1vbwl2vb8dyzki27z3sl5yf9dhdd2cpkg10vbgaz868dhpqlshgs"; + rev = "0086c28b3a419faa60562f2713346996062c03c2"; + sha256 = "0am5id8vqlqn1gb9jri0vjgiq5ffgrjq8yzdk1zc98gn2n0397wl"; }; nativeBuildInputs = [ gettext ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = [ ConfigArgParse argcomplete + beautifulsoup4 dnspython pyxdg requests ]; - checkInputs = with python2Packages; [ + checkInputs = [ parameterized pytest ]; @@ -29,21 +32,14 @@ python2Packages.buildPythonApplication rec { postPatch = '' sed -i 's/^requests.*$/requests>=2.2/' requirements.txt sed -i "s/'request.*'/'requests >= 2.2'/" setup.py - sed -i 's~/usr/lib/python2.7/argparse.py~~g' po/Makefile ''; checkPhase = '' - runHook preCheck - - # the mime test fails for me... - rm tests/test_mimeutil.py ${lib.optionalString stdenv.isDarwin '' # network tests fails on darwin rm tests/test_network.py ''} - make test PYTESTOPTS="--tb=short" TESTS="tests/test_*.py tests/logger/test_*.py" - - runHook postCheck + pytest --ignore=tests/checker/{test_telnet,telnetserver}.py -k 'not TestLoginUrl' ''; meta = {