Message ID | 20210503155417.2523-1-mike@rohleder.de |
---|---|
State | Accepted |
Headers | show |
Series | [bug#48198] gnu: vcsh: Update to 1.20190621. | expand |
Context | Check | Description |
---|---|---|
cbaines/comparison | success | View comparision |
cbaines/git branch | success | View Git branch |
cbaines/applying patch | success | View Laminar job |
cbaines/issue | success | View issue |
Michael, Michael Rohleder 写道: > * gnu/packages/version-control.scm (vcsh): Update to 1.20190621. Thanks! > [arguments]: Add phase install-bash-completion. Since this isn't new in this release, I think it should be a separate commit. Do you agree? > + #t)))) You can (finally!) omit this now. Ignore the lint warning, which is still there only because its removal needs to pass through core-updates. Kind regards, T G-R
Hey Tobias, Thanks for reviewing! Tobias Geerinckx-Rice <me@tobias.gr> writes: >> [arguments]: Add phase install-bash-completion. > > Since this isn't new in this release, I think it should be a separate > commit. Do you agree? No, I don't agree. I think it is new (at least, compared to the version we had/I made before) > >> + #t)))) > > You can (finally!) omit this now. > > Ignore the lint warning, which is still there only because its removal > needs to pass through core-updates. Ah, ok. I was wondering about the warning. Thank you!
Michael, Michael Rohleder 写道: > No, I don't agree. > I think it is new (at least, compared to the version we had/I > made > before) You're right--and what an ancient version it was! I was looking at zsh completion, not bash. I wonder why that's installed by default whilst bash is not. Shrug. I de-indented #:phases as it made your new lines exceed 80 characters for no good reason. Pushed as 2c09755a7a07a971d7c2ad6dbe991689837fd29c. Thanks! T G-R
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 8df7cc8d14..859083aa07 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -31,7 +31,7 @@ ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2020 Vinicius Monego <monego@posteo.net> ;;; Copyright © 2020 Tanguy Le Carrour <tanguy@bioneland.org> -;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> +;;; Copyright © 2020, 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2021 Greg Hogan <code@greghogan.com> ;;; Copyright © 2021 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Chris Marusich <cmmarusich@gmail.com> @@ -1316,7 +1316,7 @@ manipulate them in various ways.") (define-public vcsh (package (name "vcsh") - (version "1.20151229") + (version "1.20190621") (source (origin (method git-fetch) @@ -1325,7 +1325,7 @@ manipulate them in various ways.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1grpj45nbpv4j60vd2kg4rj53zrm0bc0h9l4pfd3c2mwbvywm6ab")))) + (base32 "1s9l47wm9r7sndcgc778mq60wkzkhvfv7rkrwci5kjvw8vsddvcc")))) (build-system gnu-build-system) (native-inputs `(("which" ,which))) @@ -1338,7 +1338,14 @@ manipulate them in various ways.") (arguments '(#:phases (modify-phases %standard-phases (delete 'configure) - (delete 'build)) + (delete 'build) + (add-after 'install 'install-bash-completion + (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")) + #t)))) #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:test-target "test"))