gnu: ghc-haskeline: Fix build

* gnu/packages/haskell-xyz.scm
(ghc-haskeline): Update to version 0.8.4.1.
[native-inputs]: Add which.
[phases]: Add example binary to PATH before running tests.

Change-Id: I0c006c89b766397dd144da76ae20c5326ad776f4
Signed-off-by: Andreas Enge <andreas@enge.fr>

CODEOWNERS

@@ -292,12 +292,12 @@ guix/build-system/julia\.scm                       @guix/julia
 
 gnu/packages/(kde)(-.+|)\.scm$                     @guix/kde
 
-gnu/build/linux-modules\.scm                       @guix/linux-libre
+gnu/build/linux-modules\.scm                       @guix/kernel
-gnu/packages/aux-files/linux-libre.*$              @guix/linux-libre
+gnu/packages/aux-files/linux-libre.*$              @guix/kernel
-gnu/packages/linux\.scm                            @guix/linux-libre
+gnu/packages/linux\.scm                            @guix/kernel
-gnu/tests/linux-modules\.scm                       @guix/linux-libre
+gnu/tests/linux-modules\.scm                       @guix/kernel
-guix/build/linux-module-build-system\.scm          @guix/linux-libre
+guix/build/linux-module-build-system\.scm          @guix/kernel
-guix/build-system/linux-module\.scm                @guix/linux-libre
+guix/build-system/linux-module\.scm                @guix/kernel
 
 gnu/packages/lisp(-.+|)\.scm$                      @guix/lisp
 guix/build/asdf-build-system\.scm                  @guix/lisp

etc/teams.scm

@@ -876,8 +876,8 @@ and the maven-build-system."
         "The plasma desktop environment, and KDE Applications."
         #:scope (list (make-regexp* "^gnu/packages/(kde)(-.+|)\\.scm$"))))
 
