From: elaexuotee--- via Guix-patches via <guix-patches@gnu.org>
To: Efraim Flashner <efraim@flashner.co.il>
Cc: 41226@debbugs.gnu.org
Subject: [bug#41226] gnu: Add bombadillo.
Date: Fri, 15 May 2020 11:37:05 +0900 [thread overview]
Message-ID: <28XNXCZEZJZX1.28FFVMDIKTMT6@wilsonb.com> (raw)
In-Reply-To: <20200513185602.GG918@E5400>
[-- Attachment #1.1: Type: text/plain, Size: 1642 bytes --]
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!
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-bombadillo.patch --]
[-- Type: text/x-patch, Size: 3631 bytes --]
From 954f46513fbb6f7b06645e8434021be03778cecd Mon Sep 17 00:00:00 2001
From: "B. Wilson" <elaexuotee@wilsonb.com>
Date: Wed, 13 May 2020 13:51:19 +0900
Subject: [PATCH] gnu: Add bombadillo.
To: guix-patches@gnu.org
gnu/packages/web-browsers.scm (bombadillo): New variable.
---
gnu/packages/web-browsers.scm | 46 ++++++++++++++++++++++++++++++++++-
1 file changed, 45 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 62b7a5bdca..269754f37a 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -11,6 +11,7 @@
;;; Copyright © 2019 Clément Lassieur <clement@lassieur.org>
;;; Copyright © 2019 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
+;;; Copyright © 2020 B. Wilson <elaexuotee@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,45 @@ 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 git-fetch)
+ (uri (git-reference
+ (url "https://tildegit.org/sloum/bombadillo")
+ (commit "61ae2859bf7be4c586e6cb82097bef7cbbb1691f")))
+ (sha256
+ (base32
+ "1m52b1wk48gkqmjy8l0x3jaksrx2v8w6w59lhr7zaw2i0n4f5k0z"))
+ (file-name (git-file-name name version))))
+ (build-system go-build-system)
+ (arguments
+ `(#:import-path "tildegit.org/sloum/bombadillo"
+ #:install-source? #f
+ #:phases (modify-phases %standard-phases
+ (add-after 'install 'install-data
+ (lambda _
+ (let* ((builddir "src/tildegit.org/sloum/bombadillo")
+ (pkg (strip-store-file-name %output))
+ (sharedir (string-append %output "/share"))
+ (appdir (string-append sharedir "/applications"))
+ (docdir (string-append sharedir "/doc/" pkg))
+ (mandir (string-append sharedir "/man/man1"))
+ (pixdir (string-append sharedir "/pixmaps")))
+ (with-directory-excursion builddir
+ (install-file "bombadillo.desktop" appdir)
+ (install-file "LICENSE" docdir)
+ (install-file "bombadillo.1" mandir)
+ (install-file "bombadillo-icon.png" pixdir)
+ #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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 260 bytes --]
next prev parent reply other threads:[~2020-05-15 2:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-13 4:55 [bug#41226] gnu: Add bombadillo elaexuotee--- via Guix-patches via
2020-05-13 6:47 ` elaexuotee--- via Guix-patches via
2020-05-13 7:26 ` elaexuotee--- via Guix-patches via
2020-05-13 18:56 ` Efraim Flashner
2020-05-15 2:37 ` elaexuotee--- via Guix-patches via [this message]
2020-05-17 13:51 ` bug#41226: " Efraim Flashner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://guix.gnu.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=28XNXCZEZJZX1.28FFVMDIKTMT6@wilsonb.com \
--to=guix-patches@gnu.org \
--cc=41226@debbugs.gnu.org \
--cc=efraim@flashner.co.il \
--cc=elaexuotee@wilsonb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).