From 0bce74d458a343e61d054c4b25d6f67bd1086f3c Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Sat, 8 Jun 2024 08:30:21 +0200
Subject: gnu: Upgrade to Stackage 20.26.

* guix/import/stackage.scm (%default-lts-version): Upgrade to Stackage
20.26.
* gnu/packages/patches/ghc-aeson-encodeDouble.patch: New file.
* gnu/packages/patches/ghc-clock-realfrag.patch: New file.
* gnu/local.mk: Register them.
* gnu/packages/haskell-check.scm (ghc-tasty-hedgehog): Update.
(ghc-tasty-hspec): Update.
(ghc-tasty-expected-failure): Update.
(ghc-quickcheck-instances): Update.
(ghc-quickcheck-io): Update.
(ghc-hspec-contrib): Update.
* gnu/packages/haskell-crypto.scm (ghc-curve25519): Update.
(ghc-tls): Update.
* gnu/packages/haskell-web.scm (ghc-tagsoup): Update.
(ghc-http2): Update.
(ghc-wai-websockets): Update.
(ghc-aeson): Update.
(ghc-clientsession): Update.
(ghc-yesod-core): Update.
(ghc-yesod-persistent): Update.
(ghc-wai-cors): Update.
* gnu/packages/haskell-xyz.scm (ghc-abstract-par): Update.
(ghc-adjunctions): Update.
(ghc-aeson-diff): Update.
(ghc-base16-bytestring): Update.
(ghc-base-compat): Update.
(ghc-base-compat-batteries): Update.
(ghc-basement): Update.
(ghc-bencode): Update.
(ghc-bytestring-handle): Update.
(ghc-c2hs): Update.
(ghc-cassava-megaparsec): Update.
(ghc-cborg): Update.
(ghc-charset): Update.
(ghc-chasingbottoms): Update.
(ghc-clock): Update.
(ghc-cmark-gfm): Update.
(ghc-concurrent-extra): Update.
(ghc-concurrent-output): Update.
(ghc-conduit-extra): Update.
(ghc-constraints): Update.
(ghc-convertible): Update.
(ghc-csv): Update.
(ghc-data-accessor): Update.
(ghc-data-ordlist): Update.
(ghc-dense-linear-algebra): Update.
(ghc-diagrams-core): Update.
(ghc-diff): Update.
(ghc-dual-tree): Update.
(ghc-either): Update.
(ghc-errors): Update.
(ghc-esqueleto): Update.
(ghc-exactprint): Update.
(ghc-extensible-exceptions): Update.
(ghc-fail): Update.
(ghc-filepath-bytestring): Update.
(ghc-fingertree): Update.
(ghc-fmlist): Update.
(ghc-foldl): Update.
(ghc-free): Update.
(ghc-fsnotify): Update.
(ghc-generic-random): Update.
(ghc-genvalidity-property): Update.
(ghc-groups): Update.
(ghc-hackage-security): Update.
(ghc-half): Update.
(ghc-hashtables): Update.
(ghc-haskell-src): Update.
(ghc-haskell-src-exts-util): Update.
(ghc-hourglass): Update.
(ghc-hpack): Update.
(ghc-hslua): Update.
(ghc-hslua-module-system): Update.
(ghc-http-api-data): Update.
(ghc-ini): Update.
(ghc-inline-c): Update.
(ghc-inline-c-cpp): Update.
(ghc-interpolate): Update.
(ghc-intervals): Update.
(ghc-invariant): Update.
(ghc-io-streams): Update.
(ghc-ipynb): Update.
(ghc-kan-extensions): Update.
(ghc-lens): Update.
(ghc-libmpd): Update.
(ghc-libyaml): Update.
(ghc-lifted-async): Update.
(ghc-linear): Update.
(ghc-listlike): Update.
(ghc-logict): Update.
(ghc-lucid): Update.
(ghc-lzma-conduit): Update.
(ghc-magic): Update.
(ghc-microlens-ghc): Update.
(ghc-microlens-mtl): Update.
(ghc-microlens-platform): Update.
(ghc-missingh): Update.
(ghc-mmorph): Update.
(ghc-monad-control): Update.
(ghc-monad-logger): Update.
(ghc-monoid-extras): Update.
(ghc-murmur-hash): Update.
(ghc-ncurses): Update.
(ghc-network-info): Update.
(ghc-newtype-generics): Update.
(ghc-openglraw): Update.
(ghc-text-conversions): Update.
(ghc-text-icu): Update.
(ghc-text-short): Update.
(ghc-text-zipper): Update.
(ghc-parsers): Update.
(ghc-path): Update.
(ghc-peano): Update.
(ghc-persistent): Update.
(ghc-persistent-sqlite): Update.
(ghc-process-extras): Update.
(ghc-indexed-profunctors): Update.
(ghc-project-template): Update.
(ghc-psqueues): Update.
(ghc-random): Update.
(ghc-reducers): Update.
(ghc-refact): Update.
(ghc-regex-posix): Update.
(ghc-resourcet): Update.
(ghc-sdl): Update.
(ghc-sdl2-image): Update.
(ghc-sdl2-mixer): Update.
(ghc-sdl2-ttf): Update.
(ghc-sdl2-gfx): Update.
(ghc-semigroupoids): Update.
(ghc-semigroups): Update.
(ghc-shakespeare): Update.
(ghc-shelly): Update.
(ghc-simple-reflect): Update.
(ghc-size-based): Update.
(ghc-skylighting-format-latex): Update.
(ghc-skylighting-format-ansi): Update.
(ghc-skylighting): Update.
(ghc-sop-core): Update.
(ghc-split): Update.
(ghc-splitmix): Update.
(ghc-statevar): Update.
(ghc-statistics): Update.
(ghc-stm-conduit): Update.
(ghc-storable-complex): Update.
(ghc-storablevector): Update.
(ghc-svg-builder): Update.
(ghc-temporary-rc): Update.
(ghc-terminal-size): Update.
(ghc-text-manipulate): Update.
(ghc-th-abstraction): Update.
(ghc-th-expand-syns): Update.
(ghc-th-lift-instances): Update.
(ghc-th-orphans): Update.
(ghc-timezone-series): Update.
(ghc-timezone-olson): Update.
(ghc-tldr): Update.
(ghc-transformers-compat): Update.
(ghc-exception-transformers): Update.
(ghc-trifecta): Update.
(ghc-turtle): Update.
(ghc-unagi-chan): Update.
(ghc-unexceptionalio): Update.
(ghc-unicode-transforms): Update.
(ghc-unix-compat): Update.
(ghc-unix-time): Update.
(ghc-unliftio): Update.
(ghc-commutative-semigroups): Update.
(ghc-utf8-string): Update.
(ghc-void): Update.
(ghc-wl-pprint-text): Update.
(ghc-x11-xft): Update.
(ghc-xml): Update.
(ghc-xml-hamlet): Update.
(ghc-yaml): Update.
(ghc-zip-archive): Update.
(ghc-zlib): Update.
(ghc-zstd): Update.
(ghc-keys): Update.
(ghc-pointed): Update.
(ghc-lift-type): Update.
(ghc-unicode-collation): Update.
(ghc-citeproc): Update.
(ghc-commonmark): Update.
(ghc-commonmark-extensions): Update.
(ghc-genvalidity-hspec): Update.
(ghc-netlink): Update.
(ghc-doctest-driver-gen): Update.
(ghc-mysql): Update.
(ghc-persistent-qq): Update.
(ghc-persistent-mysql): Update.
(ghc-string-conversions): Update.
(ghc-postgresql-simple): Update.
(ghc-persistent-postgresql): Update.
(ghc-filtrable): Update.
(ghc-hsyaml-aeson): Update.
(ghc-singleton-bool): Update.
(ghc-git-lfs): Update.
(ghc-nothunks): Update.
(ghc-onetuple): Update.
(ghc-doctest-parallel): Update.
(ghc-ordered-containers): Update.
(ghc-hslua-marshalling): Update.
(ghc-gridtables): Update.
(ghc-should-not-typecheck): Update.
(ghc-servant-server): Update.
(ghc-recv): Update.
(ghc-glib): Update.
(ghc-pango): Update.
(ghc-monoidal-containers): Update.
(ghc-newtype): Update.
(ghc-random-shuffle): Update.
(ghc-ref-tf): Update.
* gnu/packages/irc.scm (glirc): Update.
* gnu/packages/purescript.scm (purescript): Update.
* gnu/packages/wm.scm (icewm): Update.
(ghc-xmobar): Update.

