[bug#44620] [PATCH] gnu: Add gmni.

[bug#44620] [PATCH] gnu: Add gmni.

[Alexandru-Sergiu Marton]

* gnu/packages/web-browsers.scm (gmni): New variable.
---
 gnu/packages/web-browsers.scm | 44 +++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 5cb5185a31..b959825464 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,6 +61,7 @@
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lisp-xyz)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -584,6 +586,48 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
 (define-public sbcl-next
   (deprecated-package "sbcl-next" nyxt))
 
+(define-public gmni
+  (let ((commit "4a6172f1bf9cb41eb1ce3a5f720f9ebe4febc62b")
+        (revision "0"))
+    (package
+      (name "gmni")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.sr.ht/~sircmpwn/gmni")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1nznkk1ccm5l09glalkv8bmhspqhvmh74ca18cfpdpbwkbzdzc7i"))
+                (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f
+         #:phases
+         (modify-phases %standard-phases
+           (add-before 'configure 'set-variables
+             (lambda _
+               (setenv "CC" "gcc")
+               #t)))))
+      (inputs
+       `(("openssl" ,openssl)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("scdoc" ,scdoc)))
+      (home-page "https://sr.ht/~sircmpwn/gmni")
+      (synopsis "Gemini client")
+      (description "This is a Gemini client.  Included are:
+
+@itemize
+@item A CLI utility (like curl): gmni
+@item A line-mode browser: gmnlm
+@end itemize")
+      (license (list license:gpl3+
+                     (license:non-copyleft
+                      "https://curl.se/docs/copyright.html"
+                      "Used only for files taken from curl."))))))
+
 (define-public bombadillo
   (package
     (name "bombadillo")
-- 
2.29.1

[bug#44620] [PATCH v2] gnu: Add gmni.

[Alexandru-Sergiu Marton]

* gnu/packages/web-browsers.scm (gmni): New variable.
---
This second version simplifies the arguments section by using #:make-flags to
set CC, rather than using an environment variable.

 gnu/packages/web-browsers.scm | 39 +++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 5cb5185a31..b652e8d472 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -13,6 +13,7 @@
 ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
+;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -60,6 +61,7 @@
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lisp-xyz)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
@@ -584,6 +586,43 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
 (define-public sbcl-next
   (deprecated-package "sbcl-next" nyxt))
 
+(define-public gmni
+  (let ((commit "4a6172f1bf9cb41eb1ce3a5f720f9ebe4febc62b")
+        (revision "0"))
+    (package
+      (name "gmni")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.sr.ht/~sircmpwn/gmni")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1nznkk1ccm5l09glalkv8bmhspqhvmh74ca18cfpdpbwkbzdzc7i"))
+                (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f
+         #:make-flags (list "CC=gcc")))
+      (inputs
+       `(("openssl" ,openssl)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("scdoc" ,scdoc)))
+      (home-page "https://sr.ht/~sircmpwn/gmni")
+      (synopsis "Gemini client")
+      (description "This is a Gemini client.  Included are:
+
+@itemize
+@item A CLI utility (like curl): gmni
+@item A line-mode browser: gmnlm
+@end itemize")
+      (license (list license:gpl3+
+                     (license:non-copyleft
+                      "https://curl.se/docs/copyright.html"
+                      "Used only for files taken from curl."))))))
+
 (define-public bombadillo
   (package
     (name "bombadillo")
-- 
2.29.1

[bug#44620] [PATCH v2] gnu: Add gmni.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 3543 bytes --]


Alexandru-Sergiu Marton <brown121407@posteo.ro> writes:

> * gnu/packages/web-browsers.scm (gmni): New variable.

Hi,

Thanks for the patch :) I've made some comments below.

> ---
> This second version simplifies the arguments section by using #:make-flags to
> set CC, rather than using an environment variable.
>
>  gnu/packages/web-browsers.scm | 39 +++++++++++++++++++++++++++++++++++
>  1 file changed, 39 insertions(+)
>
> diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
> index 5cb5185a31..b652e8d472 100644
> --- a/gnu/packages/web-browsers.scm
> +++ b/gnu/packages/web-browsers.scm
> @@ -13,6 +13,7 @@
>  ;;; Copyright © 2020 Raghav Gururajan <raghavgururajan@disroot.org>
>  ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
>  ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
> +;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
>  ;;;
>  ;;; This file is part of GNU Guix.
>  ;;;
> @@ -60,6 +61,7 @@
>    #:use-module (gnu packages lisp)
>    #:use-module (gnu packages lisp-xyz)
>    #:use-module (gnu packages lua)
> +  #:use-module (gnu packages man)
>    #:use-module (gnu packages ncurses)
>    #:use-module (gnu packages perl)
>    #:use-module (gnu packages pkg-config)
> @@ -584,6 +586,43 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
>  (define-public sbcl-next
>    (deprecated-package "sbcl-next" nyxt))
>  
> +(define-public gmni
> +  (let ((commit "4a6172f1bf9cb41eb1ce3a5f720f9ebe4febc62b")
> +        (revision "0"))
> +    (package
> +      (name "gmni")
> +      (version (git-version "0" revision commit))
> +      (source (origin
> +                (method git-fetch)
> +                (uri (git-reference
> +                      (url "https://git.sr.ht/~sircmpwn/gmni")
> +                      (commit commit)))
> +                (sha256
> +                 (base32
> +                  "1nznkk1ccm5l09glalkv8bmhspqhvmh74ca18cfpdpbwkbzdzc7i"))
> +                (file-name (git-file-name name version))))
> +      (build-system gnu-build-system)
> +      (arguments
> +       `(#:tests? #f

I'm guessing there are no tests to run, but a comment saying that would
be good.

> +         #:make-flags (list "CC=gcc")))

I think it would be better to put something like:

  (string-append "CC=" ,(cc-for-target))

As I believe that helps when compiling for other architectures. I copied
that from the f3 package if you want an example in context.

> +      (inputs
> +       `(("openssl" ,openssl)))
> +      (native-inputs
> +       `(("pkg-config" ,pkg-config)
> +         ("scdoc" ,scdoc)))
> +      (home-page "https://sr.ht/~sircmpwn/gmni")
> +      (synopsis "Gemini client")

Is there some way of making this more descriptive, like saying it's a
command line client?

> +      (description "This is a Gemini client.  Included are:
> +
> +@itemize
> +@item A CLI utility (like curl): gmni
> +@item A line-mode browser: gmnlm
> +@end itemize")

I'd probably change the start of this to "The gmni package includes:",
as that repeats the synopsis less.

> +      (license (list license:gpl3+
> +                     (license:non-copyleft
> +                      "https://curl.se/docs/copyright.html"
> +                      "Used only for files taken from curl."))))))
> +
>  (define-public bombadillo
>    (package
>      (name "bombadillo")

Would you be able to send an updated patch?

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]

[bug#44620] [PATCH v2] gnu: Add gmni.

[Alexandru-Sergiu Marton]

[-- Attachment #1: Type: text/plain, Size: 263 bytes --]

Hi Chris,

Thank you for all the tips!

15 Nov 2020 21:24:02 Christopher Baines <mail@cbaines.net>:

> Would you be able to send an updated patch?

I will, but probably sometime later this week, as I'm currently caught in 
other stuff.

Cheers,
Sergiu

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 695 bytes --]

[bug#44620] [PATCH v2] gnu: Add gmni.

[Ludovic Courtès]

Hi Sergiu,

Did you have a chance to look into it?

Thanks in advance,
Ludo’.

Alexandru-Sergiu Marton <brown121407@posteo.ro> skribis:

> Hi Chris,
>
> Thank you for all the tips!
>
> 15 Nov 2020 21:24:02 Christopher Baines <mail@cbaines.net>:
>
>> Would you be able to send an updated patch?
>
> I will, but probably sometime later this week, as I'm currently caught
> in other stuff.
>
> Cheers,
> Sergiu

[bug#44620] [PATCH v3] gnu: Add gmni.

[Alexandru-Sergiu Marton]

* gnu/packages/web-browsers.scm (gmni): New variable.
---
This new patch version should take into account the comments provided by
Christopher. It also uses a newer commit for gmni and should fix some
conflicts when applying it to the guix repository.

Sorry for the delay!

 gnu/packages/web-browsers.scm | 40 +++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm
index 7fe890502e..b101b78008 100644
--- a/gnu/packages/web-browsers.scm
+++ b/gnu/packages/web-browsers.scm
@@ -14,6 +14,7 @@
 ;;; Copyright © 2020 B. Wilson <elaexuotee@wilsonb.com>
 ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
 ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
+;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@posteo.ro>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -41,6 +42,7 @@
   #:use-module (guix git-download)
   #:use-module ((guix licenses) #:prefix license:)
   #:use-module (guix packages)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages backup)
   #:use-module (gnu packages compression)
@@ -62,6 +64,7 @@
   #:use-module (gnu packages lisp)
   #:use-module (gnu packages lisp-xyz)
   #:use-module (gnu packages lua)
+  #:use-module (gnu packages man)
   #:use-module (gnu packages markup)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages perl)
@@ -706,6 +709,43 @@ key-bindings and is fully configurable and extensible in Common Lisp.")
 (define-public sbcl-next
   (deprecated-package "sbcl-next" nyxt))
 
+(define-public gmni
+  (let ((commit "d8f0870446c471a42612d6a8e853ad9b723a6d39")
+        (revision "0"))
+    (package
+      (name "gmni")
+      (version (git-version "0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://git.sr.ht/~sircmpwn/gmni")
+                      (commit commit)))
+                (sha256
+                 (base32
+                  "1h0iqm7l0i06glf5b2872w656s1mjdiqva14zh6sl4f5yp7zmvwr"))
+                (file-name (git-file-name name version))))
+      (build-system gnu-build-system)
+      (arguments
+       `(#:tests? #f ; no check target
+         #:make-flags (list (string-append "CC=" ,(cc-for-target)))))
+      (inputs
+       `(("openssl" ,openssl)))
+      (native-inputs
+       `(("pkg-config" ,pkg-config)
+         ("scdoc" ,scdoc)))
+      (home-page "https://sr.ht/~sircmpwn/gmni")
+      (synopsis "Minimalist command line Gemini client")
+      (description "The gmni package includes:
+
+@itemize
+@item A CLI utility (like curl): gmni
+@item A line-mode browser: gmnlm
+@end itemize")
+      (license (list license:gpl3+
+                     (license:non-copyleft
+                      "https://curl.se/docs/copyright.html"
+                      "Used only for files taken from curl."))))))
+
 (define-public bombadillo
   (package
     (name "bombadillo")
-- 
2.29.2

bug#44620: [PATCH v3] gnu: Add gmni.

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 463 bytes --]


Alexandru-Sergiu Marton <brown121407@posteo.ro> writes:

> * gnu/packages/web-browsers.scm (gmni): New variable.
> ---
> This new patch version should take into account the comments provided by
> Christopher. It also uses a newer commit for gmni and should fix some
> conflicts when applying it to the guix repository.
>
> Sorry for the delay!

No problem! The patch looks good, I've pushed to master as
6e4f62ad8fe0a1bafee4b318ad81152b7e425d4f.

Thanks,

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]