-(define-team linux-libre
+(define-team kernel
-  (team 'linux-libre
+  (team 'kernel
         #:name "Linux-libre kernel team"
         #:scope (list "gnu/build/linux-modules.scm"
                       (make-regexp* "^gnu/packages/aux-files/linux-libre.*$")
@@ -1298,7 +1298,7 @@ the \"texlive\" importer."
 (define-member (person "Leo Famulari"
                        "leo@famulari.name"
                        "lfam")
-  linux-libre)
+  kernel)
 
 (define-member (person "Efraim Flashner"
                        "efraim@flashner.co.il"
@@ -1383,7 +1383,7 @@ the \"texlive\" importer."
 (define-member (person "Vagrant Cascadian"
                        "vagrant@debian.org"
                        "vagrantc")
-  debian embedded linux-libre)
+  debian embedded kernel)
 
 (define-member (person "Vagrant Cascadian"        ;XXX: duplicate
                        "vagrant@reproducible-builds.org"
@@ -1537,7 +1537,7 @@ the \"texlive\" importer."
 (define-member (person "Rodion Goritskov"
                        "rodion@goritskov.com"
                        "rodion-goritskov")
-  games java kde linux-libre release)
+  games java kde kernel release)
 
 (define-member (person "Jason Conroy"
                        "jconroy@tscripta.net"
@@ -1622,7 +1622,7 @@ the \"texlive\" importer."
 (define-member (person "Wilko Meyer"
                        "w@wmeyer.eu"
                        "theesm")
-  linux-libre perl)
+  kernel perl)
 
 (define-member (person "Untrusem"
                        "mysticmoksh@riseup.net"

gnu/local.mk

@@ -1452,6 +1452,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghc-aeson-encodeDouble.patch		\
   %D%/packages/patches/ghc-basement-fix-32bit.patch		\
   %D%/packages/patches/ghc-bytestring-handle-ghc9.patch	\
+  %D%/packages/patches/ghc-chell-quickcheck-enable-qc-2.15.patch	\
   %D%/packages/patches/ghc-clock-realfrag.patch	\
   %D%/packages/patches/ghc-language-haskell-extract-ghc-8.10.patch	\
   %D%/packages/patches/ghc-memory-fix-32bit.patch		\

gnu/packages/dhall.scm

@@ -31,13 +31,13 @@
 (define-public dhall
   (package
     (name "dhall")
-    (version "1.41.2")
+    (version "1.42.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "dhall" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "dhall" version))
-               (base32
+       (sha256
-                "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"))))
+        (base32 "0fvvqvh6diqi55dmncfs06rvcw8k0a1hs2gq228yxvsfbzcpv44s"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "dhall")))
     (inputs (list ghc-aeson
@@ -73,8 +73,8 @@
                   ghc-text-manipulate
                   ghc-text-short
                   ghc-th-lift-instances
+                  ghc-unix-compat
                   ghc-unordered-containers
-                  ghc-uri-encode
                   ghc-vector
                   ghc-cryptohash-sha256
                   ghc-http-types
@@ -86,7 +86,6 @@
                          ghc-quickcheck-instances
                          ghc-special-values
                          ghc-spoon
-                         ghc-system-filepath
                          ghc-tasty
                          ghc-tasty-expected-failure
                          ghc-tasty-hunit
@@ -97,9 +96,8 @@
                          ghc-mockery
                          ghc-doctest))
     (arguments
-     `(#:tests? #f ; Tries to access httpbin.org
+     `(#:cabal-revision ("2"
-       #:cabal-revision ("4"
+                         "1h9kxpn3kzwmxj07mqc0cxjj2ak3dyxnifb78z5vn34xn747j5bk")))
-                         "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx")))
     (home-page "http://hackage.haskell.org/package/dhall")
     (synopsis "Configuration language guaranteed to terminate")
     (description

gnu/packages/django.scm

@@ -105,7 +105,7 @@ prefixing to determine WebSocket endpoints versus HTTP endpoints.")
 (define-public python-channels
   (package
     (name "python-channels")
-    (version "4.3.2")
+    (version "4.2.2")
     (source
      (origin
        (method git-fetch) ; no tests in PyPI
@@ -114,14 +114,8 @@ prefixing to determine WebSocket endpoints versus HTTP endpoints.")
              (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0lxq5l0729ms4xzbn1rq968qpi7ipa9aj1wjvzrpdxd3mmlg2618"))))
+        (base32 "0x7w29qpj2acrzf8hcgymsyr5gk3aj2wkbvlwcr01ygd6as8h7hz"))))
     (build-system pyproject-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-before 'check 'delete-selenium-tests
-           (lambda* _
-             (delete-file "tests/sample_project/tests/test_selenium.py"))))))
     (propagated-inputs (list python-asgiref python-django))
     ;; Channels develops and maintains Daphne but any other ASGI server can be
     ;; used, so keep it in native-inputs for tests.
@@ -206,13 +200,13 @@ your project into different processes.")
 (define-public python-django
   (package
     (name "python-django")
-    (version "6.0.5")
+    (version "5.2.13")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "django" version))
        (sha256
-        (base32 "0saj5w1pmfl2bf6smmbx2h8v6b9n9djdsbp46v468a4ax5r6hvdw"))))
+        (base32 "1i1vlffzhwbzp6r6y8ycvwklc45diy4c6i897z379l48a7dqj5d3"))))
     (build-system pyproject-build-system)
     (arguments
      '(#:test-flags
@@ -380,27 +374,28 @@ and adapters that are useful for non-trivial configuration scenarios.")
 (define-public python-django-extensions
   (package
     (name "python-django-extensions")
-    (properties '((commit . "32ddfb0499bec7f39f9fbb44568d2781cecd1f32")
+    (version "4.1")
-                  (revision . "0")))
-    (version (git-version "4.1"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
     (source
      (origin
        (method git-fetch)
        ;; Fetch from the git repository, so that the tests can be run.
        (uri (git-reference
              (url "https://github.com/django-extensions/django-extensions")
-             (commit (assoc-ref properties 'commit))))
+             (commit version)))
        (file-name (string-append name "-" version))
        (sha256
-        (base32 "09gk82rsmqgaz4pqk0xvb4mgfprls8h1wm24p74d0ykdi7li2plg"))))
+        (base32 "1qayan9za7ylvzkwp6p0l0735gavnzd1kdjsfc178smq6xnby0ss"))))
     (build-system pyproject-build-system)
     (arguments
      (list
       ;; The 5 tests in test_dumbscript.py fail (OperationalError).
       #:test-flags
-      #~(list "--ignore" "tests/test_dumpscript.py")))
+      #~(list "--ignore" "tests/test_dumpscript.py"
+              "-k" (string-append
+                    ;; These fail for unknown reasons.
+                    "not test_do_export_emails_format_vcard_start"
+                    " and not test_initialize_runserver_plus"
+                    " and not test_should_highlight_python_syntax_with_name"))))
     (propagated-inputs
      (list python-django))
     (native-inputs
@@ -411,8 +406,6 @@ and adapters that are useful for non-trivial configuration scenarios.")
            python-pytest-django
            python-setuptools
            python-shortuuid
-           python-vobject
-           python-werkzeug
            tzdata-for-tests))
     (home-page "https://github.com/django-extensions/django-extensions")
     (synopsis "Custom management extensions for Django")

gnu/packages/finance.scm

@@ -321,37 +321,41 @@ based on Qt.")
 (define-public ghc-hledger
   (package
     (name "ghc-hledger")
-    (version "1.27.1")
+    (version "1.43.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hledger" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hledger" version))
-               (base32
+       (sha256
-                "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb"))))
+        (base32 "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hledger")))
     (inputs (list ghc-decimal
                   ghc-diff
                   ghc-aeson
                   ghc-ansi-terminal
-                  ghc-breakpoint
                   ghc-cmdargs
                   ghc-data-default
                   ghc-extra
                   ghc-githash
                   ghc-hashable
                   ghc-hledger-lib
+                  ghc-http-client
+                  ghc-http-types
                   ghc-lucid
                   ghc-math-functions
                   ghc-megaparsec
                   ghc-microlens
+                  ghc-modern-uri
                   ghc-regex-tdfa
+                  ghc-req
                   ghc-safe
                   ghc-shakespeare
                   ghc-split
                   ghc-tabular
                   ghc-tasty
                   ghc-temporary
+                  ghc-text-ansi
                   ghc-timeit
                   ghc-unordered-containers
                   ghc-utf8-string
@@ -382,8 +386,8 @@ Accounting.")
       #~(modify-phases %standard-phases
           (add-after 'install 'install-doc
             (lambda _
-              (install-file "hledger.info" (string-append #$output "/share/info"))
+              (install-file "embeddedfiles/hledger.info" (string-append #$output "/share/info"))
-              (install-file "hledger.1" (string-append #$output "/man/man1"))))
+              (install-file "embeddedfiles/hledger.1" (string-append #$output "/man/man1"))))
            (add-after 'register 'remove-libraries
              (lambda* (#:key outputs #:allow-other-keys)
                (delete-file-recursively (string-append (assoc-ref outputs "out") "/lib")))))))))
@@ -2280,13 +2284,13 @@ textual ledgers to Beancount files.")
 (define-public hledger-web
   (package
     (name "hledger-web")
-    (version "1.27.1")
+    (version "1.43.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hledger-web" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hledger-web" version))
-               (base32
+       (sha256
-                "151dxci7dld8626dzw823sr3d9iaac92wfzbfcbdz4jh9f7n07wa"))))
+        (base32 "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hledger-web")))
     (inputs (list ghc-decimal
@@ -2294,7 +2298,6 @@ textual ledgers to Beancount files.")
                   ghc-base64
                   ghc-blaze-html
                   ghc-blaze-markup
-                  ghc-breakpoint
                   ghc-case-insensitive
                   ghc-clientsession
                   ghc-cmdargs
@@ -2302,6 +2305,8 @@ textual ledgers to Beancount files.")
                   ghc-conduit-extra
                   ghc-data-default
                   ghc-extra
+                  ghc-file-embed
+                  ghc-githash
                   ghc-hjsmin
                   ghc-hledger
                   ghc-hledger-lib
@@ -2311,6 +2316,7 @@ textual ledgers to Beancount files.")
                   ghc-http-types
                   ghc-megaparsec
                   ghc-network
+                  ghc-safe
                   ghc-shakespeare
                   ghc-unix-compat
                   ghc-unordered-containers

gnu/packages/fonts.scm

@@ -4287,7 +4287,7 @@ typographical palette.")
 (define-public font-mona-sans
   (package
     (name "font-mona-sans")
-    (version "2.0.27")
+    (version "2.0.26")
     (source
      (origin
        (method git-fetch)
@@ -4297,7 +4297,7 @@ typographical palette.")
        (file-name (git-file-name name version))
        (sha256
         (base32
-         "10xbs857d21zrfx0cpzcsyyk76j921qq68qpz5r2kl4jr3gz541z"))))
+         "09b6apxq659y4dkkm5swy683q6hviibv1cd48ragm5rd1376hsaz"))))
     (build-system font-build-system)
     (outputs '("out" "ttf" "woff"))
     (home-page "https://github.com/mona-sans")

gnu/packages/golang-check.scm

@@ -2151,57 +2151,6 @@ testing and improve the efficiency of unit test writing.")
 testing of time-sensitive code.")
     (license license:expat)))
 
-(define-public go-github-com-josharian-mapfs
-  (package
-    (name "go-github-com-josharian-mapfs")
-    (version "0.0.0-20210615234106-095c008854e6")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://github.com/josharian/mapfs")
-             (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "09i6shqwacx8nm6jfyhc1zvry8fcb3ddd98m96skzybv9lckq7h4"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/josharian/mapfs"))
-    (home-page "https://github.com/josharian/mapfs")
-    (synopsis "Fork of Go std's testing/fstest.MapFS")
-    (description
-     "This is a fork of the @code{MapFS} component of the Go standard
-library's testing/fstest package.")
-    (license license:bsd-3)))
-
-(define-public go-github-com-josharian-txtarfs
-  (package
-    (name "go-github-com-josharian-txtarfs")
-    (version "0.0.0-20240408113805-5dc76b8fe6bf")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/josharian/txtarfs")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "129rf6hviw46rxcnnkc8jb1k579798rrhnh1k3nn7npi260ia44m"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/josharian/txtarfs"))
-    (propagated-inputs
-     (list go-github-com-josharian-mapfs
-           go-golang-org-x-tools))
-    (home-page "https://github.com/josharian/txtarfs")
-    (synopsis "Convert a txtar to an io.FS")
-    (description
-     "This package turns a @url{https://pkg.go.dev/golang.org/x/tools/txtar,
- txtar} into an @url{https://pkg.go.dev/io/fs, fs.FS}.")
-    (license license:expat)))
-
 (define-public go-github-com-joshdk-go-junit
   (package
     (name "go-github-com-joshdk-go-junit")
@@ -2713,56 +2662,6 @@ error messages, preserving the order of @code{have} (actual result) before
 @code{want} (expected result) to minimize confusion.")
     (license license:asl2.0)))
 
-(define-public go-github-com-newmo-oss-go-caller
-  (package
-    (name "go-github-com-newmo-oss-go-caller")
-    (version "0.1.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/newmo-oss/go-caller")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1hn0wj2v6yvn83lpilbcb9xpa36fmcbv83rk6fhr2rwckp2dxy8p"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/newmo-oss/go-caller"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (home-page "https://github.com/newmo-oss/go-caller")
-    (synopsis "Collect stack traces at runtime")
-    (description
-     "This package provides a library for collecting stack traces at runtime.")
-    (license license:expat)))
-
-(define-public go-github-com-newmo-oss-gotestingmock
-  (package
-    (name "go-github-com-newmo-oss-gotestingmock")
-    (version "0.2.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/newmo-oss/gotestingmock")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1flgmarj961k4vl6d7i2740snrdfjiv4aigb87v5aznvi8bwa5d3"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/newmo-oss/gotestingmock"))
-    (propagated-inputs
-     (list go-github-com-newmo-oss-go-caller))
-    (home-page "https://github.com/newmo-oss/gotestingmock")
-    (synopsis "Mocking utilities for Go")
-    (description
-     "This package provides mocking utilities for unit tests in Go.")
-    (license license:expat)))
-
 (define-public go-github-com-onsi-ginkgo
   (package
     (name "go-github-com-onsi-ginkgo")
@@ -3368,84 +3267,6 @@ and CLI tool.")
 such as readers and writers that fail after N consecutive reads/writes.")
     (license license:expat)))
 
-(define-public go-github-com-tenntenn-golden
-  (package
-    (name "go-github-com-tenntenn-golden")
-    (version "0.5.5")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/golden")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "09w3h7c4z930z91dg7bfs9m680pw9zgqyyikw88gisv1z86y3qlz"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/golden"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (propagated-inputs
-     (list go-github-com-josharian-txtarfs
-           go-golang-org-x-tools))
-    (home-page "https://github.com/tenntenn/golden")
-    (synopsis "Utilities for golden file tests")
-    (description "This package provides utilities for golden file tests.")
-    (license license:expat)))
-
-(define-public go-github-com-tenntenn-modver
-  (package
-    (name "go-github-com-tenntenn-modver")
-    (version "1.0.1")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/modver")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1p4402lizz5ny0l49yxa65ryhx09wm8g13lx4pw0nw0s4r06rw3g"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/modver"))
-    (native-inputs
-     (list go-github-com-google-go-cmp))
-    (propagated-inputs
-     (list go-github-com-hashicorp-go-version))
-    (home-page "https://github.com/tenntenn/modver")
-    (synopsis "Utility for Go modules")
-    (description "This package provides utilities for Go modules.")
-    (license license:expat)))
-
-(define-public go-github-com-tenntenn-text-transform
-  (package
-    (name "go-github-com-tenntenn-text-transform")
-    (version "0.0.0-20250402111347-ba836492e880")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/tenntenn/text")
-              (commit (go-version->git-ref version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "19f302js8pxyqnl189992zp6pl169b4gpgn6wywpdir77vm56pih"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "github.com/tenntenn/text/transform"
-      #:unpack-path "github.com/tenntenn/text"))
-    (propagated-inputs
-     (list go-golang-org-x-text))
-    (home-page "https://github.com/tenntenn/text")
-    (synopsis "Text transformation utilities")
-    (description "This package provides text transformation utilities in Go.")
-    (license license:expat)))
-
 (define-public go-github-com-tj-assert
   (package
     (name "go-github-com-tj-assert")
@@ -3728,34 +3549,6 @@ goroutine leaks and understanding goroutine lifecycles.")
 based on Go @code{testing} library procedures.")
     (license license:cc0)))
 
-(define-public go-gitlab-com-bosi-decorder
-  (package
-    (name "go-gitlab-com-bosi-decorder")
-    (version "0.4.2")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://gitlab.com/bosi/decorder")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0g9x5f7mhvdzwki57902qgb4ih2gipkg255nf9hjv30flfnl2294"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "gitlab.com/bosi/decorder"
-      #:test-flags #~(list "-vet=off")))
-    (propagated-inputs
-     (list go-golang-org-x-tools))
-    (home-page "https://gitlab.com/bosi/decorder")
-    (synopsis "Declaration order and number linter for golang")
-    (description
-     "This package provides a declaration order linter for Go.  In case of
-this tool declarations are @code{type}, @code{const}, @code{var} and
-@code{func}.")
-    (license license:expat)))
-
 (define-public go-go-abhg-dev-requiredfield
   (package
     (name "go-go-abhg-dev-requiredfield")
@@ -3864,60 +3657,6 @@ and restore them afterwards.")
 of @url{https://github.com/wadey/gocovmerge}.")
     (license license:bsd-2)))
 
-(define-public go-go-simpler-org-assert
-  (package
-    (name "go-go-simpler-org-assert")
-    (version "0.9.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/go-simpler/assert")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "0pg3yhicggby978n8war9n5zzigr95mvnsipnk6zgsjn6gyvjdm5"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "go-simpler.org/assert"))
-    (home-page "https://go-simpler.org/assert")
-    (synopsis "Assertions for the standard testing package")
-    (description
-     "This package implements assertions for the standard @code{testing}
-package, and is a minimalistic replacement for the @code{stretchr/testify}
-package.")
-    (license license:mpl2.0)))
-
-(define-public go-go-simpler-org-musttag
-  (package
-    (name "go-go-simpler-org-musttag")
-    (version "0.14.0")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-              (url "https://github.com/go-simpler/musttag")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "15kvnppc2q8ay1m8lhag0bmdx08kc68lzv78699qkyi6bcw68ajf"))))
-    (build-system go-build-system)
-    (arguments
-     (list
-      #:import-path "go-simpler.org/musttag"
-      #:test-flags #~(list "-skip" "TestAnalyzer")))
-    (native-inputs
-     (list go-go-simpler-org-assert))
-    (propagated-inputs
-     (list go-golang-org-x-tools))
-    (home-page "https://go-simpler.org/musttag")
-    (synopsis "Enforce field tags in (un)marshaled structs")
-    (description
-     "This package checks that exported fields of a struct passed to a
-@code{Marshal}-like function are annotated with the relevant tag.")
-    (license license:mpl2.0)))
-
 (define-public go-go-simpler-org-sloglint
   (package
     (name "go-go-simpler-org-sloglint")

gnu/packages/golang-xyz.scm

@@ -4683,7 +4683,7 @@ contexts (e.g. testing).")
 (define-public go-github-com-charlievieth-fastwalk
   (package
     (name "go-github-com-charlievieth-fastwalk")
-    (version "1.0.14")
+    (version "1.0.8")
     (source
      (origin
        (method git-fetch)
@@ -4692,7 +4692,7 @@ contexts (e.g. testing).")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "0ab90pdqgnd0a6ylmq35zca0imj2pp4pxz2bcmg2zx0szv3910im"))))
+        (base32 "17zy17q31p8b93bf703rr0xqafp02bb0slkrgpxb8r0aaxz3zg4y"))))
     (build-system go-build-system)
     (arguments
      (list

gnu/packages/haskell-apps.scm

@@ -64,16 +64,17 @@
 (define-public apply-refact
   (package
     (name "apply-refact")
-    (version "0.10.0.0")
+    (version "0.15.0.0")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "apply-refact" version))
               (sha256
                (base32
-                "129bf8n66kpwh5420rxprngg43bqr2agyd8q8d7l49k2rxsjl1fb"))))
+                "0iny8ynxx46afbzjp14rvpd4sqk8c1p5883mbln53gmlxcm8zq53"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "apply-refact")))
     (inputs (list ghc-refact
+                  ghc-data-default
                   ghc-exactprint
                   ghc-paths
                   ghc-extra
@@ -96,13 +97,13 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
 (define-public cabal-install
  (package
    (name "cabal-install")
-   (version "3.6.2.0")
+   (version "3.12.1.0")
-   (source (origin
+   (source
-             (method url-fetch)
+    (origin
-             (uri (hackage-uri "cabal-install" version))
+      (method url-fetch)
-             (sha256
+      (uri (hackage-uri "cabal-install" version))
-              (base32
+      (sha256
-               "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"))))
+       (base32 "1cmifq189i4x0r0yha3dl8nrzzfh92bnd2saak7dqvvjkkysqj38"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cabal-install")))
    (inputs (list ghc-async
@@ -117,13 +118,35 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
                  ghc-tar
                  ghc-zlib
                  ghc-hackage-security
+                 ghc-open-browser
                  ghc-regex-base
                  ghc-regex-posix
+                 ghc-safe-exceptions
+                 ghc-semaphore-compat
                  ghc-resolv
                  ghc-lukko))
+   (native-inputs (list ghc-tasty
+                        ghc-tasty-golden
+                        ghc-tasty-quickcheck
+                        ghc-tasty-expected-failure
+                        ghc-tasty-hunit
+                        ghc-tree-diff
+                        ghc-quickcheck
+                        ghc-tasty
+                        ghc-tasty-hunit
+                        ghc-tasty
+                        ghc-tasty-hunit
+                        ghc-tagged
+                        ghc-tagged
+                        ghc-tasty
+                        ghc-tasty-expected-failure
+                        ghc-tasty-hunit
+                        ghc-tasty-quickcheck
+                        ghc-quickcheck
+                        ghc-pretty-show))
    (arguments
     `(#:cabal-revision ("2"
-                        "1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv")))
+                        "0fdzqdkg2vbyg0lnbk9bdskr2d23hwjpmnc7jnvpzkcmxmcvl99n")))
    (home-page "https://www.haskell.org/cabal/")
    (synopsis "Command-line interface for Cabal and Hackage")
    (description
@@ -145,11 +168,10 @@ installation of Haskell libraries and programs.")
          "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cpphs")))
-    (inputs
+    (inputs (list ghc-polyparse))
-     (list ghc-polyparse ghc-old-locale ghc-old-time))
     (arguments
-     `(#:cabal-revision ("1"
+     `(#:cabal-revision ("2"
-                         "1f8jzs8zdh4wwbcq8fy6qqxkv75ypnvsm4yzw49wpr3b9vpnzlha")))
+                         "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc")))
     (home-page "https://projects.haskell.org/cpphs/")
     (synopsis "Liberalised re-implementation of cpp, the C pre-processor")
     (description "Cpphs is a re-implementation of the C pre-processor that is
@@ -269,20 +291,18 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
 (define-public ghcid
   (package
     (name "ghcid")
-    (version "0.8.7")
+    (version "0.8.9")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "ghcid" version))
        (sha256
-        (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq"))))
+        (base32 "1dq8lc0dwzib8y21279q4j54cmm7lvx64b3hw2yiym1kzi9rrhj4"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "ghcid")))
-    (inputs
+    (inputs (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
-     (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
+                  ghc-terminal-size))
-           ghc-terminal-size))
+    (native-inputs (list ghc-tasty ghc-tasty-hunit))
-    (native-inputs
-     (list ghc-tasty ghc-tasty-hunit))
     (home-page "https://github.com/ndmitchell/ghcid#readme")
     (synopsis "GHCi based bare bones IDE")
     (description
@@ -404,95 +424,97 @@ to @code{cabal repl}).")
                         (string-append bin "/git-remote-annex"))
                (symlink (string-append bin "/git-annex")
                         (string-append bin "/git-remote-tor-annex"))))))))
-    (inputs
+    (inputs (list ghc-network-uri
-     (list curl
+                  ghc-optparse-applicative
-           ghc-aeson
+                  ghc-uuid
-           ghc-ansi-terminal
+                  ghc-data-default
-           ghc-async
+                  ghc-case-insensitive
-           ghc-attoparsec
+                  ghc-random
-           ghc-aws
+                  ghc-dlist
-           ghc-bloomfilter
+                  ghc-unix-compat
-           ghc-byteable
+                  ghc-safesemaphore
-           ghc-case-insensitive
+                  ghc-async
-           ghc-clientsession
+                  ghc-disk-free-space
-           ghc-concurrent-output
+                  ghc-ifelse
-           ghc-conduit
+                  ghc-monad-logger
-           ghc-connection
+                  ghc-free
-           ghc-crypto-api
+                  ghc-utf8-string
-           ghc-cryptonite
+                  ghc-sandi
-           ghc-data-default
+                  ghc-monad-control
-           ghc-dav
+                  ghc-bloomfilter
-           ghc-dbus
+                  ghc-edit-distance
-           ghc-disk-free-space
+                  ghc-resourcet
-           ghc-dlist
+                  ghc-http-client
-           ghc-edit-distance
+                  ghc-http-client-tls
-           ghc-exceptions
+                  ghc-http-types
-           ghc-fdo-notify
+                  ghc-http-conduit
-           ghc-feed
+                  ghc-http-client-restricted
-           ghc-filepath-bytestring
+                  ghc-conduit
-           ghc-free
+                  ghc-old-locale
-           ghc-git-lfs
+                  ghc-persistent-sqlite
-           ghc-hinotify
+                  ghc-persistent
-           ghc-http-client
+                  ghc-persistent-template
-           ghc-http-client-tls
+                  ghc-unliftio-core
-           ghc-http-client-restricted
+                  ghc-microlens
-           ghc-http-conduit
+                  ghc-aeson
-           ghc-http-types
+                  ghc-vector
-           ghc-ifelse
+                  ghc-tagsoup
-           ghc-magic
+                  ghc-unordered-containers
-           ghc-memory
+                  ghc-feed
-           ghc-microlens
+                  ghc-regex-tdfa
-           ghc-monad-control
+                  ghc-socks
-           ghc-monad-logger
+                  ghc-byteable
-           ghc-mountpoints
+                  ghc-stm-chans
-           ghc-network
+                  ghc-securemem
-           ghc-network-bsd
+                  ghc-crypto-api
-           ghc-network-info
+                  ghc-memory
-           ghc-network-multicast
+                  ghc-split
-           ghc-network-uri
+                  ghc-attoparsec
-           ghc-old-locale
+                  ghc-concurrent-output
-           ghc-optparse-applicative
+                  ghc-unbounded-delays
-           ghc-persistent
+                  ghc-quickcheck
-           ghc-persistent-sqlite
+                  ghc-tasty
-           ghc-persistent-template
+                  ghc-tasty-hunit
-           ghc-quickcheck
+                  ghc-tasty-quickcheck
-           ghc-random
+                  ghc-tasty-rerun
-           ghc-regex-tdfa
+                  ghc-ansi-terminal
-           ghc-resourcet
+                  ghc-aws
-           ghc-safesemaphore
+                  ghc-dav
-           ghc-sandi
+                  ghc-network
-           ghc-securemem
+                  ghc-network-bsd
-           ghc-servant-client
+                  ghc-git-lfs
-           ghc-servant-server
+                  ghc-clock
-           ghc-socks
+                  ghc-crypton
-           ghc-split
+                  ghc-servant
-           ghc-stm-chans
+                  ghc-servant-server
-           ghc-tagsoup
+                  ghc-servant-client
-           ghc-torrent
+                  ghc-servant-client-core
-           ghc-transformers
+                  ghc-warp
-           ghc-unbounded-delays
+                  ghc-warp-tls
-           ghc-unix-compat
+                  ghc-os-string
-           ghc-unliftio-core
+                  ghc-file-io
-           ghc-unordered-containers
+                  ghc-mountpoints
-           ghc-utf8-string
+                  ghc-yesod
-           ghc-uuid
+                  ghc-yesod-static
-           ghc-vector
+                  ghc-yesod-form
-           ghc-wai
+                  ghc-yesod-core
-           ghc-wai-extra
+                  ghc-path-pieces
-           ghc-warp
+                  ghc-wai
-           ghc-warp-tls
+                  ghc-wai-extra
-           ghc-yesod
+                  ghc-blaze-builder
-           ghc-yesod-core
+                  ghc-clientsession
-           ghc-yesod-form
+                  ghc-shakespeare
-           ghc-yesod-static
+                  ghc-hinotify
-           lsof
+                  ghc-dbus
-           rsync
+                  ghc-fdo-notify
-           xdg-utils))
+                  ghc-network-multicast
+                  ghc-network-info
+                  ghc-torrent
+                  ghc-magic
+                  ghc-criterion))
     (propagated-inputs
      (list git))
-    (native-inputs
+    (native-inputs (list ghc-filepath-bytestring))
-     (list ghc-tasty ghc-tasty-hunit ghc-tasty-quickcheck ghc-tasty-rerun
-           perl))
     (home-page "https://git-annex.branchable.com/")
     (synopsis "Manage files with Git, without checking in their contents")
     (description "This package allows managing files with Git, without
@@ -513,13 +535,13 @@ used to keep a folder in sync between computers.")
 (define-public hlint
   (package
     (name "hlint")
-    (version "3.4.1")
+    (version "3.10")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hlint" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hlint" version))
-               (base32
+       (sha256
-                "0bkk03c9hacvfd73dk89g4r81b50g7pjgw5pavldali4qwss34cz"))))
+        (base32 "0dzy7spc45v88yplczhd3la464bhcbaihi619a45bd06ghrp55nr"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hlint")))
     (inputs (list ghc-unordered-containers
@@ -536,12 +558,10 @@ used to keep a folder in sync between computers.")
                   ghc-aeson
                   ghc-deriving-aeson
                   ghc-filepattern
+                  ghc-lib-parser
                   ghc-lib-parser-ex
                   hscolour
                   ghc-yaml))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1rdaffg5n179yfcn5zjwjb0bki09qy13gz2ijky455y9pbaz8yz9")))
     (home-page "https://github.com/ndmitchell/hlint#readme")
     (synopsis "Suggest improvements for Haskell source code")
     (description
@@ -553,13 +573,13 @@ unwanted suggestions, and to add your own custom suggestions.")
 (define-public hoogle
   (package
     (name "hoogle")
-    (version "5.0.18.3")
+    (version "5.0.18.4")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hoogle" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hoogle" version))
-               (base32
+       (sha256
-                "0v6k75w0an9pqgb7a6cicnpf9rz77xd2lmxfbafc5l4f99jg83bn"))))
+        (base32 "08z32d87vqzhapb2vw21h25jb2g74csxlpvd8f54xl91k3ijs3wx"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hoogle")))
     (inputs (list ghc-quickcheck
@@ -569,7 +589,7 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-cmdargs
                   ghc-conduit
                   ghc-conduit-extra
-                  ghc-connection
+                  ghc-crypton-connection
                   ghc-extra
                   ghc-foundation
                   ghc-old-locale
@@ -582,6 +602,7 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-mmap
                   ghc-process-extras
                   ghc-resourcet
+                  ghc-safe
                   ghc-storable-tuple
                   ghc-tar
                   ghc-uniplate
@@ -593,6 +614,9 @@ unwanted suggestions, and to add your own custom suggestions.")
                   ghc-warp-tls
                   ghc-zlib
                   ghc-semigroups))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1129flhhb1992rijw46dclvmpqlylmbrzl4swsnk2knylx6jgw5a")))
     (home-page "https://hoogle.haskell.org/")
     (synopsis "Haskell API Search")
     (description
@@ -604,14 +628,13 @@ or by approximate type signature.")
 (define-public hscolour
   (package
     (name "hscolour")
-    (version "1.24.4")
+    (version "1.25")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hscolour" version))
        (sha256
-        (base32
+        (base32 "0z679khnmb6as1zcdb44n9qjk7in32jpm4ldscpqg7jrapd31kjl"))))
-         "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hscolour")))
     (home-page "https://hackage.haskell.org/package/hscolour")
@@ -760,12 +783,12 @@ Wayland, and Linux console environments alike.")
                   ghc-text-zipper
                   ghc-timezone-olson
                   ghc-timezone-series
-                  ghc-unix-compat-7
+                  ghc-unix-compat
                   ghc-unordered-containers
                   ghc-utf8-string
                   ghc-uuid
                   ghc-vector
-                  ghc-vty-6
+                  ghc-vty
                   ghc-vty-crossplatform
                   ghc-word-wrap
                   ghc-xdg-basedir))
@@ -811,20 +834,31 @@ Wayland, and Linux console environments alike.")
 (define-public nixfmt
   (package
     (name "nixfmt")
-    (version "0.5.0")
+    (version "1.1.0")
     (source
      (origin
-       (method url-fetch)
+       (method git-fetch)
-       (uri (hackage-uri "nixfmt" version))
+       (uri
+        (git-reference
+          (url "https://github.com/NixOS/nixfmt")
+          (commit (string-append "v" version))))
        (sha256
-        (base32 "0rxi8zrd2xr72w673nvgnhb0g3r7rssc1ahlhz8rmdpc6c1a82wl"))))
+        (base32 "19sydkdw1579qmvzx0zq06s23bm6m6l9wp1kvsfhxawk8pkz2pc2"))
+       (snippet
+        #~(substitute* "nixfmt.cabal"
+            (("(megaparsec|filepath)  *[0-9<>=^&|. ]*" _ package)
+             package)))
+       (modules '((guix build utils)))))
     (build-system haskell-build-system)
-    (properties '((upstream-name . "nixfmt")))
+    (inputs (list ghc-megaparsec
-    (inputs
+                  ghc-parser-combinators
-     (list ghc-megaparsec ghc-parser-combinators ghc-cmdargs
+                  ghc-scientific
-           ghc-safe-exceptions))
+                  ghc-pretty-simple
-    (home-page "https://github.com/serokell/nixfmt")
+                  ghc-cmdargs
-    (synopsis "Opinionated formatter for Nix")
+                  ghc-file-embed
+                  ghc-safe-exceptions))
+    (home-page "https://github.com/NixOS/nixfmt")
+    (synopsis "Official formatter for Nix code")
     (description
      "Nixfmt is a formatter for Nix that ensures consistent and clear
 formatting by forgetting all existing formatting during parsing.")
@@ -954,6 +988,7 @@ too slow and you'll get wound up in the scroll and crushed.")
     (build-system haskell-build-system)
     (arguments
      (list #:haddock? #f ; TODO: Fails to build.
+           #:cabal-revision '("1" "1935jrzy1r3g9cc74b330fmxnz2i1j8hsdk9jnl557qgk6xjqzs7")
            #:phases
            #~(modify-phases %standard-phases
                (add-after 'build 'build-man-page
@@ -993,13 +1028,13 @@ advanced user's otherwise working script to fail under future circumstances.
 (define-public shelltestrunner
   (package
     (name "shelltestrunner")
-    (version "1.9")
+    (version "1.10")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "shelltestrunner" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "shelltestrunner" version))
-               (base32
+       (sha256
-                "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"))))
+        (base32 "1c6bjyxqa4mgnh3w4pqp6sbr5cf160n7jf9i1b4b9sdxzdjk7g87"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "shelltestrunner")))
     (arguments
@@ -1022,17 +1057,19 @@ advanced user's otherwise working script to fail under future circumstances.
                            "tests/examples")
                    (format #t "test suite not run~%"))
                #t))))))
-    (inputs
+    (inputs (list ghc-diff
-     (list ghc-diff
+                  ghc-filemanip
-           ghc-cmdargs
+                  ghc-hunit
-           ghc-filemanip
+                  ghc-cmdargs
-           ghc-hunit
+                  ghc-pretty-show
-           ghc-pretty-show
+                  ghc-regex-tdfa
-           ghc-regex-tdfa
+                  ghc-safe
-           ghc-safe
+                  ghc-test-framework
-           ghc-utf8-string
+                  ghc-test-framework-hunit
-           ghc-test-framework
+                  ghc-utf8-string
-           ghc-test-framework-hunit))
+                  ghc-hspec
+                  ghc-hspec-core
+                  ghc-hspec-contrib))
     (home-page "https://github.com/simonmichael/shelltestrunner")
     (synopsis "Test CLI programs")
     (description
@@ -1045,13 +1082,13 @@ output, stderr, and exit status.")
 (define-public stylish-haskell
   (package
     (name "stylish-haskell")
-    (version "0.14.3.0")
+    (version "0.15.1.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "stylish-haskell" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "stylish-haskell" version))
-               (base32
+       (sha256
-                "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"))))
+        (base32 "06y6f7bv5j5k7q81194v9jqcbmmqcv7h8ii3lq1783bpfnyd6h19"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "stylish-haskell")))
     (inputs (list ghc-aeson
@@ -1061,6 +1098,7 @@ output, stderr, and exit status.")
                   ghc-hsyaml-aeson
                   ghc-hsyaml
                   ghc-semigroups
+                  ghc-lib-parser
                   ghc-lib-parser-ex
                   ghc-strict
                   ghc-optparse-applicative))

gnu/packages/haskell-check.scm

@@ -45,22 +45,18 @@
 (define-public ghc-tasty-ant-xml
   (package
     (name "ghc-tasty-ant-xml")
-    (version "1.1.8")
+    (version "1.1.9")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-ant-xml" version))
        (sha256
-        (base32
+        (base32 "00zgsd6jjfwasr69d0y781vhjr7d8p1jbaaz4pn75ljf33akd92l"))))
-         "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-ant-xml")))
-    (inputs
+    (inputs (list ghc-generic-deriving ghc-tagged ghc-tasty ghc-xml))
-     (list ghc-generic-deriving ghc-xml ghc-tagged ghc-tasty))
+    (home-page "http://github.com/ocharles/tasty-ant-xml")
-    (home-page
+    (synopsis "Render tasty output to XML for Jenkins")
-     "https://github.com/ocharles/tasty-ant-xml")
-    (synopsis
-     "Render tasty output to XML for Jenkins")
     (description
      "A tasty ingredient to output test results in XML, using the Ant
 schema.  This XML can be consumed by the Jenkins continuous integration
@@ -76,33 +72,37 @@ framework.")
        (method url-fetch)
        (uri (hackage-uri "tasty-smallcheck" version))
        (sha256
-        (base32
+        (base32 "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
-         "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-smallcheck")))
-    (inputs
+    (inputs (list ghc-tasty ghc-smallcheck ghc-tagged ghc-optparse-applicative))
-     (list ghc-tasty ghc-smallcheck ghc-async ghc-tagged))
+    (arguments
-    (home-page "https://documentup.com/feuerbach/tasty")
+     `(#:cabal-revision ("1"
+                         "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh")))
+    (home-page "https://github.com/feuerbach/tasty")
     (synopsis "SmallCheck support for the Tasty test framework")
     (description "This package provides SmallCheck support for the Tasty
 Haskell test framework.")
-    (license license:bsd-3)))
+    (license license:expat)))
 
 (define-public ghc-tasty-quickcheck
   (package
     (name "ghc-tasty-quickcheck")
-    (version "0.10.2")
+    (version "0.11.1")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-quickcheck" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-quickcheck" version))
-               (base32
+       (sha256
-                "1qnc6rdvjvlw08q6sln2n98rvj0s0pp689h6w4z58smjbn0lr25l"))))
+        (base32 "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-quickcheck")))
     (inputs (list ghc-tagged ghc-tasty ghc-random ghc-quickcheck
                   ghc-optparse-applicative))
-    (native-inputs (list ghc-tasty-hunit ghc-pcre-light))
+    (native-inputs (list ghc-regex-tdfa ghc-tasty-hunit))
+    (arguments
+     `(#:cabal-revision ("3"
+                         "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w")))
     (home-page "https://github.com/UnkindPartition/tasty")
     (synopsis "QuickCheck support for the Tasty test framework")
     (description "This package provides QuickCheck support for the Tasty
@@ -140,22 +140,23 @@ contains the correct result for the test.")
 (define-public ghc-tasty
   (package
     (name "ghc-tasty")
-    (version "1.4.3")
+    (version "1.5.3")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty" version))
-               (base32
+       (sha256
-                "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l"))))
+        (base32 "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty")))
     (inputs
-      (append
+      (list ghc-tagged
-        (list ghc-tagged ghc-optparse-applicative ghc-ansi-terminal)
+            ghc-optparse-applicative
-        ;; TODO: Add ghc-unbounded-delays unconditionally on next rebuild cycle.
+            ghc-ansi-terminal
-        (if (member (%current-system) '("i686-linux"))
+            ghc-unbounded-delays)) ; needed on 32-bit architectures
-            (list ghc-unbounded-delays)
+    (arguments
-            '())))
+     `(#:cabal-revision ("2"
+                         "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb")))
     (home-page "https://github.com/UnkindPartition/tasty")
     (synopsis "Modern and extensible testing framework")
     (description
@@ -167,17 +168,20 @@ and any other types of tests into a single test suite.")
 (define-public ghc-tasty-hedgehog
   (package
     (name "ghc-tasty-hedgehog")
-    (version "1.3.1.0")
+    (version "1.4.0.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-hedgehog" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-hedgehog" version))
-               (base32
+       (sha256
-                "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"))))
+        (base32 "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hedgehog")))
     (inputs (list ghc-tagged ghc-tasty ghc-hedgehog))
     (native-inputs (list ghc-tasty-expected-failure))
+    (arguments
+     `(#:cabal-revision ("6"
+                         "1rb8ncp6xyy7jr6v0hyls9m529ba0djndsxgxmkgr52rk3qq8lrc")))
     (home-page "https://github.com/qfpl/tasty-hedgehog")
     (synopsis "Integration for tasty and hedgehog")
     (description
@@ -190,22 +194,25 @@ framework}.")
 (define-public ghc-tasty-hspec
   (package
     (name "ghc-tasty-hspec")
-    (version "1.2.0.2")
+    (version "1.2.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-hspec" version))
        (sha256
-        (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
+        (base32 "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hspec")))
     (inputs (list ghc-hspec
+                  ghc-hspec-api
                   ghc-hspec-core
                   ghc-quickcheck
                   ghc-tasty
                   ghc-tasty-smallcheck
-                  ghc-tasty-quickcheck
+                  ghc-tasty-quickcheck))
-                  ghc-tagged))
+    (arguments
+     `(#:cabal-revision ("7"
+                         "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay")))
     (home-page "https://github.com/mitchellwrosen/tasty-hspec")
     (synopsis "Hspec support for the Tasty test framework")
     (description
@@ -215,19 +222,17 @@ framework}.")
 (define-public ghc-tasty-hunit
   (package
     (name "ghc-tasty-hunit")
-    (version "0.10.0.3")
+    (version "0.10.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "tasty-hunit" version))
        (sha256
-        (base32
+        (base32 "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"))))
-         "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-hunit")))
-    (inputs
+    (inputs (list ghc-tasty ghc-call-stack-boot))
-     (list ghc-call-stack-boot ghc-tasty))
+    (home-page "https://github.com/UnkindPartition/tasty")
-    (home-page "http://documentup.com/feuerbach/tasty")
     (synopsis "HUnit support for the Tasty test framework")
     (description "This package provides HUnit support for the Tasty Haskell
 test framework.")
@@ -257,13 +262,13 @@ tasty.")
 (define-public ghc-tasty-lua
   (package
     (name "ghc-tasty-lua")
-    (version "1.0.2")
+    (version "1.1.1.1")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-lua" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-lua" version))
-               (base32
+       (sha256
-                "1vnyvgcjsvqhwwyqkbgqksr9ppj5whiihpwcqkg33sl7jj3ysdwv"))))
+        (base32 "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-lua")))
     (inputs (list ghc-hslua-core
@@ -288,16 +293,15 @@ from Lua.")
        (method url-fetch)
        (uri (hackage-uri "tasty-th" version))
        (sha256
-        (base32
+        (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
-         "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-th")))
-    (inputs
+    (inputs (list ghc-haskell-src-exts ghc-tasty))
-     (list ghc-haskell-src-exts ghc-tasty ghc-tasty-hunit))
+    (native-inputs (list ghc-tasty-hunit))
     (home-page "https://github.com/bennofs/tasty-th")
     (synopsis "Automatically generate tasty TestTrees")
     (description
-      "Tasty-th automatically generates tasty TestTrees from functions of the
+     "Tasty-th automatically generates tasty TestTrees from functions of the
 current module, using TemplateHaskell.  This is a fork the original
 test-framework-th package, modified to work with tasty instead of
 test-framework.")
@@ -306,28 +310,27 @@ test-framework.")
 (define-public ghc-tasty-rerun
   (package
     (name "ghc-tasty-rerun")
-    (version "1.1.18")
+    (version "1.1.20")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-rerun" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-rerun" version))
-               (base32
+       (sha256
-                "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"))))
+        (base32 "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-rerun")))
-    (inputs
+    (inputs (list ghc-optparse-applicative ghc-split ghc-tagged ghc-tasty))
-     (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged
-           ghc-tasty))
     (arguments
-     `(#:cabal-revision ("3"
+     `(#:cabal-revision ("1"
-                         "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb")))
+                         "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk")))
     (home-page "https://github.com/ocharles/tasty-rerun")
     (synopsis "Run tests by filtering the test tree")
