From patchwork Fri Jul 2 10:06:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: M X-Patchwork-Id: 30919 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 3B10027BC81; Fri, 2 Jul 2021 11:12:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, FREEMAIL_FROM,MAILING_LIST_MULTI,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7221727BC78 for ; Fri, 2 Jul 2021 11:12:54 +0100 (BST) Received: from localhost ([::1]:40252 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lzGAH-00074D-9Z for patchwork@mira.cbaines.net; Fri, 02 Jul 2021 06:12:53 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lzG6c-00075I-7G for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51159) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lzG6c-0004Jk-0W for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lzG6b-0008Jj-Qe for guix-patches@gnu.org; Fri, 02 Jul 2021 06:09:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49327] [PATCH core-updates 004/128] gnu: version-control: Add 'bash' input for 'wrap-program'. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 02 Jul 2021 10:09:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49327@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 49327-submit@debbugs.gnu.org id=B49327.162522053631728 (code B ref 49327); Fri, 02 Jul 2021 10:09:05 +0000 Received: (at 49327) by debbugs.gnu.org; 2 Jul 2021 10:08:56 +0000 Received: from localhost ([127.0.0.1]:34389 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6R-0008FV-8B for submit@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:55 -0400 Received: from laurent.telenet-ops.be ([195.130.137.89]:60314) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lzG6F-0008Bz-Tq for 49327@debbugs.gnu.org; Fri, 02 Jul 2021 06:08:45 -0400 Received: from localhost.localdomain ([213.119.233.144]) by laurent.telenet-ops.be with bizsmtp id QA8h2500B37benp01A8jBj; Fri, 02 Jul 2021 12:08:43 +0200 From: Maxime Devos Date: Fri, 2 Jul 2021 12:06:10 +0200 Message-Id: <20210702100814.23249-4-maximedevos@telenet.be> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210702100814.23249-1-maximedevos@telenet.be> References: <20210702100814.23249-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1625220523; bh=AgKCZXD5ViHiCXAe1VHLMfgHKiA+7uEiKTgIHCDmnMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=N8/868AyirFzrFN+IvJAi5UlknKG++px7pC+LNPBGi6+tDsaFjD+F9ucJ4ye8s6XA ljC2TuxehlwnnuX7CjN535Mn8fMlBMSPqBuehRCAsG6MAStNnR5OJcP1seiK6dAc1J +VhJcV8SlOxoUzjogk+RsicG58uR0kPkFAYsfuF9+RqEeKfH4GESKaXVFj/FaTAq59 v7KaU3SjeYIkSco/TYluXhUYPr5a8BKIZNRkcZINdTIaeNsQjgCTYoVDL+f8Cp/zpn 2NtnPpZPQr4X0Miz7u8CoMSRvfXK4jDA+SpuHl0Vz0UnFhl9jgxYWVyKGIVLCg3JSf OXYTLGlYeMlCw== 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" X-getmail-retrieved-from-mailbox: Patches It is required for cross-compilation. I'm ignoring 'git' for now because there seems to be some complication involving bash-minimal and bash-for-tests. * gnu/packages/version-control.scm (gitless)[inputs]: Add 'bash-minimal'. (cgit)[inputs]: Likewise. (gitolite)[inputs]: Likewise. (myrepos)[inputs]: Likewise. (src)[inputs]: Likewise. (git-when-merged)[inputs]: Likewise. (git-imerge)[inputs]: Likewise. (git-open)[inputs]: Likewise. (diff-so-fancy)[inputs]: Likewise. --- gnu/packages/version-control.scm | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index c596b8bf89..bcc0ad5a0e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -682,7 +682,8 @@ logs to GNU ChangeLog format.") (native-inputs `(("git-for-tests" ,git-minimal))) (inputs - `(("git" ,git-minimal) + `(("bash" ,bash-minimal) ; for 'wrap-program' + ("git" ,git-minimal) ("python-clint" ,python-clint) ("python-pygit2" ,python-pygit2) ("python-sh" ,python-sh))) @@ -989,7 +990,8 @@ collaboration using typical untrusted file hosts or services.") ("bzip2" ,bzip2) ("xz" ,xz))) (inputs - `(;; Building cgit requires a Git source tree. + `(("bash" ,bash-minimal) ; for wrap-program + ;; Building cgit requires a Git source tree. ("git-source" ,(origin (method url-fetch) @@ -1501,7 +1503,8 @@ also walk each side of a merge and test those changes individually.") (list out coreutils findutils git)))) #t)))))) (inputs - `(("perl" ,perl) + `(("bash" ,bash-minimal) ; for wrap-program + ("perl" ,perl) ("coreutils" ,coreutils) ("findutils" ,findutils) ("inetutils" ,inetutils))) @@ -2367,7 +2370,8 @@ modification time.") "perl-uri" "perl-try-tiny")))) #t)))))) (inputs - `(("perl" ,perl) + `(("bash" ,bash-minimal) ; for wrap-program + ("perl" ,perl) ("perl-encode-locale" ,perl-encode-locale) ("perl-html-parser" ,perl-html-parser) ("perl-http-date" ,perl-http-date) @@ -2666,7 +2670,8 @@ specific files and directories.") `(("git" ,git) ("perl" ,perl))) (inputs - `(("python" ,python-wrapper) + `(("bash" ,bash-minimal) ; for wrap-program + ("python" ,python-wrapper) ("rcs" ,rcs))) (synopsis "Simple revision control") (home-page "http://www.catb.org/~esr/src/") @@ -2720,7 +2725,8 @@ directory full of HOWTOs.") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))) #t))))) (inputs - `(("git" ,git) + `(("bash" ,bash-minimal) ; for 'wrap-program' + ("git" ,git) ("python" ,python-wrapper))) (home-page "https://github.com/mhagger/git-when-merged") (synopsis "Determine when a commit was merged into a Git branch") @@ -2765,7 +2771,8 @@ how information about the merge is displayed.") `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))) #t))))) (inputs - `(("git" ,git) + `(("bash" ,bash-minimal) ; for wrap-program + ("git" ,git) ("python" ,python-wrapper))) (home-page "https://github.com/mhagger/git-imerge") (synopsis "Incremental merge for Git") @@ -2840,7 +2847,8 @@ file contents on a remote server.") (base32 "11n46bngvca5wbdbfcxzjhjbfdbad7sgf7h9gf956cb1q8swsdm0")))) (build-system copy-build-system) (inputs - `(("xdg-utils" ,xdg-utils))) + `(("bash" ,bash-minimal) ; for wrap-program + ("xdg-utils" ,xdg-utils))) (arguments `(#:phases (modify-phases %standard-phases @@ -2930,7 +2938,8 @@ for historians.") (base32 "0aavxahzha2mms4vdwysk79pa6wzswpfwgsq2hwaxnaf66maahfl")))) (inputs - `(("perl" ,perl) + `(("bash" ,bash-minimal) ; for wrap-program + ("perl" ,perl) ("ncurses" ,ncurses))) (build-system copy-build-system) (arguments