* [bug#41226] gnu: Add bombadillo.
@ 2020-05-13 4:55 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
0 siblings, 2 replies; 6+ messages in thread
From: elaexuotee--- via Guix-patches via @ 2020-05-13 4:55 UTC (permalink / raw)
To: 41226
[-- Attachment #1.1: Type: text/plain, Size: 68 bytes --]
Here's terminal browser for gopher, gemini and finger protocols.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-bombadillo.patch --]
[-- Type: text/x-patch, Size: 2456 bytes --]
From 06b08525a34d395a0dffdd14f631625c7d05e5e3 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 | 26 +++++++++++++++++++++++++-
1 file changed, 25 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 62b7a5bdca..ecc5ecfd18 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,25 @@ 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"))
+ (sha256
+ (base32
+ "0g4zjg717zvva85h1sxw2zqzlrkbaw8h2w8zs2vk9krgn1q5wyh3"))))
+ (build-system go-build-system)
+ (arguments '(#:import-path "tildegit.org/sloum/bombadillo"))
+ (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 --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#41226] gnu: Add bombadillo.
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
1 sibling, 0 replies; 6+ messages in thread
From: elaexuotee--- via Guix-patches via @ 2020-05-13 6:47 UTC (permalink / raw)
To: 41226
[-- Attachment #1.1: Type: text/plain, Size: 83 bytes --]
Looks like the manpage wasn't getting installed. This updated patch fixes that.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-bombadillo.patch --]
[-- Type: text/x-patch, Size: 3263 bytes --]
From 761b80d190b4a8786926910d4dfa9eb8f62e3f58 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 | 40 ++++++++++++++++++++++++++++++++++-
1 file changed, 39 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 62b7a5bdca..29ae3519fd 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,39 @@ 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"))
+ (sha256
+ (base32
+ "0g4zjg717zvva85h1sxw2zqzlrkbaw8h2w8zs2vk9krgn1q5wyh3"))))
+ (build-system go-build-system)
+ (native-inputs `(("gzip" ,gzip)))
+ (arguments `(#:import-path "tildegit.org/sloum/bombadillo"
+ #: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)
+ #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 --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* [bug#41226] gnu: Add bombadillo.
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
1 sibling, 1 reply; 6+ messages in thread
From: elaexuotee--- via Guix-patches via @ 2020-05-13 7:26 UTC (permalink / raw)
To: 41226
[-- Attachment #1.1: Type: text/plain, Size: 85 bytes --]
Ugh, should have linkted and checkd indenting before sending. Here is an
update.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-Add-bombadillo.patch --]
[-- Type: text/x-patch, Size: 3316 bytes --]
From b96fef2d85741ceac135a9c286a00a070b6b75e7 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 | 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@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,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"))
+ (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"
+ #: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)
+ #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 --]
^ permalink raw reply related [flat|nested] 6+ messages in thread* [bug#41226] gnu: Add bombadillo.
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
0 siblings, 1 reply; 6+ messages in thread
From: Efraim Flashner @ 2020-05-13 18:56 UTC (permalink / raw)
To: elaexuotee; +Cc: 41226
[-- Attachment #1: Type: text/plain, Size: 4456 bytes --]
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@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 | 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@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,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@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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread* [bug#41226] gnu: Add bombadillo.
2020-05-13 18:56 ` Efraim Flashner
@ 2020-05-15 2:37 ` elaexuotee--- via Guix-patches via
2020-05-17 13:51 ` bug#41226: " Efraim Flashner
0 siblings, 1 reply; 6+ messages in thread
From: elaexuotee--- via Guix-patches via @ 2020-05-15 2:37 UTC (permalink / raw)
To: Efraim Flashner; +Cc: 41226
[-- 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 --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-05-17 13:52 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2020-05-17 13:51 ` bug#41226: " Efraim Flashner
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).