From 78403d98a450317716510979bc35e18adf7ec61b Mon Sep 17 00:00:00 2001 From: luca Date: Mon, 24 Nov 2025 23:38:15 +0100 Subject: [PATCH] gnu: reuse: Update to 6.2.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/license.scm (reuse): Update to 6.2.0. [source]: Change to git-fetch. [arguments] : Prevent running tests in "src". : Remove 'chdir [inputs]: Remove python-boolean.py; add git, jujutsu, mercurial, python-charset-normalizer, and python-magic. [native-inputs]: Remove python-wheel. Change-Id: Ia8c9ceea488d1b4d9e247444494143529f523c51 Reviewed-by: Nguyễn Gia Phong Modified-by: Sharlatan Hellseher Signed-off-by: Sharlatan Hellseher --- gnu/packages/license.scm | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-) diff --git a/gnu/packages/license.scm b/gnu/packages/license.scm index 777b312d92ac092133f7379399862f537dcf7c47..47ad9441725226e44a3364f931cd6c5eafb3dbe9 100644 --- a/gnu/packages/license.scm +++ b/gnu/packages/license.scm @@ -33,6 +33,8 @@ #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages rust-apps) + #:use-module (gnu packages version-control) #:use-module (gnu packages web) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -212,38 +214,37 @@ belonging to various licenses.") (define-public reuse (package (name "reuse") - (version "5.0.2") + (version "6.2.0") (source (origin - (method url-fetch) - (uri (pypi-uri "reuse" version)) + (method git-fetch) + (uri (git-reference + (url "https://codeberg.org/fsfe/reuse-tool.git") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) (sha256 - (base32 "0p08xmpf361m81kfmkwzm898q9iaq5v6cvb0sjx1176jbnp1d047")))) + (base32 "1m76vrjqbr3a6bmzgxqkf0qdfk41v1mnhh524q67pincvqi533r7")))) (build-system pyproject-build-system) (arguments - ;; Change directory before running the test suite to avoid having both - ;; the local sources on GUIX_PYTHONPATH as well as the installed - ;; libraries confusing Pytest (ImportPathMismatchError). - (list #:phases #~(modify-phases %standard-phases - (add-before 'check 'chdir - (lambda _ - (chdir "/tmp")))) - ;; The test_simple test hangs (see: - ;; https://github.com/fsfe/reuse-tool/issues/1119). - #:test-flags #~(list "-k" "not test_simple"))) + (list + ;; tests: 907 passed, 21 skipped, 8 warnings + #:test-flags #~(list "--ignore=src/reuse"))) (native-inputs (list python-freezegun python-poetry-core - python-pytest - python-wheel)) + python-pytest)) (inputs - (list python-attrs + (list git + jujutsu + mercurial + python-attrs python-binaryornot - python-boolean.py + python-charset-normalizer python-click python-debian python-jinja2 python-license-expression + python-magic python-tomlkit)) (home-page "https://reuse.software/") (synopsis "Provide and verify copyright and licensing information")