diff options
author | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2022-06-08 14:46:24 +0200 |
commit | 8c3e9da13a3c92a7db308db8c0d81cb474ad7799 (patch) | |
tree | 88d06952aa5cc3a9c4991d9c43eb7950ff174fe1 /guix/lint.scm | |
parent | 5439c04ebdb7b6405f5ea2446b375f1d155a8d95 (diff) | |
parent | 0c5299200ffcd16370f047b7ccb187c60f30da34 (diff) |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/lint.scm')
-rw-r--r-- | guix/lint.scm | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/guix/lint.scm b/guix/lint.scm index 767083a0ff..2b89f6a02a 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -494,16 +494,16 @@ of a package, and INPUT-NAMES, a list of package specifications such as "m4" "qttools" "yasm" "nasm" "fasm" - "python-coverage" "python2-coverage" - "python-cython" "python2-cython" - "python-docutils" "python2-docutils" - "python-mock" "python2-mock" - "python-nose" "python2-nose" - "python-pbr" "python2-pbr" - "python-pytest" "python2-pytest" - "python-pytest-cov" "python2-pytest-cov" - "python-setuptools-scm" "python2-setuptools-scm" - "python-sphinx" "python2-sphinx" + "python-coverage" + "python-cython" + "python-docutils" + "python-mock" + "python-nose" + "python-pbr" + "python-pytest" + "python-pytest-cov" + "python-setuptools-scm" + "python-sphinx" "scdoc" "swig" "qmake" @@ -523,9 +523,7 @@ of a package, and INPUT-NAMES, a list of package specifications such as ;; Emit a warning if some inputs of PACKAGE are likely to should not be ;; an input at all. (let ((input-names '("python-setuptools" - "python2-setuptools" - "python-pip" - "python2-pip"))) + "python-pip"))) (map (lambda (input) (make-warning package @@ -1347,7 +1345,11 @@ descriptions maintained upstream." (formatted-message-arguments c)))) (make-warning package (G_ "failed to create ~a derivation: ~a") - (list system str))))) + (list system str)))) + (else + (make-warning package + (G_ "failed to create ~a derivation: ~a") + (list system c)))) (parameterize ((%graft? #f)) (package-derivation store package system #:graft? #f) |