GNU bug report logs - #41226
gnu: Add bombadillo.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 41226 in the body.
You can then email your comments to 41226 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: elaexuotee <at> wilsonb.com
To: guix-patches <at> gnu.org
Subject: gnu: Add bombadillo.
Date: Wed, 13 May 2020 13:55:29 +0900

[Message part 1 (text/plain, inline)]

Here's terminal browser for gopher, gemini and finger protocols.

[0001-gnu-Add-bombadillo.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Message #8 received at 41226 <at> debbugs.gnu.org (full text, mbox):

From: elaexuotee <at> wilsonb.com
To: 41226 <at> debbugs.gnu.org
Subject: gnu: Add bombadillo.
Date: Wed, 13 May 2020 15:47:30 +0900

[Message part 1 (text/plain, inline)]

Looks like the manpage wasn't getting installed. This updated patch fixes that.

[0001-gnu-Add-bombadillo.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Message #11 received at 41226 <at> debbugs.gnu.org (full text, mbox):

From: elaexuotee <at> wilsonb.com
To: 41226 <at> debbugs.gnu.org
Subject: gnu: Add bombadillo.
Date: Wed, 13 May 2020 16:26:21 +0900

[Message part 1 (text/plain, inline)]

Ugh, should have linkted and checkd indenting before sending. Here is an
update.

[0001-gnu-Add-bombadillo.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Message #14 received at 41226 <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: elaexuotee <at> wilsonb.com
Cc: 41226 <at> debbugs.gnu.org
Subject: Re: [bug#41226] gnu: Add bombadillo.
Date: Wed, 13 May 2020 21:56:02 +0300

[Message part 1 (text/plain, inline)]

A couple of inline comments

On Wed, May 13, 2020 at 04:26:21PM +0900, elaexuotee--- via Guix-patches via wrote:
> Ugh, should have linkted and checkd indenting before sending. Here is an
> update.
> 

> From b96fef2d85741ceac135a9c286a00a070b6b75e7 Mon Sep 17 00:00:00 2001
> From: "B. Wilson" <elaexuotee <at> wilsonb.com>
> Date: Wed, 13 May 2020 13:51:19 +0900
> Subject: [PATCH] gnu: Add bombadillo.
> To: guix-patches <at> gnu.org
> 
> gnu/packages/web-browsers.scm (bombadillo): New variable.
> ---
>  gnu/packages/web-browsers.scm | 42 ++++++++++++++++++++++++++++++++++-
>  1 file changed, 41 insertions(+), 1 deletion(-)
> 
> diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
> index 62b7a5bdca..acdd27509e 100644
> --- a/gnu/packages/web-browsers.scm
> +++ b/gnu/packages/web-browsers.scm
> @@ -11,6 +11,7 @@
>  ;;; Copyright © 2019 Clément Lassieur <clement <at> lassieur.org>
>  ;;; Copyright © 2019 Brett Gilio <brettg <at> gnu.org>
>  ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan <at> disroot.org>
> +;;; Copyright © 2020 B. Wilson <elaexuotee <at> wilsonb.com>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -66,7 +67,8 @@
>    #:use-module (guix build-system gnu)
>    #:use-module (guix build-system glib-or-gtk)
>    #:use-module (guix build-system python)
> -  #:use-module (guix build-system asdf))
> +  #:use-module (guix build-system asdf)
> +  #:use-module (guix build-system go))
>  
>  (define-public midori
>    (package
> @@ -692,3 +694,41 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
>  
>  (define-public sbcl-next
>    (deprecated-package "sbcl-next" next))
> +
> +(define-public bombadillo
> +  (package
> +    (name "bombadillo")
> +    (version "2.2.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "https://tildegit.org/sloum/bombadillo/"
> +                                  "archive/" version ".tar.gz"))

'guix lint' didn't catch this, but I'm pretty sure that this is an
auto-generated tarball and you should use git-fetch to download the
source instead.

> +              (sha256
> +               (base32
> +                "0g4zjg717zvva85h1sxw2zqzlrkbaw8h2w8zs2vk9krgn1q5wyh3"))
> +
> +              (file-name (string-append name "-" version))))
> +    (build-system go-build-system)
> +    (native-inputs `(("gzip" ,gzip)))
> +    (arguments `(#:import-path "tildegit.org/sloum/bombadillo"

Assuming nothing needs this to build another package, you can add
'#:install-source? #f' to the arguments.

> +                 #:phases
> +                 (modify-phases %standard-phases
> +                   (add-after 'install 'install-man
> +                     (lambda _
> +                       (let* ((manpage (string-append "src/tildegit.org"
> +                                                      "/sloum/bombadillo"
> +                                                      "/bombadillo.1"))
> +                              (zmanpage (string-append manpage ".gz"))
> +                              (mandir (string-append %output
> +                                                     "/share/man/man1")))
> +                         (invoke "gzip" manpage)
> +                         (install-file zmanpage mandir)

You actually don't need to gzip the man-page, it happens automatically
as part of the build process. Also, I noticed that there's a .desktop
file and a license file. Both of those can be installed.

> +                         #t))))))
> +    (home-page "http://bombadillo.colorfield.space")
> +    (synopsis "Terminal browser for the gopher, gemini, and finger protocols")
> +    (description "Bombadillo is a non-web browser for the terminal with
> +vim-like key bindings, a document pager, configurable settings, and robust
> +command selection.  The following protocols are supported as first-class
> +citizens: gopher, gemini, finger, and local.  There is also support for telnet,
> +http, and https via third-party applications.")
> +    (license license:gpl3+)))
> -- 
> 2.26.2
> 

Other than those small things it looks good. Can you send an updated
patch?




-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Message #17 received at 41226 <at> debbugs.gnu.org (full text, mbox):

From: elaexuotee <at> wilsonb.com
To: Efraim Flashner <efraim <at> flashner.co.il>
Cc: 41226 <at> debbugs.gnu.org
Subject: Re: [bug#41226] gnu: Add bombadillo.
Date: Fri, 15 May 2020 11:37:05 +0900

[Message part 1 (text/plain, inline)]

Thanks for taking a look, Efraim.

> 'guix lint' didn't catch this, but I'm pretty sure that this is an
> auto-generated tarball and you should use git-fetch to download the
> source instead.

This sounded surprising to me, so I asked about it on the irc channel. For
posterity, here is a summary of that discussion:

I naively would figure that url-fetch on release tarballs is preferable to a
git-fetch on the associated commit, since the tarball likely contains things
like autoconf output etc. 

On the channel, bricewge mentioned that this discussion just recently came up:
https://lists.gnu.org/archive/html/guix-devel/2020-05/msg00224.html. The
consensus seems to be that neither git-fetch nor url-fetch can be recommended
as preferable across the board.

That said, rekado also mentioned that GitHub has non-deterministically
regenerated tars in the past, causing problems, so I did go with git-fetch in
the updated patch.

> Assuming nothing needs this to build another package, you can add
> '#:install-source? #f' to the arguments.

Done.

> You actually don't need to gzip the man-page, it happens automatically
> as part of the build process. Also, I noticed that there's a .desktop
> file and a license file. Both of those can be installed.

This gave me a bit of grief. The source contains a makefile with an install
target that takes care of these files, but for some reason this was giving me
non-determinism problems. Anyway, I just went ahead and installed these "data"
files manually.

> Other than those small things it looks good. Can you send an updated
> patch?

Here you go!

[0001-gnu-Add-bombadillo.patch (text/x-patch, attachment)]

[signature.asc (application/pgp-signature, attachment)]

Message #22 received at 41226-done <at> debbugs.gnu.org (full text, mbox):

From: Efraim Flashner <efraim <at> flashner.co.il>
To: elaexuotee <at> wilsonb.com, x <at> wilsonb.com
Cc: 41226-done <at> debbugs.gnu.org
Subject: Re: [bug#41226] gnu: Add bombadillo.
Date: Sun, 17 May 2020 16:51:14 +0300

[Message part 1 (text/plain, inline)]

I changed the commit string to 'version' and adjusted the 'install-data
phase slightly. Patch pushed! Thanks.


-- 
Efraim Flashner   <efraim <at> flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[signature.asc (application/pgp-signature, inline)]

Previous Next

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