[bug#46643] [PATCH 1/3] gnu: ghc-protolude: Update to 0.3.0.

[bug#46643] [PATCH 1/3] gnu: ghc-protolude: Update to 0.3.0.

[Stefan Reichör]

* gnu/packages/haskell-xyz.scm (ghc-protolude): Update to 0.3.0.
---
 gnu/packages/haskell-xyz.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index d6c50ade71..f1709e342a 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -28,6 +28,7 @@
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
 ;;; Copyright © 2020 Carlo Holl <carloholl@gmail.com>
 ;;; Copyright © 2020 Christopher Lemmer Webber <cwebber@dustycloud.org>
+;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -10535,7 +10536,7 @@ the ideal templating system.")
 (define-public ghc-protolude
   (package
     (name "ghc-protolude")
-    (version "0.2.3")
+    (version "0.3.0")
     (source
      (origin
        (method url-fetch)
@@ -10545,7 +10546,7 @@ the ideal templating system.")
              ".tar.gz"))
        (sha256
         (base32
-         "0zzkyxz0vmcbncpid7gp72fpjj0fla3gqhlfkij5c5lg12skjgfj"))))
+         "1b6wprbwfdjyvds2bm6na0fbqgzdkj5ikkk33whbkyh3krd3i0s0"))))
     (build-system haskell-build-system)
     (inputs
      `(("ghc-async" ,ghc-async)
-- 
2.25.1

[bug#46645] [PATCH 2/3] gnu: Add ghc-wordexp.

[Stefan Reichör]

* gnu/packages/haskell-xyz.scm (ghc-wordexp): New variable.
---

I am not sure what license should be used for this package.

 gnu/packages/haskell-xyz.scm | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/gnu/packages/haskell-xyz.scm b/gnu/packages/haskell-xyz.scm
index f1709e342a..a48a100441 100644
--- a/gnu/packages/haskell-xyz.scm
+++ b/gnu/packages/haskell-xyz.scm
@@ -15169,6 +15169,30 @@ modernized interface.")
     (description "Word8 library to be used with @code{Data.ByteString}.")
     (license license:bsd-3)))
 
+(define-public ghc-wordexp
+  (package
+    (name "ghc-wordexp")
+    (version "0.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append
+             "https://hackage.haskell.org/package/wordexp/wordexp-"
+             version
+             ".tar.gz"))
+       (sha256
+        (base32
+         "1mbcrq89jz0dcibw66w0jdy4f4bfpx4zwjfs98rm3jjgdikwdzb4"))))
+    (build-system haskell-build-system)
+    (native-inputs `(("ghc-c2hs" ,ghc-c2hs)))
+    (inputs
+     `(("ghc-semigroups" ,ghc-semigroups)))
+    (home-page "https://hackage.haskell.org/package/wordexp")
+    (synopsis "wordexp wrapper library for Haskell")
+    (description "wordexp(3) wrapper library for Haskell to perform word
+expansion like a posix-shell.")
+    (license license:expat)))
+
 (define-public ghc-x11
   (package
     (name "ghc-x11")
-- 
2.25.1

[bug#46644] [PATCH 3/3] gnu: Add greenclip.

[Stefan Reichör]

* gnu/packages/haskell-apps.scm (greenclip): New variable.
---

I am not sure what license should be used for this package.

 gnu/packages/haskell-apps.scm | 38 ++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/haskell-apps.scm b/gnu/packages/haskell-apps.scm
index a6fb33c31b..22219fbd1b 100644
--- a/gnu/packages/haskell-apps.scm
+++ b/gnu/packages/haskell-apps.scm
@@ -15,6 +15,7 @@
 ;;; Copyright © 2019, 2020 Alex Griffin <a@ajgrf.com>
 ;;; Copyright © 2020 Alexandru-Sergiu Marton <brown121407@member.fsf.org>
 ;;; Copyright © 2020 Brian Leung <bkleung89@gmail.com>
+;;; Copyright © 2021 Stefan Reichör <stefan@xsteve.at>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -49,7 +50,8 @@
   #:use-module (gnu packages perl)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages rsync)
-  #:use-module (gnu packages version-control))
+  #:use-module (gnu packages version-control)
+  #:use-module (gnu packages xorg))
 
 (define-public apply-refact
   (package
@@ -690,6 +692,40 @@ By operating at a lower level than most similar tools, it supports X11,
 Wayland, and Linux console environments alike.")
     (license license:expat)))
 
+(define-public greenclip
+  (package
+    (name "greenclip")
+    (version "3.4")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/erebe/greenclip")
+             (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1baw360dcnyavacf7a8v6wq4m5g6bcmyybkckv4cz7r4xl5p3qws"))))
+    (build-system haskell-build-system)
+    (native-inputs
+     `(("pkg-config" ,pkg-config)))
+    (inputs
+     `(("libx11" ,libx11)
+       ("libxext" ,libxext)
+       ("libxscrnsaver" ,libxscrnsaver)
+       ("ghc-x11" ,ghc-x11)
+       ("ghc-exceptions" ,ghc-exceptions)
+       ("ghc-hashable" ,ghc-hashable)
+       ("ghc-microlens" ,ghc-microlens)
+       ("ghc-microlens-mtl" ,ghc-microlens-mtl)
+       ("ghc-protolude" ,ghc-protolude)
+       ("ghc-vector" ,ghc-vector)
+       ("ghc-wordexp" ,ghc-wordexp)))
+    (home-page "https://github.com/erebe/greenclip")
+    (synopsis "Simple Clipboard manager")
+    (description "@code{greenclip} is a clipboard manager written in
+Haskell.")
+    (license license:expat)))
+
 (define-public raincat
   (package
     (name "raincat")
-- 
2.25.1

bug#46643:

[Léo Le Bouter via Guix-patches via]

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

Pushed all patches in a1386815503036773a1092554f36d45dd9361efe.

It seems the licenses for ghc-wordexp and greenclip is BSD-3-Clause
from <https://hackage.haskell.org/package/wordexp> and <
https://hackage.haskell.org/package/greenclip>.

Also, your upgrade of ghc-protolude broke the purescript build which
depends on ghc-protolude<0.2.4 so I created a secondary ghc-protolude-
0.2 package that purescript now depends on.

Think about running "$ guix refresh -l <package>" if you modify any
package to check for all its dependents and then try to build all the
dependents see if they don't break and if they do break please fix
them. That's what I did here.

I also fixed lint errors on ghc-wordexp. Think about running "$ guix
lint <package>" on any package you are adding or altering before
submitting.

Thank you!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#46643]

[zimoun]

Hi Léo,

On Wed, 24 Feb 2021 at 15:28, Léo Le Bouter via Guix-patches via
<guix-patches@gnu.org> wrote:

> Also, your upgrade of ghc-protolude broke the purescript build which
> depends on ghc-protolude<0.2.4 so I created a secondary ghc-protolude-
> 0.2 package that purescript now depends on.

Usually, IIUC, the Haskell packages follows one LTS.  And there are
updated in one go to avoid the Cabal Hell.  Well, the current
%default-lts-version is 14.27 which has protolude at 0.2.3 [1].  LTS
14.27 supports GHC 8.6 which is the default current ghc in Guix.
Using LTS 17.4 seems a bad idea since it supports GHC 8.10 which is
not yet included in Guix.  Therefore, ghc-protolude should not be
updated and ghc-protolude-0.2 should not be added, neither.  Or I am
missing something.  Except corner cases, please keep the Haskell
packages consistent with one LTS.  The linter should warn about this
but it does not; I have not investigated why.

If greenclip cannot be built with ghc-protolude@0.2.3, please let the
"define-public ghc-protolude" at 0.2.3 and instead define
ghc-protolude-0.3.  As it is done for ghc-atomic-write or
ghc-generic-random or ghc-prettyprinter or ghc-repline.

Thanks,
simon

1: <https://www.stackage.org/lts-14.27/package/protolude-0.2.3>

[bug#46643]

[Léo Le Bouter via Guix-patches via]

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

On Wed, 2021-02-24 at 16:40 +0100, zimoun wrote:
> Hi Léo,

Hello! :-)

> If greenclip cannot be built with ghc-protolude@0.2.3, please let the
> "define-public ghc-protolude" at 0.2.3 and instead define
> ghc-protolude-0.3.  As it is done for ghc-atomic-write or
> ghc-generic-random or ghc-prettyprinter or ghc-repline.

I see, pushed 6bea71afac702fcab9fb420daa30aec95652e1a0 to hopefully fix
these concerns. Will keep in mind!

What about ghc-wordexp? Is the version on LTS channel? I couldnt find
much about that online (not very at ease with Stackage).

Thank you!

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

[bug#46643]

[Stefan Reichör]

Hi Léo, Hi Simon,

thank you both for your kind help.

I already enjoy using Guix and I hope to master it more and more in the future!

Stefan.

> On Wed, 2021-02-24 at 16:40 +0100, zimoun wrote:
>> Hi Léo,
>
> Hello! :-)
>
>> If greenclip cannot be built with ghc-protolude@0.2.3, please let the
>> "define-public ghc-protolude" at 0.2.3 and instead define
>> ghc-protolude-0.3.  As it is done for ghc-atomic-write or
>> ghc-generic-random or ghc-prettyprinter or ghc-repline.
>
> I see, pushed 6bea71afac702fcab9fb420daa30aec95652e1a0 to hopefully fix
> these concerns. Will keep in mind!
>
> What about ghc-wordexp? Is the version on LTS channel? I couldnt find
> much about that online (not very at ease with Stackage).
>
> Thank you!