gnu: yasm: Drop input labels.

* gnu/packages/assembly.scm (yasm)[inputs]: Drop input labels. Change-Id: I7b14b2962c72b64ac409d3914fd76af3278adbd7 Signed-off-by: Nguyễn Gia Phong <cnx@loang.net>
2026-04-15 11:23:37 +09:00
32 changed files with 5884 additions and 7569 deletions
@@ -1453,7 +1453,6 @@ 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		\
@@ -2115,7 +2114,6 @@ dist_patch_DATA =						\
  %D%/packages/patches/python-random2-getrandbits-test.patch		\
  %D%/packages/patches/python-pillow-use-zlib-1.3.patch	\
  %D%/packages/patches/python-pydocstyle-add-support-for-pep701.patch	\
-  %D%/packages/patches/python-pynvim-fix-test-command-error.patch	\
  %D%/packages/patches/python-pypytools-python-3-fixes.patch	\
  %D%/packages/patches/python-pyreadstat-link-libiconv.patch	\
  %D%/packages/patches/python-sip-include-dirs.patch	\
@@ -2523,11 +2521,10 @@ dist_patch_DATA =						\
  %D%/packages/patches/ultrastar-deluxe-no-freesans.patch		\
  %D%/packages/patches/unity-test-set-subdir-correctly.patch		\
  %D%/packages/patches/unity-test-support-int64.patch		\
-  %D%/packages/patches/ungoogled-chromium-custom-compiler.patch 	\
-  %D%/packages/patches/ungoogled-chromium-empty-parsed-rustc-args.patch	\
  %D%/packages/patches/ungoogled-chromium-extension-search-path.patch	\
  %D%/packages/patches/ungoogled-chromium-RUNPATH.patch		\
  %D%/packages/patches/ungoogled-chromium-system-nspr.patch	\
+  %D%/packages/patches/ungoogled-chromium-unbundle-icu-target.patch     \
  %D%/packages/patches/unknown-horizons-python-3.8-distro.patch	\
  %D%/packages/patches/unknown-horizons-python-3.9.patch	\
  %D%/packages/patches/unknown-horizons-python-3.10.patch	\
@@ -265,9 +265,7 @@ has strong support for macros.")
     '(#:parallel-tests? #f))           ; Some tests fail
                                        ; non-deterministically when run in
                                        ; parallel
