Message ID | a8f912efa11e1afe72244723dc7771709816a529.1631782039.git.public@yoctocell.xyz |
---|---|
State | Accepted |
Headers | show |
Series | [bug#50615] gnu: grokmirror: Update to 2.0.11. | expand |
Context | Check | Description |
---|---|---|
cbaines/applying patch | fail | View Laminar job |
cbaines/issue | success | View issue |
Xinglu Chen writes: > * gnu/packages/version-control.scm (grokmirror): Update to 2.0.11. > [arguments]<#:phases>: Don’t return #t. Thanks for keeping grokmirror up to date. > (define-public grokmirror [...] > @@ -2487,8 +2487,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") Unrelated sidenote: you could get a more informative hunk header for your patches by defining a custom one (more details in the gitattributes manpage). > "/man/man1/"))) > (mkdir-p man) > (for-each (lambda (file) (install-file file man)) > - (find-files "." "\\.1$"))) > - #t))))) > + (find-files "." "\\.1$")))))))) Oops, sorry about the unnecessary #t. I did a quick search of the lists/manual but didn't find any pointers/discussion. What's the way to decide when a custom phase should return #t (like in the below snippet from the manual)? --8<---------------cut here---------------start------------->8--- (modify-phases %standard-phases (add-after 'install 'fix-egrep-and-fgrep ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its ;; absolute file name instead of searching for it in $PATH. (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin"))) (substitute* (list (string-append bin "/egrep") (string-append bin "/fgrep")) (("^exec grep") (string-append "exec " bin "/grep"))) #t)))) --8<---------------cut here---------------end--------------->8---
On Thu, Sep 16 2021, Kyle Meyer wrote: > Xinglu Chen writes: > >> * gnu/packages/version-control.scm (grokmirror): Update to 2.0.11. >> [arguments]<#:phases>: Don’t return #t. > > Thanks for keeping grokmirror up to date. You are welcome! >> (define-public grokmirror > [...] >> @@ -2487,8 +2487,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") > > Unrelated sidenote: you could get a more informative hunk header for > your patches by defining a custom one (more details in the gitattributes > manpage). Ah, thanks for the tip! >> "/man/man1/"))) >> (mkdir-p man) >> (for-each (lambda (file) (install-file file man)) >> - (find-files "." "\\.1$"))) >> - #t))))) >> + (find-files "." "\\.1$")))))))) > > Oops, sorry about the unnecessary #t. I did a quick search of the > lists/manual but didn't find any pointers/discussion. What's the way to > decide when a custom phase should return #t (like in the below snippet > from the manual)? > > --8<---------------cut here---------------start------------->8--- > (modify-phases %standard-phases > (add-after 'install 'fix-egrep-and-fgrep > ;; Patch 'egrep' and 'fgrep' to execute 'grep' via its > ;; absolute file name instead of searching for it in $PATH. > (lambda* (#:key outputs #:allow-other-keys) > (let* ((out (assoc-ref outputs "out")) > (bin (string-append out "/bin"))) > (substitute* (list (string-append bin "/egrep") > (string-append bin "/fgrep")) > (("^exec grep") > (string-append "exec " bin "/grep"))) > #t)))) > --8<---------------cut here---------------end--------------->8--- I don’t think it documented in the manual, but on ‘master’, phases have to return #t, otherwise, you will get a warning message about it. But once the ‘core-updates-frozen’ branch gets merged (should be soon™), phases don’t have to return #t anymore. Since the boilerplate won’t be needed once ‘core-updates-frozen’ gets merged, I thought it would be a good idea to just remove the #t. :-)
Xinglu Chen writes: > But once the ‘core-updates-frozen’ branch gets merged (should be > soon™), phases don’t have to return #t anymore. Oh, got it. Thanks for the information.
Xinglu Chen <public@yoctocell.xyz> skribis: > * gnu/packages/version-control.scm (grokmirror): Update to 2.0.11. > [arguments]<#:phases>: Don’t return #t. Applied, thanks! Ludo’.
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index fe84601372..ead33ad10e 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm @@ -2465,7 +2465,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (define-public grokmirror (package (name "grokmirror") - (version "2.0.8") + (version "2.0.11") (source (origin (method git-fetch) @@ -2475,7 +2475,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") (commit (string-append "v" version)))) (file-name (string-append name "-" version "-checkout")) (sha256 - (base32 "0zfiwjw02df3mzpawp9jx61iwp0nhcf6y03cs8022l0hkvc7blbr")))) + (base32 "0c6nnfzzyl247r1dcjnsyx16d34nyra9ikjjhi0xzlrbiwnb0w32")))) (build-system python-build-system) (arguments `(#:tests? #f ; no test suite @@ -2487,8 +2487,7 @@ Mercurial, Bazaar, Darcs, CVS, Fossil, and Veracity.") "/man/man1/"))) (mkdir-p man) (for-each (lambda (file) (install-file file man)) - (find-files "." "\\.1$"))) - #t))))) + (find-files "." "\\.1$")))))))) (propagated-inputs `(("python-packaging" ,python-packaging) ("python-requests" ,python-requests)))