[bug#32517] [PATCH 0/7] Fix git-annex dependencies.

[bug#32517] [PATCH 0/7] Fix git-annex dependencies.

[Timothy Sample]

Hi Guix,

This patch fixes several Haskell packages needed for building git-annex.
Mostly the packages are updated to work with our new versions of
ghc-conduit and ghc-resourcet.

One patch updates ghc-esqueleto to an upstream Git commit.  This package
hasn’t had a release in a while, but is still being developed.  The most
recent release on Hackage does not work with some of our recently
updated Haskell packages.  According to Hackage, Fedora, Debian, and
Arch (community) are all building esqueleto from its repository.  I
chose the same commit used by Debian and Arch (Fedora is using a newer
one).


-- Tim

[bug#32517] [PATCH 1/7] gnu: ghc-monad-logger: Update to 0.3.29.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-monad-logger): Update to 0.3.29.
[inputs]: Remove ghc-blaze-builder.
---
 gnu/packages/haskell.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 759ca6044..8dc985e75 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -9262,7 +9262,7 @@ operators for looping.")
 (define-public ghc-monad-logger
   (package
     (name "ghc-monad-logger")
-    (version "0.3.25.1")
+    (version "0.3.29")
     (source
      (origin
        (method url-fetch)
@@ -9271,7 +9271,7 @@ operators for looping.")
                            "monad-logger-" version ".tar.gz"))
        (sha256
         (base32
-         "0yv4fsi566zrn30j2g5l901lyqgmflhvzy4hji7ikcbh5d45m920"))))
+         "1z516s4pa9n94zf0l45mylssg07xr1d1m6zrz900p0iv3vfd07mv"))))
     (build-system haskell-build-system)
     (inputs `(("ghc-transformers-compat" ,ghc-transformers-compat)
               ("ghc-text" ,ghc-text)
@@ -9286,7 +9286,6 @@ operators for looping.")
               ("ghc-monad-control" ,ghc-monad-control)
               ("ghc-monad-loops" ,ghc-monad-loops)
               ("ghc-mtl" ,ghc-mtl)
-              ("ghc-blaze-builder" ,ghc-blaze-builder)
               ("ghc-exceptions" ,ghc-exceptions)))
     (home-page "https://github.com/kazu-yamamoto/logger")
     (synopsis "Provides a class of monads which can log messages for Haskell")
-- 
2.18.0

[bug#32517] [PATCH 2/7] gnu: ghc-xml-conduit: Update to 1.8.0.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-xml-conduit): Update to 1.8.0.
---
 gnu/packages/haskell.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 8dc985e75..3aa5b3480 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -6604,7 +6604,7 @@ documents.")
 (define-public ghc-xml-conduit
   (package
     (name "ghc-xml-conduit")
-    (version "1.7.1.2")
+    (version "1.8.0")
     (source
      (origin
        (method url-fetch)
@@ -6612,7 +6612,7 @@ documents.")
                            "xml-conduit-" version ".tar.gz"))
        (sha256
         (base32
-         "0n4k0rq9j5cc9kdvj9xbx8gmiqlyk5x6pw8yxzw5wfsw7qkych2s"))))
+         "0di0ll2p4ykqnlipf2jrlalirxdf9wkli292245rgr3vcb9vz0h3"))))
     (build-system haskell-build-system)
     (inputs
      `(("ghc-conduit" ,ghc-conduit)
-- 
2.18.0

[bug#32517] [PATCH 3/7] gnu: ghc-feed: Update to 1.0.0.0.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-feed): Update to 1.0.0.0.
[arguments]: Add "--allow-newer=xml-conduit" to #:configure-flags.
[inputs]: Add ghc-base-compat, ghc-safe, and ghc-xml-conduit.
---
 gnu/packages/haskell.scm | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 3aa5b3480..301247c0f 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -3155,7 +3155,7 @@ online}.")
 (define-public ghc-feed
   (package
     (name "ghc-feed")
-    (version "0.3.12.0")
+    (version "1.0.0.0")
     (source
      (origin
        (method url-fetch)
@@ -3163,14 +3163,19 @@ online}.")
                            "feed/feed-" version ".tar.gz"))
        (sha256
         (base32
-         "0hkrsinspg70bbm3hwqdrvivws6zya1hyk0a3awpaz82j4xnlbfc"))))
+         "05rgg7x1984mgfhkmz792xj8lhwjgznixhygzr8blf517lns2nck"))))
     (build-system haskell-build-system)