-    (inputs
-     `(("python" ,python-wrapper)
-       ("xmlto" ,xmlto)))
+    (inputs (list python-wrapper xmlto))
    (home-page "https://yasm.tortall.net/")
    (synopsis "Rewrite of the NASM assembler")
    (description
@@ -62,7 +62,6 @@
 ;;; Copyright © 2026 Luis Guilherme Coelho <lgcoelho@disroot.org>
 ;;; Copyright © 2026 Noé Lopez <noelopez@free.fr>
 ;;; Copyright © 2026 Carlos Durán Domínguez <wurt@wurt.eu>
-;;; Copyright © 2026 Daniel Martins <email@danielfm.me>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -3704,44 +3703,6 @@ compensation, (de)interleaving, and byte-swapping
    ;; original developer.
    (license license:expat)))

-(define-public rtcqs
-  (package
-    (name "rtcqs")
-    (version "0.6.7")
-    (source
-     (origin
-       (method git-fetch)
-       (uri (git-reference
-             (url "https://codeberg.org/rtcqs/rtcqs")
-             (commit (string-append "v" version))))
-       (file-name (git-file-name name version))
-       (sha256
-        (base32 "1kc3niyaq4m8di68832pgfb1b0m54q5gm68dwlzwwilgxi61ifzc"))))
-    (build-system pyproject-build-system)
-    (arguments
-     (list
-      #:tests? #f ;no test suite
-      #:phases
-      #~(modify-phases %standard-phases
-          (add-after 'unpack 'remove-gui
-            (lambda _
-              (substitute* "pyproject.toml"
-                (("\"FreeSimpleGUI\",?")
-                 "")
-                (("rtcqs_gui = \"rtcqs\\.rtcqs_gui:main\"")
-                 ""))
-              (delete-file "src/rtcqs/rtcqs_gui.py")
-              (delete-file "src/rtcqs/rtcqs_qt_gui.py"))))))
-    (native-inputs (list python-setuptools))
-    (home-page "https://codeberg.org/rtcqs/rtcqs")
-    (synopsis "Linux audio real-time performance analyzer")
-    (description
-     "rtcqs analyzes a Linux system to detect possible bottlenecks that could
-have a negative impact on real-time audio performance.  It checks kernel
-configuration, IRQ priorities, CPU governor, swappiness, and other settings
-relevant to low-latency audio work.")
-    (license license:expat)))
-
 (define-public rtosc
  (package
    (name "rtosc")
@@ -345,8 +345,8 @@ programs and other files depend.")
    (license license:bsd-3)))

 (define-public gn
-  (let ((commit "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a")
-        (revision "2354"))            ;as returned by `git describe`, used below
+  (let ((commit "ee5b7e32b961a9da1933e9f46a018ba6cac8ef60")
+        (revision "2277"))            ;as returned by `git describe`, used below
    (package
      (name "gn")
      (version (git-version "0.0" revision commit))
@@ -356,7 +356,7 @@ programs and other files depend.")
                (uri (git-reference (url home-page) (commit commit)))
                (sha256
                 (base32
-                  "0yz38czmbc72q1hkiv3cwxqh2i8ji2vkkvvk5ws2cjplmn2vj0x9"))
+                  "19kkvwxl66vlzlfppbq03fmi59i5g8a1yc71fsfgwqqmx4wywd6w"))
                (file-name (git-file-name name version))))
      (build-system gnu-build-system)
      (arguments
@@ -366,8 +366,7 @@ programs and other files depend.")
                   (lambda _
                     (setenv "CC" "gcc")
                     (setenv "CXX" "g++")
-                     (setenv "CXXFLAGS"
-                             "-g -O2 -Wno-error=redundant-move -Wno-error=comment")
+                     (setenv "CXXFLAGS" "-g -O2 -Wno-error=redundant-move")
                     (setenv "AR" "ar")))
                 (replace 'configure
                   (lambda _
@@ -79,13 +79,11 @@
  '("base/third_party/cityhash" ;Expat
    "base/third_party/double_conversion" ;BSD-3
    "base/third_party/icu" ;Unicode, X11-style
-    "base/third_party/nspr" ;MPL-2.0
    "base/third_party/superfasthash" ;BSD-3
    "base/third_party/symbolize" ;BSD-3
    "base/third_party/xdg_user_dirs" ;Expat
-    "buildtools/third_party/libc++" ;BSD
-    "buildtools/third_party/libc++abi" ;BSD
    "net/third_party/mozilla_security_manager" ;MPL-1.1/GPL2+/LGPL2.1+
+    "net/third_party/nss" ;MPL-2.0
    "net/third_party/quiche" ;BSD-3
    "net/third_party/uri_template" ;ASL2.0
    "third_party/abseil-cpp" ;ASL2.0
@@ -106,11 +104,8 @@
    "third_party/catapult" ;BSD-3
    "third_party/catapult/common/py_vulcanize/third_party/rcssmin" ;ASL2.0
    "third_party/catapult/common/py_vulcanize/third_party/rjsmin" ;ASL2.0
-    "third_party/catapult/third_party/beautifulsoup4-4.9.3" ;Expat
-    "third_party/catapult/third_party/html5lib-1.1" ;Expat
    "third_party/catapult/third_party/polymer" ;BSD-3
    "third_party/catapult/third_party/six" ;Expat
-    "third_party/catapult/third_party/typ" ;ASL2.0
    ;; XXX: This is a minified version of <https://d3js.org/>.
    "third_party/catapult/tracing/third_party/d3" ;BSD-3
    "third_party/catapult/tracing/third_party/gl-matrix" ;Expat
@@ -125,12 +120,19 @@
    "third_party/cld_3" ;ASL2.0
    "third_party/closure_compiler" ;ASL2.0
    "third_party/compiler-rt" ;ASL2.0
+    "third_party/compiler-rt/src/lib" ;ASL2.0
+    "third_party/compiler-rt/src/lib/builtins" ;ASL2.0
    "third_party/content_analysis_sdk" ;BSD-3
    "third_party/cpuinfo" ;BSD-2
    "third_party/crabbyavif" ;ASL2.0
+    "third_party/crabbyavif/src/sys/dav1d-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/aom-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/libgav1-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/libyuv-sys" ;ASL2.0
+    "third_party/crabbyavif/src/sys/ndk-sys" ;ASL2.0
    "third_party/crashpad" ;ASL2.0
    "third_party/crashpad/crashpad/third_party/lss" ;ASL2.0
-    "third_party/crashpad/crashpad/third_party/zlib" ;Zlib
+    "third_party/crashpad/crashpad/third_party/zlib/zlib_crashpad.h" ;Zlib
    "third_party/crc32c" ;BSD-3
    "third_party/cros_system_api" ;BSD-3
    "third_party/dav1d" ;BSD-2
@@ -138,25 +140,19 @@
    ;; TODO: can likely be unbundled when Vulkan is updated.
    "third_party/dawn/third_party/khronos" ;ASL2.0
    "third_party/dawn/third_party/gn/webgpu-cts" ;BSD-3
-    "third_party/dawn/third_party/renderdoc" ;Expat
-    "third_party/dawn/third_party/webgpu-headers" ;BSD-3
-    "third_party/depot_tools" ;BSD-3
-    "third_party/devscripts" ;GPL2.0
    "third_party/devtools-frontend" ;BSD-3
    "third_party/devtools-frontend/src/front_end"
    "third_party/devtools-frontend/src/front_end/third_party"
    "third_party/devtools-frontend/src/front_end/third_party/acorn" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party\
 /additional_readme_paths.json" ;no explicit license; trivial
+    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/axe-core" ;MPL2.0
    "third_party/devtools-frontend/src/front_end/third_party/chromium" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/codemirror" ;Expat
-    "third_party/devtools-frontend/src/front_end/third_party/csp_evaluator" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/diff" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/intl-messageformat" ;BSD-3
-    "third_party/devtools-frontend/src/front_end/third_party/json5" ;Expat
-    "third_party/devtools-frontend/src/front_end/third_party/legacy-javascript" ;ASL-2.0
    "third_party/devtools-frontend/src/front_end/third_party/lighthouse" ;ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/lit" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party/marked" ;Expat, BSD-3
@@ -168,12 +164,10 @@
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/parsel" ; Expat
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer/third_party/rxjs" ; ASL2.0
    "third_party/devtools-frontend/src/front_end/third_party/puppeteer-replay" ;ASL2.0
-    "third_party/devtools-frontend/src/front_end/third_party/source-map-scopes-codec" ;BSD-3
    "third_party/devtools-frontend/src/front_end/third_party\
 /vscode.web-custom-data" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/third-party-web" ;Expat
    "third_party/devtools-frontend/src/front_end/third_party/wasmparser" ;ASL2.0
-    "third_party/devtools-frontend/src/front_end/third_party/web-vitals" ;Expat
    "third_party/devtools-frontend/src/third_party/i18n" ;ASL2.0
    "third_party/devtools-frontend/src/third_party/pyjson5" ;ASL2.0

@@ -185,7 +179,6 @@
    "third_party/farmhash" ;Expat
    "third_party/fast_float" ;ASL2.0, Boost1.0, Expat
    "third_party/fdlibm" ;non-copyleft
-    "third_party/federated_compute/chromium/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/base" ;ASL2.0
    "third_party/federated_compute/src/fcp/confidentialcompute" ;ASL2.0
    "third_party/federated_compute/src/fcp/protos/confidentialcompute" ;ASL2.0
@@ -194,9 +187,7 @@
    "third_party/fft2d" ;non-copyleft
    "third_party/flatbuffers" ;ASL2.0
    "third_party/fp16" ;Expat
-    "third_party/freetype" ;GPL2.0
    "third_party/fusejs" ;ASL2.0
-    "third_party/fxdiv" ;Expat
    "third_party/gemmlowp" ;ASL2.0
    "third_party/google_input_tools" ;ASL2.0
    "third_party/google_input_tools/third_party/closure_library" ;ASL2.0
@@ -205,9 +196,6 @@
    "third_party/harfbuzz-ng" ;Expat
    "third_party/highway" ;ASL2.0
    "third_party/hunspell" ;MPL1.1/GPL2+/LGPL2.1+
-    "third_party/hyphenation-patterns" ;Expat
-    ;; FIXME: Our icu does not have some headers such as udatamem.h.
-    "third_party/icu" ;Unicode3.0
    "third_party/ink" ;ASL2.0
    "third_party/ink_stroke_modeler" ;ASL2.0
    "third_party/inspector_protocol" ;BSD-3
@@ -220,14 +208,12 @@
    "third_party/libaddressinput" ;ASL2.0
    "third_party/libaom" ;BSD-2 or "Alliance for Open Media Patent License 1.0"
    "third_party/libaom/source/libaom/third_party/fastfeat" ;BSD-3
+    "third_party/libaom/source/libaom/third_party/SVT-AV1" ;BSD-3
    "third_party/libaom/source/libaom/third_party/vector" ;Expat
    "third_party/libaom/source/libaom/third_party/x86inc" ;ISC
-    "third_party/libc++" ;Expat
    "third_party/libdrm" ; Expat
    "third_party/libgav1" ;ASL2.0
    "third_party/libjingle_xmpp" ;BSD-3
-    "third_party/libpfm4" ;BSD
-    "third_party/libpng" ;PNG2.0
    "third_party/libphonenumber" ;ASL2.0
    "third_party/libsecret" ;LGPL2.1+
    "third_party/libsrtp" ;BSD-3
@@ -241,15 +227,11 @@
    "third_party/libvpx/source/libvpx/third_party/x86inc" ;Expat

    "third_party/libwebm" ;BSD-3
-    "third_party/libx11" ;BSD
-    "third_party/libxcb-keysyms" ;BSD
    "third_party/libxml/chromium" ;BSD-3
    "third_party/libyuv" ;BSD-3
    "third_party/libzip" ;BSD-3
    "third_party/lit" ;BSD-3
    "third_party/lit/v3_0" ;BSD-3
-    "third_party/llvm-libc" ;ASL2.0
-    "third_party/llvm-libc/src/shared" ;ASL2.0
    "third_party/lottie" ;Expat
    "third_party/lss" ;BSD-3
    "third_party/lzma_sdk" ;public domain
@@ -262,7 +244,6 @@
    "third_party/modp_b64" ;BSD-3
    "third_party/nasm" ;BSD-2
    "third_party/nearby" ;ASL2.0
-    "third_party/neon_2_sse" ;BSD-2
    "third_party/node" ;Expat
    "third_party/oak/chromium/proto" ;ASL2.0
    "third_party/oak/chromium/proto/attestation" ;ASL2.0
@@ -270,20 +251,14 @@
    "third_party/one_euro_filter" ;BSD-3
    "third_party/openscreen" ;BSD-3
    "third_party/openscreen/src/third_party/tinycbor" ;Expat
-    "third_party/opus" ;BSD-3
    "third_party/ots" ;BSD-3
    "third_party/pdfium" ;BSD-3
    "third_party/pdfium/third_party/agg23" ;Expat
    "third_party/pdfium/third_party/bigint" ;Public domain, BSD-3
-    "third_party/pdfium/third_party/lcms" ;Expat
-    "third_party/pdfium/third_party/libopenjpeg" ;BDS-2
    "third_party/pdfium/third_party/libtiff" ;non-copyleft
    "third_party/pdfium/third_party/freetype/include/pstables.h" ;FreeType
    "third_party/perfetto" ;ASL2.0
    "third_party/perfetto/protos/third_party/chromium" ;BSD-3
-    "third_party/perfetto/protos/third_party/pprof" ;ASL2.0
-    "third_party/perfetto/protos/third_party/primes" ;ASL2.0
-    "third_party/perfetto/protos/third_party/simpleperf" ;ASL2.0
    "third_party/pffft" ;the "FFTPACK" license
    "third_party/ply" ;BSD-3
    "third_party/polymer" ;BSD-3
@@ -293,7 +268,6 @@
    "third_party/protobuf/third_party/utf8_range" ; Expat
    "third_party/pthreadpool" ;BSD-2
    "third_party/puffin" ;Non-copyleft
-    "third_party/pyyaml" ;Expat
    "third_party/pyjson5" ;ASL2.0
    "third_party/rapidhash" ;BSD-2
    "third_party/readability" ;ASL2.0
@@ -305,14 +279,11 @@
    "third_party/search_engines_data" ;BSD-3
    "third_party/securemessage" ;ASL2.0
    "third_party/selenium-atoms" ;ASL2.0
-    "third_party/sentencepiece" ;ASL2.0
-    "third_party/sentencepiece/src/third_party/darts_clone" ;BSD-3
    "third_party/shell-encryption" ;ASL2.0
    "third_party/simdutf" ;Non-copyleft
    "third_party/simplejson" ; Non-copyleft
-    "third_party/six" ;Expat
    "third_party/skia" ;BSD-3
-    "third_party/skia/include/third_party/vulkan" ;BSD-3
+    "third_party/skia/third_party/vulkanmemoryallocator" ;BSD-3, Expat
    "third_party/smhasher" ;Expat, public domain

    ;; FIXME: the snappy "replacement" shim (see replace_gn_files.py below) does
@@ -367,6 +338,7 @@
    "third_party/webrtc/modules/third_party/fft" ;Non-copyleft
    "third_party/webrtc/modules/third_party/g711" ;Public domain
    "third_party/webrtc/modules/third_party/g722" ;Public domain
+    "third_party/webrtc/rtc_base/third_party/sigslot" ;Public domain
    "third_party/widevine/cdm/widevine_cdm_common.h" ;BSD-3
    "third_party/woff2" ;ASL2.0
    "third_party/wuffs" ;ASL2.0
@@ -400,7 +372,7 @@
  ;; run the Blink performance tests, just remove everything to save ~70MiB.
  '("third_party/blink/perf_tests"))

-(define %chromium-version "147.0.7727.55")
+(define %chromium-version "141.0.7390.65")
 (define %ungoogled-revision (string-append %chromium-version "-1"))
 (define %debian-revision (string-append "debian/" %ungoogled-revision))

@@ -412,7 +384,7 @@
    (file-name (git-file-name "ungoogled-chromium" %ungoogled-revision))
    (sha256
     (base32
-      "0l6v4wf16067igawjlh90f3d287mkw0cq4j5lvrxxy17y1skynzc"))))
+      "1hk4rww2gccly1qv0xnswd77haj02rlza82403dxdjm8fkdfndy6"))))

 (define %debian-origin
  (origin
@@ -425,7 +397,7 @@
                                ((_ version) version))))
    (sha256
     (base32
-      "0gqarll08i7rcs1amapciv263xvzglc8p44ikavq3xd12yyvcd98"))))
+      "06s3kvwb3490xb28n6r3q5n1c0ylsvchiw6s4h1rrp8jqzwjbmc6"))))

 (define (origin-file origin file)
  (computed-file
@@ -438,38 +410,26 @@

 (define %debian-patches
  (map debian-patch
-       '("bookworm/foreach.patch"
-         "debianization/safe-libcxx.patch"
-         "disable/enterprise-tests.patch"
+       '("bookworm/clang19.patch"
+         "bookworm/foreach.patch"
         "disable/node-version-ck.patch"
-         "disable/rustc-allow-features.patch"
-         "fixes/bytemuck.patch"
         "fixes/gentoo-stylesheet.patch"
         "fixes/libcpp-headers.patch"
-         "fixes/libpng-testonly.patch"
         "fixes/rust-clanglib.patch"
-         "llvm-19/clang19.patch"
-         "llvm-19/clone-traits.patch"
-         "llvm-19/keyfactory.patch"
-         "llvm-19/value-or.patch"
-         "llvm-22/ignore-for-ubsan.patch"
         "system/openjpeg.patch"
-         "trixie/cookie-string-view.patch"
-         "trixie/nodejs-main.patch")))
+         ;; Remove after rust is past
+         ;; <https://github.com/rust-lang/rust/pull/141061>.
+         "trixie/rust-no-alloc-shim.patch")))

 (define %guix-patches
  (list (local-file
-         (assume-valid-file-name
-          (search-patch
-           "ungoogled-chromium-custom-compiler.patch")))
-        (local-file
-         (assume-valid-file-name
-          (search-patch
-           "ungoogled-chromium-empty-parsed-rustc-args.patch")))
-        (local-file
         (assume-valid-file-name
          (search-patch
           "ungoogled-chromium-extension-search-path.patch")))
+        (local-file
+         (assume-valid-file-name
+          (search-patch
+           "ungoogled-chromium-unbundle-icu-target.patch")))
        (local-file
         (assume-valid-file-name
          (search-patch
@@ -540,8 +500,9 @@
             "#if 0"))
          (invoke "python" "build/linux/unbundle/replace_gn_files.py"
                  "--system-libraries" "flac" "fontconfig" "freetype"
-                  "harfbuzz-ng" "libjpeg" "libpng" "libwebp" "libxml"
-                  "libxslt" "openh264" "opus" "zlib")))))
+                  "harfbuzz-ng" "icu" "libjpeg"
+                  "libpng" "libwebp" "libxml" "libxslt" "openh264" "opus"
+                  "zlib")))))

 (define opus+custom
  (package/inherit opus
@@ -570,7 +531,7 @@
                                  %chromium-version "-lite.tar.xz"))
              (sha256
               (base32
-                "1salvlw5sykx3zmsbp7cgmf7y8yy6jlgb4b4zswzsbjrprk4jnap"))
+                "09iwglswnr6d45zz3zsjw7jpm1xlwwkxlz9h5nlhqxyd933a04fq"))
              (modules '((guix build utils)))
              (snippet (force ungoogled-chromium-snippet))))
    (build-system gnu-build-system)
@@ -587,7 +548,6 @@
      ;; directory for an exhaustive list of supported flags.
      ;; (Note: The 'configure' phase will do that for you.)
      #~(list "is_debug=false"
-              "is_component_build=false"
              ;; Use the "official" release optimizations, as opposed to
              ;; a developer build.
              "is_official_build=true"
@@ -595,7 +555,6 @@
              "use_clang_modules=false"
              "use_custom_libcxx=false" ; support for this is deprecated and to be removed.
              "optimize_webui=false"
-              "webnn_use_tflite=false"
              "safe_browsing_use_unrar=false"
              "chrome_pgo_phase=0"
              "use_sysroot=false"
@@ -613,10 +572,12 @@
              "enable_service_discovery=false"
              "enable_vr=false"
              "enable_enterprise_companion=false"
+              "enable_glic=false"
              "enable_iterator_debugging=false"
              "enable_hangout_services_extension=false"
              "enable_widevine=false"
-              "fatal_linker_warnings=false"
+              ;; Disable type-checking for the Web UI to avoid a Java dependency.
+              "enable_js_type_check=false"
              ;; Disable code using TensorFlow until it has been scrutinized
              ;; by the ungoogled project.
              "build_with_tflite_lib=false"
@@ -628,11 +589,6 @@
              "angle_has_histograms=false"
              "angle_build_tests=false"
              "build_angle_perftests=false"
-              "enable_perfetto_unittests=false"
-              "skia_enable_skshapper_tests=false"
-              "tint_build_unittests=false"
-              "enable_nocompile_tests=false"
-              "enable_screen_ai_browsertests=false"

              "clang_warning_suppression_file=\"\""

@@ -641,8 +597,6 @@
              "is_cfi=false"

              "symbol_level=0"
-              "blink_symbol_level=0"
-              "v8_symbol_level=0"
              "v8_enable_backtrace=false"

              ;; Define a custom toolchain that simply looks up CC, AR and
@@ -674,10 +628,26 @@
                             ;; invokation and fails if it's just the version number.
                             " (f6e511eec 2024-10-15) (built from a source tarball)\"")

+              ;; Chromium's build/rust/std/BUILD.gn has a hardcoded
+              ;; list of stdlib rlibs (stdlib_files) that GN uses to
+              ;; declare build outputs.  GN requires static output
+              ;; declarations, so the list must exactly match what
+              ;; rlibs exist in the Rust sysroot.  Chromium's list
+              ;; includes unicode_width because their bundled
+              ;; toolchain (Rust 1.89) ships it as a dependency of
+              ;; getopts 0.2.23.  Our Rust 1.93 has getopts 0.2.24
+              ;; which dropped that dependency, so unicode_width is
+              ;; not in our sysroot.  This GN arg removes it from
+              ;; the list.  (Chromium's own use of unicode_width via
+              ;; codespan-reporting is a separate vendored copy under
+              ;; third_party/rust/chromium_crates_io/ and is
+              ;; unaffected.)
+              "removed_rust_stdlib_libs=[\"unicode_width\"]"
+
              ;; Prefer system libraries.
              "use_system_freetype=true"
              "use_system_harfbuzz=true"
-              "use_system_icu=false"
+              "use_system_icu=true"
              "use_system_lcms2=true"
              "use_system_libffi=true"
              "use_system_libjpeg=true"
@@ -743,9 +713,9 @@

                ;; Many files try to include ICU headers from "third_party/icu/...".
                ;; Remove the "third_party/" prefix to use system headers instead.
-                ;(substitute* (find-files "chrome" "\\.cc$")
-                ;  (("third_party/icu/source/(common|i18n)/")
-                ;   ""))
+                (substitute* (find-files "chrome" "\\.cc$")
+                  (("third_party/icu/source/(common|i18n)/")
+                   ""))

                ;; XXX: Should be unnecessary when use_system_lcms2=true.
                (substitute* "third_party/pdfium/core/fxcodec/icc/icc_transform.h"
@@ -762,19 +732,16 @@
                  (("include \"third_party/curl")
                   "include \"curl"))

-                ;; Our clang libs and rustfmt are not under bindgen root directory.
-                (substitute* '("build/rust/rust_bindgen_generator.gni"
-                               "build/rust/rust_bindgen.gni")
+                ;; Unknown flags as of clang-19, can be removed when building with
+                ;; newer clang.
+                (substitute* "build/config/compiler/BUILD.gn"
+                  (("-gsimple-template-names") ""))
+
+                ;; Clang libs are not under bindgen root directory.
+                (substitute* "build/rust/rust_bindgen_generator.gni"
                  (("(_libclang_path = )rust_bindgen_root" _ libclang)
-                   (string-append libclang "clang_base_path"))
-                  (("(_rustfmt_path = \")\\$\\{rust_bindgen_root\\}" _ rustfmt)
-                   (string-append rustfmt "${rust_sysroot_absolute}"))))))
-          (add-after 'patch-stuff 'include-pthreadpool
-            ;; FIXME: Somehow the build system cannot locate this header.
-            (lambda _
-              (copy-file "third_party/pthreadpool/src/include/pthreadpool.h"
-                         "pthreadpool.h")))
-          (add-after 'include-pthreadpool 'add-absolute-references
+                   (string-append libclang "clang_base_path"))))))
+          (add-after 'patch-stuff 'add-absolute-references
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((cups-config (search-input-file inputs "/bin/cups-config"))
                    (libnssckbi.so (search-input-file inputs
@@ -796,22 +763,13 @@
          (add-after 'add-absolute-references 'adjust-CPLUS_INCLUDE_PATH
            ;; The libcxx include/c++/v1 directory is not exposed via
            ;; CPLUS_INCLUDE_PATH by default, causing errors like
-            ;; "fatal error: 'format' file not found".  Also clang is
-            ;; unable to find gcc's bits/c++config.h which is machine
-            ;; dependent.
+            ;; "fatal error: 'format' file not found".
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
-              (let* ((libcxx-v1 (search-input-directory inputs
-                                                        "include/c++/v1"))
-                     (target-system  #$(nix-system->gnu-triplet
-                                         (or (%current-target-system)
-                                             (%current-system))))
-                     (target-include (string-append "include/c++/"
-                                                    target-system))
-                     (gcc-bits  (search-input-directory inputs
-                                                        target-include)))
-                (setenv "CPLUS_INCLUDE_PATH"
-                        (string-append libcxx-v1 ":" gcc-bits ":"
-                         (getenv "CPLUS_INCLUDE_PATH"))))))
+              (setenv "CPLUS_INCLUDE_PATH"
+                      (string-append
+                       (search-input-directory inputs
+                                               "/include/c++/v1")
+                       ":" (getenv "CPLUS_INCLUDE_PATH")))))
          (add-before 'configure 'prepare-build-environment
            (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (let ((node (search-input-file (or native-inputs inputs)
@@ -997,7 +955,7 @@
           glib
           gtk+
           harfbuzz
-           icu4c-77
+           icu4c
           lcms
           libcxx
           libffi
@@ -42,24 +42,20 @@
  #:use-module (guix utils)
  #:use-module (srfi srfi-26))

-(define %coreboot-version "26.03")
-
-(define %coreboot-origin
-  (origin
-    (method git-fetch)
-    (uri (git-reference
-           (url "https://review.coreboot.org/coreboot")
-           (commit %coreboot-version)))
-    (file-name (git-file-name "coreboot" %coreboot-version))
-    (sha256
-     (base32
-      "0436rr0vibh35phvkxrc939njvrmnfq9xw87y1b0nlllglvq07kk"))))
-
 (define-public bincfg
  (package
    (name "bincfg")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -130,8 +126,17 @@ It also comes with example files generated by bincfg.")
 (define-public ifdtool
  (package
    (name "ifdtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -155,8 +160,16 @@ dump Intel Firmware Descriptor data of an image file.")
 (define-public intelmetool
  (package
    (name "intelmetool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://review.coreboot.org/coreboot")
+                    (commit version)))
+              (file-name (git-file-name name version))
+              (sha256
+               (base32
+                "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -188,8 +201,17 @@ Management Engine (ME).  You need to @code{sudo rmmod mei_me} and
 (define-public nvramtool
  (package
    (name "nvramtool")
-    (version %coreboot-version)
-    (source %coreboot-origin)
+    (version "25.09")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://review.coreboot.org/coreboot")
+              (commit version)))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32
+         "1a1n64dwr5fzdnaj45bjci85ap5yra5gwz4x056zn6481xwvbsmv"))))
    (build-system gnu-build-system)
    (arguments
     (list
@@ -31,13 +31,13 @@
 (define-public dhall
  (package
    (name "dhall")
-    (version "1.42.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "dhall" version))
-       (sha256
-        (base32 "0fvvqvh6diqi55dmncfs06rvcw8k0a1hs2gq228yxvsfbzcpv44s"))))
+    (version "1.41.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "dhall" version))
+              (sha256
+               (base32
+                "14m5rrvkid76qnvg0l14xw1mnqclhip3gjrz20g1lp4fd5p056ka"))))
    (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,6 +86,7 @@
                         ghc-quickcheck-instances
                         ghc-special-values
                         ghc-spoon
+                         ghc-system-filepath
                         ghc-tasty
                         ghc-tasty-expected-failure
                         ghc-tasty-hunit
@@ -96,8 +97,9 @@
                         ghc-mockery
                         ghc-doctest))
    (arguments
-     `(#:cabal-revision ("2"
-                         "1h9kxpn3kzwmxj07mqc0cxjj2ak3dyxnifb78z5vn34xn747j5bk")))
+     `(#:tests? #f ; Tries to access httpbin.org
+       #:cabal-revision ("4"
+                         "0innb3cn98ynb8bd83jdyrm64ij7wcvajg5qcwzdwbyzpr62anfx")))
    (home-page "http://hackage.haskell.org/package/dhall")
    (synopsis "Configuration language guaranteed to terminate")
    (description
@@ -323,41 +323,37 @@ based on Qt.")
 (define-public ghc-hledger
  (package
    (name "ghc-hledger")
-    (version "1.43.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hledger" version))
-       (sha256
-        (base32 "043gw3amc29fbjxlzyc4m97bw5i5462352lmk61adlxcd12l47i1"))))
+    (version "1.27.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hledger" version))
+              (sha256
+               (base32
+                "0qdg87m7ys2ykqqq32p7h7aw827w4f5bcqx4dspxxq6zqlvzddqb"))))
    (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
@@ -388,8 +384,8 @@ Accounting.")
      #~(modify-phases %standard-phases
          (add-after 'install 'install-doc
            (lambda _
-              (install-file "embeddedfiles/hledger.info" (string-append #$output "/share/info"))
-              (install-file "embeddedfiles/hledger.1" (string-append #$output "/man/man1"))))
+              (install-file "hledger.info" (string-append #$output "/share/info"))
+              (install-file "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")))))))))
@@ -2312,13 +2308,13 @@ textual ledgers to Beancount files.")
 (define-public hledger-web
  (package
    (name "hledger-web")
-    (version "1.43.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hledger-web" version))
-       (sha256
-        (base32 "0d4sv9k3m7s0764lbq2l8w9p2p47cby177l0avl5w3fa9y8d0gyd"))))
+    (version "1.27.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hledger-web" version))
+              (sha256
+               (base32
+                "151dxci7dld8626dzw823sr3d9iaac92wfzbfcbdz4jh9f7n07wa"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hledger-web")))
    (inputs (list ghc-decimal
@@ -2326,6 +2322,7 @@ textual ledgers to Beancount files.")
                  ghc-base64
                  ghc-blaze-html
                  ghc-blaze-markup
+                  ghc-breakpoint
                  ghc-case-insensitive
                  ghc-clientsession
                  ghc-cmdargs
@@ -2333,8 +2330,6 @@ 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
@@ -2344,7 +2339,6 @@ textual ledgers to Beancount files.")
                  ghc-http-types
                  ghc-megaparsec
                  ghc-network
-                  ghc-safe
                  ghc-shakespeare
                  ghc-unix-compat
                  ghc-unordered-containers
@@ -5521,7 +5521,7 @@ falling, themeable graphics and sounds, and replays.")
    (name "wesnoth")
    ;; Even-numbered minor versions indicate stable versions:
    ;; https://wiki.wesnoth.org/ReleasingWesnoth#Version_numbering
-    (version "1.18.7")
+    (version "1.18.6")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -5530,7 +5530,7 @@ falling, themeable graphics and sounds, and replays.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "0hdrp4xm9d8kj8id2g5q0wwdwykx4a0f1cs8a7fghmv0czryfv7f"))))
+                "0cdlczxczqgzdaqwydb9gfgi7d9jc39li72p2rb5nk1rlgfff79s"))))
    (build-system cmake-build-system)
    (arguments
     (list #:tests? #f                  ;no test target
@@ -19,12 +19,10 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.

 (define-module (gnu packages gkrellm)
-  #:use-module (guix build-system gnu)
-  #:use-module (guix download)
-  #:use-module (guix gexp)
  #:use-module ((guix licenses) #:prefix license:)
  #:use-module (guix packages)
-  #:use-module (guix utils)
+  #:use-module (guix download)
+  #:use-module (guix build-system gnu)
  #:use-module (gnu packages gettext)
  #:use-module (gnu packages gtk)
  #:use-module (gnu packages pkg-config)
@@ -33,27 +31,32 @@
 (define-public gkrellm
  (package
    (name "gkrellm")
-    (version "2.5.1")
+    (version "2.3.11")
    (source
     (origin
-       (method url-fetch)
-       (uri (string-append "https://gkrellm.srcbox.net/releases/gkrellm-"
-                           version ".tar.bz2"))
-       (sha256
-        (base32 "0qvy2xmwmfy5f0g09yn9lr262shnx82ba04r5il2wj4qscg3r7h8"))))
+      (method url-fetch)
+      (uri (string-append "http://gkrellm.srcbox.net/releases/gkrellm-"
+                          version ".tar.bz2"))
+      (sha256
+       (base32 "01lccz4fga40isv09j8rjgr0qy10rff9vj042n6gi6gdv4z69q0y"))))
    (build-system gnu-build-system)
-    (inputs (list gtk+-2 libsm))
-    (native-inputs (list gettext-minimal pkg-config))
+    (inputs
+     `(("gettext" ,gettext-minimal)
+       ("gtk+" ,gtk+-2)
+       ("libice" ,libice)
+       ("libsm" ,libsm)))
+    (native-inputs
+     (list pkg-config))
    (arguments
-     (list
-      #:tests? #f ;there is no check target
-      #:phases
-      #~(modify-phases %standard-phases
-          (delete 'configure)) ;no configure script
-      #:make-flags
-      #~(list (string-append "INSTALLROOT=" #$output)
-              (string-append "CC=" #$(cc-for-target)))))
-    (home-page "https://gkrellm.srcbox.net/")
+     `(#:tests? #f                      ; there is no check target
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure))           ; no configure script
+       #:make-flags
+       (let ((out (assoc-ref %outputs "out")))
+         (list (string-append "INSTALLROOT=" out)
+               "CC=gcc"))))
+    (home-page "http://gkrellm.srcbox.net/")
    (synopsis "System monitors")
    (description
     "GKrellM is a single process stack of system monitors which supports
@@ -165,14 +165,14 @@ tool to extract metadata from a file and print the results.")
 (define-public libmicrohttpd
  (package
   (name "libmicrohttpd")
-   (version "1.0.3")
+   (version "1.0.2")
   (source (origin
            (method url-fetch)
            (uri (string-append "mirror://gnu/libmicrohttpd/libmicrohttpd-"
                                version ".tar.gz"))
            (sha256
             (base32
-              "0shj6kk4xp3k45vv696bzgx4s2jzpvhp11syck1zb70rmrxba5kq"))))
+              "1ix843yqhcl8d5gh5652pw2scx4p5n836ca80ymms5rl136lycnz"))))
   (build-system gnu-build-system)
   (arguments
    (list #:configure-flags
@@ -1249,13 +1249,13 @@ testing.")
       (cpe-name . "firefox_esr")
       (cpe-version . ,(first (string-split version #\-)))))))

-(define %icedove-build-id "20260403000000") ;must be of the form YYYYMMDDhhmmss
+(define %icedove-build-id "20260324000000") ;must be of the form YYYYMMDDhhmmss
 ;;; See <https://product-details.mozilla.org/1.0/thunderbird_versions.json>
 ;;; for the source of truth regarding Thunderbird releases.
 ;;; Please keep these version numbers in sync with icecat.
 ;;; Please also update thunderbird-comm-source and thunderbird-comm-l10n to
 ;;; the icedove version.
-(define %icedove-version "140.9.1")
+(define %icedove-version "140.9.0")

 ;; Provides the "comm" folder which is inserted into the icecat source.
 ;; Avoids the duplication of Icecat's source tarball.  Pick the changeset that
@@ -1267,11 +1267,11 @@ testing.")
    (method hg-fetch)
    (uri (hg-reference
          (url "https://hg.mozilla.org/releases/comm-esr140")
-          (changeset "427d792f23672fc4adbe9436ce7dddbb2bfb287a")))
+          (changeset "8be9f2d3072c225a1e5f153745a18984c2babf8f")))
    (file-name (string-append "thunderbird-" %icedove-version "-checkout"))
    (sha256
     (base32
-      "09fj375a0zb5kgvw94f13997zhcj67a4g5ylpdbjzfql0chh572p"))
+      "04j35957x03m5x7mhh8zxa86mwjy0is2vb614sr4inkvvz4rs2hg"))
    (patches (search-patches "icedove-observer-fix.patch"))))

 ;;; To regenerate, see the `format-locales' helper defined above.
@@ -96,13 +96,13 @@ library.  It is primarily used with HLint's @code{--refactor} flag.")
 (define-public cabal-install
 (package
   (name "cabal-install")
-   (version "3.12.1.0")
-   (source
-    (origin
-      (method url-fetch)
-      (uri (hackage-uri "cabal-install" version))
-      (sha256
-       (base32 "1cmifq189i4x0r0yha3dl8nrzzfh92bnd2saak7dqvvjkkysqj38"))))
+   (version "3.6.2.0")
+   (source (origin
+             (method url-fetch)
+             (uri (hackage-uri "cabal-install" version))
+             (sha256
+              (base32
+               "0dihpm4h3xh13vnpvwflnb7v614qdvljycc6ffg5cvhwbwfrxyfw"))))
   (build-system haskell-build-system)
   (properties '((upstream-name . "cabal-install")))
   (inputs (list ghc-async
@@ -117,35 +117,13 @@ 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"
-                        "0fdzqdkg2vbyg0lnbk9bdskr2d23hwjpmnc7jnvpzkcmxmcvl99n")))
+                        "1kpgyfl5njxp4c8ax5ziag1bhqvph3h0pn660v3vpxalz8d1j6xv")))
   (home-page "https://www.haskell.org/cabal/")
   (synopsis "Command-line interface for Cabal and Hackage")
   (description
@@ -167,10 +145,11 @@ installation of Haskell libraries and programs.")
         "17wi7fma2qaqdm1hwgaam3fd140v9bpa8ky0wg708h1pqc5v2nbz"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cpphs")))
-    (inputs (list ghc-polyparse))
+    (inputs
+     (list ghc-polyparse ghc-old-locale ghc-old-time))
    (arguments
-     `(#:cabal-revision ("2"
-                         "0vxav36p0kplp4dpd17i4cfzrsl3r437d840xwv83lf1bqp7mrxc")))
+     `(#:cabal-revision ("1"
+                         "1f8jzs8zdh4wwbcq8fy6qqxkv75ypnvsm4yzw49wpr3b9vpnzlha")))
    (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
@@ -290,18 +269,20 @@ unique algebra of patches called @url{http://darcs.net/Theory,Patchtheory}.
 (define-public ghcid
  (package
    (name "ghcid")
-    (version "0.8.9")
+    (version "0.8.7")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "ghcid" version))
       (sha256
-        (base32 "1dq8lc0dwzib8y21279q4j54cmm7lvx64b3hw2yiym1kzi9rrhj4"))))
+        (base32 "0yqc1pkfajnr56gnh43sbj50r7c3r41b2jfz07ivgl6phi4frjbq"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "ghcid")))
-    (inputs (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
-                  ghc-terminal-size))
-    (native-inputs (list ghc-tasty ghc-tasty-hunit))
+    (inputs
+     (list ghc-extra ghc-ansi-terminal ghc-cmdargs ghc-fsnotify
+           ghc-terminal-size))
+    (native-inputs
+     (list ghc-tasty ghc-tasty-hunit))
    (home-page "https://github.com/ndmitchell/ghcid#readme")
    (synopsis "GHCi based bare bones IDE")
    (description
@@ -423,97 +404,95 @@ to @code{cabal repl}).")
                        (string-append bin "/git-remote-annex"))
               (symlink (string-append bin "/git-annex")
                        (string-append bin "/git-remote-tor-annex"))))))))
