mirror/guix
mirror/guix
1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 20:10:39 +02:00
Code Releases Activity

gnu: patman: Wrap program with git.

Browse source 
* gnu/packages/bootloaders.scm (patman)
[arguments]: Add 'wrap-script' phase to ensure git is always available.
[inputs]: Add git, git:send-email and guile-3.0/pinned.

Change-Id: Id4ebadd518f271baa087161b10455ec03d6f959b
Co-authored-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Simon Tournier 2024-07-23 19:59:18 +02:00 • committed by Maxim Cournoyer
parent 5fb5cbb8b4
commit 4c99ef43f0
No known key found for this signature in database
GPG key ID: 1260E46482E63562
1 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

34
gnu/packages/bootloaders.scm
View file

@ -17,8 +17,9 @@
;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re> ;;; Copyright © 2021 Brice Waegeneire <brice@waegenei.re>
;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org> ;;; Copyright © 2022, 2023 Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de> ;;; Copyright © 2021 Stefan <stefan-guix@vodafonemail.de>
;;; Copyright © 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2022, 2023, 2024 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2023 Herman Rimm <herman@rimm.ee> ;;; Copyright © 2023 Herman Rimm <herman@rimm.ee>
;;; Copyright © 2023 Simon Tournier <zimon.toutoune@gmail.com>
;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
@ -52,6 +53,7 @@
#:use-module (gnu packages fontutils) #:use-module (gnu packages fontutils)
#:use-module (gnu packages gcc) #:use-module (gnu packages gcc)
#:use-module (gnu packages gettext) #:use-module (gnu packages gettext)
#:use-module (gnu packages guile)
#:use-module (gnu packages linux) #:use-module (gnu packages linux)
#:use-module (gnu packages llvm) #:use-module (gnu packages llvm)
#:use-module (gnu packages man) #:use-module (gnu packages man)
@ -71,6 +73,7 @@
#:use-module (gnu packages serialization) #:use-module (gnu packages serialization)
#:use-module (gnu packages swig) #:use-module (gnu packages swig)
#:use-module (gnu packages valgrind) #:use-module (gnu packages valgrind)
#:use-module (gnu packages version-control)
#:use-module (gnu packages virtualization) #:use-module (gnu packages virtualization)
#:use-module (gnu packages xorg) #:use-module (gnu packages xorg)
#:use-module (gnu packages python-web) #:use-module (gnu packages python-web)
@ -982,17 +985,24 @@ commands part of the U-Boot project, such as Patman.")))
(add-after 'unpack 'chdir (add-after 'unpack 'chdir
(lambda _ (lambda _
(chdir "tools/patman"))) (chdir "tools/patman")))
(add-after 'chdir 'patch-pyproject.toml (add-after 'install 'wrap-script
;; There is no 'run_patman' procedure in the __main__.py script, (lambda* (#:key inputs #:allow-other-keys)
;; which breaks execution (wrap-script (string-append #$output "/bin/patman")
;; Patch submitted upstream (see: `("PATH" ":" prefix
;; https://patchwork.ozlabs.org/project/uboot/\ (,(string-append #$(this-package-input "git") "/bin")))
;; patch/20230901050532.725-1-maxim.cournoyer@gmail.com/). `("GIT_EXEC_PATH" ":" prefix
(lambda _ (,(dirname (search-input-file
(substitute* "pyproject.toml" inputs "libexec/git-core/git-commit"))
(("patman.__main__:run_patman") ,(dirname (search-input-file
"patman.__main__"))))))) inputs
(inputs (list python-pygit2 python-requests python-u-boot-pylib)) "libexec/git-core/git-send-email"))))))))))
(inputs
(list git
`(,git "send-email")
guile-3.0/pinned ;for wrap-script
python-pygit2
python-requests
python-u-boot-pylib))
(synopsis "Patch automation tool") (synopsis "Patch automation tool")
(description "Patman is a patch automation script which: (description "Patman is a patch automation script which:
@itemize @itemize