+    (arguments
+     `(#:configure-flags '("--allow-newer=xml-conduit")))
     (inputs
-     `(("ghc-old-locale" ,ghc-old-locale)
+     `(("ghc-base-compat" ,ghc-base-compat)
+       ("ghc-old-locale" ,ghc-old-locale)
        ("ghc-old-time" ,ghc-old-time)
+       ("ghc-safe" ,ghc-safe)
        ("ghc-time-locale-compat" ,ghc-time-locale-compat)
        ("ghc-utf8-string" ,ghc-utf8-string)
-       ("ghc-xml" ,ghc-xml)))
+       ("ghc-xml" ,ghc-xml)
+       ("ghc-xml-conduit" ,ghc-xml-conduit)))
     (native-inputs
      `(("ghc-hunit" ,ghc-hunit)
        ("ghc-test-framework" ,ghc-test-framework)
-- 
2.18.0

[bug#32517] [PATCH 4/7] gnu: ghc-persistent: Update to 2.8.2.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-persistent): Update to 2.8.2.
[inputs]: Add ghc-unliftio-core and ghc-void; remove ghc-exceptions,
ghc-monad-control, and ghc-lifted-base.
---
 gnu/packages/haskell.scm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 301247c0f..d07c24724 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -9498,7 +9498,7 @@ Haskell data types to and from HTTP API data.")
 (define-public ghc-persistent
   (package
     (name "ghc-persistent")
-    (version "2.7.3.1")
+    (version "2.8.2")
     (source
      (origin
        (method url-fetch)
@@ -9507,15 +9507,12 @@ Haskell data types to and from HTTP API data.")
                            "persistent-" version ".tar.gz"))
        (sha256
         (base32
-         "1jbvavdvr9qz5ld7vf6l1jgiadhmxx6zc4vqsdk9ivfq6d5wlg1p"))))
+         "1h0yijbf1yiwl50klyafy4ln99j8bib4kgbzviw7fc4y4mwv4sv9"))))
     (build-system haskell-build-system)
     (inputs `(("ghc-old-locale" ,ghc-old-locale)
               ("ghc-text" ,ghc-text)
               ("ghc-conduit" ,ghc-conduit)
               ("ghc-resourcet" ,ghc-resourcet)
-              ("ghc-exceptions" ,ghc-exceptions)
-              ("ghc-monad-control" ,ghc-monad-control)
-              ("ghc-lifted-base" ,ghc-lifted-base)
               ("ghc-resource-pool" ,ghc-resource-pool)
               ("ghc-path-pieces" ,ghc-path-pieces)
               ("ghc-http-api-data" ,ghc-http-api-data)
@@ -9533,7 +9530,9 @@ Haskell data types to and from HTTP API data.")
               ("ghc-mtl" ,ghc-mtl)
               ("ghc-fast-logger" ,ghc-fast-logger)
               ("ghc-scientific" ,ghc-scientific)
-              ("ghc-tagged" ,ghc-tagged)))
+              ("ghc-tagged" ,ghc-tagged)
+              ("ghc-unliftio-core" ,ghc-unliftio-core)
+              ("ghc-void" ,ghc-void)))
     (native-inputs `(("ghc-hspec" ,ghc-hspec)))
     (home-page "https://www.yesodweb.com/book/persistent")
     (synopsis "Type-safe, multi-backend data serialization for Haskell")