-    (inputs (list ghc-network-uri
-                  ghc-optparse-applicative
-                  ghc-uuid
-                  ghc-data-default
-                  ghc-case-insensitive
-                  ghc-random
-                  ghc-dlist
-                  ghc-unix-compat
-                  ghc-safesemaphore
-                  ghc-async
-                  ghc-disk-free-space
-                  ghc-ifelse
-                  ghc-monad-logger
-                  ghc-free
-                  ghc-utf8-string
-                  ghc-sandi
-                  ghc-monad-control
-                  ghc-bloomfilter
-                  ghc-edit-distance
-                  ghc-resourcet
-                  ghc-http-client
-                  ghc-http-client-tls
-                  ghc-http-types
-                  ghc-http-conduit
-                  ghc-http-client-restricted
-                  ghc-conduit
-                  ghc-old-locale
-                  ghc-persistent-sqlite
-                  ghc-persistent
-                  ghc-persistent-template
-                  ghc-unliftio-core
-                  ghc-microlens
-                  ghc-aeson
-                  ghc-vector
-                  ghc-tagsoup
-                  ghc-unordered-containers
-                  ghc-feed
-                  ghc-regex-tdfa
-                  ghc-socks
-                  ghc-byteable
-                  ghc-stm-chans
-                  ghc-securemem
-                  ghc-crypto-api
-                  ghc-memory
-                  ghc-split
-                  ghc-attoparsec
-                  ghc-concurrent-output
-                  ghc-unbounded-delays
-                  ghc-quickcheck
-                  ghc-tasty
-                  ghc-tasty-hunit
-                  ghc-tasty-quickcheck
-                  ghc-tasty-rerun
-                  ghc-ansi-terminal
-                  ghc-aws
-                  ghc-dav
-                  ghc-network
-                  ghc-network-bsd
-                  ghc-git-lfs
-                  ghc-clock
-                  ghc-crypton
-                  ghc-servant
-                  ghc-servant-server
-                  ghc-servant-client
-                  ghc-servant-client-core
-                  ghc-warp
-                  ghc-warp-tls
-                  ghc-os-string
-                  ghc-file-io
-                  ghc-mountpoints
-                  ghc-yesod
-                  ghc-yesod-static
-                  ghc-yesod-form
-                  ghc-yesod-core
-                  ghc-path-pieces
-                  ghc-wai
-                  ghc-wai-extra
-                  ghc-blaze-builder
-                  ghc-clientsession
-                  ghc-shakespeare
-                  ghc-hinotify
-                  ghc-dbus
-                  ghc-fdo-notify
-                  ghc-network-multicast
-                  ghc-network-info
-                  ghc-torrent
-                  ghc-magic
-                  ghc-criterion))
+    (inputs
+     (list curl
+           ghc-aeson
+           ghc-ansi-terminal
+           ghc-async
+           ghc-attoparsec
+           ghc-aws
+           ghc-bloomfilter
+           ghc-byteable
+           ghc-case-insensitive
+           ghc-clientsession
+           ghc-concurrent-output
+           ghc-conduit
+           ghc-connection
+           ghc-crypto-api
+           ghc-cryptonite
+           ghc-data-default
+           ghc-dav
+           ghc-dbus
+           ghc-disk-free-space
+           ghc-dlist
+           ghc-edit-distance
+           ghc-exceptions
+           ghc-fdo-notify
+           ghc-feed
+           ghc-filepath-bytestring
+           ghc-free
+           ghc-git-lfs
+           ghc-hinotify
+           ghc-http-client
+           ghc-http-client-tls
+           ghc-http-client-restricted
+           ghc-http-conduit
+           ghc-http-types
+           ghc-ifelse
+           ghc-magic
+           ghc-memory
+           ghc-microlens
+           ghc-monad-control
+           ghc-monad-logger
+           ghc-mountpoints
+           ghc-network
+           ghc-network-bsd
+           ghc-network-info
+           ghc-network-multicast
+           ghc-network-uri
+           ghc-old-locale
+           ghc-optparse-applicative
+           ghc-persistent
+           ghc-persistent-sqlite
+           ghc-persistent-template
+           ghc-quickcheck
+           ghc-random
+           ghc-regex-tdfa
+           ghc-resourcet
+           ghc-safesemaphore
+           ghc-sandi
+           ghc-securemem
+           ghc-servant-client
+           ghc-servant-server
+           ghc-socks
+           ghc-split
+           ghc-stm-chans
+           ghc-tagsoup
+           ghc-torrent
+           ghc-transformers
+           ghc-unbounded-delays
+           ghc-unix-compat
+           ghc-unliftio-core
+           ghc-unordered-containers
+           ghc-utf8-string
+           ghc-uuid
+           ghc-vector
+           ghc-wai
+           ghc-wai-extra
+           ghc-warp
+           ghc-warp-tls
+           ghc-yesod
+           ghc-yesod-core
+           ghc-yesod-form
+           ghc-yesod-static
+           lsof
+           rsync
+           xdg-utils))
    (propagated-inputs
     (list git))
-    (native-inputs (list ghc-filepath-bytestring))
+    (native-inputs
+     (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
@@ -534,13 +513,13 @@ used to keep a folder in sync between computers.")
 (define-public hlint
  (package
    (name "hlint")
-    (version "3.10")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hlint" version))
-       (sha256
-        (base32 "0dzy7spc45v88yplczhd3la464bhcbaihi619a45bd06ghrp55nr"))))
+    (version "3.4.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hlint" version))
+              (sha256
+               (base32
+                "0bkk03c9hacvfd73dk89g4r81b50g7pjgw5pavldali4qwss34cz"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hlint")))
    (inputs (list ghc-unordered-containers
@@ -557,10 +536,12 @@ 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
@@ -572,13 +553,13 @@ unwanted suggestions, and to add your own custom suggestions.")
 (define-public hoogle
  (package
    (name "hoogle")
-    (version "5.0.18.4")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hoogle" version))
-       (sha256
-        (base32 "08z32d87vqzhapb2vw21h25jb2g74csxlpvd8f54xl91k3ijs3wx"))))
+    (version "5.0.18.3")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hoogle" version))
+              (sha256
+               (base32
+                "0v6k75w0an9pqgb7a6cicnpf9rz77xd2lmxfbafc5l4f99jg83bn"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hoogle")))
    (inputs (list ghc-quickcheck
@@ -588,7 +569,7 @@ unwanted suggestions, and to add your own custom suggestions.")
                  ghc-cmdargs
                  ghc-conduit
                  ghc-conduit-extra
-                  ghc-crypton-connection
+                  ghc-connection
                  ghc-extra
                  ghc-foundation
                  ghc-old-locale
@@ -601,7 +582,6 @@ 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
@@ -613,9 +593,6 @@ 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
@@ -627,13 +604,14 @@ or by approximate type signature.")
 (define-public hscolour
  (package
    (name "hscolour")
-    (version "1.25")
+    (version "1.24.4")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "hscolour" version))
       (sha256
-        (base32 "0z679khnmb6as1zcdb44n9qjk7in32jpm4ldscpqg7jrapd31kjl"))))
+        (base32
+         "079jwph4bwllfp03yfr26s5zc6m6kw3nhb1cggrifh99haq34cr4"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hscolour")))
    (home-page "https://hackage.haskell.org/package/hscolour")
@@ -782,7 +760,7 @@ Wayland, and Linux console environments alike.")
                  ghc-text-zipper
                  ghc-timezone-olson
                  ghc-timezone-series
-                  ghc-unix-compat
+                  ghc-unix-compat-7
                  ghc-unordered-containers
                  ghc-utf8-string
                  ghc-uuid
@@ -976,7 +954,6 @@ 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
@@ -1016,13 +993,13 @@ advanced user's otherwise working script to fail under future circumstances.
 (define-public shelltestrunner
  (package
    (name "shelltestrunner")
-    (version "1.10")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "shelltestrunner" version))
-       (sha256
-        (base32 "1c6bjyxqa4mgnh3w4pqp6sbr5cf160n7jf9i1b4b9sdxzdjk7g87"))))
+    (version "1.9")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "shelltestrunner" version))
+              (sha256
+               (base32
+                "1a5kzqbwg6990249ypw0cx6cqj6663as1kbj8nzblcky8j6kbi6b"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "shelltestrunner")))
    (arguments
@@ -1045,19 +1022,17 @@ advanced user's otherwise working script to fail under future circumstances.
                           "tests/examples")
                   (format #t "test suite not run~%"))
               #t))))))
-    (inputs (list ghc-diff
-                  ghc-filemanip
-                  ghc-hunit
-                  ghc-cmdargs
-                  ghc-pretty-show
-                  ghc-regex-tdfa
-                  ghc-safe
-                  ghc-test-framework
-                  ghc-test-framework-hunit
-                  ghc-utf8-string
-                  ghc-hspec
-                  ghc-hspec-core
-                  ghc-hspec-contrib))
+    (inputs
+     (list ghc-diff
+           ghc-cmdargs
+           ghc-filemanip
+           ghc-hunit
+           ghc-pretty-show
+           ghc-regex-tdfa
+           ghc-safe
+           ghc-utf8-string
+           ghc-test-framework
+           ghc-test-framework-hunit))
    (home-page "https://github.com/simonmichael/shelltestrunner")
    (synopsis "Test CLI programs")
    (description
@@ -1070,13 +1045,13 @@ output, stderr, and exit status.")
 (define-public stylish-haskell
  (package
    (name "stylish-haskell")
-    (version "0.15.1.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "stylish-haskell" version))
-       (sha256
-        (base32 "06y6f7bv5j5k7q81194v9jqcbmmqcv7h8ii3lq1783bpfnyd6h19"))))
+    (version "0.14.3.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "stylish-haskell" version))
+              (sha256
+               (base32
+                "17w92v0qnwj7m6yqdq5cxbr04xiz0yfnnyx5q54218wdl7n5lf6d"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "stylish-haskell")))
    (inputs (list ghc-aeson
@@ -1086,7 +1061,6 @@ output, stderr, and exit status.")
                  ghc-hsyaml-aeson
                  ghc-hsyaml
                  ghc-semigroups
-                  ghc-lib-parser
                  ghc-lib-parser-ex
                  ghc-strict
                  ghc-optparse-applicative))
@@ -45,18 +45,22 @@
 (define-public ghc-tasty-ant-xml
  (package
    (name "ghc-tasty-ant-xml")
-    (version "1.1.9")
+    (version "1.1.8")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "tasty-ant-xml" version))
       (sha256
-        (base32 "00zgsd6jjfwasr69d0y781vhjr7d8p1jbaaz4pn75ljf33akd92l"))))
+        (base32
+         "0h9mllhw9cd0rn34xhj8grwmbny7z7hpd8qmp9lfcdj0s4qx9vx8"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-ant-xml")))
-    (inputs (list ghc-generic-deriving ghc-tagged ghc-tasty ghc-xml))
-    (home-page "http://github.com/ocharles/tasty-ant-xml")
-    (synopsis "Render tasty output to XML for Jenkins")
+    (inputs
+     (list ghc-generic-deriving ghc-xml ghc-tagged ghc-tasty))
+    (home-page
+     "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
@@ -72,37 +76,33 @@ framework.")
       (method url-fetch)
       (uri (hackage-uri "tasty-smallcheck" version))
       (sha256
-        (base32 "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
+        (base32
+         "0csgwn3vch0jnpqyyfnrfjq4z0dpl67imh5a7byll3hhlyidgjym"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-smallcheck")))
-    (inputs (list ghc-tasty ghc-smallcheck ghc-tagged ghc-optparse-applicative))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "0033ha2w9rzc1rxpzh1dkfdrn256i5lvb41pqbdh2i6kli0v5vmh")))
-    (home-page "https://github.com/feuerbach/tasty")
+    (inputs
+     (list ghc-tasty ghc-smallcheck ghc-async ghc-tagged))
+    (home-page "https://documentup.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:expat)))
+    (license license:bsd-3)))

 (define-public ghc-tasty-quickcheck
  (package
    (name "ghc-tasty-quickcheck")
-    (version "0.11.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-quickcheck" version))
-       (sha256
-        (base32 "0si4ccgqlv8h33d6310rrqba7f4pz3g8cinqfj42yd7damsdxm73"))))
+    (version "0.10.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-quickcheck" version))
+              (sha256
+               (base32
+                "1qnc6rdvjvlw08q6sln2n98rvj0s0pp689h6w4z58smjbn0lr25l"))))
    (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-regex-tdfa ghc-tasty-hunit))
-    (arguments
-     `(#:cabal-revision ("3"
-                         "1wzvha4xam8npx5mk33c056grmrqnjd6m38nnm6d7y99w2mn1a7w")))
+    (native-inputs (list ghc-tasty-hunit ghc-pcre-light))
    (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,23 +140,22 @@ contains the correct result for the test.")
 (define-public ghc-tasty
  (package
    (name "ghc-tasty")
-    (version "1.5.3")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty" version))
-       (sha256
-        (base32 "10076vlklbcyiz7plakrihava5sy3dvwhskjldqzhfl18jvcg82l"))))
+    (version "1.4.3")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty" version))
+              (sha256
+               (base32
+                "006bf4gyc30i2gvb17hj1mzrh1kwnwf7l050x3f72wi6c2axl87l"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty")))
    (inputs
-      (list ghc-tagged
-            ghc-optparse-applicative
-            ghc-ansi-terminal
-            ghc-unbounded-delays)) ; needed on 32-bit architectures
-    (arguments
-     `(#:cabal-revision ("2"
-                         "04llcf1i3gawdik0bjhxdgls2wkiqlx0gi76nfh784nv2qzxlpbb")))
+      (append
+        (list ghc-tagged ghc-optparse-applicative ghc-ansi-terminal)
+        ;; TODO: Add ghc-unbounded-delays unconditionally on next rebuild cycle.
+        (if (member (%current-system) '("i686-linux"))
+            (list ghc-unbounded-delays)
+            '())))
    (home-page "https://github.com/UnkindPartition/tasty")
    (synopsis "Modern and extensible testing framework")
    (description
@@ -168,20 +167,17 @@ and any other types of tests into a single test suite.")
 (define-public ghc-tasty-hedgehog
  (package
    (name "ghc-tasty-hedgehog")
-    (version "1.4.0.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-hedgehog" version))
-       (sha256
-        (base32 "0lki03z0p38x0dkqx5cqga30zy5m31gxn1saqylja9bi6bbq8d25"))))
+    (version "1.3.1.0")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-hedgehog" version))
+              (sha256
+               (base32
+                "1iq452mvd9wc9pfmjsmm848jwp3cvsk1faf2mlr21vcs0yaxvq3m"))))
    (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
@@ -194,25 +190,22 @@ framework}.")
 (define-public ghc-tasty-hspec
  (package
    (name "ghc-tasty-hspec")
-    (version "1.2.0.4")
+    (version "1.2.0.2")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "tasty-hspec" version))
       (sha256
-        (base32 "1hk1nkjvhp89xxgzj6dhbgw0fknnghpng6afq4i39hjkwv5p78ni"))))
+        (base32 "0cfcpi25jmnmzfzsx364qsj68q6gyph5z112kl8ja222hnhhr2n2"))))
    (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))
