From patchwork Fri Dec 16 11:05:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Rohleder X-Patchwork-Id: 45344 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 AF09727BBEB; Fri, 16 Dec 2022 11:07:49 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,SPF_HELO_PASS autolearn=unavailable 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 08CF027BBE9 for ; Fri, 16 Dec 2022 11:07:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p68Ym-0004J4-F1; Fri, 16 Dec 2022 06:07:24 -0500 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 1p68YR-0004HZ-ID for guix-patches@gnu.org; Fri, 16 Dec 2022 06:07:13 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p68YQ-00029K-9a for guix-patches@gnu.org; Fri, 16 Dec 2022 06:07:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p68YP-0007Qn-NY for guix-patches@gnu.org; Fri, 16 Dec 2022 06:07:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60115] [PATCH] gnu: vcsh: Update to 2.0.5. Resent-From: Michael Rohleder Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 11:07:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 60115 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60115@debbugs.gnu.org Cc: Michael Rohleder X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167118877828551 (code B ref -1); Fri, 16 Dec 2022 11:07:01 +0000 Received: (at submit) by debbugs.gnu.org; 16 Dec 2022 11:06:18 +0000 Received: from localhost ([127.0.0.1]:48601 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p68Xh-0007QR-Q4 for submit@debbugs.gnu.org; Fri, 16 Dec 2022 06:06:18 -0500 Received: from lists.gnu.org ([209.51.188.17]:46368) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p68Xe-0007QL-IJ for submit@debbugs.gnu.org; Fri, 16 Dec 2022 06:06:16 -0500 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 1p68Xe-0003kV-DW for guix-patches@gnu.org; Fri, 16 Dec 2022 06:06:14 -0500 Received: from sxb1nlsmtp04.prod.sxb1.secureserver.net ([92.204.71.247]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p68Xc-0001rx-AL for guix-patches@gnu.org; Fri, 16 Dec 2022 06:06:14 -0500 Received: from 122.164.205.92.host.secureserver.net ([92.205.164.122]) by : HOSTING RELAY : with ESMTP id 68WZpKJj9ayqm68WapdfQH; Fri, 16 Dec 2022 04:05:09 -0700 X-SECURESERVER-ACCT: 92.205.164.122 x-originating-ip: 92.205.164.122 X-CMAE-Analysis: v=2.4 cv=L7jbAcf8 c=1 sm=1 tr=0 ts=639c50e5 a=B/z3iHJ5y0TSvJOmeNZOnw==:117 a=sHyYjHe8cH0A:10 a=z0pGH4qGAli9MJXEmN0A:9 Received: from [192.168.1.3] (helo=micha.rohleder.de) by hr with esmtp (Exim 4.94.2) (envelope-from ) id 1p68WZ-00520V-Ic; Fri, 16 Dec 2022 12:05:07 +0100 From: Michael Rohleder Date: Fri, 16 Dec 2022 12:05:04 +0100 Message-Id: <20221216110504.32750-1-mike@rohleder.de> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 X-CMAE-Envelope: MS4xfK0AnThXfJWZcS0z9QQ1qwfDsRKHvSF4bmw3TxKxzpG4rXeVDdPUQkWagxNaoukIKBS1C3PB+5yYjJXTCXxBc0VT2GPCze6AdKiPk/HbJJMCMxhq2cuK DyUebjJUVDPDiI7JhedlTom/pviDfq3aZ7FCtUBHHs73jakwH80rgujYHj0e4gr6ibnDRBBtgFgzFFY04QYlfu1hoTGr4/0QT1py1d1hcGpgQhjBotsPmI2p 8gJXHVQCM8A4jyexfqii0g== Received-SPF: permerror client-ip=92.204.71.247; envelope-from=mike@rohleder.de; helo=sxb1nlsmtp04.prod.sxb1.secureserver.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, T_SPF_PERMERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/version-control.scm (vcsh): Update to 2.0.5. [native-inputs]: Remove which. Add autoconf, automake, ronn-ng, perl, perl-test-harness, perl-shell-command, perl-test-most, pkg-config. [inputs]: Remove perl, perl-test-harness, perl-shell-command, perl-test-most. [arguments]: Remove phase install-bash-completion. Add phase fix-version-gen. Remove deletion of configure and build phases. --- gnu/packages/version-control.scm | 33 ++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5da93fa0ce..5a5e4eb7a4 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -1408,7 +1408,7 @@ (define-public stgit (define-public vcsh (package (name "vcsh") - (version "1.20190621-4") + (version "2.0.5") (source (origin (method git-fetch) @@ -1417,25 +1417,30 @@ (define-public vcsh (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1gx5nbqyprgy6picns5hxky3lyzkqfq3xhm614f0wcdi58xrsdh0")))) + (base32 "15lb09c2q261p1pp5r7j9k8389ybrd2q19xhnp1nnha6gs78i4wq")))) (build-system gnu-build-system) (native-inputs - (list which)) + (list autoconf + automake + ;; for man page + ronn-ng + ;; for tests + perl + perl-test-harness + perl-shell-command + perl-test-most + ;; for bash-completion + pkg-config)) (inputs - (list git perl perl-test-harness perl-shell-command perl-test-most)) + (list git)) (arguments '(#:phases (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (add-after 'install 'install-bash-completion - ;; As of 1.20190621, zsh completion is installed by default but bash - ;; completion is not. Do so manually. - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (completions (string-append out "/etc/bash_completion.d"))) - (mkdir-p completions) - (copy-file "_vcsh_bash" (string-append completions "/vcsh")))))) + (add-before 'bootstrap 'fix-version-gen + (lambda _ + (call-with-output-file ".tarball-version" + (lambda (port) + (display version port)))))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:test-target "test"))