From 40b67a1f2a49c3a00f30b943dcd4e1de5a62632f Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Fri, 22 Jan 2021 16:58:17 -0500 Subject: [PATCH] gnu: linkchecker: Do not set PYTHONPATH. * gnu/packages/web.scm (linkchecker): Remove trailing #t. [phases]: Do not reorder the check phase after the install phase. {check}: Do not set PYTHONPATH. --- gnu/packages/web.scm | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index 029a05df49..44405d4223 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -47,6 +47,7 @@ ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Ryan Prior ;;; Copyright © 2020 Alexandru-Sergiu Marton +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -6431,23 +6432,13 @@ Instagram and YouTube.") `(#:python ,python-2 #:phases (modify-phases %standard-phases - ;; Move the 'check phase to after 'install, so that the installed - ;; library can be used - (delete 'check) - (add-after 'install 'check + (replace 'check (lambda* (#:key outputs #:allow-other-keys) (let ((out (assoc-ref outputs "out"))) - ;; Set PYTHONPATH so that the installed linkchecker is used - (setenv "PYTHONPATH" - (string-append out "/lib/python2.7/site-packages" - ":" - (getenv "PYTHONPATH"))) ;; Remove this directory to avoid it being used when running ;; the tests (delete-file-recursively "linkcheck") - - (invoke "py.test" "tests")) - #t))))) + (invoke "py.test" "tests"))))))) (home-page "https://linkcheck.github.io/linkchecker") (synopsis "Check websites for broken links") (description "LinkChecker is a website validator. It checks for broken