-- 
2.18.0

[bug#32517] [PATCH 5/7] gnu: ghc-warp: Update to 3.2.18.1.

[Timothy Sample]

* gnu/packages/haskell-web.scm (ghc-warp): Update to 3.2.18.1.
[inputs]: Remove ghc-bytestring-builder.
---
 gnu/packages/haskell-web.scm | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm
index a043ffcc0..92f96c1e5 100644
--- a/gnu/packages/haskell-web.scm
+++ b/gnu/packages/haskell-web.scm
@@ -529,7 +529,7 @@ Haskell's Web Application Interface (WAI).")
 (define-public ghc-warp
   (package
     (name "ghc-warp")
-    (version "3.2.11.1")
+    (version "3.2.18.1")
     (source
      (origin
        (method url-fetch)
@@ -538,7 +538,7 @@ Haskell's Web Application Interface (WAI).")
                            ".tar.gz"))
        (sha256
         (base32
-         "1zp5cy0bbj508vdvms1n5z80z37m253kwsqc5a83cfc990n6fgw5"))))
+         "15narz2dawzqmc8sys9cigg2dnn4a681cn07cgnpbvlyadwi5bpn"))))
     (build-system haskell-build-system)
     (arguments
      `(#:tests? #f)) ; FIXME: Test-Suite `spec` fails.
@@ -546,7 +546,6 @@ Haskell's Web Application Interface (WAI).")
      `(("ghc-async" ,ghc-async)
        ("ghc-auto-update" ,ghc-auto-update)
        ("ghc-blaze-builder" ,ghc-blaze-builder)
-       ("ghc-bytestring-builder" ,ghc-bytestring-builder)
        ("ghc-case-insensitive" ,ghc-case-insensitive)
        ("ghc-hashable" ,ghc-hashable)
        ("ghc-http-types" ,ghc-http-types)
-- 
2.18.0

[bug#32517] [PATCH 6/7] gnu: ghc-persistent-sqlite: Update to 2.8.2.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-persistent-sqlite): Update to 2.8.2.
---
 gnu/packages/haskell.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index d07c24724..387a001b2 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -9712,7 +9712,7 @@ working with it.")
 (define-public ghc-persistent-sqlite
   (package
     (name "ghc-persistent-sqlite")
-    (version "2.6.4")
+    (version "2.8.2")
     (source
      (origin
        (method url-fetch)
@@ -9721,7 +9721,7 @@ working with it.")
                            "persistent-sqlite-" version ".tar.gz"))
        (sha256
         (base32
-         "16mc2ra0hbyyc8ckjlxxc11bpskdymbr8c3g6ih6wzik639xprbm"))))
+         "1chbmvjz46smhgnzhha3bbkhys3fys6dip1jr4v7xp1jf78zbyp6"))))
     (build-system haskell-build-system)
     (inputs `(("ghc-persistent" ,ghc-persistent)
               ("ghc-unliftio-core" ,ghc-unliftio-core)
-- 
2.18.0

[bug#32517] [PATCH 7/7] gnu: ghc-esqueleto: Update to commit b81e0d9.

[Timothy Sample]

* gnu/packages/haskell.scm (ghc-esqueleto): Update to commit b81e0d9.
[source]: Use git-fetch.
[arguments]: Add phase to remove MySQL and PostgreSQL test-suites.
[inputs]: Add ghc-unliftio.
[native-inputs]: Remove ghc-hunit, ghc-monad-control, and ghc-quickcheck.
---
 gnu/packages/haskell.scm | 89 +++++++++++++++++++++++++---------------
 1 file changed, 57 insertions(+), 32 deletions(-)

diff --git a/gnu/packages/haskell.scm b/gnu/packages/haskell.scm
index 387a001b2..420c4c748 100644
--- a/gnu/packages/haskell.scm
+++ b/gnu/packages/haskell.scm
@@ -8038,42 +8038,67 @@ JSON (JavaScript Object Notation) is a lightweight data-interchange format.")
     (license license:bsd-3)))
 
 (define-public ghc-esqueleto
-  (package
-    (name "ghc-esqueleto")
-    (version "2.5.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (string-append "https://hackage.haskell.org/package/"
-                           "esqueleto/esqueleto-" version ".tar.gz"))
-       (sha256
-        (base32
-         "10n49rzqmblky7pwjnysalyy6nacmxfms8dqbsdv6hlyzr8pb69x"))))
-    (build-system haskell-build-system)
-    (inputs
-     `(("ghc-blaze-html" ,ghc-blaze-html)
-       ("ghc-conduit" ,ghc-conduit)
-       ("ghc-monad-logger" ,ghc-monad-logger)
-       ("ghc-persistent" ,ghc-persistent)
-       ("ghc-resourcet" ,ghc-resourcet)
-       ("ghc-tagged" ,ghc-tagged)
-       ("ghc-text" ,ghc-text)
-       ("ghc-unordered-containers" ,ghc-unordered-containers)))
-    (native-inputs
-     `(("ghc-hspec" ,ghc-hspec)
-       ("ghc-hunit" ,ghc-hunit)
-       ("ghc-monad-control" ,ghc-monad-control)
-       ("ghc-persistent-sqlite" ,ghc-persistent-sqlite)
-       ("ghc-persistent-template" ,ghc-persistent-template)
-       ("ghc-quickcheck" ,ghc-quickcheck)))
-    (home-page "https://github.com/bitemyapp/esqueleto")
-    (synopsis "Type-safe embedded domain specific language for SQL queries")
-    (description "This library provides a type-safe embedded domain specific
+  (let ((version "2.5.3")
+        (revision "1")
+        (commit "b81e0d951e510ebffca03c5a58658ad884cc6fbd"))
+    (package
+      (name "ghc-esqueleto")
+      (version (git-version version revision commit))
+      (source
+       (origin
+         (method git-fetch)
+         (uri (git-reference
+               (url "https://github.com/bitemyapp/esqueleto")
+               (commit commit)))
+         (sha256
+          (base32
+           "0lz1qxms7cfg5p3j37inlych0r2fwhm8xbarcys3df9m7jy9nixa"))))
+      (build-system haskell-build-system)
+      (arguments
+       `(#:phases
+         (modify-phases %standard-phases
+           ;; This package normally runs tests for the MySQL, PostgreSQL, and
+           ;; SQLite backends.  Since we only have Haskell packages for
+           ;; SQLite, we remove the other two test suites.  FIXME: Add the
+           ;; other backends and run all three test suites.
+           (add-before 'configure 'remove-non-sqlite-test-suites
+             (lambda _
+               (use-modules (ice-9 rdelim))
+               (with-atomic-file-replacement "esqueleto.cabal"
+                 (lambda (in out)
+                   (let loop ((line (read-line in 'concat)) (deleting? #f))
+                     (cond
+                      ((eof-object? line) #t)
+                      ((string-every char-set:whitespace line)
+                       (unless deleting? (display line out))
+                       (loop (read-line in 'concat) #f))
+                      ((member line '("test-suite mysql\n" "test-suite postgresql\n"))
+                       (loop (read-line in 'concat) #t))
+                      (else
+                       (unless deleting? (display line out))
+                       (loop (read-line in 'concat) deleting?)))))))))))
+      (inputs
+       `(("ghc-blaze-html" ,ghc-blaze-html)
+         ("ghc-conduit" ,ghc-conduit)
+         ("ghc-monad-logger" ,ghc-monad-logger)
+         ("ghc-persistent" ,ghc-persistent)
+         ("ghc-resourcet" ,ghc-resourcet)
+         ("ghc-tagged" ,ghc-tagged)
+         ("ghc-text" ,ghc-text)
+         ("ghc-unliftio" ,ghc-unliftio)
+         ("ghc-unordered-containers" ,ghc-unordered-containers)))
+      (native-inputs
+       `(("ghc-hspec" ,ghc-hspec)
+         ("ghc-persistent-sqlite" ,ghc-persistent-sqlite)
+         ("ghc-persistent-template" ,ghc-persistent-template)))
+      (home-page "https://github.com/bitemyapp/esqueleto")
+      (synopsis "Type-safe embedded domain specific language for SQL queries")
+      (description "This library provides a type-safe embedded domain specific
 language (EDSL) for SQL queries that works with SQL backends as provided by
 @code{ghc-persistent}.  Its language closely resembles SQL, so you don't have
 to learn new concepts, just new syntax, and it's fairly easy to predict the
 generated SQL and optimize it for your backend.")
-    (license license:bsd-3)))
+      (license license:bsd-3))))
 
 (define-public shellcheck
   (package
-- 
2.18.0

[bug#32517] [PATCH 0/7] Fix git-annex dependencies.

[Leo Famulari]

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

On Thu, Aug 23, 2018 at 11:07:12PM -0400, Timothy Sample wrote:
> Hi Guix,
> 
> This patch fixes several Haskell packages needed for building git-annex.
> Mostly the packages are updated to work with our new versions of
> ghc-conduit and ghc-resourcet.

Thanks! Can you clarify if git-annex is supposed to build with these
patches?

I applied them on recent master branch and tried building git-annex but
ghc-aeson fails to build.

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

[bug#32517] [PATCH 0/7] Fix git-annex dependencies.

[Timothy Sample]

Hi Leo,

Leo Famulari <leo@famulari.name> writes:

> On Thu, Aug 23, 2018 at 11:07:12PM -0400, Timothy Sample wrote:
>> Hi Guix,
>> 
>> This patch fixes several Haskell packages needed for building git-annex.
>> Mostly the packages are updated to work with our new versions of
>> ghc-conduit and ghc-resourcet.
>
> Thanks! Can you clarify if git-annex is supposed to build with these
> patches?
>
> I applied them on recent master branch and tried building git-annex but
> ghc-aeson fails to build.

Yes!  I noticed this earlier today.  I made the patches before Arun
updated darcs and all of its dependencies.  One of the updated packages
is ghc-base-compat, which is now too new for ghc-aeson.  Unfortunately,
if we update ghc-aeson, we need to update ghc-text, which has around 300
dependencies.  I’m not sure how to proceed here.  The patches up to (but
excluding) ghc-persistent should be fine IIRC.

I didn’t look very closely into Arun’s changes to see if we could find a
set of mutually agreeable versions.  To do so would involve downgrading
packages that Arun changed, which seems undesirable.

Ricardo mentioned on IRC that we should try and update all of our
packages to the recent LTS versions, which would be ideal here.  The
blocker is getting GHC 8.4.3 to work (which I am working on).

Maybe this patch series should just be rejected for now.

Thank you for reviewing!


-- Tim

[bug#32517] [PATCH 0/7] Fix git-annex dependencies.

[Ludovic Courtès]

Hi Timothy,

Timothy Sample <samplet@ngyro.com> skribis:

> This patch fixes several Haskell packages needed for building git-annex.
> Mostly the packages are updated to work with our new versions of
> ghc-conduit and ghc-resourcet.

Is this patch set now obsolete with the (heroic!) work you did on
updating Haskell packages?

Ludo’.

bug#32517: [PATCH 0/7] Fix git-annex dependencies.

[Timothy Sample]

Hello,

ludo@gnu.org (Ludovic Courtès) writes:

> Is this patch set now obsolete with the (heroic!) work you did on
> updating Haskell packages?

Yes.  These patches are no longer needed.  I’m closing this bug.


-- Tim