-    (arguments
-     `(#:cabal-revision ("7"
-                         "0s1y34i8g7fva0z10ws3ipcy2jmlvqk0v4hdbx8rqnby5n0l5kay")))
+                  ghc-tasty-quickcheck
+                  ghc-tagged))
    (home-page "https://github.com/mitchellwrosen/tasty-hspec")
    (synopsis "Hspec support for the Tasty test framework")
    (description
@@ -222,17 +215,19 @@ framework}.")
 (define-public ghc-tasty-hunit
  (package
    (name "ghc-tasty-hunit")
-    (version "0.10.2")
+    (version "0.10.0.3")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "tasty-hunit" version))
       (sha256
-        (base32 "1xh33ss7dncm7zanzkzh7ywb3a46k7vkcbh6v8jb767gq6kizw2s"))))
+        (base32
+         "0gz6zz3w7s44pymw33xcxnawryl27zk33766sab96nz2xh91kvxp"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-hunit")))
-    (inputs (list ghc-tasty ghc-call-stack-boot))
-    (home-page "https://github.com/UnkindPartition/tasty")
+    (inputs
+     (list ghc-call-stack-boot ghc-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.")
@@ -262,13 +257,13 @@ tasty.")
 (define-public ghc-tasty-lua
  (package
    (name "ghc-tasty-lua")
-    (version "1.1.1.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-lua" version))
-       (sha256
-        (base32 "03b2n3gw2w70cnl57w3sh3cv5ka270sf07jlxpb4zs0z5gh83p1r"))))
+    (version "1.0.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-lua" version))
+              (sha256
+               (base32
+                "1vnyvgcjsvqhwwyqkbgqksr9ppj5whiihpwcqkg33sl7jj3ysdwv"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-lua")))
    (inputs (list ghc-hslua-core
@@ -293,15 +288,16 @@ from Lua.")
       (method url-fetch)
       (uri (hackage-uri "tasty-th" version))
       (sha256
-        (base32 "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
+        (base32
+         "0b2ivrw2257m4cy4rjnkwqlarh83j1y3zywnmaqqqbvy667sqnj3"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-th")))
-    (inputs (list ghc-haskell-src-exts ghc-tasty))
-    (native-inputs (list ghc-tasty-hunit))
+    (inputs
+     (list ghc-haskell-src-exts ghc-tasty 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.")
@@ -310,27 +306,28 @@ test-framework.")
 (define-public ghc-tasty-rerun
  (package
    (name "ghc-tasty-rerun")
-    (version "1.1.20")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-rerun" version))
-       (sha256
-        (base32 "0px58jm1yqbg32qf2s0yk09d2qdjxkkz9df89f31q3nzw85jv2ky"))))
+    (version "1.1.18")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-rerun" version))
+              (sha256
+               (base32
+                "0sccp5zx9v2rx741nbmgd8mzjhy5m4v74hk26d23xz93ph8aqx7s"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tasty-rerun")))
-    (inputs (list ghc-optparse-applicative ghc-split ghc-tagged ghc-tasty))
+    (inputs
+     (list ghc-optparse-applicative ghc-reducers ghc-split ghc-tagged
+           ghc-tasty))
    (arguments
-     `(#:cabal-revision ("1"
-                         "13xmx91hp7i0qzrhada9ckliqkynwlwa8x6pjbvxjcy1y0qsd7hk")))
+     `(#:cabal-revision ("3"
+                         "0091arn90cx5rzn5n2bpb9alzybwraf9yj7hb0bwdfyamzpf3pkb")))
    (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
@@ -365,17 +362,17 @@ development.")
 (define-public ghc-quickcheck-instances
  (package
    (name "ghc-quickcheck-instances")
-    (version "0.3.33")
+    (version "0.3.29.1")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "quickcheck-instances" version))
       (sha256
-        (base32 "0rl8y3rb4fm4nqz122bp5f2aya4f8bc9m9i9n2vwlyq2gdacs0v8"))))
+        (base32 "0jx2wfy7y5dr14s9i457g2aah4isjxry4mlbqhj7vlav6ib84gdj"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-instances")))
    (inputs (list ghc-quickcheck
-                  ghc-splitmix-bootstrap
+                  ghc-splitmix
                  ghc-case-insensitive
                  ghc-data-fix
                  ghc-hashable
@@ -386,15 +383,17 @@ 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 ("1"
-                         "1xkc7rsfgya4rwiizh0yfincws3knpdnh08m280v1dgik4kv37vh")))
+     `(#:cabal-revision ("2"
+                         "118xy4z4dy4bpkzsp98daiv3l4n5j7ph9my0saca7cqjybqwkcip")))
    (home-page "https://github.com/haskellari/qc-instances")
    (synopsis "Common quickcheck instances")
    (description "This package provides QuickCheck instances for types
@@ -410,38 +409,17 @@ provided by the Haskell Platform.")
       (method url-fetch)
       (uri (hackage-uri "quickcheck-unicode" version))
       (sha256
-        (base32 "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
+        (base32
+         "0s43s1bzbg3gwsjgm7fpyksd1339f0m26dlw2famxwyzgvm0a80k"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-unicode")))
    (inputs (list ghc-quickcheck))
-    (home-page "https://github.com/bos/quickcheck-unicode")
+    (home-page
+     "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-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)))
+    (license license:bsd-3)))

 (define-public ghc-quickcheck-io
  (package
@@ -468,19 +446,17 @@ use HUnit assertions as QuickCheck properties.")
 (define-public ghc-quickcheck
  (package
    (name "ghc-quickcheck")
-    (version "2.15.0.1")
+    (version "2.14.3")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "QuickCheck" version))
       (sha256
-        (base32 "0zvfydg44ibs1br522rzvdlxj9mpz0h62js1hay1sj5gvdnj3cm3"))))
+        (base32 "0085lwy14r7hk7ibmv8d7d54ja9zin0ijf0b27xai898dfrj43sw"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "QuickCheck")))
-    (inputs (list ghc-random-bootstrap ghc-splitmix-bootstrap))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "0cgfp4s51cjphsn9cls6rndisvqmi94vn95xan9g1yz6p5xk7z8c")))
+    (inputs
+     (list ghc-random ghc-splitmix-bootstrap))
    (home-page "https://github.com/nick8325/quickcheck")
    (synopsis "Automatic testing of Haskell programs")
    (description
@@ -503,8 +479,10 @@ expressed in Haskell, using combinators defined in the QuickCheck library.")
        (base32 "1kyam4cy7qmnizjwjm8jamq43w7f0fs6ljfplwj0ib6wi2kjh0wv"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-assertions")))
-    (inputs (list ghc-quickcheck ghc-ieee754 ghc-pretty-show))
-    (native-inputs (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
@@ -516,27 +494,33 @@ HUnit.")
 (define-public ghc-test-framework
  (package
    (name "ghc-test-framework")
-    (version "0.8.2.2")
+    (version "0.8.2.0")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "test-framework" version))
       (sha256
-        (base32 "04ijf5x6xx8i5lqv9ir33zs1rfzc4qkwwz8c1fdycnzvydcv4dnp"))))
+        (base32
+         "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
-     `(#:cabal-revision ("1"
-                         "1yv1qsr6bxphxk9430id9bqhfmkffdqmfg0k017dp9pnn4pqj0zh")))
-    (home-page "https://github.com/haskell/test-framework#readme")
+     `(#:tests? #f  ; FIXME: Tests do not build.
+       #:cabal-revision
+       ("6" "0wbq9wiaag69nsqxwijzhs5y1hb9kbpkp1x65dvx158cxp8i9w9r")))
+    ;(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
@@ -573,21 +557,23 @@ reporting and test statistics output.")
 (define-public ghc-test-framework-quickcheck2
  (package
    (name "ghc-test-framework-quickcheck2")
-    (version "0.3.0.6")
+    (version "0.3.0.5")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "test-framework-quickcheck2" version))
       (sha256
-        (base32 "1d0w2q9sm8aayk0aj1zr2irpnqwpzixn6pdfq1i904vs1kkb2xin"))))
+        (base32
+         "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 ("1"
-                         "1af2gw9gvq143jdqmsnxj23cgss9ffdyr67951a5x151aps04y7z")))
-    (home-page "https://github.com/haskell/test-framework")
+     `(#:cabal-revision
+       ("3" "0mglqfimla4vvv80mg08aj76zf4993wmngqlirh05h8i9nmgv6lh")))
+    (inputs
+     (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
@@ -606,8 +592,9 @@ package.")
        (base32 "1xpgpk1gp4w7w46b4rhj80fa0bcyz8asj2dcjb5x1c37b7rw90b0"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "test-framework-smallcheck")))
-    (inputs (list ghc-test-framework ghc-smallcheck))
-    (home-page "https://github.com/feuerbach/smallcheck")
+    (inputs
+     (list ghc-smallcheck ghc-test-framework))
+    (home-page "https://github.com/Bodigrim/smallcheck")
    (synopsis "SmallCheck support for test-framework")
    (description
     "This package lets programmers use SmallCheck properties in Haskell's
@@ -673,17 +660,17 @@ JUnit tool for Java.")
 (define-public hspec-discover
  (package
    (name "hspec-discover")
-    (version "2.11.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hspec-discover" version))
-       (sha256
-        (base32 "044vgsy45ff00h9z2k3jgn2m37npcjiacc4cifahrjlmwa7a7ylp"))))
+    (version "2.9.7")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hspec-discover" version))
+              (sha256
+               (base32
+                "0536kdxjw6p8b6gcwvmr22jbmb6cgzbddi0fkd01b2m847z37sb5"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-discover")))
    (native-inputs (list ghc-quickcheck ghc-hspec-meta ghc-mockery-bootstrap))
-    (home-page "https://hspec.github.io/")
+    (home-page "http://hspec.github.io/")
    (synopsis "Automatically discover and run Hspec tests")
    (description "hspec-discover is a tool which automatically discovers and
 runs Hspec tests.")
@@ -692,30 +679,28 @@ runs Hspec tests.")
 (define-public ghc-hspec-core
  (package
    (name "ghc-hspec-core")
-    (version "2.11.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hspec-core" version))
-       (sha256
-        (base32 "030400w95775jrivbi7n1nnx6j5z717rqd3986ggklb8h9hjalfc"))))
+    (version "2.9.7")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hspec-core" version))
+              (sha256
+               (base32
+                "040rzqiqwkp373jjpij8lkmv08pp2ya92zzcf95bw8px215rp08n"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-core")))
    (inputs (list ghc-hunit
                  ghc-quickcheck
                  ghc-ansi-terminal
                  ghc-call-stack
-                  ghc-haskell-lexer
+                  ghc-clock
                  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-bootstrap))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "0yq9nnawcgbgxiz4ymfa8k66jrvgrhmv8j7g880x8k6q8q4ncqlq")))
-    (home-page "https://hspec.github.io/")
+                         ghc-silently-bootstrap ghc-temporary))
+    (home-page "http://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.")
@@ -724,28 +709,23 @@ be used to extend Hspec's functionality.")
 (define-public ghc-hspec-meta
  (package
    (name "ghc-hspec-meta")
-    (version "2.11.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hspec-meta" version))
-       (sha256
-        (base32 "1612pg5gihqjxrzqqvbbgckaqiwq3rmz3rg07lrjhzklg975nj69"))))
+    (version "2.9.3")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hspec-meta" version))
+              (sha256
+               (base32
+                "1raxwpsmcijl3x2h5naw6aydhbiknxvhj3x7v384bi1rqi51ainm"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-meta")))
-    (inputs (list ghc-hunit
-                  ghc-quickcheck
+    (inputs (list ghc-quickcheck
                  ghc-ansi-terminal
                  ghc-call-stack-boot
-                  ghc-haskell-lexer
-                  ghc-hspec-expectations
+                  ghc-clock
                  ghc-quickcheck-io
                  ghc-random
-                  ghc-tf-random))
-    (arguments
-     `(#:cabal-revision ("2"
-                         "1jrk14s51psb0zjici56220iyb98i3q06sd3rsyx594s3cddgn5d")))
-    (home-page "https://hspec.github.io/")
+                  ghc-setenv))
+    (home-page "http://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.")
@@ -754,58 +734,38 @@ used to test the in-development version of Hspec.")
 (define-public ghc-hspec
  (package
    (name "ghc-hspec")
-    (version "2.11.12")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hspec" version))
-       (sha256
-        (base32 "1zdgkn0gkcphcsfqcqwcfqiqvkz12ljks46v3czpaysndz8icfip"))))
+    (version "2.9.7")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hspec" version))
+              (sha256
+               (base32
+                "092sfqjkargxxszp9jjqa8ldjz0xv34jwn6k21q59ys5ckvsrpc1"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec")))
    (inputs (list ghc-quickcheck ghc-hspec-core hspec-discover
                  ghc-hspec-expectations))
-    (home-page "https://hspec.github.io/")
+    (home-page "http://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.2")
+    (version "0.5.1.1")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "hspec-contrib" version))
       (sha256
-        (base32 "0002xzvyh790iwf1y33d4nflrbp5sxvpsp010srcfryf1n3qx2b0"))))
+        (base32 "1nyb5n2jiq920yyf3flzyxrs5xpfyppl3jn18zhviyysjjk5drpx"))))
    (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.")
@@ -814,25 +774,22 @@ functionality.")
 (define-public ghc-hspec-expectations
  (package
    (name "ghc-hspec-expectations")
-    (version "0.8.4")
+    (version "0.8.2")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "hspec-expectations" version))
       (sha256
-        (base32 "1zr1pqchcwglfr5dvcrgc1l5x924n9w09n2zr68dmkqf4dzdx3bv"))))
+        (base32
+         "1vxl9zazbaapijr6zmcj72j9wf7ka1pirrjbwddwwddg3zm0g5l1"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hspec-expectations")))
-    (inputs (list ghc-hunit ghc-call-stack))
-    (arguments
    ;; Tests depend on ghc-nanospec.
-     `(#:tests? #f
-       #:cabal-revision ("2"
-                         "14zzsjqcz1zbnvi50i82lx84nc8b5da7ar5cazzh44lklyag0ds2")))
-    (home-page "https://github.com/hspec/hspec-expectations#readme")
+    (arguments '(#:tests? #f))
+    (inputs (list ghc-hunit))
+    (home-page "https://github.com/sol/hspec-expectations")
    (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)))

@@ -897,13 +854,13 @@ implementations of cryptographic ciphers.")
 (define-public ghc-hedgehog
  (package
    (name "ghc-hedgehog")
-    (version "1.5")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "hedgehog" version))
-       (sha256
-        (base32 "0sl6x9q9kyrpv73565w9na9dm10wzxdl0qgiraqarffynfgn0hg9"))))
+    (version "1.1.2")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "hedgehog" version))
+              (sha256
+               (base32
+                "0dbk75hk6hqpzkjdlpw3s63qhm42kqigij33p321by6xndb59jg1"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "hedgehog")))
    (inputs (list ghc-ansi-terminal
@@ -918,12 +875,8 @@ 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
@@ -939,16 +892,26 @@ To get started quickly, see the examples:
 (define-public cabal-doctest
  (package
    (name "cabal-doctest")
-    (version "1.0.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "cabal-doctest" version))
-       (sha256
-        (base32 "0gwjpwv2v7c7gs2dvf7ixsxx6likmgw5yi0fy4bqc0i7nkqg4bfw"))))
+    (version "1.0.9")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "cabal-doctest" version))
+              (sha256
+               (base32
+                "0wxs0xkspc80h0g8ks792lrzldxvcnhc9rja1j0k678ijs20hmjm"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cabal-doctest")))
-    (home-page "https://github.com/ulidtko/cabal-doctest")
+    (arguments
+     `(#: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
@@ -1008,13 +971,13 @@ random testing, and hybrids of the two.")
 (define-public ghc-inspection-testing
  (package
    (name "ghc-inspection-testing")
-    (version "0.6.2")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "inspection-testing" version))
-       (sha256
-        (base32 "0zi1q86sd9jy5dpqfs2j71acdl7kvik0ps78xirpdhyldhwwyqws"))))
+    (version "0.4.6.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "inspection-testing" version))
+              (sha256
+               (base32
+                "0mxff0v3ciccbk4b8kxnh4752fzbwn7213qd8xji0csv6gi2w83y"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "inspection-testing")))
    (home-page "https://github.com/nomeata/inspection-testing")
@@ -1047,33 +1010,33 @@ examples and more information.")
    (name "ghc-quickcheck-classes")
    (version "0.6.5.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "quickcheck-classes" version))
-       (sha256
-        (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
+      (origin
+        (method url-fetch)
+        (uri (hackage-uri "quickcheck-classes" version))
+        (sha256
+          (base32 "19iw15mvb7gws3ljdxqwsbb4pmfc0sfflf8szgmrhiqr3k82mqv2"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-classes")))
-    (inputs (list ghc-quickcheck
-                  ghc-primitive
-                  ghc-primitive-addr
-                  ghc-quickcheck-classes-base
-                  ghc-semigroups-bootstrap
-                  ghc-fail
-                  ghc-tagged
-                  ghc-aeson
-                  ghc-semigroupoids
-                  ghc-semirings
-                  ghc-vector))
-    (native-inputs (list ghc-base-orphans ghc-base-orphans ghc-tasty
-                         ghc-tasty-quickcheck))
-    (arguments
-     `(#:cabal-revision ("3"
-                         "1pawam5rsdcdv21fqc87khzqjm0ixwzklfxd6gk3b2qrr5q66bn5")))
+    (inputs
+      (list ghc-quickcheck
+            ghc-primitive
+            ghc-primitive-addr
+            ghc-quickcheck-classes-base
+            ghc-aeson
+            ghc-semigroupoids
+            ghc-semirings
+            ghc-vector))
+    (native-inputs
+      (list ghc-base-orphans
+            ghc-tagged
+            ghc-base-orphans
+            ghc-tagged
+            ghc-tasty
+            ghc-tasty-quickcheck))
    (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
@@ -1089,26 +1052,24 @@ constraints more cleanly.")
    (name "ghc-quickcheck-classes-base")
    (version "0.6.2.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "quickcheck-classes-base" version))
-       (sha256
-        (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
+      (origin
+        (method url-fetch)
+        (uri (hackage-uri "quickcheck-classes-base" version))
+        (sha256
+          (base32 "16c6gq4cqpkwnq1pzkhm6r7mrwk4an50ha5w77bmiia2qkhla6ch"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "quickcheck-classes-base")))
-    (inputs (list ghc-quickcheck
-                  ghc-contravariant
-                  ghc-bifunctors
-                  ghc-semigroups-bootstrap
-                  ghc-fail
-                  ghc-tagged))
-    (arguments
-     `(#:cabal-revision ("1"
-                         "1p3v38jhpx0r6rnvaspkkivl8xyq2mq4xnmycgmkj1gr77vplkdr")))
+    (inputs
+      (list ghc-quickcheck
+            ghc-contravariant
+            ghc-bifunctors
+            ghc-semigroups
+            ghc-fail
+            ghc-tagged))
    (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
@@ -1126,61 +1087,67 @@ this library uses the higher-kinded typeclasses
 (define-public ghc-doctest-lib
  (package
    (name "ghc-doctest-lib")
-    (version "0.1.1.1")
+    (version "0.1")
    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "doctest-lib" version))
-       (sha256
-        (base32 "1hb3zx1xzib3v41blnwcbhc2v0rzwdzq7gm4sajqndimwjkkxc67"))))
+      (origin
+        (method url-fetch)
+        (uri (hackage-uri "doctest-lib" version))
+        (sha256
+          (base32 "1vswam0dhw52dihgnzirh18gqs8rj8h6jd7pl6y1mg2f9f9zmih2"))))
    (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.0.1")
+    (version "0.0")
    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "doctest-exitcode-stdio" version))
-       (sha256
-        (base32 "0kg5xiw4giyvqpcj6cxqqnysvixhxlwm0pbg3qks8dzwb5w79dvk"))))
+      (origin
+        (method url-fetch)
+        (uri (hackage-uri "doctest-exitcode-stdio" version))
+        (sha256
+          (base32 "1g3c7yrqq2mwqbmvs8vkx1a3cf0p0x74b7fnn344dsk7bsfpgv0x"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "doctest-exitcode-stdio")))
-    (inputs (list ghc-doctest-lib ghc-quickcheck ghc-semigroups))
+    (inputs
+      (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.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-silver" version))
-       (sha256
-        (base32 "01w3576kymglcddinh10m1wgy71dia49k2pnw5y1c97jjrhanf17"))))
+    (version "3.3.1.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-silver" version))
+              (sha256
+               (base32
+                "13j0zs0ciijv9q2nncna1gbgsgw2g7xc228hzmqic1750n3ybz9m"))))
    (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")
@@ -1196,19 +1163,16 @@ result of golden tests.")
 (define-public ghc-tasty-inspection-testing
  (package
    (name "ghc-tasty-inspection-testing")
-    (version "0.2.1")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "tasty-inspection-testing" version))
-       (sha256
-        (base32 "0wl2xlnbmqdkwhi4ic6a4q4lxf9qg433lidi8d0hlp3ykrjpbcay"))))
+    (version "0.1.0.1")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "tasty-inspection-testing" version))
+              (sha256
+               (base32
+                "0p46w44f19w7lvdzyg3vq6qzix0rjp8p23ilxz82dviq38lgmifp"))))
    (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
@@ -62,19 +62,18 @@ format.")
  (package
    (name "ghc-asn1-encoding")
    (version "0.9.6")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "asn1-encoding" version))
