GNU bug report logs - #60115
[PATCH] gnu: vcsh: Update to 2.0.5.

Previous Next

Package: guix-patches;

Reported by: Michael Rohleder <mike <at> rohleder.de>

Date: Fri, 16 Dec 2022 11:07:01 UTC

Severity: normal

Tags: patch

Done: Mathieu Othacehe <othacehe <at> gnu.org>

Bug is archived. No further changes may be made.

Full log


View this message in rfc822 format

From: help-debbugs <at> gnu.org (GNU bug Tracking System)
To: Mathieu Othacehe <othacehe <at> gnu.org>
Cc: tracker <at> debbugs.gnu.org
Subject: bug#60115: closed ([PATCH] gnu: vcsh: Update to 2.0.5.)
Date: Sun, 25 Dec 2022 16:20:01 +0000
[Message part 1 (text/plain, inline)]
Your message dated Sun, 25 Dec 2022 17:19:29 +0100
with message-id <87fsd3foby.fsf <at> gnu.org>
and subject line Re: bug#60115: [PATCH] gnu: vcsh: Update to 2.0.5.
has caused the debbugs.gnu.org bug report #60115,
regarding [PATCH] gnu: vcsh: Update to 2.0.5.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs <at> gnu.org.)


-- 
60115: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=60115
GNU Bug Tracking System
Contact help-debbugs <at> gnu.org with problems
[Message part 2 (message/rfc822, inline)]
From: Michael Rohleder <mike <at> rohleder.de>
To: guix-patches <at> gnu.org
Cc: Michael Rohleder <mike <at> rohleder.de>
Subject: [PATCH] gnu: vcsh: Update to 2.0.5.
Date: Fri, 16 Dec 2022 12:05:04 +0100
* 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"))
-- 
2.38.1



[Message part 3 (message/rfc822, inline)]
From: Mathieu Othacehe <othacehe <at> gnu.org>
To: Michael Rohleder <mike <at> rohleder.de>
Cc: 60115-done <at> debbugs.gnu.org
Subject: Re: bug#60115: [PATCH] gnu: vcsh: Update to 2.0.5.
Date: Sun, 25 Dec 2022 17:19:29 +0100
> * 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.

Applied, thanks,

Mathieu


This bug report was last modified 2 years and 185 days ago.

Previous Next


GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.