From 278fa8cf8eb061f9639944fccccf43c3093a44ef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sat, 20 Jun 2026 19:19:07 -0300 Subject: gnu: b4: Cleanup code. * gnu/packages/version-control.scm (b4): Cleanup. [arguments]: Indent. <#:phases>: Update comment about sanity-check deletion. [home-page]: Update. Change-Id: I07b8f14740a81b1bcae76cfd36e4def2c7710363 Signed-off-by: Liliana Marie Prikler --- gnu/packages/version-control.scm | 37 +++++++++++++++++++++---------------- 1 file changed, 21 insertions(+), 16 deletions(-) (limited to 'gnu') diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index e0d9a55ba86..20c2bd72c39 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -3938,20 +3938,24 @@ email header.") "1xxrdh0pr7yml83xdk0x20dqrnmwkhvhjkqwk16d41kxx0p391zr")))) (build-system pyproject-build-system) (arguments - (list #:tests? (not (%current-target-system)) ;git path hardcoded. - #:phases - #~(modify-phases %standard-phases - ;; XXX: dnspython attempts to read /etc/resolv.conf when loading - ;; resolver.py, which breaks the sanity check in dependent - ;; packages. This should rather be fixed in dnspython. - (delete 'sanity-check) - ;; This ensures git is present when called. - (add-after 'unpack 'hardcode-git-bin - (lambda* (#:key inputs #:allow-other-keys) - (substitute* (find-files "src/b4" "\\.py$") - (("\\['git'") - (string-append - "['" (search-input-file inputs "bin/git") "'")))))))) + (list + #:tests? (not (%current-target-system)) ; git path is hardcoded. + #:phases + #~(modify-phases %standard-phases + ;; INFO: phase `sanity-check' fails with the following message: + ;; . . . + ;; ...checking requirements: ERROR: b4== + ;; DistributionNotFound(Requirement.parse('git-filter-repo<3.0,>=2.30'), + ;; {'b4'}) + ;; This should rather be fixed in git-filter-repo. + (delete 'sanity-check) + ;; This ensures git is present when called. + (add-after 'unpack 'hardcode-git-bin + (lambda* (#:key inputs #:allow-other-keys) + (substitute* (find-files "src/b4" "\\.py$") + (("\\['git'") + (string-append + "['" (search-input-file inputs "bin/git") "'")))))))) (inputs (list git-filter-repo git-minimal @@ -3960,8 +3964,9 @@ email header.") python-dnspython python-requests)) (native-inputs - (list python-pytest python-setuptools)) - (home-page "https://git.kernel.org/pub/scm/utils/b4/b4.git") + (list python-pytest + python-setuptools)) + (home-page "https://b4.docs.kernel.org/en/latest/") (synopsis "Tool for working with patches in public-inbox archives") (description "The @code{b4} command is designed to make it easier to participate in -- cgit v1.2.3