Merge pull request #185574 from NixOS/haskell-updates

haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "219207531a7a2e12e857b3ec55a7573f0a0f34d2",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/219207531a7a2e12e857b3ec55a7573f0a0f34d2.tar.gz",
-  "sha256": "146y45g6f1vvc3f8p1dq56y1fk1ls7v814iwa736k08ah6jfrq4f",
-  "msg": "Update from Hackage at 2022-07-31T09:12:37Z"
+  "commit": "7a6596613e0d6549f329cb3c2862b035667e0fc3",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/7a6596613e0d6549f329cb3c2862b035667e0fc3.tar.gz",
+  "sha256": "07sm18dn6lsi8xjhfhm7dyw62lpln9wyhafkigc6f3xaqblz3ap4",
+  "msg": "Update from Hackage at 2022-08-07T14:05:30Z"
 }

pkgs/development/haskell-modules/configuration-common.nix

@@ -833,9 +833,9 @@ self: super: {
     testHaskellDepends = drv.testHaskellDepends or [] ++ [ self.hspec-meta_2_9_3 ];
     testToolDepends = drv.testToolDepends or [] ++ [ pkgs.git ];
   }) (super.sensei.override {
-    hspec = self.hspec_2_10_0;
+    hspec = self.hspec_2_10_0_1;
     hspec-wai = super.hspec-wai.override {
-      hspec = self.hspec_2_10_0;
+      hspec = self.hspec_2_10_0_1;
     };
   });
 