-    (description "This package adds the ability to run tests by filtering the
+    (description
+     "This package adds the ability to run tests by filtering the
 test tree based on the result of a previous test run.  You can use this to run
 only those tests that failed in the last run, or to only run the tests that have
 been added since previous test run.")
-  (license license:bsd-3)))
+    (license license:bsd-3)))
 
 (define-public ghc-tasty-expected-failure
   (package
@@ -362,17 +365,17 @@ development.")
 (define-public ghc-quickcheck-instances
   (package
     (name "ghc-quickcheck-instances")
-    (version "0.3.29.1")
+    (version "0.3.33")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "quickcheck-instances" version))
        (sha256
-        (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
+        (base32 "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-instances")))
     (inputs (list ghc-quickcheck
-                  ghc-splitmix
+                  ghc-splitmix-bootstrap
                   ghc-case-insensitive
                   ghc-data-fix
                   ghc-hashable
@@ -383,17 +386,15 @@ development.")
                   ghc-scientific
                   ghc-strict
                   ghc-tagged
+                  ghc-text-short
                   ghc-these
                   ghc-time-compat
-                  ghc-transformers-compat
                   ghc-unordered-containers
                   ghc-uuid-types
-                  ghc-vector
+                  ghc-vector))
-                  ghc-data-array-byte
-                  ghc-text-short))
     (arguments
-     `(#:cabal-revision ("2"
+     `(#:cabal-revision ("1"
-                         "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
+                         "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh")))
     (home-page "https://github.com/haskellari/qc-instances")
     (synopsis "Common quickcheck instances")
     (description "This package provides QuickCheck instances for types
@@ -409,17 +410,38 @@ provided by the Haskell Platform.")
        (method url-fetch)
        (uri (hackage-uri "quickcheck-unicode" version))
        (sha256
-        (base32
+        (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
-         "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-unicode")))
     (inputs (list ghc-quickcheck))
-    (home-page
+    (home-page "https://github.com/bos/quickcheck-unicode")
-     "https://github.com/bos/quickcheck-unicode")
     (synopsis "Generator functions Unicode-related tests")
     (description "This package provides generator and shrink functions for
 testing Unicode-related software.")
-    (license license:bsd-3)))
+    (license license:bsd-2)))
+
+(define-public ghc-quickcheck-text
+  (package
+    (name "ghc-quickcheck-text")
+    (version "0.1.2.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "quickcheck-text" version))
+       (sha256
+        (base32 "02dbs0k6igmsa1hcw8yfvp09v7038vp4zlsp9706km3cmswgshj4"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "quickcheck-text")))
+    (inputs (list ghc-quickcheck))
+    (home-page "https://github.com/olorin/quickcheck-text")
+    (synopsis "Alternative arbitrary instance for Text")
+    (description
+     "The usual Arbitrary instance for Text (in
+<https://hackage.haskell.org/package/quickcheck-instances quickcheck-instances>)
+only has single-byte instances and so isn't an ideal representation of a valid
+UTF-8 character.  This package has generators for one-, two- and three-byte
+UTF-8 characters (all that are currently in use).")
+    (license license:expat)))
 
 (define-public ghc-quickcheck-io
   (package
@@ -446,17 +468,19 @@ use HUnit assertions as QuickCheck properties.")
 (define-public ghc-quickcheck
   (package
     (name "ghc-quickcheck")
-    (version "2.14.3")
+    (version "2.15.0.1")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "QuickCheck" version))
        (sha256
-        (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
+        (base32 "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "QuickCheck")))
-    (inputs
+    (inputs (list ghc-random-bootstrap ghc-splitmix-bootstrap))
-     (list ghc-random ghc-splitmix-bootstrap))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c")))
     (home-page "https://github.com/nick8325/quickcheck")
     (synopsis "Automatic testing of Haskell programs")
     (description
@@ -479,10 +503,8 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
         (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-assertions")))
-    (native-inputs
+    (inputs (list ghc-quickcheck ghc-ieee754 ghc-pretty-show))
-     (list ghc-hspec))
+    (native-inputs (list ghc-hspec))
-    (inputs
-     (list ghc-ieee754 ghc-pretty-show ghc-quickcheck))
     (home-page "https://github.com/s9gf4ult/quickcheck-assertions")
     (synopsis "HUnit-like assertions for QuickCheck")
     (description
@@ -494,33 +516,27 @@ HUnit.")
 (define-public ghc-test-framework
   (package
     (name "ghc-test-framework")
-    (version "0.8.2.0")
+    (version "0.8.2.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "test-framework" version))
        (sha256
-        (base32
+        (base32 "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"))))
-         "1hhacrzam6b8f10hyldmjw8pb7frdxh04rfg3farxcxwbnhwgbpm"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework")))
+    (inputs (list ghc-ansi-terminal
+                  ghc-ansi-wl-pprint
+                  ghc-random
+                  ghc-regex-posix
+                  ghc-old-locale
+                  ghc-xml
+                  ghc-hostname))
+    (native-inputs (list ghc-hunit ghc-quickcheck ghc-semigroups-bootstrap))
     (arguments
-     `(#:tests? #f  ; FIXME: Tests do not build.
+     `(#:cabal-revision ("1"
-       #:cabal-revision
+                         "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh")))
-       ("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r")))
+    (home-page "https://github.com/haskell/test-framework#readme")
-    ;(native-inputs
-    ; (list ghc-hunit ghc-quickcheck))
-    (inputs
-     `(("ghc-ansi-terminal" ,ghc-ansi-terminal)
-       ("ghc-ansi-wl-pprint" ,ghc-ansi-wl-pprint)
-       ("ghc-hostname" ,ghc-hostname)
-       ("ghc-old-locale" ,ghc-old-locale)
-       ("ghc-random" ,ghc-random)
-       ("ghc-regex-posix" ,ghc-regex-posix)
-       ("ghc-xml" ,ghc-xml)
-       ("ghc-libxml" ,ghc-libxml)
-       ("ghc-semigroups" ,ghc-semigroups-bootstrap)))
-    (home-page "https://batterseapower.github.io/test-framework/")
     (synopsis "Framework for running and organising tests")
     (description
      "This package allows tests such as QuickCheck properties and HUnit test
@@ -557,23 +573,21 @@ reporting and test statistics output.")
 (define-public ghc-test-framework-quickcheck2
   (package
     (name "ghc-test-framework-quickcheck2")
-    (version "0.3.0.5")
+    (version "0.3.0.6")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "test-framework-quickcheck2" version))
        (sha256
-        (base32
+        (base32 "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"))))
-         "0ngf9vvby4nrdf1i7dxf5m9jn0g2pkq32w48xdr92n9hxka7ixn9"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework-quickcheck2")))
+    (inputs (list ghc-test-framework ghc-quickcheck ghc-extensible-exceptions
+                  ghc-random))
     (arguments
-     `(#:cabal-revision
+     `(#:cabal-revision ("1"
-       ("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh")))
+                         "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z")))
-    (inputs
+    (home-page "https://github.com/haskell/test-framework")
-     (list ghc-extensible-exceptions ghc-quickcheck ghc-random
-           ghc-test-framework))
-    (home-page "https://batterseapower.github.io/test-framework/")
     (synopsis "QuickCheck2 support for test-framework")
     (description
      "This package provides QuickCheck2 support for the test-framework
@@ -592,9 +606,8 @@ package.")
         (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "test-framework-smallcheck")))
-    (inputs
+    (inputs (list ghc-test-framework ghc-smallcheck))
-     (list ghc-smallcheck ghc-test-framework))
+    (home-page "https://github.com/feuerbach/smallcheck")
-    (home-page "https://github.com/Bodigrim/smallcheck")
     (synopsis "SmallCheck support for test-framework")
     (description
      "This package lets programmers use SmallCheck properties in Haskell's
@@ -660,17 +673,17 @@ JUnit tool for Java.")
 (define-public hspec-discover
   (package
     (name "hspec-discover")
-    (version "2.9.7")
+    (version "2.11.12")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hspec-discover" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hspec-discover" version))
-               (base32
+       (sha256
-                "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"))))
+        (base32 "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-discover")))
     (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery-bootstrap))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
     (synopsis "Automatically discover and run Hspec tests")
     (description "hspec-discover is a tool which automatically discovers and
 runs Hspec tests.")
@@ -679,28 +692,30 @@ runs Hspec tests.")
 (define-public ghc-hspec-core
   (package
     (name "ghc-hspec-core")
-    (version "2.9.7")
+    (version "2.11.12")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hspec-core" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hspec-core" version))
-               (base32
+       (sha256
-                "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"))))
+        (base32 "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-core")))
     (inputs (list ghc-hunit
                   ghc-quickcheck
                   ghc-ansi-terminal
                   ghc-call-stack
-                  ghc-clock
+                  ghc-haskell-lexer
                   ghc-hspec-expectations
                   ghc-quickcheck-io
                   ghc-random
-                  ghc-setenv
                   ghc-tf-random))
     (native-inputs (list ghc-base-orphans-bootstrap ghc-hspec-meta
-                         ghc-silently-bootstrap ghc-temporary))
+                         ghc-silently-bootstrap ghc-temporary-bootstrap))
-    (home-page "http://hspec.github.io/")
+    (arguments
+     `(#:cabal-revision ("1"
+                         "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq")))
+    (home-page "https://hspec.github.io/")
     (synopsis "Testing framework for Haskell")
     (description "This library exposes internal types and functions that can
 be used to extend Hspec's functionality.")
@@ -709,23 +724,28 @@ be used to extend Hspec's functionality.")
 (define-public ghc-hspec-meta
   (package
     (name "ghc-hspec-meta")
-    (version "2.9.3")
+    (version "2.11.12")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hspec-meta" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hspec-meta" version))
-               (base32
+       (sha256
-                "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"))))
+        (base32 "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-meta")))
-    (inputs (list ghc-quickcheck
+    (inputs (list ghc-hunit
+                  ghc-quickcheck
                   ghc-ansi-terminal
                   ghc-call-stack-boot
-                  ghc-clock
+                  ghc-haskell-lexer
+                  ghc-hspec-expectations
                   ghc-quickcheck-io
                   ghc-random
-                  ghc-setenv))
+                  ghc-tf-random))
-    (home-page "http://hspec.github.io/")
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d")))
+    (home-page "https://hspec.github.io/")
     (synopsis "Version of Hspec to test Hspec itself")
     (description "This library provides a stable version of Hspec which is
 used to test the in-development version of Hspec.")
@@ -734,38 +754,58 @@ used to test the in-development version of Hspec.")
 (define-public ghc-hspec
   (package
     (name "ghc-hspec")
-    (version "2.9.7")
+    (version "2.11.12")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hspec" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hspec" version))
-               (base32
+       (sha256
-                "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"))))
+        (base32 "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec")))
     (inputs (list ghc-quickcheck ghc-hspec-core hspec-discover
                   ghc-hspec-expectations))
-    (home-page "http://hspec.github.io/")
+    (home-page "https://hspec.github.io/")
     (synopsis "Testing Framework for Haskell")
     (description "This library provides the Hspec testing framework for
 Haskell, inspired by the Ruby library RSpec.")
     (license license:expat)))
 
+(define-public ghc-hspec-api
+  (package
+    (name "ghc-hspec-api")
+    (version "2.11.12")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "hspec-api" version))
+       (sha256
+        (base32 "1xn2b2hafyq6qm3zaia9nw27ir4cg8v2qn499bz2zwnp2vkjra07"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "hspec-api")))
+    (inputs (list ghc-hspec-core))
+    (native-inputs (list ghc-hspec))
+    (home-page "https://hspec.github.io/")
+    (synopsis "A Testing Framework for Haskell")
+    (description
+     "This package provides a stable API that can be used to extend Hspec's
+functionality.")
+    (license license:expat)))
+
 (define-public ghc-hspec-contrib
   (package
     (name "ghc-hspec-contrib")
-    (version "0.5.1.1")
+    (version "0.5.2")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hspec-contrib" version))
        (sha256
-        (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
+        (base32 "0002xzvyh790iwf1y33d4nflrbp5sxvpsp010srcfryf1n3qx2b0"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-contrib")))
     (inputs (list ghc-hunit ghc-call-stack ghc-hspec-core))
     (native-inputs (list ghc-quickcheck ghc-hspec hspec-discover))
-    (arguments (list #:tests? #f)) ; Fail to build.
     (home-page "https://hspec.github.io/")
     (synopsis "Contributed functionality for Hspec")
     (description "This package provides contributed Hspec extensions.")
@@ -774,22 +814,25 @@ Haskell, inspired by the Ruby library RSpec.")
 (define-public ghc-hspec-expectations
   (package
     (name "ghc-hspec-expectations")
-    (version "0.8.2")
+    (version "0.8.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "hspec-expectations" version))
        (sha256
-        (base32
+        (base32 "1zr1pqchcwglfr5dvcrgc1l5x924n9w09n2zr68dmkqf4dzdx3bv"))))
-         "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hspec-expectations")))
+    (inputs (list ghc-hunit ghc-call-stack))
+    (arguments
     ;; Tests depend on ghc-nanospec.
-    (arguments '(#:tests? #f))
+     `(#:tests? #f
-    (inputs (list ghc-hunit))
+       #:cabal-revision ("2"
-    (home-page "https://github.com/sol/hspec-expectations")
+                         "14zzsjqcz1zbnvi50i82lx84nc8b5da7ar5cazzh44lklyag0ds2")))
+    (home-page "https://github.com/hspec/hspec-expectations#readme")
     (synopsis "Catchy combinators for HUnit")
-    (description "This library provides catchy combinators for HUnit, see
+    (description
+     "This library provides catchy combinators for HUnit, see
 @uref{https://github.com/sol/hspec-expectations#readme, the README}.")
     (license license:expat)))
 
@@ -854,13 +897,13 @@ implementations of cryptographic ciphers.")
 (define-public ghc-hedgehog
   (package
     (name "ghc-hedgehog")
-    (version "1.1.2")
+    (version "1.5")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "hedgehog" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "hedgehog" version))
-               (base32
+       (sha256
-                "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1"))))
+        (base32 "0sl6x9q9kyrpv73565w9na9dm10wzxdl0qgiraqarffynfgn0hg9"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "hedgehog")))
     (inputs (list ghc-ansi-terminal
@@ -875,8 +918,12 @@ implementations of cryptographic ciphers.")
                   ghc-primitive
                   ghc-random
                   ghc-resourcet
+                  ghc-safe-exceptions
                   ghc-transformers-base
                   ghc-wl-pprint-annotated))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "1m0b9m8dw5nw4b3w1jbp5fd0b0kqlyvvy3qsfxc7md77iafxq169")))
     (home-page "https://hedgehog.qa")
     (synopsis "Property-based testing in the spirt of QuickCheck")
     (description
@@ -892,26 +939,16 @@ To get started quickly, see the examples:
 (define-public cabal-doctest
   (package
     (name "cabal-doctest")
-    (version "1.0.9")
+    (version "1.0.11")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "cabal-doctest" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "cabal-doctest" version))
-               (base32
+       (sha256
-                "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"))))
+        (base32 "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cabal-doctest")))
-    (arguments
+    (home-page "https://github.com/ulidtko/cabal-doctest")
-     `(#:cabal-revision ("2"
-                         "0868js0qgfhvmyw4hjzrvmlzyqsm8dfsbmqhybxb90x44xi3r0i1")
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'configure 'update-constraints
-           (lambda _
-             (substitute* "cabal-doctest.cabal"
-               (("\\b(Cabal|base)\\s+[^,]+" all dep)
-                dep)))))))
-    (home-page "https://github.com/haskellari/cabal-doctest")
     (synopsis "Setup.hs helper for running doctests")
     (description
      "To properly work, the @code{doctest} package needs plenty of
@@ -971,13 +1008,13 @@ random testing, and hybrids of the two.")
 (define-public ghc-inspection-testing
   (package
     (name "ghc-inspection-testing")
-    (version "0.4.6.1")
+    (version "0.6.2")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "inspection-testing" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "inspection-testing" version))
-               (base32
+       (sha256
-                "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y"))))
+        (base32 "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "inspection-testing")))
     (home-page "https://github.com/nomeata/inspection-testing")
@@ -1010,33 +1047,33 @@ examples and more information.")
     (name "ghc-quickcheck-classes")
     (version "0.6.5.0")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes" version))
+       (uri (hackage-uri "quickcheck-classes" version))
-        (sha256
+       (sha256
-          (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
+        (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-classes")))
-    (inputs
+    (inputs (list ghc-quickcheck
-      (list ghc-quickcheck
+                  ghc-primitive
-            ghc-primitive
+                  ghc-primitive-addr
-            ghc-primitive-addr
+                  ghc-quickcheck-classes-base
-            ghc-quickcheck-classes-base
+                  ghc-semigroups-bootstrap
-            ghc-aeson
+                  ghc-fail
-            ghc-semigroupoids
+                  ghc-tagged
-            ghc-semirings
+                  ghc-aeson
-            ghc-vector))
+                  ghc-semigroupoids
-    (native-inputs
+                  ghc-semirings
-      (list ghc-base-orphans
+                  ghc-vector))
-            ghc-tagged
+    (native-inputs (list ghc-base-orphans ghc-base-orphans ghc-tasty
-            ghc-base-orphans
+                         ghc-tasty-quickcheck))
-            ghc-tagged
+    (arguments
-            ghc-tasty
+     `(#:cabal-revision ("3"
-            ghc-tasty-quickcheck))
+                         "1pawam5rsdcdv21fqc87khzqjm0ixwzklfxd6gk3b2qrr5q66bn5")))
     (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
     (synopsis "QuickCheck common typeclasses")
     (description
-      "This library provides QuickCheck properties to ensure that typeclass
+     "This library provides QuickCheck properties to ensure that typeclass
 instances adhere to the set of laws that they are supposed to.  There are
 other libraries that do similar things, such as @code{genvalidity-hspec} and
 @code{checkers}.  This library differs from other solutions by not introducing
@@ -1052,24 +1089,26 @@ constraints more cleanly.")
     (name "ghc-quickcheck-classes-base")
     (version "0.6.2.0")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (hackage-uri "quickcheck-classes-base" version))
+       (uri (hackage-uri "quickcheck-classes-base" version))
-        (sha256
+       (sha256
-          (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
+        (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "quickcheck-classes-base")))
-    (inputs
+    (inputs (list ghc-quickcheck
-      (list ghc-quickcheck
+                  ghc-contravariant
-            ghc-contravariant
+                  ghc-bifunctors
-            ghc-bifunctors
+                  ghc-semigroups-bootstrap
-            ghc-semigroups
+                  ghc-fail
-            ghc-fail
+                  ghc-tagged))
-            ghc-tagged))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1p3v38jhpx0r6rnvaspkkivl8xyq2mq4xnmycgmkj1gr77vplkdr")))
     (home-page "https://github.com/andrewthad/quickcheck-classes#readme")
     (synopsis "QuickCheck common typeclasses from `base`")
     (description
-      "This library is a minimal variant of `quickcheck-classes` that only
+     "This library is a minimal variant of `quickcheck-classes` that only
 provides laws for typeclasses from `base`.  The main purpose of splitting this
 out is so that `primitive` can depend on `quickcheck-classes-base` in its test
 suite, avoiding the circular dependency that arises if `quickcheck-classes` is
@@ -1087,67 +1126,61 @@ this library uses the higher-kinded typeclasses
 (define-public ghc-doctest-lib
   (package
     (name "ghc-doctest-lib")
-    (version "0.1")
+    (version "0.1.1.1")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (hackage-uri "doctest-lib" version))
+       (uri (hackage-uri "doctest-lib" version))
-        (sha256
+       (sha256
-          (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"))))
+        (base32 "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "doctest-lib")))
     (home-page "https://hub.darcs.net/thielema/doctest-lib/")
     (synopsis "Parts of doctest exposed as library")
     (description
-      "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
+     "Parts of doctest exposed as library.  For use with the doctest-extract utility.")
     (license license:expat)))
 
 (define-public ghc-doctest-exitcode-stdio
   (package
     (name "ghc-doctest-exitcode-stdio")
-    (version "0.0")
+    (version "0.0.0.1")
     (source
-      (origin
+     (origin
-        (method url-fetch)
+       (method url-fetch)
-        (uri (hackage-uri "doctest-exitcode-stdio" version))
+       (uri (hackage-uri "doctest-exitcode-stdio" version))
-        (sha256
+       (sha256
-          (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"))))
+        (base32 "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "doctest-exitcode-stdio")))
-    (inputs
+    (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
-      (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1065s8bch6zhl6mc8nhvfpwd1irmjd04z7xgycbpihc14x4ijim3")))
     (home-page "https://hub.darcs.net/thielema/doctest-exitcode-stdio/")
     (synopsis "Run Doctests in a @code{Cabal.Test.exitcode-stdio} environment")
     (description
-      "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
+     "This package allows on to run Doctests in a Cabal.Test.exitcode-stdio
 environment.")
     (license license:bsd-3)))
 
 (define-public ghc-tasty-silver
   (package
     (name "ghc-tasty-silver")
-    (version "3.3.1.1")
+    (version "3.3.2.1")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-silver" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-silver" version))
-               (base32
+       (sha256
-                "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"))))
+        (base32 "01w3576kymglcddinh10m1wgy71dia49k2pnw5y1c97jjrhanf17"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-silver")))
     (inputs (list ghc-ansi-terminal
-                  ghc-async
                   ghc-optparse-applicative
                   ghc-process-extras
                   ghc-regex-tdfa
                   ghc-silently
                   ghc-tagged
                   ghc-tasty
-                  ghc-temporary
+                  ghc-temporary))
-                  ghc-semigroups))
     (native-inputs (list ghc-tasty-hunit))
     (home-page "https://github.com/phile314/tasty-silver")
     (synopsis "Fancy test runner, including support for golden tests")
@@ -1163,16 +1196,19 @@ result of golden tests.")
 (define-public ghc-tasty-inspection-testing
   (package
     (name "ghc-tasty-inspection-testing")
-    (version "0.1.0.1")
+    (version "0.2.1")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "tasty-inspection-testing" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "tasty-inspection-testing" version))
-               (base32
+       (sha256
-                "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp"))))
+        (base32 "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tasty-inspection-testing")))
     (inputs (list ghc-inspection-testing ghc-tasty))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "0z9al0hyq381fw146agbpz7rf24rwms1w91m7s0k1w3xbfw16l9n")))
     (home-page "https://github.com/Bodigrim/tasty-inspection-testing")
     (synopsis "Inspection testing support for tasty")
     (description
@@ -1182,13 +1218,13 @@ result of golden tests.")
 (define-public ghc-proctest
   (package
     (name "ghc-proctest")
-    (version "0.1.3.0")
+    (version "0.1.3.1")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "proctest" version))
               (sha256
                (base32
-                "02iz323arx9zwclvspgaaqz81bp6jdnj89pjm08n2gamg39zsbdn"))))
+                "0yvhc0l5aj170ymhjx4ig0im0yd7wfa150m5lqhabr8j7cf16l7y"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "proctest")))
     (inputs (list ghc-hunit ghc-hspec ghc-quickcheck))

gnu/packages/haskell-crypto.scm

@@ -62,18 +62,19 @@ format.")
   (package
     (name "ghc-asn1-encoding")
     (version "0.9.6")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "asn1-encoding" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "asn1-encoding" version))
-               (base32
+       (sha256
-                "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
+        (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "asn1-encoding")))
-    (inputs
+    (inputs (list ghc-hourglass ghc-asn1-types))
-     (list ghc-hourglass ghc-asn1-types))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
-    (native-inputs
+    (arguments
-     (list ghc-tasty ghc-tasty-quickcheck))
+     `(#:cabal-revision ("2"
+                         "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97")))
     (home-page "https://github.com/vincenthz/hs-asn1")
     (synopsis "ASN1 data reader and writer in RAW, BER and DER forms")
     (description
@@ -111,15 +112,18 @@ when ASN1 pattern matching is not convenient.")
        (method url-fetch)
        (uri (hackage-uri "crypto-api" version))
        (sha256
-        (base32
+        (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
-         "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypto-api")))
     (inputs (list ghc-cereal ghc-tagged ghc-entropy))
+    (arguments
+     `(#:cabal-revision ("1"
+                         "1z6n1sa5pn3iqvqjrd8hv4bc2pxzsrhm5sh0l8z7g9lbqp6w0wp5")))
     (home-page "https://github.com/TomMD/crypto-api")
     (synopsis "Provides generic interface for cryptographic operations
 for Haskell")
-    (description "This Haskell package provides a generic interface for
+    (description
+     "This Haskell package provides a generic interface for
 cryptographic operations (hashes, ciphers, randomness).
 
 Maintainers of hash and cipher implementations are encouraged to add instances
@@ -197,13 +201,15 @@ that hides the C implementation.")
        (method url-fetch)
        (uri (hackage-uri "cryptohash-md5" version))
        (sha256
-        (base32
+        (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
-         "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-md5")))
     (native-inputs (list ghc-base16-bytestring ghc-puremd5 ghc-tasty
-                         ghc-tasty-hunit ghc-tasty-quickcheck))
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
-    (home-page "https://github.com/hvr/cryptohash-md5")
+    (arguments
+     `(#:cabal-revision ("6"
+                         "0m7f9mgw4w9vcch37ja9zgbn0knq8rjppqr9x2ylkcdxfdnmhhif")))
+    (home-page "https://github.com/haskell-hvr/cryptohash-md5")
     (synopsis "MD5 implementation for Haskell")
     (description "This Haskell package provides implementation of MD5.")
     (license license:bsd-3)))
@@ -212,20 +218,20 @@ that hides the C implementation.")
   (package
     (name "ghc-cryptohash-sha1")
     (version "0.11.101.0")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "cryptohash-sha1" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "cryptohash-sha1" version))
-               (base32
+       (sha256
-                "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
+        (base32 "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-sha1")))
     (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
                          ghc-tasty-quickcheck ghc-tasty-hunit))
     (arguments
-     `(#:cabal-revision ("1"
+     `(#:cabal-revision ("6"
-                         "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b")))
+                         "1cxdw2y10z4v0mz91wki7f233jziipx85j4qy5msig4nv3djkprb")))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha1")
     (synopsis "SHA-1 implementation for Haskell")
     (description
      "This Haskell package provides an incremental and one-pass,
@@ -246,20 +252,18 @@ the C implementation.")
        (method url-fetch)
        (uri (hackage-uri "cryptohash-sha256" version))
        (sha256
-        (base32
+        (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
-         "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptohash-sha256")))
+    (native-inputs (list ghc-base16-bytestring ghc-sha ghc-tasty
+                         ghc-tasty-quickcheck ghc-tasty-hunit))
     (arguments
-     `(#:cabal-revision
+     `(#:cabal-revision ("6"
-       ("1" "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs")
+                         "01s12sl5mxvraj5fj3cs0pkb03pm8xpjz13y09dpl7i6rv6f578f")))
-       #:tests? #f)) ; TODO: tasty ==1.1.*
+    (home-page "https://github.com/haskell-hvr/cryptohash-sha256")
-    (native-inputs
-     (list ghc-base16-bytestring ghc-sha ghc-tasty ghc-tasty-hunit
-           ghc-tasty-quickcheck))
-    (home-page "https://github.com/hvr/cryptohash-sha1")
     (synopsis "SHA-256 implementation for Haskell")
-    (description "This Haskell package provides an incremental and
+    (description
+     "This Haskell package provides an incremental and
 one-pass, pure API to the @uref{https://en.wikipedia.org/wiki/SHA-2,
 SHA-256 cryptographic hash algorithm}, with performance close to the
 fastest implementations available in other languages.
@@ -272,12 +276,12 @@ the C implementation.")
   (package
     (name "ghc-cryptonite")
     (version "0.30")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "cryptonite" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "cryptonite" version))
-               (base32
+       (sha256
-                "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
+        (base32 "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "cryptonite")))
     (inputs (list ghc-memory ghc-basement))
@@ -295,13 +299,13 @@ generators, and more.")
 (define-public ghc-curve25519
   (package
   (name "ghc-curve25519")
-  (version "0.2.7")
+  (version "0.2.8.1")
   (source
    (origin
      (method url-fetch)
      (uri (hackage-uri "curve25519" version))
      (sha256
-      (base32 "1p8b1lppkvc19974hr43lcqdi4nj55j2nf7gsnp8dn7gyf23aayq"))))
+      (base32 "0p2rxad477cxbpxryvp78v8nrrf5gm35106jbqrj5cjgksappkdj"))))
   (build-system haskell-build-system)
   (native-inputs
    (list ghc-hunit
@@ -326,19 +330,17 @@ elsewhere.")
 (define-public ghc-digest
   (package
     (name "ghc-digest")
-    (version "0.0.1.7")
+    (version "0.0.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "digest" version))
        (sha256
-        (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
+        (base32 "163418p50bqdxn8ajzj6x3455xbch9jq1w6psbkdz5qzw017py6b"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "digest")))
     (arguments
-     `(#:extra-directories ("zlib")
+     `(#:extra-directories ("zlib")))
-       #:cabal-revision ("1"
-                         "0wh34kyag2vhwvsdwv8qmvm13gy32nc94yfyqfdnl67nyc2sx8wl")))
     (inputs (list zlib))
     (native-inputs (list pkg-config))
     (home-page "http://hackage.haskell.org/package/digest")
@@ -352,13 +354,13 @@ are implemented as FFI bindings to efficient code from zlib.")
 (define-public ghc-entropy
   (package
     (name "ghc-entropy")
-    (version "0.4.1.10")
+    (version "0.4.1.11")
-    (source (origin
+    (source
-              (method url-fetch)
+     (origin
-              (uri (hackage-uri "entropy" version))
+       (method url-fetch)
-              (sha256
+       (uri (hackage-uri "entropy" version))
-               (base32
+       (sha256
-                "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"))))
+        (base32 "1slj5n783k2amsx2hqs5qwvcw4rgfhdhgmiyg7cii0wg4w0mmpgm"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "entropy")))
     (home-page "https://github.com/TomMD/entropy")
@@ -415,6 +417,35 @@ the MD5 digest (hash) algorithm.  This now supports the @code{crypto-api} class
 interface.")
     (license license:bsd-3)))
 
+(define-public ghc-rsa
+  (package
+    (name "ghc-rsa")
+    (version "2.4.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "RSA" version))
+       (sha256
+        (base32 "0hchsqrxpfw7mqrqwscfy8ig1w2di6w3nxpzi873w0gibv2diibj"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "RSA")))
+    (inputs (list ghc-crypto-api ghc-crypto-pubkey-types ghc-sha))
+    (native-inputs (list ghc-quickcheck ghc-tagged ghc-test-framework
+                         ghc-test-framework-quickcheck2))
+    (arguments
+     `(#:cabal-revision ("2"
+                         "090yzm99fmh7c6z4m9hbkasqhc3xlw104g2b6wnk77n1abd13ryj")))
+    (home-page "http://hackage.haskell.org/package/RSA")
+    (synopsis
+     "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.")
+    (description
+     "This library implements the RSA encryption and signature algorithms for
+arbitrarily-sized @code{ByteStrings}.  While the implementations work, they are
+not necessarily the fastest ones on the planet.  Particularly key generation.
+The algorithms included are based of RFC 3447, or the Public-Key Cryptography
+Standard for RSA, version 2.1 (a.k.a, PKCS#1 v2.1).")
+    (license license:bsd-3)))
+
 (define-public ghc-sha
   (package
     (name "ghc-sha")
@@ -594,6 +625,24 @@ implementation.  If it matters for your case, you should make sure you have
 AES-NI available, or you'll need to use a different implementation.")
     (license license:bsd-3)))
 
+(define-public ghc-crypto-pubkey-types
+  (package
+    (name "ghc-crypto-pubkey-types")
+    (version "0.4.3")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-pubkey-types" version))
+       (sha256
+        (base32 "0q0wlzjmpx536h1zcdzrpxjkvqw8abj8z0ci38138kpch4igbnby"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-pubkey-types")))
+    (inputs (list ghc-asn1-types ghc-asn1-encoding))
+    (home-page "http://github.com/vincenthz/hs-crypto-pubkey-types")
+    (synopsis "Generic cryptography Public keys algorithm types")
+    (description "Generic cryptography public keys algorithm types.")
+    (license license:bsd-3)))
+
 (define-public ghc-crypto-random
   (package
     (name "ghc-crypto-random")
@@ -617,13 +666,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton
   (package
     (name "ghc-crypton")
-    (version "0.34")
+    (version "1.0.4")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton" version))
        (sha256
-        (base32 "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"))))
+        (base32 "06h1qjvqd8gmiyzvh31sc061vcgns101l0774c44a8k44015925l"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton")))
     (inputs (list ghc-memory ghc-basement))
@@ -653,13 +702,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509
   (package
     (name "ghc-crypton-x509")
-    (version "1.7.6")
+    (version "1.7.7")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509" version))
        (sha256
-        (base32 "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"))))
+        (base32 "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509")))
     (inputs (list ghc-memory
@@ -669,13 +718,7 @@ abstraction for CPRNGs.")
                   ghc-asn1-encoding
                   ghc-asn1-parse
                   ghc-crypton))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-x509))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "10a2x47znhbayyfr6fqgq27623akpycyjbfxz4hnavavf1x6ary5")
-       ;; build phase fails when tests are activated.
-       ;; See https://github.com/kazu-yamamoto/crypton-certificate/pull/7
-       #:tests? #f))
     (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
     (synopsis "X509 reader and writer")
     (description "This package provides generic X509 support for Haskell.")
@@ -684,13 +727,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509-store
   (package
     (name "ghc-crypton-x509-store")
-    (version "1.6.9")
+    (version "1.6.11")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509-store" version))
        (sha256
-        (base32 "0vr5b9cyf9x016wn1g0bryslf5nz8jq2sy8r3llwqfg02apihqiy"))))
+        (base32 "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509-store")))
     (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-crypton
@@ -727,24 +770,25 @@ storage methods, and accessors.")
 (define-public ghc-crypton-x509-validation
   (package
     (name "ghc-crypton-x509-validation")
-    (version "1.6.12")
+    (version "1.6.14")
     (source
      (origin
        (method url-fetch)
        (uri (hackage-uri "crypton-x509-validation" version))
        (sha256
-        (base32 "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f"))))
+        (base32 "07b09kgrd3m5ahxpj458r5ycd30bz8ldwjwf19mdcnfv4x0kj3pd"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "crypton-x509-validation")))
     (inputs (list ghc-memory
                   ghc-hourglass
-                  ghc-data-default-class
+                  ghc-data-default
                   ghc-pem
                   ghc-asn1-types
                   ghc-asn1-encoding
                   ghc-crypton-x509
                   ghc-crypton-x509-store
-                  ghc-crypton))
+                  ghc-crypton
+                  ghc-iproute))
     (native-inputs (list ghc-tasty ghc-tasty-hunit))
     (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
     (synopsis "X.509 Certificate and CRL validation")
@@ -752,6 +796,44 @@ storage methods, and accessors.")
 and @dfn{Certificates revocation list} (CRL) validation.")
     (license license:bsd-3)))
 
+(define-public ghc-crypton-socks
+  (package
+    (name "ghc-crypton-socks")
+    (version "0.6.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypton-socks" version))
+       (sha256
+        (base32 "0fwzlvndyxjwhxambxdjzzm63yvb6jzsg53dkv3i6x17biz0hdm8"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypton-socks")))
+    (inputs (list ghc-cereal ghc-network ghc-network-bsd))
+    (home-page "http://github.com/mpilgrem/crypton-socks")
+    (synopsis "SOCKS Protocol Version 5")
+    (description
+     "This package provides a library implementing SOCKS Protocol Version 5.")
+    (license license:bsd-3)))
+
+(define-public ghc-crypto-token
+  (package
+    (name "ghc-crypto-token")
+    (version "0.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (hackage-uri "crypto-token" version))
+       (sha256
+        (base32 "18xphlvn6wzyi6lqrvm5vic97pkcbiph1938p5l1mb22rj5215zm"))))
+    (build-system haskell-build-system)
+    (properties '((upstream-name . "crypto-token")))
+    (inputs (list ghc-crypton ghc-memory ghc-network-byte-order))
+    (native-inputs (list ghc-hspec hspec-discover))
+    (home-page "http://hackage.haskell.org/package/crypto-token")
+    (synopsis "crypto tokens")
+    (description "Encrypted tokens/tickets to keep state in the client side.")
+    (license license:bsd-3)))
+
 (define-public ghc-cprng-aes
   (package
     (name "ghc-cprng-aes")
@@ -804,20 +886,19 @@ percent.
        (method url-fetch)
        (uri (hackage-uri "ed25519" version))
        (sha256
-        (base32
+        (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
-         "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "ed25519")))
+    (native-inputs (list ghc-quickcheck ghc-doctest))
     (arguments
-     `(#:cabal-revision
+     `(#:cabal-revision ("9"
-       ("6" "0qyx6cl52fnll8lp6v9133wfvv3zhvq7v2crn441mng520j9wp48")
+                         "0y5vfdcys18waa5k5zxiq9n8jq0l05j76riml23i0gxmwgdhsmgi")
-       ;; We omit these test suites because they require old versions of
+       ;; the tests don't work with current versions of the test frameworks
-       ;; packages and packages we do not have.
+       #:tests? #f))
-       #:configure-flags
+    (home-page "https://github.com/thoughtpolice/hs-ed25519/")
-       '("--flags=-test-hlint -test-doctests -test-properties")))
-    (home-page "http://thoughtpolice.github.com/hs-ed25519")
     (synopsis "Ed25519 cryptographic signatures")
-    (description "This package provides a simple, fast, self-contained
+    (description
+     "This package provides a simple, fast, self-contained
 copy of the Ed25519 public-key signature system with a clean interface.
 It also includes support for detached signatures, and thorough
 documentation on the design and implementation, including usage
@@ -827,29 +908,41 @@ guidelines.")
 (define-public ghc-tls
   (package
     (name "ghc-tls")
-    (version "1.5.8")
+    (version "2.1.8")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "tls" version))
               (sha256
                (base32
-                "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b"))))
+                "1csdy3426lva1a5f7gh9qm96vzfraqj91jbxlm79wbf1jsdzfhsq"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
+    (inputs (list ghc-asn1-types
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-cryptonite
-                  ghc-asn1-types
                   ghc-asn1-encoding
-                  ghc-x509
+                  ghc-base16-bytestring
-                  ghc-x509-store
+                  ghc-cereal
-                  ghc-x509-validation
+                  ghc-crypton
-                  ghc-async
+                  ghc-crypton-x509
-                  ghc-hourglass
+                  ghc-crypton-x509-store
-                  ghc-network))
+                  ghc-crypton-x509-validation
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
+                  ghc-data-default
-    (home-page "http://github.com/vincenthz/hs-tls")
+                  ghc-memory
+                  ghc-network
+                  ghc-serialise
+                  ghc-transformers
+                  ghc-unix-time
+                  ghc-zlib))
+    (native-inputs (list ghc-quickcheck
+                         ghc-asn1-types
+                         ghc-async
+                         ghc-crypton
+                         ghc-crypton-x509
+                         ghc-crypton-x509-validation
+                         ghc-hourglass
+                         ghc-hspec
+                         ghc-serialise
+                         hspec-discover))
+    (home-page "http://github.com/haskell-tls/hs-tls")
     (synopsis "TLS/SSL protocol native implementation (Server and Client)")
     (description
      "Native Haskell TLS and SSL protocol implementation for server and client.
@@ -861,43 +954,6 @@ Ephemeral (Elliptic curve and regular) Diffie Hellman key exchanges, and many
 extensions.")
     (license license:bsd-3)))
 
-(define-public ghc-tls-1.9
-  (package
-    (name "ghc-tls")
-    (version "1.9.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tls" version))
-       (sha256
-        (base32 "0gj3af9sqd0bw7dpcqfyvbslpxsk2ij00a77kl710fwhw35vj1an"))))
-    (build-system haskell-build-system)
-    (properties '((upstream-name . "tls")))
-    (inputs (list ghc-cereal
-                  ghc-data-default-class
-                  ghc-memory
-                  ghc-crypton
-                  ghc-asn1-types
-                  ghc-asn1-encoding
-                  ghc-crypton-x509
-                  ghc-crypton-x509-store
-                  ghc-crypton-x509-validation
-                  ghc-async
-                  ghc-unix-time
-                  ghc-network))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
-    (home-page "https://github.com/haskell-tls/hs-tls")
-    (synopsis "TLS/SSL protocol native implementation (server and client)")
-    (description
-     "This package provides a native Haskell TLS and SSL protocol
-implementation for server and client.  It provides a high-level implementation
-of a sensitive security protocol, eliminating a common set of security issues
-through the use of the advanced type system, high level constructions and
-common Haskell features.  It currently implements the SSL3.0, TLS1.0, TLS1.1
-and TLS1.2 protocol, and supports RSA and Ephemeral (Elliptic curve and
-regular) Diffie Hellman key exchanges, and many extensions.")
-    (license license:bsd-3)))
-
 (define-public ghc-hsopenssl
   (package
     (name "ghc-hsopenssl")
@@ -960,17 +1016,14 @@ the tls package, and borrows some ideas from x509-system.")
        (method url-fetch)
        (uri (hackage-uri "openssl-streams" version))
        (sha256
-        (base32
+        (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
-         "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "openssl-streams")))
-    (inputs
+    (inputs (list ghc-hsopenssl ghc-io-streams ghc-network))
-     (list ghc-hsopenssl ghc-io-streams ghc-network))
+    (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
-    (native-inputs
-     (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
     (arguments
-     `(#:cabal-revision ("1"
+     `(#:cabal-revision ("3"
-                         "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp")))
+                         "1vizl9yajkbd59rrnfb38xwq7hfj36avbv6vwqnkhbvz3qaj3dwg")))
     (home-page "https://hackage.haskell.org/package/openssl-streams")
     (synopsis "OpenSSL network support for io-streams")
     (description "This library contains io-streams routines for secure

gnu/packages/haskell.scm

@@ -1686,12 +1686,6 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
               (file-pattern ".*\\.conf\\.d$")
               (file-type 'directory)))))))
 
-;; Versions newer than ghc defined below (i.e. the compiler
-;; haskell-build-system uses) should use ghc-next as their name to
-;; ensure ghc (without version specification) and ghc-* packages are
-;; always compatible. See https://issues.guix.gnu.org/issue/47335.
-(define-public ghc ghc-9.2)
-
 ;; 9.4 is the last version to support the make-based build system,
 ;; but it boot with 9.2, only 9.0 is supported.
 (define ghc-bootstrap-for-9.4 ghc-9.0)
@@ -1755,22 +1749,24 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
   (let ((base ghc-9.2))
     (package
       (inherit base)
-      (name "ghc-next")
+      (name "ghc")
-      (version "9.4.4")
+      (version "9.4.3")
       (source (origin
                 (method url-fetch)
                 (uri (string-append "https://www.haskell.org/ghc/dist/" version
                                     "/ghc-" version "-src.tar.xz"))
                 (sha256
                  (base32
-                  "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))
+                  "0nlhx2cbq1jh2yr6zk475lavjkh9sncj57qp77p51pkfad4kkxpa"))
                 (patches (search-patches "ghc-9-StgCRunAsm-only-when-needed.patch"))))
       (arguments
        (substitute-keyword-arguments arguments
          ((#:phases phases '%standard-phases)
           #~(modify-phases #$phases
              ;; Files don’t exist any more.
-             (delete 'skip-tests)))))
+             (delete 'skip-tests)))
+         ((#:tests? _ #f)
+          #f)))
       (native-inputs
        `(;; GHC 9.4 must be built with GHC >= 9.0.
          ("ghc-bootstrap" ,ghc-bootstrap-for-9.4)
@@ -1782,8 +1778,7 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
                     version "/ghc-" version "-testsuite.tar.xz"))
              (sha256
               (base32
-               "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))
+               "1xbps33pq6mg2bwp5gvmc4qhgdq52yng5993if99b9s3fylqk86l"))))
-             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
          ("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
          ("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
          ,@(filter (match-lambda
@@ -1798,4 +1793,326 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
               (file-pattern ".*\\.conf\\.d$")
               (file-type 'directory)))))))
 
+;;; GHC >= 9.6 must be built using it's new haskell-written Hadrian build
+;;; system. Use this opportunity to cut the inheritance chain to simplify
+;;; understanding what building ghc requires with the new build system.
+
+(define-public ghc-9.8
+  (let ((ghc-bootstrap ghc-9.4))
+    (package
+      (name "ghc")
+      (version "9.8.1")
+      (source (origin
+                (method url-fetch)
+                (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                                    "/ghc-" version "-src.tar.xz"))
+                (sha256
+                 (base32
+                  "0l87yb8hmd350klrp6lw2h9hjlla11pgzx1n4jlrfdvkgxmyvy5j"))))
+      (outputs (list "out" "doc"))
+      (arguments
+       (list
+        #:make-flags #~(list "-V" "--docs=no-sphinx")
+       #:configure-flags
+       #~(list
+           (string-append "--with-gmp-libraries="
+                          (assoc-ref %build-inputs "gmp") "/lib")
+           (string-append "--with-gmp-includes="
+                          (assoc-ref %build-inputs "gmp") "/include")
+           "--with-system-libffi"
+           (string-append "--with-ffi-libraries="
+                          (assoc-ref %build-inputs "libffi") "/lib")
+           (string-append "--with-ffi-includes="
+                          (assoc-ref %build-inputs "libffi") "/include")
+           (string-append "--with-curses-libraries="
+                          (assoc-ref %build-inputs "ncurses") "/lib")
+           (string-append "--with-curses-includes="
+                          (assoc-ref %build-inputs "ncurses") "/include"))
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-before 'build 'fix-iserv-rpath
+              (lambda _
+                (mkdir-p "_build")
+                (call-with-output-file
+                 "_build/hadrian.settings"
+                 (lambda (port)
+                   (display
+                    (string-append
+                     "*.iserv.ghc.link.opts += -optl-Wl,-rpath,"
+                     #$output "/lib/ghc-" #$(package-version this-package)
+                     "/lib/" #$(or (%current-target-system)
+                                   (%current-system))
+                     "-ghc-" #$(package-version this-package) "/")
+                    port)))))
+            ;; This phase patches the 'ghc-pkg' command so that it sorts the list
+            ;; of packages in the binary cache it generates.
+            (add-before 'build 'fix-ghc-pkg-nondeterminism
+              (lambda _
+                (substitute* "utils/ghc-pkg/Main.hs"
+                  (("confs = map \\(path </>\\) \\$ filter \\(\".conf\" `isSuffixOf`\\) fs")
+                   "confs = map (path </>) $ filter (\".conf\" `isSuffixOf`) (sort fs)"))))
+            (add-after 'unpack 'unpack-testsuite
+              (lambda* (#:key inputs #:allow-other-keys)
+                (with-directory-excursion ".."
+                  (invoke "tar" "xvf" (assoc-ref inputs "ghc-testsuite")))))
+            (add-after 'unpack-testsuite 'fix-/bin/sh-references
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute*
+                 (list "hadrian/src/Rules/BinaryDist.hs"
+                       "hadrian/src/Rules/Test.hs"
+                       "libraries/process/System/Process/Posix.hs"
+                       "libraries/process/jsbits/process.js"
+                       "libraries/unix/cbits/execvpe.c"
+                       "testsuite/tests/driver/T8602/T8602.script"
+                       "testsuite/timeout/timeout.py")
+                 (("/bin/sh") (search-input-file inputs "/bin/sh")))))
+            (add-after 'unpack-testsuite 'fix-cc-reference
+              (lambda* (#:key inputs #:allow-other-keys)
+                (substitute*
+                 (list "utils/hsc2hs/src/Common.hs")
+                 (("\"cc\"") "\"gcc\""))))
+            ;; XXX: something causes ld-wrapper to see test\ \ \ spaces/... and
+            ;; look for the files "test\", "\", "\" and "spaces/...", which obviously
+            ;; don't exist
+            (add-after 'unpack-testsuite 'fix-testsuite
+              (lambda _
+                (substitute*
+                  (list "testsuite/driver/runtests.py")
+                  (("'test   spaces'") "'dont-test-spaces'"))))
+            (add-before 'configure 'set-target-programs
+              (lambda* (#:key inputs #:allow-other-keys)
+                (let ((binutils (assoc-ref inputs "binutils"))
+                      (gcc (assoc-ref inputs "gcc"))
+                      (ld-wrapper (assoc-ref inputs "ld-wrapper")))
+                  (setenv "CC" (string-append gcc "/bin/gcc"))
+                  (setenv "CXX" (string-append gcc "/bin/g++"))
+                  (setenv "LD" (string-append ld-wrapper "/bin/ld"))
+                  (setenv "NM" (string-append binutils "/bin/nm"))
+                  (setenv "RANLIB" (string-append binutils "/bin/ranlib"))
+                  (setenv "STRIP" (string-append binutils "/bin/strip"))
+                  ;; The 'ar' command does not follow the same pattern.
+                  (setenv "fp_prog_ar" (string-append binutils "/bin/ar")))))
+            (add-before 'build 'build-hadrian
+              (lambda* (#:key (inputs '()) #:allow-other-keys)
+                (invoke "./hadrian/bootstrap/bootstrap.py"
+                        "-s" (assoc-ref inputs "hadrian-bootstrap")
+                        "-w" (which "ghc"))))
+            (add-before 'build-hadrian 'fix-environment
+              (lambda _
+                (unsetenv "GHC_PACKAGE_PATH")
+                (setenv "CONFIG_SHELL" (which "bash"))))
+            (replace 'build
+              (lambda* (#:key (parallel-build? #f) (make-flags '())
+                       #:allow-other-keys)
+                (apply invoke "_build/bin/hadrian"
+                       `("binary-dist-dir"
+                         ,@(if parallel-build?
+                             (list (string-append
+                                    "-j" (number->string
+                                          (parallel-job-count)))))
+                         ,@make-flags))))
+            (replace 'check
+              (lambda* (#:key (tests? #t) (parallel-tests? #f) (make-flags '())
+                        #:allow-other-keys)
+                (if tests?
+                  (apply invoke "_build/bin/hadrian"
+                         `(,@(if parallel-tests?
+                               (list (string-append
+                                      "-j"
+                                      (number->string (parallel-job-count))))
+                               '())
+                           ,@make-flags
+                           "test"
+                           ,(string-append
+                             "--broken-test="
+                             (string-join
+                              (list  "T15904" ; ld-wrapper, apparently
+                                     "T16521" ; no idea
+                                     ;; These fail due to gcc
+                                     ;; -Wincompatible-pointer-types, which
+                                     ;; apparently is not used in GHC's CI
+                                     ;; https://gitlab.haskell.org/ghc/ghc/-/issues/22263
+                                     "hs_try_putmvar001"
+                                     "list_threads_and_misc_roots"
+                                     "testwsdeque")))
+                           "--skip-perf"))
+                  (format #t "test suite not run~%"))))
+            (replace 'install
+              (lambda* (#:key (make-flags '()) #:allow-other-keys)
+                (apply invoke "_build/bin/hadrian"
+                       `("install"
+                         ,@make-flags
+                         ,(string-append "--prefix=" #$output)))))
+           (add-after 'install 'remove-unnecessary-references
+             (lambda* (#:key outputs #:allow-other-keys)
+               (substitute* (find-files (string-append (assoc-ref outputs "out") "/lib/")
+                                        "settings")
+                 (("/gnu/store/.*/bin/(.*)" m program) program))
+
+               ;; Remove references to "doc" output from "out" by rewriting
+               ;; the "haddock-interfaces" fields and removing the optional
+               ;; "haddock-html" field in the generated .conf files.
+               (let ((doc (assoc-ref outputs "doc"))
+                     (out (assoc-ref outputs "out")))
+                 (with-fluids ((%default-port-encoding #f))
+                   (for-each (lambda (config-file)
+                               (substitute* config-file
+                                 (("^haddock-html: .*") "\n")
+                                 (((format #f "^haddock-interfaces: ~a" doc))
+                                  (string-append "haddock-interfaces: " out))))
+                             (find-files (string-append out "/lib") ".conf")))
+                 ;; Move the referenced files to the "out" output.
+                 (for-each (lambda (haddock-file)
+                             (let* ((subdir (string-drop haddock-file (string-length doc)))
+                                    (new    (string-append out subdir)))
+                               (mkdir-p (dirname new))
+                               (rename-file haddock-file new)))
+                           (find-files doc "\\.haddock$")))))
+            (add-after 'install 'replace-$pkgroot
+              (lambda* (#:key outputs #:allow-other-keys)
+                ((@ (srfi srfi-11) let*-values)
+                  (((out) (assoc-ref outputs "out"))
+                   ((_ version) (package-name->name+version
+                                    (strip-store-file-name out))))
+                 ;; We split out the version because we want this to also work
+                 ;; with packages named "ghc-next" instead of "ghc"
+                 (substitute*
+                   (find-files
+                    (string-append (assoc-ref outputs "out") "/lib/ghc-"
+                                   version "/lib/package.conf.d/")
+                    "^.*\\.conf$")
+                   (("\\$\\{pkgroot\\}/")
+                    (string-append (assoc-ref outputs "out") "/lib/ghc-"
+                                   version "/lib/")))))))))
+      (build-system gnu-build-system)
+      (inputs (list bash-minimal gmp ncurses libffi))
+      (native-inputs
+       `(("perl" ,perl)
+         ("python" ,python)
+         ("git" ,git-minimal/pinned)
+         ("which" ,which)
+         ("ghostscript" ,ghostscript)
+         ("autoconf" ,autoconf)
+         ("automake" ,automake)
+
+         ("ghc-bootstrap" ,ghc-bootstrap)
+         ("ghc-alex" ,ghc-alex-bootstrap-for-9.4)
+         ("ghc-happy" ,ghc-happy-bootstrap-for-9.4)
+         ("ghc-testsuite"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append
+                   "https://www.haskell.org/ghc/dist/"
+                   version "/ghc-" version "-testsuite.tar.xz"))
+             (sha256
+              (base32
+               "1hxylm3nhxzl7yidarlavvcg1240w4bk0hy5jnvwna24jyxz69i6"))
+             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+         ("hadrian-bootstrap"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append "https://downloads.haskell.org/~ghc/"
+                                 version "/hadrian-bootstrap-sources/"
+                                 "hadrian-bootstrap-sources-"
+                                 (package-version ghc-bootstrap) ".tar.gz"))
+             (sha256
+               (base32
+                 "14dkxif9x4hy85phcj3j0glf95k04g4ab6hfchpw9vxgvk97syi1"))))))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "GHC_PACKAGE_PATH")
+              (files (list (string-append "lib/ghc-" version)))
+              (file-pattern ".*\\.conf\\.d$")
+              (file-type 'directory))))
+      (home-page "https://www.haskell.org/ghc")
+      (synopsis "The Glasgow Haskell Compiler")
+      (description
+        "The Glasgow Haskell Compiler (GHC) is a state-of-the-art compiler and
+interactive environment for the functional language Haskell.")
+      (license license:bsd-3))))
+
+(define-public ghc-9.10
+  (let ((base ghc-9.8))
+    (package
+      (inherit base)
+      (name "ghc")
+      (version "9.10.2")
+      (source
+        (origin
+          (method url-fetch)
+          (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                              "/ghc-" version "-src.tar.xz"))
+          (sha256
+            (base32
+             "1pm84cgr3yg99r3srdjllgz6zig8h7dbwa597srwcnjp0nh41zam"))))
+      (arguments
+        (substitute-keyword-arguments (package-arguments base)
+          ((#:phases phases #~%standard-phases)
+           #~(modify-phases #$phases
+               (replace 'check
+                 (lambda* (#:key (tests? #t) (parallel-tests? #f) (make-flags '())
+                           #:allow-other-keys)
+                   (if tests?
+                     (apply invoke "_build/bin/hadrian"
+                            `(,@(if parallel-tests?
+                                  (list (string-append
+                                         "-j"
+                                         (number->string (parallel-job-count))))
+                                  '())
+                              ,@make-flags
+                              "test"
+                              ,(string-append
+                                "--broken-test="
+                                (string-join
+                                 (list  "T15904" ; ld-wrapper, apparently
+                                        "T16521" ; no idea
+                                        ;; These fail due to gcc
+                                        ;; -Wincompatible-pointer-types, which
+                                        ;; apparently is not used in GHC's CI
+                                        ;; https://gitlab.haskell.org/ghc/ghc/-/issues/22263
+                                        "list_threads_and_misc_roots"
+                                        "stack_misc_closures")))
+                              "--skip-perf"))
+                     (format #t "test suite not run~%"))))))))
+      (native-inputs
+       `(("ghc-bootstrap" ,base)
+         ("ghc-testsuite"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append
+                    "https://downloads.haskell.org/~ghc/"
+                    version "/ghc-" version "-testsuite.tar.xz"))
+             (sha256
+              (base32
+               "143ifc4g3jc6s9hcry5qha913rzwg4hpsvk6pqvxk5r0qigfxjwx"))
+             (patches (search-patches "ghc-testsuite-recomp015-execstack.patch"))))
+         ("hadrian-bootstrap"
+          ,(origin
+             (method url-fetch)
+             (uri (string-append "https://downloads.haskell.org/~ghc/" version
+                                 "/hadrian-bootstrap-sources/"
+                                 "hadrian-bootstrap-sources-"
+                                 (package-version base) ".tar.gz"))
+             (sha256
+               (base32
+                 "162lbafvdamfhx1jldax3shgk8jbbqn4an97ny363lxbdjgdn708"))))
+         ,@(filter (match-lambda
+                     (("ghc-bootstrap" . _) #f)
+                     (("ghc-testsuite" . _) #f)
+                     (("hadrian-bootstrap" . _) #f)
+                     (_ #t))
+                   (package-native-inputs base))))
+      (native-search-paths
+       (list (search-path-specification
+              (variable "GHC_PACKAGE_PATH")
+              (files (list (string-append "lib/ghc-" version)))
+              (file-pattern ".*\\.conf\\.d$")
+              (file-type 'directory)))))))
+
+;; Versions newer than ghc defined below (i.e. the compiler
+;; haskell-build-system uses) should use ghc-next as their name to
+;; ensure ghc (without version specification) and ghc-* packages are
+;; always compatible. See https://issues.guix.gnu.org/issue/47335.
+(define-public ghc ghc-9.10)
+
 ;;; haskell.scm ends here

gnu/packages/ibus.scm

@@ -36,7 +36,6 @@
   #:use-module (guix licenses)
   #:use-module (guix packages)
   #:use-module (guix gexp)
-  #:use-module (guix deprecation)
   #:use-module (guix download)
   #:use-module (guix git-download)
   #:use-module (guix build-system cmake)
@@ -947,42 +946,37 @@ traditional Chinese output.")
 hanja dictionary and small hangul character classification.")
     (license lgpl2.1+)))
 
-(define-public ibus-hangul
+(define-public ibus-libhangul
   (package
-    (name "ibus-hangul")
+    (name "ibus-libhangul")
-    (version "1.5.5")
+    (version "1.5.3")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (string-append "https://github.com/libhangul/ibus-hangul/"
-             (url "https://github.com/libhangul/ibus-hangul")
+                           "releases/download/" version
-             (commit version)))
+                           "/ibus-hangul-" version ".tar.gz"))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "0wsbh6ii223wdai2qwcwy6sj5jr9zzma7511fhkfq4m2qxdhwsn7"))))
+        (base32
+         "1400ba2p34vr9q285lqvjm73f6m677cgfdymmjpiwyrjgbbiqrjy"))))
     (build-system gnu-build-system)
     (arguments
-     (list
+     `(#:phases
-      #:make-flags
+       (modify-phases %standard-phases
-      #~'("DISABLE_GUI_TESTS=ibus-hangul")
+         (add-after 'install 'wrap
-      #:phases
+           (lambda* (#:key inputs outputs #:allow-other-keys)
-      #~(modify-phases %standard-phases
+             (wrap-program (string-append (assoc-ref outputs "out")
-          (add-after 'install 'wrap
+                                          "/libexec/ibus-setup-hangul")
-            (lambda* (#:key inputs #:allow-other-keys)
+               `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
-              (wrap-program (string-append #$output
+               `("LD_LIBRARY_PATH" ":" prefix
-                                           "/libexec/ibus-setup-hangul")
+                 (,(string-append (assoc-ref inputs "libhangul") "/lib")))
-                `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH")))
+               `("GI_TYPELIB_PATH" ":" prefix
-                `("LD_LIBRARY_PATH" ":" prefix
+                 (,(getenv "GI_TYPELIB_PATH"))))
-                  (,(dirname (search-input-file inputs "lib/libhangul.so"))))
+             #t)))))
-                `("GI_TYPELIB_PATH" ":" prefix
-                  (,(getenv "GI_TYPELIB_PATH")))))))))
     (native-inputs
-     (list autoconf
+     `(("pkg-config" ,pkg-config)
-           automake
+       ("gettext" ,gettext-minimal)
-           gettext-minimal
+       ("glib:bin" ,glib "bin")))
-           `(,glib "bin")
-           libtool
-           pkg-config))
     (inputs
      (list bash-minimal
            ibus
@@ -997,9 +991,6 @@ hanja dictionary and small hangul character classification.")
      "ibus-hangul is a Korean input method engine for IBus.")
     (license gpl2+)))
 
-;; XXX: Deprecated on 2026-05-26.
-(define-deprecated-package ibus-libhangul ibus-hangul)
-
 (define-public ibus-table
   (package
     (name "ibus-table")

gnu/packages/image-viewers.scm

@@ -39,7 +39,6 @@
 ;;; Copyright © 2025 Vinicius Monego <monego@posteo.net>
 ;;; Copyright © 2025 Igorj Gorjaĉev <igor@goryachev.org>
 ;;; Copyright © 2026 Daniel Littlewood <dan@danielittlewood.xyz>
-;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -95,16 +94,13 @@
   #:use-module (gnu packages gnome)
   #:use-module (gnu packages golang-build)
   #:use-module (gnu packages golang-xyz)
-  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages graphics)
   #:use-module (gnu packages haskell-xyz)
   #:use-module (gnu packages image)
   #:use-module (gnu packages image-processing)
   #:use-module (gnu packages imagemagick)
-  #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages linux)
-  #:use-module (gnu packages logging)
   #:use-module (gnu packages maths)
   #:use-module (gnu packages ncurses)
   #:use-module (gnu packages pdf)
@@ -112,7 +108,6 @@
   #:use-module (gnu packages perl-check)
   #:use-module (gnu packages photo)
   #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages profiling)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -125,8 +120,6 @@
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages suckless)
   #:use-module (gnu packages stb)
-  #:use-module (gnu packages tbb)
-  #:use-module (gnu packages tls)
   #:use-module (gnu packages terminals)
   #:use-module (gnu packages upnp)
   #:use-module (gnu packages version-control)
@@ -1293,84 +1286,6 @@ workspaces.
 (define-deprecated-package python-ueberzug
   ueberzug)
 
-(define-public ueberzugpp
-  (package
-    (name "ueberzugpp")
-    (version "2.9.10")
-    (source
-      (origin
-        (method git-fetch)
-        (uri (git-reference
-              (url "https://github.com/jstkdng/ueberzugpp")
-              (commit (string-append "v" version))))
-        (file-name (git-file-name name version))
-        (sha256
-         (base32 "1jac2sca4pmcxp8xcvaxhf6j15phyc85gb5n9ymajbahnd4hbcv2"))))
-    (build-system cmake-build-system)
-    (arguments
-     (list #:tests? #f    ; no tests
-           #:configure-flags
-           #~(list "-DENABLE_OPENCV=ON"
-                   "-DENABLE_X11=ON"
-                   "-DENABLE_WAYLAND=ON")))
-    (native-inputs
-     (list extra-cmake-modules
-           gobject-introspection
-           pkg-config))
-    (inputs
-     (list cairo
-           chafa
-           cli11
-           expat
-           fftw
-           fmt
-           imagemagick
-           imath
-           lcms
-           libexif
-           libgsf
-           librsvg
-           libsixel
-           libwebp
-           libxcb
-           matio
-           nlohmann-json
-           opencv
-           openexr
-           openssl
-           orc
-           pango
-           poppler
-           range-v3
-           spdlog
-           tbb
-           vips
-           wayland
-           wayland-protocols
-           xcb-util-image))
-    (home-page "https://github.com/jstkdng/ueberzugpp")
-    (synopsis "Drop in replacement for ueberzug written in C++")
-    (description "Überzug++ is a command line utility written in C++ which
-allows to draw images on terminals by using X11/Wayland child windows, sixels,
- kitty and iterm2.
-
-Advantages over @command{w3mimgdisplay}:
-@itemize
-@item Support for Wayland: Sway, Hyprland, niri and Wayfire
-@item No race conditions as a new window is created to display images
-@item Expose events will be processed, so images will be redrawn on switch
-workspaces
-@item Tmux support on X11, Sway and Hyprland
-@item Terminals without the @env{WINDOWID} environment variable are supported
-@item Chars are used as position - and size unit
-@item No memory leak (usage of smart pointers)
-@item A lot of image formats supported (through OpenCV and libvips).
-@item GIF and animated WEBP support on X11, Sixel, Sway and hyprland
-@item Fast image downscaling (through OpenCV and OpenCL)
-@item Cache resized images for faster viewing
-@end itemize")
-    (license license:gpl3)))
-
 (define-public vv
   (package
     (name "vv")

gnu/packages/patches/ghc-chell-quickcheck-enable-qc-2.15.patch

@@ -0,0 +1,58 @@
+From 4617d2682738aeaece613ea61390dd47447c2d9f Mon Sep 17 00:00:00 2001
+From: Potato Hatsue <1793913507@qq.com>
+Date: Fri, 12 Sep 2025 06:07:02 -0700
+Subject: [PATCH] Allow QuickCheck 2.15.0
+
+---
+ Test/Chell/QuickCheck.hs | 8 ++++++++
+ chell-quickcheck.cabal   | 2 +-
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/Test/Chell/QuickCheck.hs b/Test/Chell/QuickCheck.hs
+index ea1c488..3227b8e 100644
+--- a/Test/Chell/QuickCheck.hs
++++ b/Test/Chell/QuickCheck.hs
+@@ -1,3 +1,4 @@
++{-# LANGUAGE CPP #-}
+ module Test.Chell.QuickCheck (property) where
+ 
+ import Test.Chell qualified as Chell
+@@ -30,7 +31,12 @@ property name prop = Chell.test name $ \opts -> Text.withNullTerminal $ \term ->
+             { State.terminal = term,
+               State.maxSuccessTests = QuickCheck.maxSuccess args,
+               State.maxDiscardedRatio = QuickCheck.maxDiscardRatio args,
++#if MIN_VERSION_QuickCheck(2,15,0)
++              State.replayStartSize = Nothing,
++              State.maxTestSize = QuickCheck.maxSize args,
++#else
+               State.computeSize = computeSize (QuickCheck.maxSize args) (QuickCheck.maxSuccess args),
++#endif
+               State.numSuccessTests = 0,
+               State.numDiscardedTests = 0,
+               State.classes = mempty,
+@@ -59,6 +65,7 @@ property name prop = Chell.test name $ \opts -> Text.withNullTerminal $ \term ->
+         Test.GaveUp {} -> Chell.TestAborted notes output
+         Test.NoExpectedFailure {} -> Chell.TestFailed notes [failure]
+ 
++#if !MIN_VERSION_QuickCheck(2,15,0)
+ -- copied from quickcheck-2.4.1.1/src/Test/QuickCheck/Test.hs
+ computeSize :: Int -> Int -> Int -> Int -> Int
+ computeSize maxSize maxSuccess n d
+@@ -79,3 +86,4 @@ computeSize maxSize maxSuccess n d
+ 
+ roundTo :: Int -> Int -> Int
+ roundTo n m = (n `div` m) * m
++#endif
+diff --git a/chell-quickcheck.cabal b/chell-quickcheck.cabal
+index e854412..1f3a1d9 100644
+--- a/chell-quickcheck.cabal
++++ b/chell-quickcheck.cabal
+@@ -34,7 +34,7 @@ library
+     build-depends:
+       , base ^>= 4.16 || ^>= 4.17 || ^>= 4.18 || ^>= 4.19 || ^>= 4.20 || ^>= 4.21
+       , chell ^>= 0.5
+-      , QuickCheck ^>= 2.14.2
++      , QuickCheck ^>= 2.14.2 || ^>= 2.15.0
+       , random ^>= 1.2.1 || ^>= 1.3.0
+ 
+     exposed-modules:

gnu/packages/patches/ghc-testsuite-recomp015-execstack.patch

@@ -4,7 +4,7 @@
  	# number of sections)
  	'$(TEST_HC)' $(TEST_HC_OPTS) Generate.hs
  	./Generate > ManySections.s
-+	echo '.section .note.GNU-stack,"",@progbits' > ManySections.s
++	echo '.section .note.GNU-stack,"",@progbits' >> ManySections.s
  	echo 'main = putStrLn "Running main..."' > Main.hs
  	'$(TEST_HC)' $(TEST_HC_OPTS) -c ManySections.s
  	'$(TEST_HC)' $(TEST_HC_OPTS) --make -O Main.hs ManySections.o

gnu/packages/prolog.scm

@@ -237,7 +237,7 @@ it.")
 (define-public trealla
   (package
     (name "trealla")
-    (version "2.100.24")
+    (version "2.100.15")
     (source
      (origin
        (method git-fetch)
@@ -246,7 +246,7 @@ it.")
           (url "https://github.com/trealla-prolog/trealla")
           (commit (string-append "v" version))))
        (sha256
-        (base32 "09jm5hs2lv481yzf76p646jx6467zx98bbbsg24xh3glk1f9gaaq"))
+        (base32 "1fr3h0hqk5bbzr8n415pd24n2nvxhyaxi03hn5s78q1yklynw13f"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (inputs

gnu/packages/python-check.scm

@@ -2246,21 +2246,18 @@ attachments).
 (define-public python-pyflakes
   (package
     (name "python-pyflakes")
-    (version "3.4.0")
+    (version "3.2.0")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "pyflakes" version))
-              (url "https://github.com/PyCQA/pyflakes")
-              (commit version)))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "0ag6j4flayslbxcqipmfy5njawzy66py71p63mpjsys4gy70jhg1"))))
+        (base32 "0gxgz0kg008pgmjk1dn8z3g00dfa9pc3f80pm6r1yqjly4zn0q8w"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list #:test-backend #~'unittest))
     (native-inputs
-     (list python-setuptools))
+     (list python-pytest
+           python-setuptools
+           python-wheel))
     (home-page "https://github.com/PyCQA/pyflakes")
     (synopsis "Passive checker of Python programs")
     (description

gnu/packages/python-web.scm

@@ -2378,7 +2378,7 @@ for adding, removing and dropping callbacks.")
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 3046 passed, 31 skipped, 29 xfailed, 2 subtests passed
+      ;; tests: 3045 passed, 32 skipped, 29 xfailed, 2 subtests passed
       #:test-flags
       '(list
         "-o" "addopts=''"               ; Avoid -p pytest_cov.
@@ -2449,6 +2449,7 @@ for adding, removing and dropping callbacks.")
      (list gunicorn-bootstrap
            python-cython
            python-freezegun
+           python-isal
            python-pytest
            python-pytest-mock
            python-pytest-xdist
@@ -2760,12 +2761,12 @@ stream is an enhanced asynchronous iterable.")
 (define-public python-asgiref
   (package
     (name "python-asgiref")
-    (version "3.11.1")
+    (version "3.8.1")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "asgiref" version))
               (sha256
-               (base32 "1km4xlaa21z2h0gz8x84gfgrq8k2mhg48rc0hkz3wxky7g24s62z"))))
+               (base32 "146mhkn3zp2bqf7j6r3chdlvfzgs5x1lrnqahsllgjdyl20bshy3"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest

gnu/packages/python-xyz.scm

@@ -3732,31 +3732,23 @@ libraries to make them compatible with the Array API standard")
 (define-public python-array-api-strict
   (package
     (name "python-array-api-strict")
-    (version "2.5")
+    (version "2.4.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "array_api_strict" version))
        (sha256
-        (base32 "1ig116ld5k8wx82ahld4l7qcb0d4s5s4f4a0nrflrh3hzabyarvp"))))
+        (base32 "0k1v3h54y1yny8mhgwjk6p51zf87farfk1xn9842g5lcrfhxqxvc"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 585 passed, 2 deselected
+      ;; tests: 584 passed, 1 skipped, 2 deselected
       #:test-flags
-      ;; hypothesis.errors.InvalidArgument:
+      ;; ModuleNotFoundError: No module named 'numpy', not sure why?
-      ;; xp.__array_api_version__='2025.12', but it must be a valid version
+      #~(list "-k" (string-append "not test_disabled_extensions"
-      ;; string ('2021.12', '2022.12', '2023.12', '2024.12'). If the standard
-      ;; version you want is not available, please ensure you're using the
-      ;; latest version of Hypothesis, then open an issue if one doesn't
-      ;; already exist.
-      #~(list "--ignore=array_api_strict/tests/test_set_functions.py"
-              ;; ModuleNotFoundError: No module named 'numpy', not sure why?
-              "-k" (string-append "not test_disabled_extensions"
                                   " and not test_environment_variables"))))
     (native-inputs
-     (list python-hypothesis
+     (list python-pytest
-           python-pytest
            python-setuptools
            python-setuptools-scm))
     (propagated-inputs
@@ -8952,20 +8944,16 @@ and convert DDL to BigQuery JSON schema.")
 (define-public python-jsonschema
   (package
     (name "python-jsonschema")
-    (version "4.26.0")
+    (version "4.23.0")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "jsonschema" version))
-              (url "https://github.com/Julian/jsonschema")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "0p89jy7s1agi2zqrsdm56p843k847n9cixjsc12hnzscll37kysk"))))
+        (base32 "1i3b4sckkc3v8vckqa11xbrj695qzrzsfzrkclra6lb3ybz9f56p"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 7744 passed, 71 skipped
       #:phases
       #~(modify-phases %standard-phases
           (add-before 'check 'pre-check
@@ -8975,20 +8963,21 @@ and convert DDL to BigQuery JSON schema.")
      (list python-hatchling
            python-hatch-fancy-pypi-readme
            python-hatch-vcs
-           python-jsonpath-ng
+           ;; For <tests/test_cli.py::TestCLIIntegration::test_license>.
+           python-pip
            python-pytest))
     (propagated-inputs
      (list python-attrs
-           python-jsonschema-specifications
-           python-referencing-bootstrap
-           python-rpds-py
-           ;; [optional]
            python-fqdn
            python-idna
+           python-importlib-resources
            python-isoduration
            python-jsonpointer
+           python-jsonschema-specifications
            python-rfc3339-validator
            python-rfc3986-validator
+           python-referencing-bootstrap
+           python-rpds-py
            python-uri-template
            python-webcolors))
     (home-page "https://github.com/Julian/jsonschema")
@@ -9326,8 +9315,7 @@ JavaScript-like message boxes.  Types of dialog boxes include:
            ;; See <https://github.com/pympler/pympler/issues/134>.
            "--deselect=test/muppy/test_summary.py::SummaryTest::test_repr_function"
            ;; This test times out.
-           "--deselect=test/gui/test_web.py::WebGuiTest::test_traceback"
+           "--deselect=test/gui/test_web.py::WebGuiTest::test_traceback")))
-           "--deselect=test/muppy/test_tracker.py::TrackerTest::test_otracker_diff")))
       (native-inputs
        (list python-pytest python-setuptools))
       (home-page "https://pythonhosted.org/Pympler/")
@@ -10056,13 +10044,13 @@ Google and Numpydoc format.")
 (define-public python-docutils
   (package
     (name "python-docutils")
-    (version "0.22.4")
+    (version "0.21.2")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "docutils" version))
        (sha256
-        (base32 "0s4ryafs954ivgb7bifzpbv98vb2mcr0s8wi9nvwpglsvqgkpdad"))))
+        (base32 "0vwqzbmzdvwx23myx4cg8s8mdkrqnfxpa9yi7jm2s66z5rrihsrs"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -11494,16 +11482,13 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
   ;; TODO: Move to python-build.
   (package
     (name "python-cython")
-    (version "3.2.5")
+    (version "3.1.7")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "cython" version))
-              (url "https://github.com/cython/cython")
-              (commit version)))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "07n0x4z0ifkhl8hi47amqhqfjc6jlh5dra9r54nlsnwnai83psy1"))))
+        (base32 "0gaslzb3virk4v6yh5a7dp6ka1lm267v994g8r25lck1702vjy3g"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -11511,16 +11496,17 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
       #:test-flags
       #~(list "runtests.py"
               "-vv"
-              ;; Some tests fail when number of cores are 24, keep on save
+              "-j" (number->string (parallel-job-count))
-              ;; minimal count.
-              "-j" (number->string (min 8 (parallel-job-count)))
               "-x" (string-join
                     (list "annotate_html"
                           "Debugger"
+                          ;; It introduces cycle.
+                          "numpy_test"
                           ;; It fails with AssertionError: Failed doctest test
                           ;; for complex_numbers_cpp.double_abs.
-                          ;; See: <https://github.com/cython/cython/issues/6528>.
                           "complex_numbers_cpp"
+                          ;; This test fails when running on 24 cores.
+                          "cpp_stl_conversion"
                           #$@(if (target-32bit?)
                                  ;; XXX: On 32-bit architectures, running the
                                  ;; parallel tests fails on many-core systems.
@@ -11547,7 +11533,8 @@ For some datatypes the overhead can be reduced by using khash by factor 4-8.")
               (setenv "HOME" "/tmp"))))))
     (native-inputs
      (list libxcrypt
-           python-setuptools))
+           python-setuptools
+           python-wheel))
     ;; we need the full python package and not just the python-wrapper
     ;; because we need libpython3.3m.so
     (inputs
@@ -11622,8 +11609,16 @@ def load_dynamic(name, path):
               ;; time of the test suite.
               (setenv "CFLAGS" "-O0"))))))))
 
-;; XXX: Deprecated on <2026-05-28>.
+(define-public python-cython-next
-(define-public python-cython-next python-cython)
+  (package
+    (inherit python-cython)
+    (version "3.2.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (pypi-uri "cython" version))
+       (sha256
+        (base32 "0d0n0yyicr7icd4f5kn1wwbjqyad6j4m640xlqlk3ixchgad7bf3"))))))
 
 ;; NOTE: when upgrading numpy please make sure that python-numba,
 ;; python-pandas and python-scipy still build, as these three packages are
@@ -11631,41 +11626,49 @@ def load_dynamic(name, path):
 (define-public python-numpy
   (package
     (name "python-numpy")
-    (version "2.4.6")
+    (version "2.3.1")
     (source
      (origin
-       ;; XXX: When switching to Git it fails to find Numpy's fork of Meson
-       ;; git submodule -- <https://github.com/numpy/meson>.
        (method url-fetch)
        (uri (string-append
              "https://github.com/numpy/numpy/releases/download/v"
              version "/numpy-" version ".tar.gz"))
        (sha256
-        (base32 "1nkx73blw298dzdk6blhrsann60cgdy7q6n3q9m785ia9865g8zk"))))
+        (base32 "0aqx8hsw54wfp7iv0h0ljlpsygvmrmi3rjic6rsa6v92lhhaxj8y"))))
     (build-system pyproject-build-system)
     (arguments
      (list
-      ;; tests: 47255 passed, 1079 skipped, 32 xfailed, 2 xpassed, 318 warnings
+      ;; tests: 47513 passed, 1740 skipped, 33 xfailed, 5 xpassed, 341 warnings
       #:modules '((guix build utils)
                   (guix build pyproject-build-system)
                   (ice-9 format))
       #:test-flags
       #~(list "-m" "not slow"
-              "--numprocesses" (number->string (min 8 (parallel-job-count))))
+              "--numprocesses" (number->string (min 8 (parallel-job-count)))
+              ;; See: <https://github.com/numpy/numpy/issues/27531>,
+              ;;      <https://github.com/numpy/numpy/issues/17685>,
+              ;;      <https://github.com/numpy/numpy/issues/17635>.
+              "-k" "not test_api_importable")
       #:phases
       #~(modify-phases %standard-phases
           (add-after 'unpack 'fix-executable-paths
-            (lambda* (#:key inputs #:allow-other-keys)
+            (lambda _
               (substitute* "numpy/distutils/exec_command.py"
                 (("'/bin/sh'")
                  (format #f "~s" (which "bash"))))
               (substitute* "numpy/meson.build"
                 ;; Relay on python from the PATH instead of full reference
                 ;; stored in built wheel.
-                (("'py.full_path\\(\\)'") "'python'"))
+                (("'py.full_path\\(\\)'") "'python'"))))
-              (substitute* "numpy/_core/tests/test_cpu_features.py"
+          ;; This isn't architecture specific.
-                (("/bin/true")
+          ;; TODO: Remove this conditional and apply for all builds.
-                 (search-input-file inputs "bin/true")))))
+          #$@(if (target-ppc64le?)
+                 #~((add-after 'unpack 'patch-bin-true
+                      (lambda* (#:key inputs #:allow-other-keys)
+                        (substitute* "numpy/_core/tests/test_cpu_features.py"
+                          (("/bin/true")
+                           (search-input-file inputs "bin/true"))))))
+                 #~())
           (add-before 'build 'parallelize-build
             (lambda _
               (setenv "OMP_NUM_THREAD"
@@ -11685,7 +11688,7 @@ def load_dynamic(name, path):
                                  (string-split (getenv "CPLUS_INCLUDE_PATH") #\:))
                          ":")))))
           (add-before 'build 'configure-blas
-            (lambda _
+            (lambda* (#:key inputs #:allow-other-keys)
               (call-with-output-file "site.cfg"
                 (lambda (port)
                   (format port
@@ -11697,11 +11700,7 @@ include_dirs = ~:*~a/include~%" #$(this-package-input "openblas"))))))
             (lambda* (#:key tests? test-flags #:allow-other-keys)
               (when tests?
                 (with-directory-excursion #$output
-                  (apply invoke "pytest" test-flags)
+                  (apply invoke "pytest" test-flags)))))
-                  (let ((pytest-cache (string-append #$output
-                                                     "/.pytest_cache")))
-                    (when (access? pytest-cache X_OK)
-                      (delete-file-recursively pytest-cache)))))))
           ;; The executables provided by this package ('f2py' and 'numpy-config')
           ;; only depend on Python.  By customizing the wrap phase we can ensure
           ;; that we don't add all Python packages listed in native-inputs to
@@ -11718,14 +11717,12 @@ include_dirs = ~:*~a/include~%" #$(this-package-input "openblas"))))))
                        (find-files (in-vicinity #$output "/bin"))))))))
     (native-inputs
      (list gfortran
-           python-cython
            python-hypothesis
            python-meson
            python-pytest
-           python-pytest-xdist))
+           python-pytest-xdist
-    (inputs
+           python-setuptools
-     (list bash
+           python-typing-extensions))
-           openblas))
     (home-page "https://numpy.org")
     (synopsis "Fundamental package for scientific computing with Python")
     (description "NumPy is the fundamental package for scientific computing
@@ -13496,7 +13493,7 @@ Python list with elements of type @code{PIL.Image} (from the
 (define-public python-pillow
   (package
     (name "python-pillow")
-    (version "12.2.0")
+    (version "12.1.1")
     (source
      (origin
        (method git-fetch)
@@ -13505,7 +13502,7 @@ Python list with elements of type @code{PIL.Image} (from the
               (commit version)))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "140ynzxpazq6gq041bhkzx314z4kkzv3wlmvph68a0nkj9nqa3pg"))))
+        (base32 "1g374rklljx0941j6d1gib9pgcq3scmqw9psqaj2c7m8pilqsn9n"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -13546,7 +13543,7 @@ stored in a few basic pixel formats.  It should provide a solid foundation for
 a general image processing tool.")
     (properties `((cpe-name . "pillow")))
     (license (license:x11-style
-              "https://github.com/python-pillow/Pillow/blob/12.2.0/LICENSE"
+              "https://github.com/python-pillow/Pillow/blob/12.1.1/LICENSE"
               "MIT-CMU License"))))
 
 (define-public python-pillow-avif-plugin
@@ -15534,21 +15531,20 @@ to Python code.")
 (define-public python-asttokens
   (package
     (name "python-asttokens")
-    (version "3.0.1")
+    (version "3.0.0")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "asttokens" version))
-             (url "https://github.com/gristlabs/asttokens")
+       (sha256
-             (commit (string-append "v" version))))
+        (base32 "1ixv6n8cg08n9h6rwyhd3lkzyjiwpbfv56dk338w3c32inm8pk8d"))))
-       (file-name (git-file-name name version))
-       (sha256 (base32 "1qqi7dygcv58czrsafc4gf41prfb6shd0crx33kd9wypk0v29afn"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-astroid
            python-pytest
            python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
     (home-page "https://github.com/gristlabs/asttokens")
     (synopsis "Python library to annotate abstract syntax trees")
     (description "The @code{asttokens} module annotates Python abstract syntax
@@ -18126,16 +18122,14 @@ primary use case is APIs defined before keyword-only parameters existed.")
 (define-public python-pyasn1
   (package
     (name "python-pyasn1")
-    (version "0.6.3")
+    (version "0.6.1")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "pyasn1" version))
-              (url "https://github.com/pyasn1/pyasn1")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "0b22m94j163nikfkl031hgrfasb6wgqp3374b8dbr84jalkl0ykw"))))
+        (base32
+         "0d5h500ig8sp72pabd1wcyglc4951xalbkqahf056dl4vlmhsn3g"))))
     (build-system pyproject-build-system)
     (arguments
      (list #:test-backend #~'unittest
@@ -22753,22 +22747,20 @@ times.
 (define-public python-lazy-object-proxy
   (package
     (name "python-lazy-object-proxy")
-    (version "1.12.0")
+    (version "1.11.0")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "lazy_object_proxy" version))
-              (url "https://github.com/ionelmc/python-lazy-object-proxy")
-              (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "1qig879igkjmj4mir26b0n40w3vn5jqn293172s6npxnb4k90kzk"))))
+        (base32 "174fswfrsqr7yj72f8fyry34qxgagbfw37vzljxbp7schq8l91qq"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-pytest
            python-pytest-benchmark
            python-setuptools
-           python-setuptools-scm))
+           python-setuptools-scm
+           python-wheel))
     (home-page "https://github.com/ionelmc/python-lazy-object-proxy")
     (synopsis "Lazy object proxy for Python")
     (description
@@ -24796,7 +24788,7 @@ instead of servers and network commands.")
 (define-public python-astroid
   (package
     (name "python-astroid")
-    (version "4.1.2")
+    (version "3.3.11")
     (source
      (origin
        (method git-fetch)
@@ -24805,12 +24797,24 @@ instead of servers and network commands.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "04x82slqxyyv0pikz680sw5aj2vbid1s7zdnzgqj7dlbz68c0ch0"))))
+        (base32 "1x5903kmi47pc87r949lym2cwl0xg885xyy730adxv0g6r083zwn"))))
     (build-system pyproject-build-system)
+    (arguments
+     ;; UserWarning: pkg_resources is deprecated as an API. See
+     ;; https://setuptools.pypa.io/en/latest/pkg_resources.html. The
+     ;; pkg_resources package is slated for removal as early as
+     ;; 2025-11-30. Refrain from using this package or pin to Setuptools<81.
+     (list #:test-flags
+           #~(list "-k" "not test_identify_old_namespace_package_protocol")))
     (native-inputs
      (list python-mypy-minimal
            python-pytest
-           python-setuptools))
+           python-setuptools
+           python-wheel))
+    (propagated-inputs
+     (list python-lazy-object-proxy
+           python-typing-extensions
+           python-wrapt))
     (home-page "https://github.com/PyCQA/astroid")
     (synopsis "Python source code base representation")
     (description "@code{python-astroid} provides a common base representation
@@ -27926,23 +27930,26 @@ codecs for use in data storage and communication applications.")
 (define-public python-dill
   (package
     (name "python-dill")
-    (version "0.4.1")
+    (version "0.4.0")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "dill" version))
-              (url "https://github.com/uqfoundation/dill")
-              (commit version)))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "09ig6820sd68cjixl5vkwkwvvgdii8qhaikc1rxhabhwxfymc7v2"))))
+        (base32 "1w5w5hlijw7ahqji45ssyvdip5pv074h4nw97bsj8ws7vz9g2cq6"))))
     (build-system pyproject-build-system)
     (arguments
-     (list #:test-backend #~'custom
+     (list
-           #:test-flags #~(list "dill/tests/__main__.py")))
+      #:phases #~(modify-phases %standard-phases
+                   (replace 'check
+                     (lambda* (#:key tests? #:allow-other-keys)
+                       (if tests?
+                           ;; Extracted from tox.ini
+                           (invoke "python" "dill/tests/__main__.py")
+                           (format #t "test suite not run~%")))))))
     (native-inputs
-     (list python-setuptools))
+     (list python-setuptools python-wheel))
-    (home-page "http://dill.rtfd.io/")
+    (home-page "https://pypi.org/project/dill/")
     (synopsis "Serialize all of Python")
     (description "Dill extends Python's @code{pickle} module for serializing
 and de-serializing Python objects to the majority of the built-in Python
@@ -30904,20 +30911,14 @@ positioning, and keyboard input.")
 (define-public python-readme-renderer
   (package
     (name "python-readme-renderer")
-    (properties '((commit . "e603eb17fcabd6bd20706d278fc24a7e9a663190")
+    (version "44.0")
-                  (revision . "0")))
-    (version (git-version "44.0"
-                          (assoc-ref properties 'revision)
-                          (assoc-ref properties 'commit)))
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "readme_renderer" version))
-              (url "https://github.com/pypa/readme_renderer")
-              (commit (assoc-ref properties 'commit))))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "15w3lzgg8gcq22saqy2cpnv3hvkrixhyn57fcg1p1bm2njh1hr61"))))
+        (base32
+         "1qfiqm3w1ydpbipns5nifa7h4wraxd72nh7imif819mzmd7064l7"))))
     (build-system pyproject-build-system)
     (arguments
      (list
@@ -33513,22 +33514,18 @@ systems in Python.")
 (define-public python-dotenv
   (package
     (name "python-dotenv")
-    (version "1.2.2")
+    (version "1.1.1")
     (source
      (origin
        (method url-fetch)
        (uri (pypi-uri "python_dotenv" version))
        (sha256
-        (base32 "1wwwg7gasqmnv5y2hb3w1155c8nai6zzih8x5hn0ifnpzf8ildrc"))))
+        (base32 "1aw9c5gw2gfjf7n3s7k6lb6ybz090hh60wq0daz4azr52sbkk9m8"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:test-flags
-      ;; .dotenv-real instead of dotenv
-      #~(list "-k not test_run_with_dotenv_and_command_flags")))
     (native-inputs
      (list python-pytest
-           python-setuptools))
+           python-setuptools
+           python-sh))
     (propagated-inputs
      (list python-click))
     (home-page "https://saurabh-kumar.com/python-dotenv/")
@@ -34617,22 +34614,19 @@ for styling strings in the terminal.")
 (define-public python-multipart
   (package
     (name "python-multipart")
-    (version "0.0.29")
+    (version "0.0.20")
-    (source
+    (source (origin
-     (origin
+              (method url-fetch)
-       (method git-fetch)
+              (uri (pypi-uri "python_multipart" version))
-       (uri (git-reference
+              (sha256
-              (url "https://github.com/Kludex/python-multipart")
+               (base32
-              (commit version)))
+                "04wxzakk3hs4z4xf3ldhym3gm46hjicn4iwiw150c8wfbfscml4d"))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "06rxa2xymdqri8zydy7xw2cnpsnzlv2jzdy9g86m5fpfca0pp9fm"))))
     (build-system pyproject-build-system)
     (native-inputs
      (list python-hatchling
            python-pytest
            python-pyyaml))
-    (home-page "https://github.com/Kludex/python-multipart")
+    (home-page "https://github.com/andrew-d/python-multipart")
     (synopsis "Streaming multipart parser for Python")
     (description
      "This package provides a streaming multipart parser for Python.")
@@ -35893,13 +35887,13 @@ line by line or column by column or a combination of both.")
 (define-public python-rpds-py
   (package
     (name "python-rpds-py")
-    (version "0.30.0")
+    (version "0.10.6")
     (source (origin
               (method url-fetch)
               (uri (pypi-uri "rpds_py" version))
               (sha256
                (base32
-                "110y8k62b9xb3slny7gf89943xpbji3s7vl7yz0g0jh1j37zg3yx"))))
+                "0l5slkvhq2vf64mapimmj6ginsv01mc4niyj90vvz3assq4agrac"))))
     (build-system cargo-build-system)
     (arguments
      (list
@@ -38399,32 +38393,18 @@ and @code{tokens_to_src} to roundtrip.")
 (define-public python-tomlkit
   (package
     (name "python-tomlkit")
-    (version "0.15.0")
+    (version "0.13.3")
     (source
      (origin
-       (method git-fetch)
+       (method url-fetch)
-       (uri (git-reference
+       (uri (pypi-uri "tomlkit" version))
-              (url "https://github.com/sdispater/tomlkit")
-              (commit version)))
-       (file-name (git-file-name name version))
        (sha256
-        (base32 "00sv5x8j78zkirzh9rl89lkpwfwhkhrq4mql2p4rqws1j37zx88g"))))
+        (base32 "18fjmmhiv5jkkg1dwidmxd0sjqnkf675igizxsa2ppspxr3z4323"))))
     (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; toml-test is submodule to
-          ;; <https://github.com/toml-lang/toml-test>.
-          (add-after 'unpack 'copy-toml-test-source
-            (lambda _
-              (copy-recursively
-               #$(package-source (this-package-native-input "toml-test"))
-               "tests/toml-test"))))))
     (native-inputs
      (list python-poetry-core
            python-pytest
-           toml-test))
+           python-pyyaml))
     (home-page "https://github.com/sdispater/tomlkit")
     (synopsis "Style-preserving TOML library")
     (description

gnu/packages/rust-crates.scm

@@ -747,10 +747,6 @@
   (crate-source "archery" "1.2.1"
                 "0sdqlmybcvd0rzv22ac3k3xxm5anr1gpm03sf02iy0jmrlhyvqpa"))
 
-(define rust-archery-1.2.2
-  (crate-source "archery" "1.2.2"
-                "07a4wn09ad1q7qi1bfdv03hl4668jaxm63rd6jxqgfzykpwsbq3h"))
-
 (define rust-archspec-0.1.3
   (crate-source "archspec" "0.1.3"
                 "1is6yjyk38hlijhp8yyk3xq3dgg5aass7rms5h6s2mjgrzcprdlx"))
@@ -3803,10 +3799,6 @@
   (crate-source "cc" "1.2.46"
                 "0diynsnlmw8fr032dxci5a79il5br2ws1l2a730v3cac0vhn6x5r"))
 
-(define rust-cc-1.2.48
-  (crate-source "cc" "1.2.48"
-                "0fk37741p34v904a49zcli9b65fmmir7sa06z3v95f6k1szvv0f4"))
-
 (define rust-cc-1.2.49
   (crate-source "cc" "1.2.49"
                 "05929ra8a2q81w45f932nr4blifnxkpr8i7lmcba28bm0c4k0n4h"))
@@ -24621,10 +24613,6 @@
   (crate-source "rpds" "1.1.0"
                 "194hjbsicmgqi3dyllqrz09mmhh597m2j9l49lr16cyfscambqd0"))
 
-(define rust-rpds-1.2.0
-  (crate-source "rpds" "1.2.0"
-                "0d7vpyignq837rh9wgcrq53xplsg5b85a3bcbq0x7m0rx22z8xcy"))
-
 (define rust-rpm-pkg-count-0.2.1
   (crate-source "rpm-pkg-count" "0.2.1"
                 "1jzh63l7k30l37s5gd2m2hvh8slzjaxw54s4xpcjnaqb8xfsq0sa"))
@@ -73522,32 +73510,42 @@
                                             rust-zerovec-0.10.4
                                             rust-zerovec-derive-0.10.3))
                      (python-rpds-py =>
-                                     (list rust-archery-1.2.2
+                                     (list rust-archery-1.2.1
-                                      rust-autocfg-1.5.0
+                                      rust-autocfg-1.4.0
-                                      rust-cc-1.2.48
+                                      rust-bitflags-2.9.0
-                                      rust-find-msvc-tools-0.1.5
+                                      rust-cfg-if-1.0.0
-                                      rust-heck-0.5.0
+                                      rust-indoc-1.0.9
-                                      rust-indoc-2.0.7
+                                      rust-libc-0.2.171
-                                      rust-libc-0.2.177
+                                      rust-lock-api-0.4.12
                                       rust-memoffset-0.9.1
                                       rust-once-cell-1.21.3
-                                      rust-portable-atomic-1.11.1
+                                      rust-parking-lot-0.12.3
-                                      rust-proc-macro2-1.0.103
+                                      rust-parking-lot-core-0.9.10
-                                      rust-pyo3-0.27.2
+                                      rust-proc-macro2-1.0.94
-                                      rust-pyo3-build-config-0.27.2
+                                      rust-pyo3-0.19.2
-                                      rust-pyo3-ffi-0.27.2
+                                      rust-pyo3-build-config-0.19.2
-                                      rust-pyo3-macros-0.27.2
+                                      rust-pyo3-ffi-0.19.2
-                                      rust-pyo3-macros-backend-0.27.2
+                                      rust-pyo3-macros-0.19.2
-                                      rust-python3-dll-a-0.2.14
+                                      rust-pyo3-macros-backend-0.19.2
-                                      rust-quote-1.0.42
+                                      rust-quote-1.0.40
-                                      rust-rpds-1.2.0
+                                      rust-redox-syscall-0.5.10
-                                      rust-rustversion-1.0.22
+                                      rust-rpds-1.1.0
-                                      rust-shlex-1.3.0
+                                      rust-scopeguard-1.2.0
-                                      rust-syn-2.0.111
+                                      rust-smallvec-1.15.0
-                                      rust-target-lexicon-0.13.3
+                                      rust-syn-1.0.109
-                                      rust-triomphe-0.1.15
+                                      rust-target-lexicon-0.12.16
-                                      rust-unicode-ident-1.0.22
+                                      rust-triomphe-0.1.14
-                                      rust-unindent-0.2.4))
+                                      rust-unicode-ident-1.0.18
+                                      rust-unindent-0.1.11
+                                      rust-windows-targets-0.52.6
+                                      rust-windows-aarch64-gnullvm-0.52.6
+                                      rust-windows-aarch64-msvc-0.52.6
+                                      rust-windows-i686-gnu-0.52.6
+                                      rust-windows-i686-gnullvm-0.52.6
+                                      rust-windows-i686-msvc-0.52.6
+                                      rust-windows-x86-64-gnu-0.52.6
+                                      rust-windows-x86-64-gnullvm-0.52.6
+                                      rust-windows-x86-64-msvc-0.52.6))
                      (python-rustworkx =>
                                        (list rust-adler2-2.0.1
                                         rust-aho-corasick-1.1.4

gnu/packages/shells.scm

@@ -924,7 +924,7 @@ and aims to be maximally portable across operating systems and C compilers.")
 (define-public loksh
   (package
     (name "loksh")
-    (version "7.9")
+    (version "7.8")
     (source (origin
               (method git-fetch)
               (uri (git-reference
@@ -936,7 +936,7 @@ and aims to be maximally portable across operating systems and C compilers.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0nwssdxcqs3fypfg884cwcmp21kmwsqrr5rvm1cck1qx5240hyjb"))))
+                "1x5kg01r0k7g825ia71f8an6585azba8x5khwdvq4dmnib11vakm"))))
     (build-system meson-build-system)
     (inputs (list ncurses))
     (native-inputs (list pkg-config))

gnu/packages/terminals.scm

@@ -1094,7 +1094,7 @@ minimalistic.")
 (define-public fzf
   (package
     (name "fzf")
-    (version "0.73.1")
+    (version "0.73.0")
     (source
      (origin
        (method git-fetch)
@@ -1103,7 +1103,7 @@ minimalistic.")
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1wyaggd00jgr519pxvik6hszgnp6dq71rn7xa20kf2qyi5p6bn65"))))
+        (base32 "1p6xda7ncpi38c5jyyi7ybsjmyj07axmax68iag0ccszm42hnq60"))))
     (build-system go-build-system)
     (arguments
      (list

gnu/packages/text-editors.scm

@@ -1413,9 +1413,7 @@ interface with CI pipeline UIs.")
             (lambda _
               (substitute* "packages/linux/icons.sh"
                 (("/usr/share")
-                 (string-append #$output "/share")))
+                 (string-append #$output "/share")))))
-              (substitute* "TeXmacs/misc/mime/texmacs.desktop"
-                (("Icon=.*$") "Icon=TeXmacs\n"))))
           (add-before 'configure 'gzip-flags
             (lambda _
               (substitute* "Makefile.in"

gnu/packages/wm.scm

@@ -1677,13 +1677,13 @@ tiled on several screens.")
 (define-public ghc-xmobar
   (package
     (name "ghc-xmobar")
-    (version "0.48.1")
+    (version "0.50")
     (source (origin
               (method url-fetch)
               (uri (hackage-uri "xmobar" version))
               (sha256
                (base32
-                "1infcisv7l00a4z4byjwjisg4yndk0cymibfii1c7yzyzrlvavhl"))))
+                "026s0q718z89vzjgva19vg58dm1l016i67mzi0wbj7kgai89w909"))))
     (build-system haskell-build-system)
     (properties '((upstream-name . "xmobar")))
     (native-inputs

guix/build/haskell-build-system.scm

@@ -84,7 +84,6 @@ and parameters ~s~%"
          (lib (assoc-ref outputs "lib"))
          (name-version (strip-store-file-name out))
          (extra-dirs (filter-map (cut assoc-ref inputs <>) extra-directories))
-         (ghc-path (getenv "GHC_PACKAGE_PATH"))
          (params `(,(string-append "--prefix=" out)
                    ,(string-append "--libdir=" (or lib out) "/lib")
                    ,(string-append "--docdir=" (or doc out)
@@ -120,9 +119,7 @@ and parameters ~s~%"
     ;; <https://www.haskell.org/cabal/users-guide/developing-packages.html>.
     (when (file-exists? "configure")
       (setenv "CONFIG_SHELL" "sh"))
-    (run-setuphs "configure" params)
+    (run-setuphs "configure" params)))
-
-    (setenv "GHC_PACKAGE_PATH" ghc-path)))
 
 (define* (build #:key parallel-build? #:allow-other-keys)
   "Build a given Haskell package."

guix/import/stackage.scm

@@ -50,7 +50,7 @@
   (make-parameter "https://www.stackage.org/api/v1/snapshot"))
 
 ;; Latest LTS version compatible with current GHC.
-(define %default-lts-version "20.26")
+(define %default-lts-version "24.9")
 
 (define-json-mapping <stackage-lts> make-stackage-lts
   stackage-lts?