haskellPackages: update stackage and hackage

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/ef5d0a2b18aa5fb9d03c1a0cadf1e90791b81f99.tar.gz",
-  "sha256": "034hmgc16mn9ly7pc6d67ksv9qdpmrv7va8jwpnjsd2mf1fc9gwz",
-  "msg": "Update from Hackage at 2023-05-30T03:47:42Z"
+  "commit": "4744eb212287f09a540ba7de2a4837b504956ed4",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4744eb212287f09a540ba7de2a4837b504956ed4.tar.gz",
+  "sha256": "1lwdnjmndmixnv8saq68g45skf9yc3zq9npjm8gv9pdga7vy3m96",
+  "msg": "Update from Hackage at 2023-05-31T06:44:49Z"
 }

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

@@ -1663,6 +1663,14 @@ self: super: {
   servant-swagger-ui-core = doJailbreak super.servant-swagger-ui-core;
 
   hercules-ci-agent = lib.pipe super.hercules-ci-agent [
+    (appendPatches [
+      # https://github.com/hercules-ci/hercules-ci-agent/pull/507
+      (fetchpatch {
+        url = "https://github.com/hercules-ci/hercules-ci-agent/commit/f5c39d0cbde36a056419cab8d69a67302eb8b0e4.patch";
+        sha256 = "sha256-J8N4+HUQ6vlJBCwCyxv8Fv5HSbtiim64Qh1n9CaRe1o=";
+        stripLen = 1;
+      })
+    ])
     (self.generateOptparseApplicativeCompletions [ "hercules-ci-agent" ])
   ];
 

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

@@ -78,6 +78,10 @@ self: super: {
   # https://github.com/sjakobi/bsb-http-chunked/issues/38
   bsb-http-chunked = dontCheck super.bsb-http-chunked;
 
+  # https://github.com/NixOS/cabal2nix/issues/554
+  # https://github.com/clash-lang/clash-compiler/blob/f0f6275e19b8c672f042026c478484c5fd45191d/README.md#ghc-compatibility
+  clash-prelude = dontDistribute (markBroken super.clash-prelude);
+
   # 2022-08-01: Tests are broken on ghc 9.2.4: https://github.com/wz1000/HieDb/issues/46
   hiedb = dontCheck super.hiedb;
 

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

@@ -205,11 +205,6 @@ in {
   cairo = __CabalEagerPkgConfigWorkaround (doJailbreak super.cairo);
   pango = __CabalEagerPkgConfigWorkaround (doJailbreak super.pango);
 
-  # The gtk2hs setup hook provided by this package lacks the ppOrdering field that
-  # recent versions of Cabal require. This leads to builds like cairo and glib
-  # failing during the Setup.hs phase: https://github.com/gtk2hs/gtk2hs/issues/323.
-  gtk2hs-buildtools = appendPatch ./patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch super.gtk2hs-buildtools;
-
   # Pending text-2.0 support https://github.com/gtk2hs/gtk2hs/issues/327
   gtk = doJailbreak super.gtk;
 }

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

@@ -703,7 +703,6 @@ broken-packages:
   - clanki
   - clarifai
   - CLASE
-  - clash-prelude
   - Clash-Royale-Hack-Cheats
   - ClassLaws
   - classy-influxdb-simple
@@ -3095,6 +3094,7 @@ broken-packages:
   - libpq
   - librandomorg
   - libsecp256k1
+  - libssh2 # failure in compileBuildDriverPhase in job https://hydra.nixos.org/build/223222399 at 2023-06-07
   - libsystemd-daemon
   - libtagc
   - libxls

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

@@ -459,6 +459,7 @@ package-maintainers:
     - calendar-recycling
     - checksum
     - check-pvp
+    - coinor-clp
     - combinatorial
     - comfort-graph
     - comfort-array
@@ -490,6 +491,7 @@ package-maintainers:
     - jack
     - latex
     - lazyio
+    - linear-programming
     - markov-chain
     - midi
     - midi-alsa
@@ -548,6 +550,7 @@ package-maintainers:
     - netlib-comfort-array
     - blas-comfort-array
     - lapack-comfort-array
+    - comfort-blas
     - lapack
     - lapack-hmatrix
     - hmm-lapack
@@ -568,6 +571,7 @@ unsupported-platforms:
   bytelog:                                      [ platforms.darwin ] # due to posix-api
   camfort:                                      [ aarch64-linux ]
   charsetdetect:                                [ aarch64-linux ] # not supported by vendored lib / not configured properly https://github.com/batterseapower/libcharsetdetect/issues/3
+  Codec-Image-DevIL:                            [ platforms.darwin ] # depends on mesa
   coinor-clp:                                   [ aarch64-linux ] # aarch64-linux is not supported by required system dependency clp
   cut-the-crap:                                 [ platforms.darwin ]
   essence-of-live-coding-PortMidi:              [ platforms.darwin ]
@@ -589,9 +593,12 @@ unsupported-platforms:
   gi-webkit2webextension:                       [ platforms.darwin ] # webkitgtk marked broken on darwin
   gi-webkit2:                                   [ platforms.darwin ] # webkitgtk marked broken on darwin
   gi-wnck:                                      [ platforms.darwin ]
+  gl:                                           [ platforms.darwin ] # depends on mesa
+  GLHUI:                                        [ platforms.darwin ] # depends on mesa
   gnome-keyring:                                [ platforms.darwin ]
   grid-proto:                                   [ platforms.darwin ]
   gtk-sni-tray:                                 [ platforms.darwin ]
+  h-raylib:                                     [ platforms.darwin ] # depends on mesa
   haskell-snake:                                [ platforms.darwin ]
   hb3sum:                                       [ aarch64-linux ] # depends on blake3, which is not supported on aarch64-linux
   hcwiid:                                       [ platforms.darwin ]
@@ -600,6 +607,7 @@ unsupported-platforms:
   hinotify-bytestring:                          [ platforms.darwin ]
   honk:                                         [ platforms.darwin ]
   HSoM:                                         [ platforms.darwin ]
+  intricacy:                                    [ platforms.darwin ] # depends on mesa
   iwlib:                                        [ platforms.darwin ]
   Jazzkell:                                     [ platforms.darwin ] # depends on Euterpea
   jsaddle-hello:                                [ platforms.darwin ] # depends on jsaddle-webkit2gtk
@@ -620,8 +628,11 @@ unsupported-platforms:
   mpi-hs-binary:                                [ aarch64-linux, platforms.darwin ]
   mpi-hs-cereal:                                [ aarch64-linux, platforms.darwin ]
   mpi-hs-store:                                 [ aarch64-linux, platforms.darwin ]
-  mplayer-spot:                                 [ aarch64-linux ]
+  mplayer-spot:                                 [ aarch64-linux, platforms.darwin ]
+  monomer:                                      [ platforms.darwin ] # depends on mesa
+  monomer-hagrid:                               [ platforms.darwin ] # depends on mesa
   mptcp-pm:                                     [ platforms.darwin ]
+  nanovg:                                       [ platforms.darwin ] # depends on mesa
   netlink:                                      [ platforms.darwin ]
   notifications-tray-icon:                      [ platforms.darwin ] # depends on gi-dbusmenu
   oculus:                                       [ platforms.darwin ]
@@ -639,6 +650,8 @@ unsupported-platforms:
   reflex-localize-dom:                          [ platforms.darwin, aarch64-linux ]
   rtlsdr:                                       [ platforms.darwin ]
   rubberband:                                   [ platforms.darwin ]
+  SDL-mixer:                                    [ platforms.darwin ] # depends on mesa
+  SDL-mpeg:                                     [ platforms.darwin ] # depends on mesa
   sdl2-mixer:                                   [ platforms.darwin ]
   sdl2-ttf:                                     [ platforms.darwin ]
   sensei:                                       [ platforms.darwin ]

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

@@ -2597,6 +2597,7 @@ dont-distribute-packages:
  - libmolude
  - libraft
  - librato
+ - libssh2-conduit
  - libxml-enumerator
  - lifted-base-tf
  - lightning-haskell

pkgs/development/haskell-modules/generic-builder.nix

@@ -7,7 +7,7 @@ let
   isCross = stdenv.buildPlatform != stdenv.hostPlatform;
   inherit (buildPackages)
     fetchurl removeReferencesTo
-    pkg-config coreutils gnugrep gnused glibcLocales;
+    pkg-config coreutils gnugrep glibcLocales;
 in
 
 { pname
@@ -246,11 +246,11 @@ let
     "--ghc-options=-haddock"
   ];
 
-  postPhases = optional doInstallIntermediates [ "installIntermediatesPhase" ];
+  postPhases = optional doInstallIntermediates "installIntermediatesPhase";
 
   setupCompileFlags = [
     (optionalString (!coreSetup) "-${nativePackageDbFlag}=$setupPackageConfDir")
-    (optionalString enableParallelBuilding (parallelBuildingFlags))
+    (optionalString enableParallelBuilding parallelBuildingFlags)
     "-threaded"       # https://github.com/haskell/cabal/issues/2398
     "-rtsopts"        # allow us to pass RTS flags to the generated Setup executable
   ];
@@ -698,7 +698,7 @@ stdenv.mkDerivation ({
           lib.optionals (!isCross) setupHaskellDepends);
 
         ghcCommandCaps = lib.toUpper ghcCommand';
-      in stdenv.mkDerivation ({
+      in stdenv.mkDerivation {
         inherit name shellHook;
 
         depsBuildBuild = lib.optional isCross ghcEnvForBuild;
@@ -718,7 +718,7 @@ stdenv.mkDerivation ({
         "NIX_${ghcCommandCaps}_LIBDIR" = if ghc.isHaLVM or false
           then "${ghcEnv}/lib/HaLVM-${ghc.version}"
           else "${ghcEnv}/${ghcLibdir}";
-      });
+      };
 
     env = envFunc { };