-       (sha256
-        (base32 "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "asn1-encoding" version))
+              (sha256
+               (base32
+                "02nsr30h5yic1mk7znf0q4z3n560ip017n60hg7ya25rsfmxxy6r"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "asn1-encoding")))
-    (inputs (list ghc-hourglass ghc-asn1-types))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
-    (arguments
-     `(#:cabal-revision ("2"
-                         "16503ryhq15f2rfdav2qnkq11dg2r3vk3f9v64q9dmxf8dh8zv97")))
+    (inputs
+     (list ghc-hourglass ghc-asn1-types))
+    (native-inputs
+     (list ghc-tasty ghc-tasty-quickcheck))
    (home-page "https://github.com/vincenthz/hs-asn1")
    (synopsis "ASN1 data reader and writer in RAW, BER and DER forms")
    (description
@@ -112,18 +111,15 @@ when ASN1 pattern matching is not convenient.")
       (method url-fetch)
       (uri (hackage-uri "crypto-api" version))
       (sha256
-        (base32 "19bsmkqkpnvh01b77pmyarx00fic15j4hvg4pzscrj4prskrx2i9"))))
+        (base32
+         "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
@@ -201,15 +197,13 @@ that hides the C implementation.")
       (method url-fetch)
       (uri (hackage-uri "cryptohash-md5" version))
       (sha256
-        (base32 "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
+        (base32
+         "018g13hkmq5782i24b4518hcd926fl6x6fh5hd7b9wlxwc5dn21v"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptohash-md5")))
    (native-inputs (list ghc-base16-bytestring ghc-puremd5 ghc-tasty
-                         ghc-tasty-quickcheck ghc-tasty-hunit))
-    (arguments
-     `(#:cabal-revision ("6"
-                         "0m7f9mgw4w9vcch37ja9zgbn0knq8rjppqr9x2ylkcdxfdnmhhif")))
-    (home-page "https://github.com/haskell-hvr/cryptohash-md5")
+                         ghc-tasty-hunit ghc-tasty-quickcheck))
+    (home-page "https://github.com/hvr/cryptohash-md5")
    (synopsis "MD5 implementation for Haskell")
    (description "This Haskell package provides implementation of MD5.")
    (license license:bsd-3)))
@@ -218,20 +212,20 @@ that hides the C implementation.")
  (package
    (name "ghc-cryptohash-sha1")
    (version "0.11.101.0")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "cryptohash-sha1" version))