Change-Id: I26ef7c2ef06e3075eba3da21947f16708c437f98
---
 gnu/packages/haskell-web.scm | 166 ++++++++++++++++++++-----------------------
 1 file changed, 78 insertions(+), 88 deletions(-)

(limited to 'gnu/packages/haskell-web.scm')

diff --git a/gnu/packages/haskell-web.scm b/gnu/packages/haskell-web.scm
index 75b84b10a7..0aaa609e42 100644
--- a/gnu/packages/haskell-web.scm
+++ b/gnu/packages/haskell-web.scm
@@ -72,29 +72,22 @@ for screen-scraping.")
 (define-public ghc-cookie
   (package
     (name "ghc-cookie")
-    (version "0.4.5")
+    (version "0.4.6")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "cookie" version))
        (sha256
-        (base32
-         "10rmdasb7mypbwxdj2mhr810vqhkakpik7hyd8fvj60hng8r8zvh"))))
+        (base32 "1ajbcsk4k0jc6v2fqn36scs6l8wa6fq46gd54pak75rbqdbajhcc"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cookie")))
-    (inputs
-     (list ghc-old-locale
-           ghc-blaze-builder
-           ghc-data-default-class
-           ghc-hunit
-           ghc-quickcheck
-           ghc-tasty
-           ghc-tasty-hunit
-           ghc-tasty-quickcheck))
+    (inputs (list ghc-data-default-class))
+    (native-inputs (list ghc-hunit ghc-quickcheck ghc-tasty ghc-tasty-hunit
+                         ghc-tasty-quickcheck))
     (home-page "https://github.com/snoyberg/cookie")
     (synopsis "HTTP cookie parsing and rendering")
     (description "HTTP cookie parsing and rendering library for Haskell.")
-    (license license:bsd-3)))
+    (license license:expat)))
 
 (define-public ghc-curl
   (package
@@ -363,58 +356,54 @@ and HPACK.  Currently HTTP/2 16 framing and HPACK 10 is supported.")
 
 (define-public ghc-http-conduit
   (package
-    (name  "ghc-http-conduit")
-    (version "2.3.8")
+    (name "ghc-http-conduit")
+    (version "2.3.8.1")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "http-conduit" version))
        (sha256
-        (base32
-         "1bj24phbcb7s3k6v48l5gk82m3m23j8zy9l7c5ccxp3ghn9z5gng"))))
+        (base32 "11zf4hyw8f1gpj0w1cmgc9g62xwy2v4hhzqazdsla4q49iqbzxgd"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "http-conduit")))
-    ;; FIXME: `httpLbs TLS` in test-suite `test` fails with
-    ;; ConnectionFailure getProtocolByName: does not exist (no such protocol
-    ;; name: tcp)
-    (arguments `(#:tests? #f))
-    (inputs
-     (list ghc-aeson
-           ghc-resourcet
-           ghc-conduit
-           ghc-conduit-extra
-           ghc-http-types
-           ghc-lifted-base
-           ghc-http-client
-           ghc-http-client-tls
-           ghc-monad-control
-           ghc-exceptions
-           ghc-unliftio))
-    (native-inputs
-     (list ghc-hunit
-           ghc-hspec
-           ghc-data-default-class
-           ghc-connection
-           ghc-warp-tls
-           ghc-blaze-builder
-           ghc-conduit
-           ghc-utf8-string
-           ghc-case-insensitive
-           ghc-lifted-base
-           ghc-network
-           ghc-wai
-           ghc-warp
-           ghc-wai-conduit
-           ghc-http-types
-           ghc-cookie
-           ghc-conduit-extra
-           ghc-streaming-commons
-           ghc-aeson
-           ghc-temporary
-           ghc-resourcet))
-    (home-page "https://hackage.haskell.org/package/http-conduit")
+    (inputs (list ghc-attoparsec
+                  ghc-resourcet
+                  ghc-conduit
+                  ghc-conduit-extra
+                  ghc-http-types
+                  ghc-http-client
+                  ghc-http-client-tls
+                  ghc-unliftio-core
+                  ghc-aeson))
+    (native-inputs (list ghc-hunit
+                         ghc-hspec
+                         ghc-data-default-class
+                         ghc-warp-tls
+                         ghc-tls
+                         ghc-blaze-builder
+                         ghc-utf8-string
+                         ghc-case-insensitive
+                         ghc-unliftio
+                         ghc-wai
+                         ghc-warp
+                         ghc-wai-conduit
+                         ghc-cookie
+                         ghc-streaming-commons
+                         ghc-temporary
+                         ghc-network))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1wvr0v948s5fmlf47r4pqjan355x6v65rm7dz7y65ngj10xwk5f9")
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'update-constraints
+           (lambda _
+             (substitute* "http-conduit.cabal"
+               ((", network") ", network\n                 , connection\n")))))))
+    (home-page "https://github.com/snoyberg/http-client")
     (synopsis "HTTP/HTTPS client with conduit interface")
-    (description "This library uses attoparsec for parsing the actual
+    (description
+     "This library uses attoparsec for parsing the actual
 contents of the HTTP connection.  It also provides higher-level functions
 which allow you to avoid direct usage of conduits.")
     (license license:bsd-3)))
@@ -781,18 +770,21 @@ See also:
 (define-public ghc-xss-sanitize
   (package
     (name "ghc-xss-sanitize")
-    (version "0.3.7.1")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "xss-sanitize" version))
-              (sha256
-               (base32
-                "1lmmyh28mb1k44m63m7qx6iy4x2fgqq5srmky47dsm0fby9iag1h"))))
+    (version "0.3.7.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "xss-sanitize" version))
+       (sha256
+        (base32 "0in9kn51i2ddh5c8scyf9l8zi6zxidwznn34qwj02nglw5dpzfqv"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "xss-sanitize")))
     (inputs (list ghc-attoparsec ghc-css-text ghc-network-uri ghc-tagsoup
                   ghc-utf8-string))
     (native-inputs (list ghc-hunit ghc-hspec))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1l8y52nja9a2iyxawm3vp23jcs46ziwx0yj2w46drb7knaa306d0")))
     (home-page "https://github.com/yesodweb/haskell-xss-sanitize#readme")
     (synopsis "Sanitize untrusted HTML to prevent XSS attacks")
     (description
@@ -930,7 +922,8 @@ entity decoding bugfixes applied.")
               (uri (hackage-uri "aeson" version))
               (sha256
                (base32
-                "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"))))
+                "09dk0j33n262dm75vff3y3i9fm6lh06dyqswwv7a6kvnhhmhlxhr"))
+              (patches (search-patches "ghc-aeson-encodeDouble.patch"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "aeson")))
     (inputs (list ghc-base-compat-batteries
@@ -1196,13 +1189,13 @@ avoid any issues with characters.")
 (define-public ghc-yesod-core
   (package
     (name "ghc-yesod-core")
-    (version "1.6.24.0")
-    (source (origin
-              (method url-fetch)
-              (uri (hackage-uri "yesod-core" version))
-              (sha256
-               (base32
-                "19ilgm73108ki1hvqc86kir0yrx36vp9g45na6g8dmfsvk9izr10"))))
+    (version "1.6.24.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "yesod-core" version))
+       (sha256
+        (base32 "0cql4gk83ya0lyv0nyrp387nljpab4dwwy288rzp8klq9z5r2a7j"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "yesod-core")))
     (inputs (list ghc-aeson
@@ -1241,9 +1234,6 @@ avoid any issues with characters.")
                          ghc-hspec-expectations
                          ghc-network
                          ghc-streaming-commons))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1406s7is60ji6nn3h1mafkdh7729ipq3i06cqsq77hz2ilj264jl")))
     (home-page "http://www.yesodweb.com/")
     (synopsis "Core package for the Yesod web framework")
     (description
@@ -1282,13 +1272,13 @@ from Yesod.")
 (define-public ghc-yesod-form
     (package
       (name "ghc-yesod-form")
-      (version "1.7.3")
-      (source (origin
-                (method url-fetch)
-                (uri (hackage-uri "yesod-form" version))
-                (sha256
-                 (base32
-                  "10y3mfh96sicqyzngvl7f4wrjgkvl3znqnh71s8gx1vf7158sjww"))))
+      (version "1.7.4")
+      (source
+       (origin
+         (method url-fetch)
+         (uri (hackage-uri "yesod-form" version))
+         (sha256
+          (base32 "012w6pq0zznwqn19nx5h30rmd7dazcd0d75a6426d7brxvf9vn98"))))
       (build-system haskell-build-system)
       (properties '((upstream-name . "yesod-form")))
       (inputs (list ghc-aeson
@@ -2156,13 +2146,13 @@ aims to be compliant with @url{https://www.w3.org/TR/cors}.")
 (define-public ghc-network-run
   (package
     (name "ghc-network-run")
-    (version "0.2.4")
+    (version "0.2.5")
     (source
-      (origin
-        (method url-fetch)
-        (uri (hackage-uri "network-run" version))
-        (sha256
-          (base32 "0w3dmwk03j4n01xkiq8m4sqa27bskh239mpw7m4ihjmkxqcwc5gl"))))
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "network-run" version))
+       (sha256
+        (base32 "08662w7ja9w4a4fwikaawxnxcszkd0mdmaajmshas2dd25xyikwi"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "network-run")))
     (inputs (list ghc-network))
-- 
cgit v1.2.3