From patchwork Mon Oct 23 16:26:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Simon Tournier X-Patchwork-Id: 55171 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id B52B627BBEC; Mon, 23 Oct 2023 17:27:04 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id DF51027BBE2 for ; Mon, 23 Oct 2023 17:27:03 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1quxlC-0005Qz-Me; Mon, 23 Oct 2023 12:26:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1quxlB-0005Qc-J4 for guix-patches@gnu.org; Mon, 23 Oct 2023 12:26:33 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1quxlB-0004nW-Bk for guix-patches@gnu.org; Mon, 23 Oct 2023 12:26:33 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1quxle-0002v6-C0 for guix-patches@gnu.org; Mon, 23 Oct 2023 12:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66704] [PATCH 1/1] gnu: patman: Wrap program with git. Resent-From: Simon Tournier Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 23 Oct 2023 16:27:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66704 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66704@debbugs.gnu.org Cc: Simon Tournier Received: via spool by 66704-submit@debbugs.gnu.org id=B66704.169807840711186 (code B ref 66704); Mon, 23 Oct 2023 16:27:02 +0000 Received: (at 66704) by debbugs.gnu.org; 23 Oct 2023 16:26:47 +0000 Received: from localhost ([127.0.0.1]:51426 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxlP-0002uM-EC for submit@debbugs.gnu.org; Mon, 23 Oct 2023 12:26:47 -0400 Received: from mail-wm1-x331.google.com ([2a00:1450:4864:20::331]:40979) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1quxlL-0002u2-O4 for 66704@debbugs.gnu.org; Mon, 23 Oct 2023 12:26:45 -0400 Received: by mail-wm1-x331.google.com with SMTP id 5b1f17b1804b1-408363c2918so3914895e9.0 for <66704@debbugs.gnu.org>; Mon, 23 Oct 2023 09:26:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1698078368; x=1698683168; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7JycLcK8tBW5BNuYbrhsDT2STagGUQtbc/SKoJRf3lo=; b=j64kuwBe8g5Us7716nM9riQG5zA5itPPrWMsRz/1YjyAppCmnpUqDfC+Qh3wlww0F/ ax9H+aW5eJBZeXdQ+TSiy+SCGyXmBk1O1RjlMAaoOUGBS1yuSjfDUv9dwveCHNRwtp1F 5tbu9rV7GEH3KECjoO6MInp9qwd7J+Ylm2ZmWI/OJKfYiCPsa/n+yTDjGBEI9J+NyLm5 UZms2iUPfSE/UvJCxTwQUM2jPvXBgWGiDUen4WAa4da8bDOPJYfqR1XILlSmccJnwnBT HWLMxH5rG3LkgGEw5WwHhPQZ0NyeYel06hbbOtgYteb2xoehkOcgyD4pB7WAL17HI6ZW zVpg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698078368; x=1698683168; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7JycLcK8tBW5BNuYbrhsDT2STagGUQtbc/SKoJRf3lo=; b=ObjenjMDr3eIlnFicixy6TUHqkA6ifKRKLWKkLD0jB+aAwi9it8zGl/dmHGi4EvbWQ Snyqlhhl9+S01cu25xicT00TY9gqdS7evAc71CXZeWyMvzInjs/h+JXMSv0Xb0LWKo2T PGNwX8FtT/j7mpfEHQIJNj/0UNAUGMzopthfbkqRd9wpRzAiVhDBsNQd0/NPwyGVzBtQ 71sbs4D0bdWHQ7349gSdpPTclITJltKfiK7d9LCXD4hrdB0yJDcwmSMWKz/61MIEBf93 TjgPQQ6qOkroLOebfTfLAsdJmH1+xKzAKeVwnpIKKyugdFQ9m8MnsZ8ZQmo3OT1+i1h1 W+1g== X-Gm-Message-State: AOJu0Yxi0RcO+58XYpWZtWYGmjIR/u0e6AmcjmCwxBBNTdDvCUPBiofh p1FLMNHv21eP8q/b76HOzOmGi8y+WU0= X-Google-Smtp-Source: AGHT+IF3D4Ode4LoUDdpTzDDt+b3jkkUHUKJ5lXRHb+7pjnqvB2klZaTrxIHVGbLtg5Unb+DZBCE0Q== X-Received: by 2002:a05:600c:1c06:b0:405:4721:800 with SMTP id j6-20020a05600c1c0600b0040547210800mr7140624wms.1.1698078368427; Mon, 23 Oct 2023 09:26:08 -0700 (PDT) Received: from localhost.localdomain ([193.48.40.241]) by smtp.gmail.com with ESMTPSA id v19-20020a05600c471300b00405959bbf4fsm9919415wmo.19.2023.10.23.09.26.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 23 Oct 2023 09:26:08 -0700 (PDT) From: Simon Tournier Date: Mon, 23 Oct 2023 18:26:00 +0200 Message-Id: <377171f13a5d00cc460c394a6e0226f6cdcf217a.1698076987.git.zimon.toutoune@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/bootloaders.scm (patman): Replace by 'package/inherit'. [arguments]: Add 'wrap-program' that uses git-minimal dependency. [inputs]: Add git-minimal. Change-Id: Id4ebadd518f271baa087161b10455ec03d6f959b --- gnu/packages/bootloaders.scm | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/gnu/packages/bootloaders.scm b/gnu/packages/bootloaders.scm index fb20ba0efa..cdc26a0c9e 100644 --- a/gnu/packages/bootloaders.scm +++ b/gnu/packages/bootloaders.scm @@ -18,6 +18,7 @@ ;;; Copyright © 2022 Denis 'GNUtoo' Carikli ;;; Copyright © 2021 Stefan ;;; Copyright © 2022, 2023 Maxim Cournoyer +;;; Copyright © 2023 Simon Tournier ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,6 +66,7 @@ (define-module (gnu packages bootloaders) #:use-module (gnu packages serialization) #:use-module (gnu packages swig) #:use-module (gnu packages valgrind) + #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages xorg) #:use-module (gnu packages python-web) @@ -864,8 +866,7 @@ (define-public python-u-boot-pylib ;;; This is packaged separately, as it can be used in other contexts than for ;;; U-Boot development. (define-public patman - (package - (inherit u-boot) + (package/inherit u-boot (name "patman") (build-system pyproject-build-system) (arguments @@ -890,8 +891,17 @@ (define-public patman (lambda _ (substitute* "pyproject.toml" (("patman.__main__:run_patman") - "patman.__main__"))))))) - (inputs (list python-pygit2 python-requests python-u-boot-pylib)) + "patman.__main__")))) + (add-after 'install 'wrap-program + (lambda _ + (wrap-program (string-append #$output "/bin/patman") + `("PATH" ":" suffix + (,(string-append + #$(this-package-input "git-minimal") "/bin"))))))))) + (inputs (list git-minimal + python-pygit2 + python-requests + python-u-boot-pylib)) (synopsis "Patch automation tool") (description "Patman is a patch automation script which: @itemize