-       (sha256
-        (base32 "0h9jl9v38gj0vnscqx7xdklk634p05fa6z2pcvknisq2mnbjq154"))))
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "cryptohash-sha1" version))
+              (sha256
+               (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 ("6"
-                         "1cxdw2y10z4v0mz91wki7f233jziipx85j4qy5msig4nv3djkprb")))
-    (home-page "https://github.com/haskell-hvr/cryptohash-sha1")
+     `(#:cabal-revision ("1"
+                         "0bz9rfl7b2iwn45m0lxcmsyi5rrv3xdgzx2lzr79bds91dw6i25b")))
+    (home-page "https://github.com/hvr/cryptohash-sha1")
    (synopsis "SHA-1 implementation for Haskell")
    (description
     "This Haskell package provides an incremental and one-pass,
@@ -252,18 +246,20 @@ the C implementation.")
       (method url-fetch)
       (uri (hackage-uri "cryptohash-sha256" version))
       (sha256
-        (base32 "1xkb7iqplbw4fy1122p79xf1zcb7k44rl0wmfj1q06l7cdqxr9vk"))))
+        (base32
+         "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 ("6"
-                         "01s12sl5mxvraj5fj3cs0pkb03pm8xpjz13y09dpl7i6rv6f578f")))
-    (home-page "https://github.com/haskell-hvr/cryptohash-sha256")
+     `(#:cabal-revision
+       ("1" "1hyzqv30rpj920ddnr0zypyjjlh52vyp2d140pn2byayj820rkgs")
+       #:tests? #f)) ; TODO: tasty ==1.1.*
+    (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.
@@ -276,12 +272,12 @@ the C implementation.")
  (package
    (name "ghc-cryptonite")
    (version "0.30")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "cryptonite" version))
-       (sha256
-        (base32 "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "cryptonite" version))
+              (sha256
+               (base32
+                "07bb97iszhnrfddh5ql6p3dqd0c13xycjw5n2kljw7d0ia59q2an"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "cryptonite")))
    (inputs (list ghc-memory ghc-basement))
@@ -330,17 +326,19 @@ elsewhere.")
 (define-public ghc-digest
  (package
    (name "ghc-digest")
-    (version "0.0.2.1")
+    (version "0.0.1.7")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "digest" version))
       (sha256
-        (base32 "163418p50bqdxn8ajzj6x3455xbch9jq1w6psbkdz5qzw017py6b"))))
+        (base32 "02jzw0bsng87y1n2kgpy7vb30lvqsnpbfd8dpg4hmvbg9s06qgdj"))))
    (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")
@@ -354,13 +352,13 @@ are implemented as FFI bindings to efficient code from zlib.")
 (define-public ghc-entropy
  (package
    (name "ghc-entropy")
-    (version "0.4.1.11")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (hackage-uri "entropy" version))
-       (sha256
-        (base32 "1slj5n783k2amsx2hqs5qwvcw4rgfhdhgmiyg7cii0wg4w0mmpgm"))))
+    (version "0.4.1.10")
+    (source (origin
+              (method url-fetch)
+              (uri (hackage-uri "entropy" version))
+              (sha256
+               (base32
+                "1rbx4ydabrjs8kkdg9laznkh9nisiq6b5z93vnp9bh6iy59ivb45"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "entropy")))
    (home-page "https://github.com/TomMD/entropy")
@@ -417,35 +415,6 @@ 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")
@@ -625,24 +594,6 @@ 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")
@@ -666,13 +617,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton
  (package
    (name "ghc-crypton")
-    (version "1.0.4")
+    (version "0.34")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton" version))
       (sha256
-        (base32 "06h1qjvqd8gmiyzvh31sc061vcgns101l0774c44a8k44015925l"))))
+        (base32 "1mhypjhzn95in853bp7ary0a2xc6lsji6j8hrrgn2mfa4ilq8i24"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton")))
    (inputs (list ghc-memory ghc-basement))
@@ -702,13 +653,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509
  (package
    (name "ghc-crypton-x509")
-    (version "1.7.7")
+    (version "1.7.6")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509" version))
       (sha256
-        (base32 "10pkva9wvm6ih48bprxlnyhnn3nr6xq9dhkrk4hfxpsaij6f9v7g"))))
+        (base32 "1zyaz0krf08g36g30zr5wn8f2x51l4dj2zcjnhpiw9h05p54mdzb"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509")))
    (inputs (list ghc-memory
@@ -718,7 +669,13 @@ abstraction for CPRNGs.")
                  ghc-asn1-encoding
                  ghc-asn1-parse
                  ghc-crypton))
-    (native-inputs (list ghc-tasty ghc-tasty-quickcheck))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-x509))
+    (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.")
@@ -727,13 +684,13 @@ abstraction for CPRNGs.")
 (define-public ghc-crypton-x509-store
  (package
    (name "ghc-crypton-x509-store")
-    (version "1.6.11")
+    (version "1.6.9")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509-store" version))
       (sha256
-        (base32 "07vq7f883cm5krqz2kc0qkh9ks54jknrwdqvfqsk91s12b693a83"))))
+        (base32 "0vr5b9cyf9x016wn1g0bryslf5nz8jq2sy8r3llwqfg02apihqiy"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509-store")))
    (inputs (list ghc-pem ghc-asn1-types ghc-asn1-encoding ghc-crypton
@@ -770,25 +727,24 @@ storage methods, and accessors.")
 (define-public ghc-crypton-x509-validation
  (package
    (name "ghc-crypton-x509-validation")
-    (version "1.6.14")
+    (version "1.6.12")
    (source
     (origin
       (method url-fetch)
       (uri (hackage-uri "crypton-x509-validation" version))
       (sha256
-        (base32 "07b09kgrd3m5ahxpj458r5ycd30bz8ldwjwf19mdcnfv4x0kj3pd"))))
+        (base32 "1xjhwvmkcy47a6xiqxb3xy944ca7g660203jdrz5xzd46zibfq0f"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "crypton-x509-validation")))
    (inputs (list ghc-memory
                  ghc-hourglass
-                  ghc-data-default
+                  ghc-data-default-class
                  ghc-pem
                  ghc-asn1-types
                  ghc-asn1-encoding
                  ghc-crypton-x509
                  ghc-crypton-x509-store
-                  ghc-crypton
-                  ghc-iproute))
+                  ghc-crypton))
    (native-inputs (list ghc-tasty ghc-tasty-hunit))
    (home-page "https://github.com/kazu-yamamoto/crypton-certificate")
    (synopsis "X.509 Certificate and CRL validation")
@@ -796,44 +752,6 @@ 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")
@@ -886,17 +804,20 @@ percent.
       (method url-fetch)
       (uri (hackage-uri "ed25519" version))
       (sha256
-        (base32 "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
+        (base32
+         "0v8msqvgzimhs7p5ri25hrb1ni2wvisl5rmdxy89fc59py79b9fq"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "ed25519")))
-    (native-inputs (list ghc-quickcheck ghc-doctest))
    (arguments
-     `(#:cabal-revision ("9"
-                         "0y5vfdcys18waa5k5zxiq9n8jq0l05j76riml23i0gxmwgdhsmgi")))
-    (home-page "https://github.com/thoughtpolice/hs-ed25519/")
+     `(#:cabal-revision
+       ("6" "0qyx6cl52fnll8lp6v9133wfvv3zhvq7v2crn441mng520j9wp48")
+       ;; We omit these test suites because they require old versions of
+       ;; packages and packages we do not have.
+       #:configure-flags
+       '("--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
@@ -906,41 +827,29 @@ guidelines.")
 (define-public ghc-tls
  (package
    (name "ghc-tls")
-    (version "2.1.8")
+    (version "1.5.8")
    (source (origin
              (method url-fetch)
              (uri (hackage-uri "tls" version))
              (sha256
               (base32
-                "1csdy3426lva1a5f7gh9qm96vzfraqj91jbxlm79wbf1jsdzfhsq"))))
+                "0rxdv8ab98kd4nqql7djmmi51k4vayq21s38s43sx3rzn0iyla3b"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "tls")))
-    (inputs (list ghc-asn1-types
-                  ghc-asn1-encoding
-                  ghc-base16-bytestring
-                  ghc-cereal
-                  ghc-crypton
-                  ghc-crypton-x509
-                  ghc-crypton-x509-store
-                  ghc-crypton-x509-validation
-                  ghc-data-default
+    (inputs (list ghc-cereal
+                  ghc-data-default-class
                  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")
+                  ghc-cryptonite
+                  ghc-asn1-types
+                  ghc-asn1-encoding
+                  ghc-x509
+                  ghc-x509-store
+                  ghc-x509-validation
+                  ghc-async
+                  ghc-hourglass
+                  ghc-network))
+    (native-inputs (list ghc-tasty ghc-tasty-quickcheck ghc-quickcheck))
+    (home-page "http://github.com/vincenthz/hs-tls")
    (synopsis "TLS/SSL protocol native implementation (Server and Client)")
    (description
     "Native Haskell TLS and SSL protocol implementation for server and client.
@@ -952,6 +861,43 @@ 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")
@@ -1014,14 +960,17 @@ the tls package, and borrows some ideas from x509-system.")
       (method url-fetch)
       (uri (hackage-uri "openssl-streams" version))
       (sha256
-        (base32 "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
+        (base32
+         "10pnnpzgb5xr811kc9qdk7h2cgn6hk2yiyhnzz8f8p0fjzc0pwjm"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "openssl-streams")))
-    (inputs (list ghc-hsopenssl ghc-io-streams ghc-network))
-    (native-inputs (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
+    (inputs
+     (list ghc-hsopenssl ghc-io-streams ghc-network))
+    (native-inputs
+     (list ghc-hunit ghc-test-framework ghc-test-framework-hunit))
    (arguments
-     `(#:cabal-revision ("3"
-                         "1vizl9yajkbd59rrnfb38xwq7hfj36avbv6vwqnkhbvz3qaj3dwg")))
+     `(#:cabal-revision ("1"
+                         "0vfawnfcjrw29qg1n7k6z6bk4bmnk869gjlr9mxw4mzxgl80b2vp")))
    (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
@@ -1626,6 +1626,12 @@ 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)
@@ -1689,24 +1695,22 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
  (let ((base ghc-9.2))
    (package
      (inherit base)
-      (name "ghc")
-      (version "9.4.3")
+      (name "ghc-next")
+      (version "9.4.4")
      (source (origin
                (method url-fetch)
                (uri (string-append "https://www.haskell.org/ghc/dist/" version
                                    "/ghc-" version "-src.tar.xz"))
                (sha256
                 (base32
-                  "0nlhx2cbq1jh2yr6zk475lavjkh9sncj57qp77p51pkfad4kkxpa"))
+                  "1qk7rlqf02s3b6m6sqqngmjq1mxnrz88h159lz6k25gddmdg5kp8"))
                (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)))
-         ((#:tests? _ #f)
-          #f)))
+             (delete 'skip-tests)))))
      (native-inputs
       `(;; GHC 9.4 must be built with GHC >= 9.0.
         ("ghc-bootstrap" ,ghc-bootstrap-for-9.4)
@@ -1718,7 +1722,8 @@ SRC_HC_OPTS += -optc-mno-outline-atomics
                    version "/ghc-" version "-testsuite.tar.xz"))
             (sha256
              (base32
-               "1xbps33pq6mg2bwp5gvmc4qhgdq52yng5993if99b9s3fylqk86l"))))
+               "04p2lawxxg3nyv6frzhyjyh3arhqqyh5ka3alxa2pxhcd2hdcja3"))
+             (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
@@ -1733,326 +1738,4 @@ 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
@@ -1,58 +0,0 @@
-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:
@@ -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
@@ -1,29 +0,0 @@
-Fix test_command_error for neovim 0.12.x.
-
-In neovim 0.12.0, the error message for an invalid cursor position changed from
-"Cursor position outside buffer" to "Invalid cursor line: out of range".  Update
-the test to accept both messages.
-
-Taken from upstream commit d89b62ed622976c8d6dbc7733a99dac371b01cbf.
-
-diff --git a/test/test_vim.py b/test/test_vim.py
-index 8a76f5e..26e2fce 100644
--- a/test/test_vim.py
-+++ b/test/test_vim.py
-@@ -1,6 +1,7 @@
- """Tests interaction with neovim via Nvim API (with child process)."""
- 
- import os
-+import re
- import sys
- import tempfile
- from pathlib import Path
-@@ -50,7 +51,7 @@ def test_command_output(vim: Nvim) -> None:
- def test_command_error(vim: Nvim) -> None:
-     with pytest.raises(vim.error) as excinfo:
-         vim.current.window.cursor = -1, -1
-    assert excinfo.value.args == ('Cursor position outside buffer',)
-+    assert re.search(r"Cursor position outside buffer|Invalid cursor line", excinfo.value.args[0])
- 
- 
- def test_eval(vim: Nvim) -> None:
@@ -1,299 +0,0 @@
-From 7a372a6914e9d9d6f0c914a1ca8cdff592c40593 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Thu, 12 Mar 2026 11:57:11 +1000
-Subject: [PATCH] Update compiler patch for M147 beta
-
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
--- a/build/config/compiler/BUILD.gn
-+++ b/build/config/compiler/BUILD.gn
-@@ -367,9 +367,6 @@ config("compiler") {
- 
-   configs += [
-     # See the definitions below.
-    ":clang_revision",
-    ":rustc_revision",
-    ":compiler_cpu_abi",
-     ":compiler_codegen",
-     ":compiler_deterministic",
-     ":clang_warning_suppression",
-@@ -1690,43 +1687,6 @@ config("compiler_deterministic") {
-     }
-   }
- 
-  # Makes builds independent of absolute file path.
-  if (is_clang && strip_absolute_paths_from_debug_symbols) {
-    # If debug option is given, clang includes $cwd in debug info by default.
-    # For such build, this flag generates reproducible obj files even we use
-    # different build directory like "out/feature_a" and "out/feature_b" if
-    # we build same files with same compile flag.
-    # Other paths are already given in relative, no need to normalize them.
-
-    # -ffile-compilation-dir is an alias for both -fdebug-compilation-dir=
-    # and -fcoverage-compilation-dir=.
-    cflags += [ "-ffile-compilation-dir=." ]
-
-    # Convert absolute paths to relative paths. Expands to, for example:
-    #   -file-prefix-map /path/to/chromium/src=../..
-    swiftflags += [
-      "-file-prefix-map",
-      rebase_path("//.", "") + "=" + rebase_path("//.", root_build_dir),
-    ]
-    if (!is_win) {
-      # We don't use clang -cc1as on Windows (yet? https://crbug.com/762167)
-      asmflags = [ "-Wa,-fdebug-compilation-dir,." ]
-    }
-
-    if (is_win && use_lld) {
-      if (symbol_level == 2 || (is_clang && using_sanitizer)) {
-        # Absolutize source file paths for PDB. Pass the real build directory
-        # if the pdb contains source-level debug information and if linker
-        # reproducibility is not critical.
-        ldflags += [ "/PDBSourcePath:" + rebase_path(root_build_dir) ]
-      } else {
-        # Use a fake fixed base directory for paths in the pdb to make the pdb
-        # output fully deterministic and independent of the build directory.
-        ldflags += [ "/PDBSourcePath:o:\fake\prefix" ]
-      }
-    }
-  }
-
-   # Tells the compiler not to use absolute paths when passing the default
-   # paths to the tools it invokes. We don't want this because we don't
-   # really need it and it can mess up the RBE cache entries.
-@@ -1759,88 +1719,6 @@ config("compiler_deterministic") {
-   }
- }
- 
-config("clang_revision") {
-  if (is_clang && clang_base_path == default_clang_base_path &&
-      current_os != "zos") {
-    _perform_consistency_checks = current_toolchain == default_toolchain
-    if (llvm_force_head_revision) {
-      _head_revision_stamp_path = "//third_party/llvm-build/force_head_revision"
-      _head_revision = ""
-      if (path_exists(_head_revision_stamp_path)) {
-        _head_revision = read_file(_head_revision_stamp_path, "trim string")
-      }
-      assert(
-          _head_revision != "",
-          "llvm_force_head_revision=true, but no locally built version was detected.")
-      _clang_revision = _head_revision
-    } else {
-      _clang_revision = read_file(
-              "//third_party/llvm-build/Release+Asserts/cr_build_revision",
-              "trim string")
-
-      # Ensure that the synced clang version matches what's in git.
-      if (_perform_consistency_checks) {
-        # Parse the clang version from the Python script.
-        _clang_version_lines = filter_include(
-                read_file("//tools/clang/scripts/update.py", "list lines"),
-                [ "CLANG_*REVISION = *" ])
-        _py_revision =
-            string_replace(_clang_version_lines[0], "CLANG_REVISION = '", "")
-        _py_revision = string_replace(_py_revision, "'", "")
-        _py_subrevision =
-            string_replace(_clang_version_lines[1], "CLANG_SUB_REVISION = ", "")
-        _expected_clang_revision = "$_py_revision-$_py_subrevision"
-
-        # TODO(agrieve): Change filter_include to _clang_revision ==
-        # _expected_clang_revision once angle & webrtc use a GCS DEPS entry
-        # rather than a update.py runhook.
-        assert(
-            filter_include([ _clang_revision ],
-                           [
-                             _expected_clang_revision,
-                             "$_expected_clang_revision,*",
-                           ]) != [],
-            "clang_revision=\"$_clang_revision\" but update.py expected \"$_expected_clang_revision\". Did you forget to gclient sync?")
-      }
-    }
-
-    if (_perform_consistency_checks) {
-      # Ensure that the revision matches the version major expected by GN.
-      _versions_match = filter_include([ _clang_revision ],
-                                       [ "llvmorg-$clang_version-*" ]) != []
-      assert(
-          _versions_match,
-          "clang_revision=\"$_clang_revision\" but clang_version=\"$clang_version\". clang_version in build/toolchain/toolchain.gni is likely outdated.")
-    }
-
-    if (toolchain_has_rust && _perform_consistency_checks &&
-        !rust_force_head_revision) {
-      # Ensure that the synced rust version matches what's in git.
-      _rust_revision_lines =
-          filter_include(read_file("//tools/rust/update_rust.py", "list lines"),
-                         [ "RUST_*REVISION = *" ])
-      _py_revision =
-          string_replace(_rust_revision_lines[0], "RUST_REVISION = '", "")
-      _py_revision = string_replace(_py_revision, "'", "")
-      _py_subrevision =
-          string_replace(_rust_revision_lines[1], "RUST_SUB_REVISION = ", "")
-      _expected_rust_revision = "$_py_revision-$_py_subrevision"
-
-      # Ensure the rust version matches the clang version.
-      assert(
-          filter_include([ rustc_revision ],
-                         [ "*-$_expected_rust_revision-*" ]) != [],
-          "rustc_revision=\"$rustc_revision\" but update_rust.py expected \"$_expected_rust_revision\". Run \"gclient sync\"?")
-    }
-
-    # This is here so that all files get recompiled after a clang roll and
-    # when turning clang on or off. (defines are passed via the command line,
-    # and build system rebuild things when their commandline changes). Nothing
-    # should ever read this define.
-    defines = [ "CR_CLANG_REVISION=\"$_clang_revision\"" ]
-  }
-}
-
- # Controls the usage of a warning suppression mapping (WSM) file to suppress
- # warnings based on the path of the file they come from. It's controlled by the
- # `clang_warning_suppression_file` gn argument , which points to a text file
-@@ -1896,18 +1774,6 @@ config("sanitize_c_array_bounds") {
-   }
- }
- 
-config("rustc_revision") {
-  if (rustc_revision != "") {
-    # Similar to the `clang_revision` config, this is here so that all `.rs`
-    # sources get recompiled after a rustc roll. Nothing should ever read this
-    # cfg. This will not be set if a custom toolchain is used.
-    rustflags = [
-      "--cfg",
-      "cr_rustc_revision=\"$rustc_revision\"",
-    ]
-  }
-}
-
- config("compiler_arm_fpu") {
-   if (current_cpu == "arm" && !is_ios) {
-     cflags = [ "-mfpu=neon" ]
-@@ -2386,11 +2252,7 @@ config("chromium_code") {
-       defines = [ "_HAS_NODISCARD" ]
-     }
-   } else {
-    cflags = [ "-Wall" ]
-    if (is_clang) {
-      # Enable extra warnings for chromium_code when we control the compiler.
-      cflags += [ "-Wextra" ]
-    }
-+    cflags = []
- 
-     # In Chromium code, we define __STDC_foo_MACROS in order to get the
-     # C99 macros on Mac and Linux.
-@@ -2399,32 +2261,6 @@ config("chromium_code") {
-       "__STDC_FORMAT_MACROS",
-     ]
- 
-    if (!is_debug && !using_sanitizer && current_cpu != "s390x" &&
-        current_cpu != "ppc64" && current_cpu != "mips" &&
-        current_cpu != "mips64" && current_cpu != "riscv64" &&
-        current_cpu != "loong64") {
-      # Non-chromium code is not guaranteed to compile cleanly with
-      # _FORTIFY_SOURCE. Also, fortified build may fail when optimizations are
-      # disabled, so only do that for Release build.
-      fortify_level = "2"
-
-      # ChromeOS's toolchain supports a high-quality _FORTIFY_SOURCE=3
-      # implementation with a few custom glibc patches. Use that if it's
-      # available.
-      if (is_chromeos_device) {
-        fortify_level = "3"
-      }
-
-      # _FORTIFY_SOURCE=3 is available in glibc 2.34+. Enable it when building
-      # with the sysroot where support is guaranteed. Clang is also required since
-      # the system gcc is often patched to add _FORTIFY_SOURCE=2 which would conflict
-      # with our definition.
-      if (use_sysroot && is_clang) {
-        fortify_level = "3"
-      }
-      defines += [ "_FORTIFY_SOURCE=" + fortify_level ]
-    }
-
-     if (is_apple) {
-       cflags_objc = [ "-Wimplicit-retain-self" ]
-       cflags_objcc = [ "-Wimplicit-retain-self" ]
-@@ -2848,7 +2684,8 @@ config("default_stack_frames") {
- # [0]: https://pinpoint-dot-chromeperf.appspot.com/job/147634a8be0000
- # [1]: https://pinpoint-dot-chromeperf.appspot.com/job/132bc772be0000
- # [2]: https://crrev.com/c/5447532
-config("optimize") {
-+config("optimize") { }
-+config("xoptimize") {
-   if (is_win) {
-     # clang-cl's /O2 corresponds to clang's -O3, and really want -O2 for
-     # consistency with the other platforms.
-@@ -2897,7 +2734,8 @@ config("optimize") {
- }
- 
- # Turn off optimizations.
-config("no_optimize") {
-+config("no_optimize") { }
-+config("xno_optimize") {
-   if (is_win) {
-     cflags = [
-       "/Od",  # Disable optimization.
-@@ -2932,7 +2770,8 @@ config("no_optimize") {
- # Turns up the optimization level. Used to explicitly enable -O2 instead of
- # -Os for select targets on platforms that use optimize_for_size. No-op
- # elsewhere.
-config("optimize_max") {
-+config("optimize_max") { }
-+config("xoptimize_max") {
-   ldflags = common_optimize_on_ldflags
-   if (is_win) {
-     # Favor speed over size, /O2 must be before the common flags.
-@@ -2953,7 +2792,8 @@ config("optimize_max") {
- #
- # TODO(crbug.com/41259697) - rework how all of these configs are related
- # so that we don't need this disclaimer.
-config("optimize_speed") {
-+config("optimize_speed") { }
-+config("xoptimize_speed") {
-   ldflags = common_optimize_on_ldflags
-   if (is_win) {
-     # Favor speed over size, /O2 must be before the common flags.
-@@ -2970,7 +2810,8 @@ config("optimize_speed") {
-   rustflags = [ "-Copt-level=3" ]
- }
- 
-config("optimize_fuzzing") {
-+config("optimize_fuzzing") { }
-+config("xoptimize_fuzzing") {
-   cflags = [ "-O1" ] + common_optimize_on_cflags
-   rustflags = [ "-Copt-level=1" ]
-   ldflags = common_optimize_on_ldflags
-@@ -3115,7 +2956,8 @@ config("split_dwarf") {
- }
- 
- # Full symbols.
-config("symbols") {
-+config("symbols") { }
-+config("xsymbols") {
-   rustflags = []
-   configs = []
-   if (is_win) {
-@@ -3275,7 +3117,8 @@ config("symbols") {
- # Minimal symbols.
- # This config guarantees to hold symbol for stack trace which are shown to user
- # when crash happens in unittests running on buildbot.
-config("minimal_symbols") {
-+config("minimal_symbols") { }
-+config("xminimal_symbols") {
-   configs = []
-   rustflags = []
-   if (is_win) {
-@@ -3355,7 +3198,8 @@ config("minimal_symbols") {
- # This configuration contains function names only. That is, the compiler is
- # told to not generate debug information and the linker then just puts function
- # names in the final debug information.
-config("no_symbols") {
-+config("no_symbols") { }
-+config("xno_symbols") {
-   if (is_win) {
-     ldflags = [ "/DEBUG" ]
- 
-- 
-2.52.0
-
@@ -1,46 +0,0 @@
-From da37bd781c0371e02ffc4877c3ac1b5f2020c207 Mon Sep 17 00:00:00 2001
-From: Matt Jolly <kangie@gentoo.org>
-Date: Tue, 17 Feb 2026 15:45:01 +1000
-Subject: [PATCH] Handle case where `parsed_rustc_args.cfg` is empty
-
-This may occur when (for example) using the unbundle toolchain
-
-Signed-off-by: Matt Jolly <kangie@gentoo.org>
--- a/third_party/rust/cxx/chromium_integration/run_cxxbridge.py
-+++ b/third_party/rust/cxx/chromium_integration/run_cxxbridge.py
-@@ -44,18 +44,20 @@ def calculate_cxxbridge_args(unrecognized_script_args, rustc_print_cfg_path):
-   parser.add_argument("--cfg", action="append"),
-   parsed_rustc_args, _other_args = parser.parse_known_args(
-       args=unrecognized_script_args[:rustflags_separator])
-  for cfg_arg in parsed_rustc_args.cfg:
-    if "=" not in cfg_arg:  # `buildflag_header.gni` only supports bool flags.
-      # TODO(https://crbug.com/436606652): Stop using `_BUILDFLAG_NOT_SET_`
-      # prefix and instead use `--check-cfg` in `run_cxxbridge.py` to
-      # detect buildflag names.
-      FALSE_PREFIX = "_BUILDFLAG_NOT_SET_"
-      if cfg_arg.startswith(FALSE_PREFIX):
-        flagname = cfg_arg[len(FALSE_PREFIX):]
-        cxxbridge_args.append(f"--cfg={flagname}=false")
-      else:
-        flagname = cfg_arg
-        cxxbridge_args.append(f"--cfg={flagname}=true")
-+  # Unbundled toolchain may not have any `--cfg` flags
-+  if parsed_rustc_args.cfg:
-+    for cfg_arg in parsed_rustc_args.cfg:
-+      if "=" not in cfg_arg:  # `buildflag_header.gni` only supports bool flags.
-+        # TODO(https://crbug.com/436606652): Stop using `_BUILDFLAG_NOT_SET_`
-+        # prefix and instead use `--check-cfg` in `run_cxxbridge.py` to
-+        # detect buildflag names.
-+        FALSE_PREFIX = "_BUILDFLAG_NOT_SET_"
-+        if cfg_arg.startswith(FALSE_PREFIX):
-+          flagname = cfg_arg[len(FALSE_PREFIX):]
-+          cxxbridge_args.append(f"--cfg={flagname}=false")
-+        else:
-+          flagname = cfg_arg
-+          cxxbridge_args.append(f"--cfg={flagname}=true")
- 
-   with open(rustc_print_cfg_path, 'r') as file:
-     for line in file:
-- 
-2.52.0
-
@@ -0,0 +1,21 @@
+From a665875b4013eed997bd042326a038e24f3296e7 Mon Sep 17 00:00:00 2001
+From: Matt Jolly <kangie@gentoo.org>
+Date: Thu, 10 Oct 2024 14:36:51 +1000
+Subject: [PATCH] unbundle: add missing icu target
+
+--- a/build/linux/unbundle/icu.gn
+++ b/build/linux/unbundle/icu.gn
+@@ -65,6 +65,10 @@ group("icuuc_public") {
+   public_deps = [ ":icuuc" ]
+ }
+ 
+group("icui18n_hidden_visibility") {
+  public_deps = [ ":icuuc" ]
+}
+
+ shim_headers("icui18n_shim") {
+   root_path = "source/i18n"
+   headers = [
+-- 
+2.46.2
+
@@ -10497,6 +10497,33 @@ which can produce feeds in RSS 2.0, RSS 0.91, and Atom formats.")
 errors when data is invalid.")
    (license license:expat)))

+(define-public python-pydantic-1
+  (package
+    (inherit python-pydantic)
+    (name "python-pydantic")
+    (version "1.10.19")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+              (url "https://github.com/samuelcolvin/pydantic")
+              (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "0swcpfq1y0h5dcj82idls8k5la4xh4c0vz47y7jci2qass8gjffc"))))
+    (build-system pyproject-build-system)
+    (arguments
+     (list
+      #:test-flags
+      ;; One test fails with  not equal assertion.
+      #~(list "--deselect=tests/test_validators.py::test_assert_raises_validation_error")))
+    (native-inputs
+     (list python-pytest
+           python-pytest-mock
+           python-setuptools))
+    (propagated-inputs
+     (list python-typing-extensions))))
+
 ;; It may be removed after 2026-01-05.
 (define-deprecated/public-alias python-pydantic-2 python-pydantic)

@@ -326,13 +326,12 @@
  (crate-source "alsa-sys" "0.3.1"
                "09qmmnpmlcj23zcgx2xsi4phcgm5i02g9xaf801y7i067mkfx3yv"))

-(define rust-ambient-authority-0.0.2
-  (crate-source "ambient-authority" "0.0.2"
-                "0fxsfyhy64jx7zrkb85h1vhr5nfqncja3pwpikid471d8w6yxm79"))
-
 (define rust-ambient-id-0.0.10
  (crate-source "ambient-id" "0.0.10"
                "0z5idh2h94naqylgica1skn6xpnadnqhg4z4n0ss4m6am3q204z6"))
+(define rust-ambient-authority-0.0.2
+  (crate-source "ambient-authority" "0.0.2"
+                "0fxsfyhy64jx7zrkb85h1vhr5nfqncja3pwpikid471d8w6yxm79"))

 (define rust-amd-0.2.2
  (crate-source "amd" "0.2.2"
@@ -1190,8 +1189,7 @@

 (define rust-async-compression-0.4.32
  (crate-source "async-compression" "0.4.32"
-                "1q7l15lwlc1ral2bi8a4d88a4rha12xgnci4mish4wjc0pkbr2as"
-                #:snippet '(delete-file-recursively "tests")))
+                "1q7l15lwlc1ral2bi8a4d88a4rha12xgnci4mish4wjc0pkbr2as"))

 (define rust-async-compression-0.4.33
  (crate-source "async-compression" "0.4.33"
@@ -1421,13 +1419,12 @@
  (crate-source "async-trait" "0.1.89"
                "1fsxxmz3rzx1prn1h3rs7kyjhkap60i7xvi0ldapkvbb14nssdch"))

-(define rust-async-tungstenite-0.31.0
-  (crate-source "async-tungstenite" "0.31.0"
-                "13ribs355ng5rwfg54j39kkbp92hayarhd6ld92fmjf8ib4b927f"))
-
 (define rust-async-tungstenite-0.33.0
  (crate-source "async-tungstenite" "0.33.0"
                "0jchjqhd8642jlpgpayhx3rk93m58if6jipdmf2bpabqckb6bd7k"))
+(define rust-async-tungstenite-0.31.0
+  (crate-source "async-tungstenite" "0.31.0"
+                "13ribs355ng5rwfg54j39kkbp92hayarhd6ld92fmjf8ib4b927f"))

 (define rust-async-zip-0.0.12
  (crate-source "async_zip" "0.0.12"
@@ -1446,9 +1443,7 @@

 (define rust-async-zip-0.0.18
  (crate-source "async_zip" "0.0.18"
-                "1rl59ym8s843p79lf1i9aivhv1kqbxhzz1d7cp5y1c71bkb5130d"
-                #:snippet '(for-each delete-file-recursively
-                                     '("src/tests" "tests"))))
+                "1rl59ym8s843p79lf1i9aivhv1kqbxhzz1d7cp5y1c71bkb5130d"))

 (define rust-asyncgit-0.27.0
  (crate-source "asyncgit" "0.27.0"
@@ -1831,8 +1826,7 @@
  ;; objects (builder/prebuilt-nasm/, 26 .obj files), and generated includes
  ;; (generated-include/, generated-src/).  Link against system aws-lc instead.
  (crate-source "aws-lc-sys" "0.37.0"
-                "06h8yb8843607zb3wwhmkmj6308g5s50ybqkabdwh5vhvyjdsd2w"
-                #:snippet '(delete-file-recursively "builder/prebuilt-nasm")))
+                "06h8yb8843607zb3wwhmkmj6308g5s50ybqkabdwh5vhvyjdsd2w"))

 (define rust-aws-lc-sys-0.37.1
  ;; TODO: Unbundle aws-lc.
@@ -1870,10 +1864,6 @@
  (crate-source "aws-sdk-config" "1.65.0"
                "00bmiag1avvd3rx8isl5802syfq68ynnmw3r7mma8xlqicngni96"))

-(define rust-aws-sdk-kinesis-1.95.0
-  (crate-source "aws-sdk-kinesis" "1.95.0"
-                "0p904mgidawn0yncjs79bj0il3k1jw24js9gbipyb39h87ljqfww"))
-
 (define rust-aws-sdk-kinesisvideo-1.98.0
  (crate-source "aws-sdk-kinesisvideo" "1.98.0"
                "0wv1rrf8vs0fmhigrn4qrb4xya57ckcaqf1m6xvy59mgkfh7vm81"))
@@ -1885,15 +1875,14 @@
 (define rust-aws-sdk-polly-1.102.0
  (crate-source "aws-sdk-polly" "1.102.0"
                "1rzf87q6545jy93mra755a1c0qnlr3g699ppz0q951dcavjdz1dw"))
+(define rust-aws-sdk-kinesis-1.95.0
+  (crate-source "aws-sdk-kinesis" "1.95.0"
+                "0p904mgidawn0yncjs79bj0il3k1jw24js9gbipyb39h87ljqfww"))

 (define rust-aws-sdk-s3-1.102.0
  (crate-source "aws-sdk-s3" "1.102.0"
                "1k8np6pkak7c72h7sfwjpx74ph5ypmxbcf33m9399x20x0jvkpbm"))

-(define rust-aws-sdk-s3-1.112.0
-  (crate-source "aws-sdk-s3" "1.112.0"
-                "1436p7p55ybziwylzhkp04yk7nzvd453jaspl1nw8d8hf8kkmrzf"))
-
 (define rust-aws-sdk-s3-1.125.0
  (crate-source "aws-sdk-s3" "1.125.0"
                "1v88swvjvkg555516lllcn7rw67g7pdw5x4iba95g58dcnamqgr2"))
@@ -1901,6 +1890,9 @@
 (define rust-aws-sdk-s3-1.126.0
  (crate-source "aws-sdk-s3" "1.126.0"
                "1fxjdi6hkd22f368dbk072sii55mingy12yvr7p1bli14c50ay3q"))
+(define rust-aws-sdk-s3-1.112.0
+  (crate-source "aws-sdk-s3" "1.112.0"
+                "1436p7p55ybziwylzhkp04yk7nzvd453jaspl1nw8d8hf8kkmrzf"))

 (define rust-aws-sdk-s3-1.79.0
  (crate-source "aws-sdk-s3" "1.79.0"
@@ -1979,8 +1971,7 @@

 (define rust-aws-smithy-eventstream-0.60.13
  (crate-source "aws-smithy-eventstream" "0.60.13"
-                "0n46cdrjc8whmakkv4vfnwdindb1jnryyiw8h0wily0rhd7k16p2"
-                #:snippet '(delete-file-recursively "test_data")))
+                "0n46cdrjc8whmakkv4vfnwdindb1jnryyiw8h0wily0rhd7k16p2"))

 (define rust-aws-smithy-eventstream-0.60.20
  (crate-source "aws-smithy-eventstream" "0.60.20"
@@ -2145,7 +2136,6 @@
 (define rust-axoupdater-0.9.1
  (crate-source "axoupdater" "0.9.1"
                "10p9ynd4gpkj3x4arc2an9aap8bkzvrk9f067178y2fz4qcjlj6w"))
-
 (define rust-axum-0.6.20
  (crate-source "axum" "0.6.20"
                "1gynqkg3dcy1zd7il69h8a3zax86v6qq5zpawqyn87mr6979x0iv"))
@@ -2384,10 +2374,6 @@
  (crate-source "bigdecimal" "0.4.10"
                "159nc0bs6bbzxrpfxbnn83ccyzq8bc2ia40zd22ssfjvavqnfs2d"))

-(define rust-bigdecimal-0.4.8
-  (crate-source "bigdecimal" "0.4.8"
-                "04q0d4f9k3czy6ynydd8gspig046f85kav6cgh1266vsmclg48hs"))
-
 (define rust-bilge-0.2.0
  (crate-source "bilge" "0.2.0"
                "0mvvwq9caiq701bmmwyd4q4pc8c69i5zaj3zdk6ya7gqxgc7ww6w"))
@@ -2395,6 +2381,9 @@
 (define rust-bilge-impl-0.2.0
  (crate-source "bilge-impl" "0.2.0"
                "1n5jml0c1z0np76ms0h5rxx19krblz46h84wycx29b9q4001xcgy"))
+(define rust-bigdecimal-0.4.8
+  (crate-source "bigdecimal" "0.4.8"
+                "04q0d4f9k3czy6ynydd8gspig046f85kav6cgh1266vsmclg48hs"))

 (define rust-binascii-0.1.4
  (crate-source "binascii" "0.1.4"
@@ -3523,6 +3512,9 @@
  (crate-source "canonical-path" "2.0.2"
                "0vvsjda6ka5nz8zvx6r08zqi0j59sjccgcbjxj96xj764w9y1sg6"))

+(define rust-caplog-0.3.0
+  (crate-source "caplog" "0.3.0"
+                "033w5vva7hm3i1qxaykiig2jzki8ycwz0ff9d7gi9q6d71ibkp5v"))
 (define rust-cap-fs-ext-3.4.4
  (crate-source "cap-fs-ext" "3.4.4"
                "0g0pdhz3w09pdza8xamzrzicjpmwk73y7h8mdzxfhgqra62w2774"))
@@ -3547,10 +3539,6 @@
  (crate-source "cap-time-ext" "3.4.4"
                "0nqskcskhki1chj3ylln333nh0xrbp3phsa6l3d8a03pp0hga6j9"))

-(define rust-caplog-0.3.0
-  (crate-source "caplog" "0.3.0"
-                "033w5vva7hm3i1qxaykiig2jzki8ycwz0ff9d7gi9q6d71ibkp5v"))
-
 (define rust-capnp-0.19.8
  (crate-source "capnp" "0.19.8"
                "0vk3vxcq11v4nzxlrdfxmyr4339i1jqi4zcmi919mbnsddb5m62f"))
@@ -5772,13 +5760,12 @@
  (crate-source "core_maths" "0.1.1"
                "0c0dv11ixxpc9bsx5xasvl98mb1dlprzcm6qq6ls3nsygw0mwx3p"))

-(define rust-core-services-0.2.1
-  (crate-source "core-services" "0.2.1"
-                "1zf0wcm7rkp4c265zvn7q8h7iv14as3msb3lmzmm09ajvf0pwmlj"))
-
 (define rust-core-text-19.2.0
  (crate-source "core-text" "19.2.0"
                "09aa9gfw0zvjwncskr721ljnyj2vfsxbz2lgl7piqz70cvd4mmwr"))
+(define rust-core-services-0.2.1
+  (crate-source "core-services" "0.2.1"
+                "1zf0wcm7rkp4c265zvn7q8h7iv14as3msb3lmzmm09ajvf0pwmlj"))

 (define rust-core-text-20.1.0
  (crate-source "core-text" "20.1.0"
@@ -5827,8 +5814,7 @@

 (define rust-cosmic-text-0.17.1
  (crate-source "cosmic-text" "0.17.1"
-                "0synqbv7l40qzg05nykj3ir0xj22w5839a190r0wb9jawrl9hp4c"
-                #:snippet '(delete-file-recursively "tests")))
+                "0synqbv7l40qzg05nykj3ir0xj22w5839a190r0wb9jawrl9hp4c"))

 (define rust-countme-3.0.1
  (crate-source "countme" "3.0.1"
@@ -6673,8 +6659,7 @@

 (define rust-cxx-1.0.187
  (crate-source "cxx" "1.0.187"
-                "11z1nplfy6f5ndjip8vinilzsn3l60acyflxpwn6wacrsiw5cinq"
-                #:snippet '(delete-file-recursively "book")))
+                "11z1nplfy6f5ndjip8vinilzsn3l60acyflxpwn6wacrsiw5cinq"))

 (define rust-cxx-1.0.194
  (crate-source "cxx" "1.0.194"
@@ -9271,8 +9256,7 @@

 (define rust-fontdb-0.16.2
  (crate-source "fontdb" "0.16.2"
-                "1hqxv3jnh06s4bflrwnb39mi3knllfs4mxm44vsn0gzgqch90adh"
-                #:snippet '(delete-file-recursively "tests")))
+                "1hqxv3jnh06s4bflrwnb39mi3knllfs4mxm44vsn0gzgqch90adh"))

 (define rust-fontdb-0.21.0
  (crate-source "fontdb" "0.21.0"
@@ -13733,7 +13717,6 @@
 (define rust-handlebars-6.4.0
  (crate-source "handlebars" "6.4.0"
                "13llan04gkqkfxyk70xscgwb7m3325fjynlipn3mnl88qab94gwv"))
-
 (define rust-harfrust-0.5.0
  (crate-source "harfrust" "0.5.0"
                "0753qln2b9vadkkzzkzkgq0r6zknymzjcxdx2rrhzg0339jl17sg"))
@@ -16219,7 +16202,6 @@
 (define rust-junction-1.4.2
  (crate-source "junction" "1.4.2"
                "15dfcgl4gzx9qxm4gqwh1wmzrdh8jn01xxcy4cikr45scqm3bz4c"))
-
 (define rust-jupyter-protocol-1.2.0
  (crate-source "jupyter-protocol" "1.2.0"
                "19g306rzk5k5m6ls4358jfps96gsrb75hmzsys6llmr0jkrxrv2z"))
@@ -17544,7 +17526,6 @@
                       (format #t "fn main() {~@
                        println!(\"cargo:rustc-link-lib=webp\");~@
                        }~%"))))))
-
 (define rust-libwebrtc-0.3.10.5f04705
  package:rust-livekit-0.7.8.5f04705)

@@ -17797,19 +17778,10 @@
  (crate-source "litrs" "1.0.0"
                "14p0kzzkavnngvybl88nvfwv031cc2qx4vaxpfwsiifm8grdglqi"))

-(define rust-livekit-0.7.8.5f04705
-  package:rust-livekit-0.7.8.5f04705)
-
-(define rust-livekit-api-0.4.2.5f04705
-  package:rust-livekit-0.7.8.5f04705)
-
 (define rust-livekit-api-0.4.15
  (crate-source "livekit-api" "0.4.15"
                "1a4ad4zq5ak2xpi84rnafjpwpqlyr9g0xidpm58nv3d9igmfzyhs"))

-(define rust-livekit-protocol-0.3.9.5f04705
-  package:rust-livekit-0.7.8.5f04705)
-
 (define rust-livekit-protocol-0.7.1
  (crate-source "livekit-protocol" "0.7.1"
                "0ajk0dyipgk7snhmlvfsk5g5r1yq0mbjs36zvs2a87cnzc9531q1"))
@@ -17817,6 +17789,14 @@
 (define rust-livekit-runtime-0.4.0
  (crate-source "livekit-runtime" "0.4.0"
                "1xn346fm891ys2b8591735bflfszgdci56ax5d7pgzn5rp388bjk"))
+(define rust-livekit-0.7.8.5f04705
+  package:rust-livekit-0.7.8.5f04705)
+
+(define rust-livekit-api-0.4.2.5f04705
+  package:rust-livekit-0.7.8.5f04705)
+
+(define rust-livekit-protocol-0.3.9.5f04705
+  package:rust-livekit-0.7.8.5f04705)

 (define rust-livekit-runtime-0.4.0.5f04705
  package:rust-livekit-0.7.8.5f04705)
@@ -17856,6 +17836,11 @@
                     (("\"--link-static\"")
                      "\"--link-shared\"")))))

+(define rust-lmdb-master-sys-0.2.5
+  ;; TODO: Delete bundled liblmdb (lmdb/) and link against system lmdb.
+  (crate-source "lmdb-master-sys" "0.2.5"
+                "1pr7h2q5pijml6qax06gaisy3z423dkyx55sf0xxvdlzn7h0hj46"))
+
 (define rust-llvm-sys-140.1.3
  (crate-source "llvm-sys" "140.1.3"
                "030srgq5vgshgpmb0w05gpf3yjbh73vcrgg327n320kwhplpip73"
@@ -17866,12 +17851,6 @@
                      (string-append all "\n default=[\"force-dynamic\"]")))
                   (copy-file "Cargo.toml.orig" "Cargo.toml"))))

-(define rust-lmdb-master-sys-0.2.5
-  ;; TODO: Delete bundled liblmdb (lmdb/) and link against system lmdb.
-  (crate-source "lmdb-master-sys" "0.2.5"
-                "1pr7h2q5pijml6qax06gaisy3z423dkyx55sf0xxvdlzn7h0hj46"
-                #:snippet '(delete-file-recursively "tests")))
-
 (define rust-lmdb-rkv-sys-0.11.2
  (crate-source "lmdb-rkv-sys" "0.11.2"
                "1zjjz00x249fwyxpci62ksl34x1pcmsppi8363xcx2p07dmwxfb1"
@@ -18668,8 +18647,7 @@

 (define rust-metal-0.29.0
  (crate-source "metal" "0.29.0"
-                "08gsqxnj0pq1018c8l4q0377i7gsrrqkrb7vyv0vfmlcdwlx7kvy"
-                #:snippet '(delete-file-recursively "examples")))
+                "08gsqxnj0pq1018c8l4q0377i7gsrrqkrb7vyv0vfmlcdwlx7kvy"))

 (define rust-metal-0.31.0
  (crate-source "metal" "0.31.0"
@@ -18680,11 +18658,9 @@
  (crate-source "metal" "0.32.0"
                "01g6a10l2p576ibybz0v9hignw7qj0r6d513qbf2vxrzcxpmmh80"
                #:snippet '(delete-file-recursively "examples")))
-
 (define rust-metal-0.33.0
  (crate-source "metal" "0.33.0"
-                "05dwbjpdrhbnfq2jgdx0m5j9ip3ibwsln0b3v663p45wnn8pf167"
-                #:snippet '(delete-file-recursively "examples")))
+                "05dwbjpdrhbnfq2jgdx0m5j9ip3ibwsln0b3v663p45wnn8pf167"))

 (define rust-metrics-0.23.1
  (crate-source "metrics" "0.23.1"
@@ -18771,6 +18747,22 @@
  (crate-source "mime" "0.2.6"
                "1q1s1ax1gaz8ld3513nvhidfwnik5asbs1ma3hp6inp5dn56nqms"))

+(define rust-minidump-common-0.21.2
+  (crate-source "minidump-common" "0.21.2"
+                "0xqf6jakppxg5p5h1s9l1j3ccr53ma008003b8bfvlqgray18kaw"))
+
+(define rust-minidump-writer-0.8.9
+  (crate-source "minidump-writer" "0.8.9"
+                "0zcasx1px7gj232npj8p7sl7x89r3y2jfdnfasfiwvhyiafcvaz2"))
+
+(define rust-minidumper-0.8.3
+  (crate-source "minidumper" "0.8.3"
+                "1ld7c0wz1myq7kwdahpjl7pypq4qsmgb6y4g0wfyqiw83yfvqklv"))
+
+(define rust-msvc-spectre-libs-0.1.3
+  (crate-source "msvc_spectre_libs" "0.1.3"
+                "0nqz5frnmqh2qsqv9b9d1h4mbpaf3lqfj13yigqn8dhzhslp3s19"))
+
 (define rust-mime-0.3.17
  (crate-source "mime" "0.3.17"
                "16hkibgvb9klh0w0jk5crr5xv90l3wlf77ggymzjmvl1818vnxv8"))
@@ -18795,18 +18787,6 @@
  (crate-source "minidom" "0.12.0"
                "06nbqscsv2clc4mvdzzl1syn89plsqvmxn2lqxjfrxbllqar2m7y"))

-(define rust-minidump-common-0.21.2
-  (crate-source "minidump-common" "0.21.2"
-                "0xqf6jakppxg5p5h1s9l1j3ccr53ma008003b8bfvlqgray18kaw"))
-
-(define rust-minidump-writer-0.8.9
-  (crate-source "minidump-writer" "0.8.9"
-                "0zcasx1px7gj232npj8p7sl7x89r3y2jfdnfasfiwvhyiafcvaz2"))
-
-(define rust-minidumper-0.8.3
-  (crate-source "minidumper" "0.8.3"
-                "1ld7c0wz1myq7kwdahpjl7pypq4qsmgb6y4g0wfyqiw83yfvqklv"))
-
 (define rust-minify-html-0.16.4
  (crate-source "minify-html" "0.16.4"
                "1mdv9k2mw6way5kya4nmkr1c03m5b8d9wqipk8zal7ddg007dpzh"))
@@ -19045,10 +19025,6 @@
  (crate-source "more-asserts" "0.3.1"
                "0zj0f9z73nsn1zxk2y21f0mmafvz7dz5v93prlxwdndb3jbadbqz"))

-(define rust-msvc-spectre-libs-0.1.3
-  (crate-source "msvc_spectre_libs" "0.1.3"
-                "0nqz5frnmqh2qsqv9b9d1h4mbpaf3lqfj13yigqn8dhzhslp3s19"))
-
 (define rust-moxcms-0.7.10
  (crate-source "moxcms" "0.7.10"
                "022njiwc0843877ra5ahhi2jhm8jhqyn29jcwlxvspljryxnp640"))
@@ -19211,7 +19187,6 @@
 (define rust-naga-26.0.0
  (crate-source "naga" "26.0.0"
                "0b36bcfx7721xvc2zwlmj5b3kg7l7hjdmqm463lhpdkxn9ybqv4i"))
-
 (define rust-naga-28.0.0
  (crate-source "naga" "28.0.0"
                "0d8idx407r0lnqbcjl097wyfr6lavf3i09b1zkfijch64mr6d3v1"))
@@ -22953,7 +22928,6 @@
 (define rust-procfs-0.18.0
  (crate-source "procfs" "0.18.0"
                "1xw25dx4cfc2z745w0dz4vhv24z7dprcxyk0km1n2s2dlmh56j15"))
-
 (define rust-procfs-core-0.16.0
  (crate-source "procfs-core" "0.16.0"
                "0acs0p19yfcs0h787ls24vi5ql4g6c62cm57qh2cxx397a958d9d"))
@@ -23216,9 +23190,9 @@
                #:snippet '(delete-file "src/arch/wasm32.o")))

 (define rust-psm-0.1.27
+  ;; TODO: Delete prebuilt src/arch/wasm32.o and build it from source.
  (crate-source "psm" "0.1.27"
-                "075v7pcl538avywd81irir8v05isr368pccggm4lidskhhlcsvz6"
-                #:snippet '(delete-file "src/arch/wasm32.o")))
+                "075v7pcl538avywd81irir8v05isr368pccggm4lidskhhlcsvz6"))

 (define rust-psm-0.1.28
  (crate-source "psm" "0.1.28"
@@ -24394,7 +24368,6 @@
 (define rust-range-alloc-0.1.5
  (crate-source "range-alloc" "0.1.5"
                "020xrpn0qaabkxg49wpi0hgy92d8ikji55cyancphnmfi6bl2ifa"))
-
 (define rust-range-map-0.2.0
  (crate-source "range-map" "0.2.0"
                "0pz9mrj55s6g67as86pndn0ml8g1kcwa8whlcapmk403qzba598j"))
@@ -25510,13 +25483,12 @@
  (crate-source "rtsp-types" "0.1.3"
                "0cqlvj2as9r75m05d884rxfy47nbhprj85x7cvpr8yfsqcwg4yzl"))

-(define rust-rtrb-0.3.2
-  (crate-source "rtrb" "0.3.2"
-                "1fp3rjd8bzx89wdx5g7c42rxqzlyd4x2ds22wh3sh3ly3bm8i0xd"))
-
 (define rust-rubato-0.14.1
  (crate-source "rubato" "0.14.1"
                "1mdh2xyczy9nwn1s5xr58sp3ha80fdb4lmfzx96qj8gw1kl55pg6"))
+(define rust-rtrb-0.3.2
+  (crate-source "rtrb" "0.3.2"
+                "1fp3rjd8bzx89wdx5g7c42rxqzlyd4x2ds22wh3sh3ly3bm8i0xd"))

 (define rust-run-script-0.10.1
  (crate-source "run_script" "0.10.1"
@@ -26612,13 +26584,12 @@
  (crate-source "sdd" "3.0.8"
                "08gfrs3cz2ncbqz7v1xm5687hggl166pic1frfk7s0f7244hfkjq"))

-(define rust-sdd-4.6.2
-  (crate-source "sdd" "4.6.2"
-                "17jwgqbfzidz6pnbdzmfcgn69g0d5dmvjc0d1g5xykmjcjpa8pf2"))
-
 (define rust-sdp-types-0.1.8
  (crate-source "sdp-types" "0.1.8"
                "0w65mw8zvlpkmaj43hx6121jb6q6xzwifq2kp4zyf3g2mhvcddlv"))
+(define rust-sdd-4.6.2
+  (crate-source "sdd" "4.6.2"
+                "17jwgqbfzidz6pnbdzmfcgn69g0d5dmvjc0d1g5xykmjcjpa8pf2"))

 (define rust-sea-bae-0.2.1
  (crate-source "sea-bae" "0.2.1"
@@ -26626,9 +26597,7 @@

 (define rust-sea-orm-1.1.10
  (crate-source "sea-orm" "1.1.10"
-                "0kmxjj7pxbz8i13rwks0ida6i4gf3i0xiq689dyi674887w1mri1"
-                #:snippet '(for-each delete-file-recursively
-                                     '("docs" "examples" "tests"))))
+                "0kmxjj7pxbz8i13rwks0ida6i4gf3i0xiq689dyi674887w1mri1"))

 (define rust-sea-orm-macros-1.1.10
  (crate-source "sea-orm-macros" "1.1.10"
@@ -26636,8 +26605,7 @@

 (define rust-sea-query-0.32.7
  (crate-source "sea-query" "0.32.7"
-                "1324h1pzjk66lsf39cibksg5wvdb4qmr0gvpwlwdlpmgir8iqpca"
-                #:snippet '(delete-file-recursively "docs")))
+                "1324h1pzjk66lsf39cibksg5wvdb4qmr0gvpwlwdlpmgir8iqpca"))

 (define rust-sea-query-binder-0.7.0
  (crate-source "sea-query-binder" "0.7.0"
@@ -28312,14 +28280,13 @@
  (crate-source "spdx" "0.10.8"
                "14r1bl3gmx7cj91l5r1qr5wildjacmzflw9cahgzrqk7v9b97djq"))

-(define rust-spdx-0.10.9
-  (crate-source "spdx" "0.10.9"
-                "18qgak6ng0g60q30xy48l52i9dn5pm3fqldplxib7bmg1f47xqf3"))
-
 (define rust-spdx-0.13.4
  (crate-source "spdx" "0.13.4"
                "1mrj5y7dxvf1l6ypsdihxgjl82rjk2w2wl14jky91dxy60z5knm8"
                #:snippet '(delete-file "src/detection/cache.bin.zstd")))
+(define rust-spdx-0.10.9
+  (crate-source "spdx" "0.10.9"
+                "18qgak6ng0g60q30xy48l52i9dn5pm3fqldplxib7bmg1f47xqf3"))

 (define rust-speculoos-0.12.0
  (crate-source "speculoos" "0.12.0"
@@ -29096,7 +29063,6 @@
 (define rust-svgtypes-0.16.1
  (crate-source "svgtypes" "0.16.1"
                "0gdw5a7znyv5sh4a575ddlhkvnvf45dd5grvkflsy78knf85fnv9"))
-
 (define rust-swash-0.2.6
  (crate-source "swash" "0.2.6"
                "02jmadp6nvmwrcn3028ks4h4gwnsnwjcryfh0zfnp5ry4n8n9127"))
@@ -31172,7 +31138,6 @@
 (define rust-tracing-test-macro-0.2.6
  (crate-source "tracing-test-macro" "0.2.6"
                "179jcllv4gq1kwlp2kzaihqmx28bqislnrinda3cfrgvg9xq81md"))
-
 (define rust-tracing-tracy-0.11.4
  (crate-source "tracing-tracy" "0.11.4"
                "1fp4asppg1kzz44ww4961xgd1nfj1gf57ajcwklhyvm9mx91iahf"))
@@ -31420,16 +31385,15 @@
  (crate-source "tree-sitter-elm" "5.9.0"
                "170yp6hidmbydli77zb9957n5j5s0ckh0iw0cg3kykf7pxch5113"))

+(define rust-tree-sitter-erlang-0.13.0
+  (crate-source "tree-sitter-erlang" "0.13.0"
+                "1bz1icmrd2q7x6ff3yp76ybh0gm02i0sdqf2xjr7ajdh8jj6b4pb"))
 (define rust-tree-sitter-embedded-template-0.23.2
  ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
  ;; as a native-input, then delete the shipped copy.
  (crate-source "tree-sitter-embedded-template" "0.23.2"
                "1bs6zahl5sr01f6cz4g7bvb43yv3v07bxcy0mdb7bdp52kpn603r"))

-(define rust-tree-sitter-erlang-0.13.0
-  (crate-source "tree-sitter-erlang" "0.13.0"
-                "1bz1icmrd2q7x6ff3yp76ybh0gm02i0sdqf2xjr7ajdh8jj6b4pb"))
-
 (define rust-tree-sitter-erlang-0.15.0
  (crate-source "tree-sitter-erlang" "0.15.0"
                "1gm6cwj11h1sx7hxv4anlak4ax31qs56134jfwyw06fs9v71q2gj"))
@@ -31442,6 +31406,9 @@
  (crate-source "tree-sitter-fsharp" "0.1.0"
                "0h8bc9pxl1ji19w21akan28dd6pvggbc7qpb7z23ggs814551nzj"))

+(define rust-tree-sitter-gleam-1.0.0
+  (crate-source "tree-sitter-gleam" "1.0.0"
+                "1crgpxhzrqlicwfm4zzvdbb1hga64pfmmpb08d25vnivg59mq5zh"))
 ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
 ;; as a native-input, then delete the shipped copy.
 (define rust-tree-sitter-gitcommit-0.0.1.8830971
@@ -31453,10 +31420,6 @@
    (file-name (git-file-name "rust-tree-sitter-gitcommit" "0.0.1.8830971"))
    (sha256 (base32 "0mp2sjk5lwla8nfi4wv1j7cnix818wjl64x7dd8qjyzgamc46l37"))))

-(define rust-tree-sitter-gleam-1.0.0
-  (crate-source "tree-sitter-gleam" "1.0.0"
-                "1crgpxhzrqlicwfm4zzvdbb1hga64pfmmpb08d25vnivg59mq5zh"))
-
 (define rust-tree-sitter-go-0.23.4
  (crate-source "tree-sitter-go" "0.23.4"
                "0cc4w4p12inxpsn2hgpmbvw1nyf5cm0l9pa705hbw3928milfgdi"))
@@ -31471,6 +31434,9 @@
  (crate-source "tree-sitter-gomod-orchard" "0.5.3"
                "0pb40777grgf0iwzyj9rb2v7glxc3zk0p4i2qv8gvnn6mlsccmc7"))

+(define rust-tree-sitter-gosum-orchard-0.3.2
+  (crate-source "tree-sitter-gosum-orchard" "0.3.2"
+                "0bkmby2sm99h9icrh358zsrlm60c7mvvwr038q8ms188pq4442zj"))
 ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
 ;; as a native-input, then delete the shipped copy.
 (define rust-tree-sitter-gomod-1.1.1.2e88687
@@ -31482,10 +31448,6 @@
    (file-name (git-file-name "rust-tree-sitter-gomod" "1.1.1.2e88687"))
    (sha256 (base32 "0j43jls6zmnxmj0j0jf2qi1arlxmqjknsn3nvm08ij2xbkg5by1r"))))

-(define rust-tree-sitter-gosum-orchard-0.3.2
-  (crate-source "tree-sitter-gosum-orchard" "0.3.2"
-                "0bkmby2sm99h9icrh358zsrlm60c7mvvwr038q8ms188pq4442zj"))
-
 ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
 ;; as a native-input, then delete the shipped copy.
 (define rust-tree-sitter-gowork-0.0.1.acb0617
@@ -31504,7 +31466,6 @@
 (define rust-tree-sitter-hcl-1.1.0
  (crate-source "tree-sitter-hcl" "1.1.0"
                "04phkjfwvlcz1zjrmvry80hd9wrz3g8vkyh98fw5658jsz1jqyss"))
-
 ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
 ;; as a native-input, then delete the shipped copy.
 (define rust-tree-sitter-heex-0.0.1.1dd4514
@@ -31548,16 +31509,16 @@
  (crate-source "tree-sitter-javascript" "0.25.0"
                "1xckcrssvg8479aym090rgyjdakhqkshbrh6vw5sj9q6phm4y838"))

+(define rust-tree-sitter-json-0.23.0
+  (crate-source "tree-sitter-json" "0.23.0"
+                "1r3531sqnpq96ba5b49mz78c0rjqizbavgma6ix6xq0pxarxd9c6"))
+
 (define rust-tree-sitter-jsdoc-0.23.2
  ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
  ;; as a native-input, then delete the shipped copy.
  (crate-source "tree-sitter-jsdoc" "0.23.2"
                "1bqgrgw9b0zma5gzv22j87hvgpmgj10z2z9dh7kwb3q3n7y2v1m3"))

-(define rust-tree-sitter-json-0.23.0
-  (crate-source "tree-sitter-json" "0.23.0"
-                "1r3531sqnpq96ba5b49mz78c0rjqizbavgma6ix6xq0pxarxd9c6"))
-
 (define rust-tree-sitter-json-0.24.8
  (crate-source "tree-sitter-json" "0.24.8"
                "0wf4gsa5mcrcprg8wh647n76rwv4cx8kbky6zw605h06lk67lwjd"))
@@ -31690,7 +31651,6 @@
 (define rust-tree-sitter-racket-0.24.7
  (crate-source "tree-sitter-racket" "0.24.7"
                "0a7ib1n36g5zplw9dinpnxsnby6477r1by8ygv368qjf0mm5nfgq"))
-
 (define rust-tree-sitter-regex-0.24.3
  ;; TODO: Regenerate src/parser.c from grammar.js using tree-sitter generate
  ;; as a native-input, then delete the shipped copy.
@@ -32033,13 +31993,12 @@
  (crate-source "typed-builder-macro" "0.21.2"
                "060bisai28h8xmrpkicdjs05fdkk07zgv32aq43h88crfz7rxjqy"))

-(define rust-typed-path-0.11.0
-  (crate-source "typed-path" "0.11.0"
-                "0ri5lc10hfyf21kjj2n8pi4bnw3ilrgsyf6kayk7m1d2f22d2qn4"))
-
 (define rust-typed-path-0.12.3
  (crate-source "typed-path" "0.12.3"
                "03k051dafrnyg3lbm4c85zg0mpfhbn6l9aq4ryq8yyy8h2dzha4f"))
+(define rust-typed-path-0.11.0
+  (crate-source "typed-path" "0.11.0"
+                "0ri5lc10hfyf21kjj2n8pi4bnw3ilrgsyf6kayk7m1d2f22d2qn4"))

 (define rust-typed-sled-0.2.3
  (crate-source "typed-sled" "0.2.3"
@@ -32327,7 +32286,6 @@
 (define rust-uds-windows-1.2.1
  (crate-source "uds_windows" "1.2.1"
                "0vidqwwfgn8wyzvbxiqil787b4wyqjia50zpdbbjqx7n8wlgpxpj"))
-
 (define rust-ug-0.4.0
  (crate-source "ug" "0.4.0"
                "1lqdd9096xajz36p37na2i1shwnhgwj27fv0byy44ih7x4vhpdwh"))
@@ -32897,7 +32855,6 @@
 (define rust-utf16-lit-2.0.2
  (crate-source "utf16_lit" "2.0.2"
                "1bm10sdzakmldc20sz7bb7m72sb1rmrvivfkq4wgzs0fh0m6sw0l"))
-
 (define rust-utf8-chars-3.0.6
  (crate-source "utf8-chars" "3.0.6"
                "1hvyfjxs8vgsfv13vq593xdf0hgyj255d527y7bp5wbddl09xr7b"))
@@ -34190,13 +34147,12 @@
  (crate-source "wasmtime-wit-bindgen" "29.0.1"
                "1rh6ds0kcslrwks8k7rz6hand5c4myjx7if1wdwxpr6i5nf32n43"))

-(define rust-wasmtime-wit-bindgen-33.0.2
-  (crate-source "wasmtime-wit-bindgen" "33.0.2"
-                "0id1yrychlw2gb37x03iln39y9znn31x1529bpbv1slhjgqg90hk"))
-
 (define rust-wasmtimer-0.4.3
  (crate-source "wasmtimer" "0.4.3"
                "0jv45z8yvgn6jgqqhmd1rpakk0yhf13gr5s6hhskw0gak5mqsn8w"))
+(define rust-wasmtime-wit-bindgen-33.0.2
+  (crate-source "wasmtime-wit-bindgen" "33.0.2"
+                "0id1yrychlw2gb37x03iln39y9znn31x1529bpbv1slhjgqg90hk"))

 (define rust-wast-229.0.0
  (crate-source "wast" "229.0.0"
@@ -34213,8 +34169,7 @@

 (define rust-wast-35.0.2
  (crate-source "wast" "35.0.2"
-                "0s2d43g326dw21bygpalzjnr1fi83lx4afimg1h5hilrnkql1w9f"
-                #:snippet '(delete-file-recursively "tests")))
+                "0s2d43g326dw21bygpalzjnr1fi83lx4afimg1h5hilrnkql1w9f"))

 (define rust-wat-1.229.0
  (crate-source "wat" "1.229.0"
@@ -34861,7 +34816,6 @@
 (define rust-wgpu-26.0.1
  (crate-source "wgpu" "26.0.1"
                "162prlf794407bfp93h2r7qj130zhn71g8z151l21sgnpf1gzdkh"))
-
 (define rust-wgpu-28.0.0
  (crate-source "wgpu" "28.0.0"
                "17ypgaygh18pzvf2b9jm92wylq4ywbd4rwrm25yrq47xbx6m7jzr"))
@@ -34873,7 +34827,6 @@
 (define rust-wgpu-core-26.0.1
  (crate-source "wgpu-core" "26.0.1"
                "1ncbr8bm0lck2aw93zz2jr3zd0cgb0qnz4a2iwkc4a5xac82zxnm"))
-
 (define rust-wgpu-core-28.0.0
  (crate-source "wgpu-core" "28.0.0"
                "1a8i0b7v0h61zs8i1h7bqy5przqd1a3rv1h83xpya02zvfswid4b"))
@@ -34885,7 +34838,6 @@
 (define rust-wgpu-core-deps-apple-26.0.0
  (crate-source "wgpu-core-deps-apple" "26.0.0"
                "1pyv4nqhvv8xr5fyyrsb2k31a3vfrlzsg2im72pfpjx4wsymzbhq"))
-
 (define rust-wgpu-core-deps-apple-28.0.0
  (crate-source "wgpu-core-deps-apple" "28.0.0"
                "1nj7024j30plwhqqmfijg2ik42h8ahj194xzhv23gwqqp6bbddw7"))
@@ -34897,7 +34849,6 @@
 (define rust-wgpu-core-deps-emscripten-26.0.0
  (crate-source "wgpu-core-deps-emscripten" "26.0.0"
                "0bfx2sidlrcspwx7dggm4wv5wi9nj7fhyq5l8vvhcq211wwhwryp"))
-
 (define rust-wgpu-core-deps-emscripten-28.0.0
  (crate-source "wgpu-core-deps-emscripten" "28.0.0"
                "0ydxim2s0krqfhdyxmsxm4i2c4a5maillg6y8z0ylkzq671m3cil"))
@@ -34909,7 +34860,6 @@
 (define rust-wgpu-core-deps-windows-linux-android-26.0.0
  (crate-source "wgpu-core-deps-windows-linux-android" "26.0.0"
                "053gbpx6i36rygkhcx9zzy819lbyx79j83pz2my36g9bs6wmq2kj"))
-
 (define rust-wgpu-core-deps-windows-linux-android-28.0.0
  (crate-source "wgpu-core-deps-windows-linux-android" "28.0.0"
                "1bmszr0aw4nsvhh0k4h9whaaa53zrvv83qj3n979djdjf9p9gjk8"))
@@ -34921,7 +34871,6 @@
 (define rust-wgpu-hal-26.0.6
  (crate-source "wgpu-hal" "26.0.6"
                "1pbvqhcnx07acbhvxlf1cp3azhy4liycab7bnjrhawyc4irfdl58"))
-
 (define rust-wgpu-hal-28.0.0
  ;; Link libvulkan directly instead of dlopening it, because dlopen
  ;; bypasses RUNPATH.
@@ -34946,7 +34895,6 @@
 (define rust-wgpu-types-26.0.0
  (crate-source "wgpu-types" "26.0.0"
                "1qls5ikpsgw9h1gnn6wg6arfib2rn4gilq4ksdbqzhapmzcai9zc"))
-
 (define rust-wgpu-types-28.0.0
  (crate-source "wgpu-types" "28.0.0"
                "0344ym97a5mhn7ha4clxh61schlw2dmb3nyx4z6x4kjrgrshi0z1"))
@@ -35917,9 +35865,7 @@

 (define rust-winresource-0.1.23
  (crate-source "winresource" "0.1.23"
-                "0ms9grkhzf7l28281hlcvar2kpnmpn8zj0m0kcdx53glnq8wzjpd"
-                #:snippet '(for-each delete-file
-                                     '("test.ico" "winresource_embed_properties.png"))))
+                "0ms9grkhzf7l28281hlcvar2kpnmpn8zj0m0kcdx53glnq8wzjpd"))

 (define rust-winsafe-0.0.19
  (crate-source "winsafe" "0.0.19"
@@ -36227,7 +36173,6 @@
  (crate-source "x509-parser" "0.18.1"
                "00jj31m702vxas7xs0vjn2863y7k4kp266w5q1ms0z85rrqhyfyl"
                #:snippet '(delete-file-recursively "assets")))
-
 (define rust-xattr-0.2.3
  (crate-source "xattr" "0.2.3"
                "1g7s46l5c0g07ywfjp85hwqy59fzpj3xkx45d2q5xsxawnxjc5bd"))
@@ -2051,10 +2051,7 @@ colours), kitty keyboard protocol, editorconfig support, amongst other features.
                        "zed-0.225.10-fix-workspace-race.patch"
                        "zed-0.225.10-keep-regular-file-workspaces.patch"
                        "zed-0.225.10-remove-patch-crates-io.patch"
-                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))
-       (snippet
-        #~(begin (delete-file
-                   "crates/zed/resources/windows/bin/x64/OpenConsole.exe")))))
+                        "zed-0.225.10-use-mock-livekit-on-linux.patch"))))
    (build-system cargo-build-system)
    (arguments
     (list #:install-source? #f
@@ -792,7 +792,7 @@ is based on Vim's builtin plugin support.")
 (define-public neovim
  (package
    (name "neovim")
-    (version "0.12.1")
+    (version "0.11.5")
    (source (origin
              (method git-fetch)
              (uri (git-reference
@@ -801,7 +801,7 @@ is based on Vim's builtin plugin support.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1lydhvm4abh2y3336nyqqbwiszllnw63c98wdna2mrhi44gfh2jf"))
+                "1b524vi44gkcsyy8w4jggvprwdsgy0gjprgxpyhh0dmqm47c0c48"))
              (patches (search-patches "neovim-tree-sitter-grammar-path.patch"))))
    (build-system cmake-build-system)
    (arguments
@@ -1017,10 +1017,7 @@ With the package comes a plugin to use vifm as a vim file selector.")
             (commit version)))
       (file-name (git-file-name name version))
       (sha256
-        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))
-       ;; This patch can be removed when the next pynvim version after 0.6.0 is
-       ;; released.
-       (patches (search-patches "python-pynvim-fix-test-command-error.patch"))))
+        (base32 "0k98c0i14z3adx6l4ncf2zmzk9aykqkdnws6qw4m0yj5z61zh6av"))))
    (build-system pyproject-build-system)
    (native-inputs
     (list neovim
@@ -1653,13 +1653,13 @@ tiled on several screens.")
 (define-public ghc-xmobar
  (package
    (name "ghc-xmobar")
-    (version "0.50")
+    (version "0.48.1")
    (source (origin
              (method url-fetch)
              (uri (hackage-uri "xmobar" version))
              (sha256
               (base32
-                "026s0q718z89vzjgva19vg58dm1l016i67mzi0wbj7kgai89w909"))))
+                "1infcisv7l00a4z4byjwjisg4yndk0cymibfii1c7yzyzrlvavhl"))))
    (build-system haskell-build-system)
    (properties '((upstream-name . "xmobar")))
    (native-inputs
@@ -3863,7 +3863,7 @@ using @command{dmenu}.")
 (define-public fuzzel
  (package
    (name "fuzzel")
-    (version "1.14.1")
+    (version "1.14.0")
    (home-page "https://codeberg.org/dnkl/fuzzel")
    (source (origin
              (method git-fetch)
@@ -3871,7 +3871,7 @@ using @command{dmenu}.")
              (file-name (git-file-name name version))
              (sha256
               (base32
-                "1bk49fq66a0fr9danpj7vnq3dcfmrw1hdcc2ygqkld9z5lv1h5an"))))
+                "1fx1y430iwdjzba1rb6m56k3phvjn8di5v7d6rnxdqvm30085vpl"))))
    (build-system meson-build-system)
    (arguments
     (list #:build-type "release"
@@ -84,6 +84,7 @@ 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)
@@ -119,7 +120,9 @@ 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."
@@ -50,7 +50,7 @@
  (make-parameter "https://www.stackage.org/api/v1/snapshot"))

 ;; Latest LTS version compatible with current GHC.
-(define %default-lts-version "24.9")
+(define %default-lts-version "20.26")

 (define-json-mapping <stackage-lts> make-stackage-lts
  stackage-lts?