@@ -1646,14 +1646,14 @@ self: super: {
   servant-openapi3 = dontCheck super.servant-openapi3;
 
   # Give hspec 2.10.* correct dependency versions without overrideScope
-  hspec_2_10_0 = doDistribute (super.hspec_2_10_0.override {
-    hspec-discover = self.hspec-discover_2_10_0;
-    hspec-core = self.hspec-core_2_10_0;
+  hspec_2_10_0_1 = doDistribute (super.hspec_2_10_0_1.override {
+    hspec-discover = self.hspec-discover_2_10_0_1;
+    hspec-core = self.hspec-core_2_10_0_1;
   });
-  hspec-discover_2_10_0 = super.hspec-discover_2_10_0.override {
+  hspec-discover_2_10_0_1 = super.hspec-discover_2_10_0_1.override {
     hspec-meta = self.hspec-meta_2_9_3;
   };
-  hspec-core_2_10_0 = super.hspec-core_2_10_0.override {
+  hspec-core_2_10_0_1 = super.hspec-core_2_10_0_1.override {
     hspec-meta = self.hspec-meta_2_9_3;
   };
 
@@ -2357,6 +2357,10 @@ self: super: {
   # https://github.com/tree-sitter/haskell-tree-sitter/issues/298
   tree-sitter = doJailbreak super.tree-sitter;
 
+  # 2022-08-07: Bounds are too restrictive: https://github.com/marcin-rzeznicki/libjwt-typed/issues/2
+  # Also, the tests fail.
+  libjwt-typed = dontCheck (doJailbreak super.libjwt-typed);
+
   # Test suite fails to compile
   # https://github.com/kuribas/mfsolve/issues/8
   mfsolve = dontCheck super.mfsolve;
@@ -2622,4 +2626,11 @@ in {
   purescript-ast = purescriptStOverride super.purescript-ast;
 
   purenix = purescriptStOverride super.purenix;
+
+  # Needs update for ghc-9:
+  # https://github.com/haskell/text-format/issues/27
+  text-format = appendPatch (fetchpatch {
+    url = "https://github.com/hackage-trustees/text-format/pull/4/commits/949383aa053497b8c251219c10506136c29b4d32.patch";
+    sha256 = "QzpZ7lDedsz1mZcq6DL4x7LBnn58rx70+ZVvPh9shRo=";
+  }) super.text-format;
 })

pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix

@@ -113,7 +113,7 @@ self: super: {
   lifted-async = doJailbreak super.lifted-async;
   lukko = doJailbreak super.lukko;
   lzma-conduit = doJailbreak super.lzma-conduit;
-  ormolu = self.ormolu_0_5_0_0;
+  ormolu = self.ormolu_0_5_0_1;
   parallel = doJailbreak super.parallel;
   path = doJailbreak super.path;
   polyparse = overrideCabal (drv: { postPatch = "sed -i -e 's, <0.11, <0.12,' polyparse.cabal"; }) (doJailbreak super.polyparse);

pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml

@@ -357,6 +357,7 @@ broken-packages:
   - bindings-apr
   - bindings-bfd
   - bindings-cctools
+  - bindings-common
   - bindings-dc1394
   - bindings-eskit
   - bindings-EsounD
@@ -970,6 +971,7 @@ broken-packages:
   - data-diverse
   - datadog
   - data-easy
+  - data-elevator
   - data-embed
   - data-emoticons
   - data-filepath
@@ -1176,6 +1178,7 @@ broken-packages:
   - dpor
   - dragen
   - drawille
+  - dr-cabal
   - drClickOn
   - dresdner-verkehrsbetriebe
   - DrIFT
@@ -1435,6 +1438,7 @@ broken-packages:
   - file-command-qq
   - filediff
   - file-embed-poly
+  - file-io
   - file-location
   - FileManip
   - FileManipCompat
@@ -1691,6 +1695,7 @@ broken-packages:
   - ghcup
   - ghc-usage
   - gh-labeler
+  - gi-adwaita
   - giak
   - gi-cogl
   - Gifcurry
@@ -2306,6 +2311,7 @@ broken-packages:
   - houseman
   - hp2any-core
   - hpack-convert
+  - hpapi
   - hpasteit
   - HPath
   - hpc-coveralls
@@ -2518,6 +2524,7 @@ broken-packages:
   - hunit-rematch
   - hunspell-hs
   - hup
+  - hurl
   - hurriyet
   - husky
   - hutton
@@ -2939,7 +2946,6 @@ broken-packages:
   - libhbb
   - libinfluxdb
   - libjenkins
-  - libjwt-typed
   - libltdl
   - liboath-hs
   - liboleg
@@ -4135,6 +4141,7 @@ broken-packages:
   - rand-vars
   - Range
   - rangemin
+  - rangeset
   - rank1dynamic
   - rank-product
   - rapid-term
@@ -4683,6 +4690,7 @@ broken-packages:
   - SNet
   - snipcheck
   - snorkels
+  - snowchecked
   - snowtify
   - socket-activation
   - socketed
@@ -5033,7 +5041,6 @@ broken-packages:
   - text-ascii
   - text-builder-linear
   - text-containers
-  - text-format
   - text-format-heavy
   - text-generic-pretty
   - text-icu-normalized
@@ -5739,7 +5746,9 @@ broken-packages:
   - zeno
   - zeolite-lang
   - zephyr
+  - zeromq4-clone-pattern
   - zeromq4-conduit
+  - zeromq4-patterns
   - zeromq-haskell
   - zettelkast
   - ZFS

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

@@ -446,6 +446,7 @@ unsupported-platforms:
   grid-proto:                                   [ platforms.darwin ]
   gtk-sni-tray:                                 [ platforms.darwin ]
   haskell-snake:                                [ platforms.darwin ]
+  hb3sum:                                       [ aarch64-linux ] # depends on blake3, which is not supported on aarch64-linux
   hcwiid:                                       [ platforms.darwin ]
   HDRUtils:                                     [ platforms.darwin ]
   hidapi:                                       [ platforms.darwin ]
@@ -539,8 +540,10 @@ supported-platforms:
   hw-prim-bits:                                 [ platforms.x86 ] # x86 assembler
   inline-asm:                                   [ platforms.x86 ] # x86 assembler
   keid-core:                                    [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
+  keid-frp-banana:                              [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   keid-geometry:                                [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   keid-render-basic:                            [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
+  keid-resource-gltf:                           [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   keid-sound-openal:                            [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   keid-ui-dearimgui:                            [ x86_64-linux ] # geomancy (only x86), vulkan (no i686, no darwin, …)
   kqueue:                                       [ platforms.netbsd, platforms.freebsd, platforms.openbsd, platforms.darwin ]
@@ -644,3 +647,6 @@ dont-distribute-packages:
 
   # mesos was removed from nixpkgs
   - hs-mesos
+
+  # Output exceeds Hydra's maximum allowable size
+  - stripeapi

pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

@@ -693,7 +693,6 @@ dont-distribute-packages:
  - aws-dynamodb-conduit
  - aws-dynamodb-streams
  - aws-easy
- - aws-ec2-knownhosts
  - aws-elastic-transcoder
  - aws-kinesis
  - aws-kinesis-client
@@ -857,9 +856,7 @@ dont-distribute-packages:
  - cabal2json
  - cabalmdvrpm
  - cabalrpmdeps
- - cabocha
  - cake
- - cake3
  - cakyrespa
  - cal3d-examples
  - cal3d-opengl
@@ -1273,7 +1270,6 @@ dont-distribute-packages:
  - dtd
  - dtw
  - dumb-cas
- - duplo
  - dvda
  - dynamic-cabal
  - dynamic-plot
@@ -1506,7 +1502,6 @@ dont-distribute-packages:
  - gbu
  - gdax
  - gdiff-ig
- - gedcom
  - geek
  - geek-server
  - gelatin-freetype2
@@ -1549,6 +1544,7 @@ dont-distribute-packages:
  - gi-cairo-again
  - gi-clutter
  - gi-coglpango
+ - gi-ges
  - gi-gsk
  - gi-gstpbutils
  - gi-gtk_4_0_5
@@ -1905,7 +1901,6 @@ dont-distribute-packages:
  - hashes
  - hashflare
  - hask-home
- - haskades
  - haskdeep
  - haskeem
  - haskell-aliyun
@@ -2045,7 +2040,6 @@ dont-distribute-packages:
  - hesh
  - hesql
  - heterolist
- - hevm
  - hevolisa
  - hevolisa-dph
  - hexpat-conduit
@@ -2071,7 +2065,6 @@ dont-distribute-packages:
  - hinvaders
  - hinze-streams
  - hipbot
- - hipe
  - hipsql-client
  - hipsql-server
  - hirt
@@ -2335,7 +2328,6 @@ dont-distribute-packages:
  - jmacro-rpc-happstack
  - jmacro-rpc-snap
  - jmonkey
- - jobqueue
  - join
  - jsc
  - jsmw
@@ -2370,7 +2362,6 @@ dont-distribute-packages:
  - kansas-lava-papilio
  - kansas-lava-shake
  - karakuri
- - karps
  - katip-rollbar
  - keenser
  - keera-hails-i18n
@@ -2407,7 +2398,6 @@ dont-distribute-packages:
  - koji-install
  - koji-tool
  - korfu
- - krapsh
  - ks-test
  - kubernetes-client
  - kure-your-boilerplate
@@ -2448,7 +2438,6 @@ dont-distribute-packages:
  - language-qux
  - language-spelling
  - lat
- - latest-npm-version
  - latex-formulae-hakyll
  - latex-formulae-pandoc
  - latex-svg-hakyll
@@ -2552,11 +2541,9 @@ dont-distribute-packages:
  - lojysamban
  - lol-apps
  - lol-benches
- - lol-calculus
  - lol-cpp
  - lol-repa
  - lol-tests
- - lol-typing
  - loli
  - loop-effin
  - looper
@@ -2647,7 +2634,6 @@ dont-distribute-packages:
  - micro-gateway
  - microformats2-parser
  - microformats2-types
- - micrologger
  - midimory
  - mighttpd
  - migrant-hdbc
@@ -2816,7 +2802,6 @@ dont-distribute-packages:
  - newsynth
  - ngrams-loader
  - ngx-export-tools-extra
- - nicovideo-translator
  - nikepub
  - nirum
  - nix-thunk
@@ -2964,7 +2949,6 @@ dont-distribute-packages:
  - phonetic-languages-simplified-properties-lists-double
  - phonetic-languages-ukrainian
  - phooey
- - pia-forward
  - pianola
  - pier
  - ping
@@ -3082,7 +3066,6 @@ dont-distribute-packages:
  - push-notify-apn
  - push-notify-ccs
  - push-notify-general
- - pushme
  - puzzle-draw-cmdline
  - pvd
  - qd-vec
@@ -3412,8 +3395,6 @@ dont-distribute-packages:
  - servant-streaming-server
  - servant-swagger-tags
  - servant-to-elm
- - servant-util
- - servant-util-beam-pg
  - servant-waargonaut
  - servant-zeppelin-client
  - servant-zeppelin-server
@@ -3653,7 +3634,6 @@ dont-distribute-packages:
  - syntaxnet-haskell
  - synthesizer-llvm
  - sys-process
- - systemstats
  - t3-client
  - ta
  - tag-stream
@@ -3696,7 +3676,6 @@ dont-distribute-packages:
  - test-sandbox-compose
  - test-simple
  - testbench
- - text-all
  - text-builder-dev_0_3_3
  - text-json-qq
  - text-locale-encoding
@@ -3862,7 +3841,6 @@ dont-distribute-packages:
  - urbit-airlock
  - urbit-api
  - ureader
- - urembed
  - uri-enumerator
  - uri-enumerator-file
  - usb

pkgs/development/haskell-modules/configuration-nix.nix

@@ -315,6 +315,9 @@ self: super: builtins.intersectAttrs super {
   greenclip = addExtraLibrary pkgs.xorg.libXdmcp super.greenclip;
 
   # The cabal files for these libraries do not list the required system dependencies.
+  libjwt-typed = overrideCabal (drv: {
+    librarySystemDepends = [ pkgs.libjwt ];
+  }) super.libjwt-typed;
   miniball = overrideCabal (drv: {
     librarySystemDepends = [ pkgs.miniball ];
   }) super.miniball;