Merge pull request #235142 from NixOS/haskell-updates

haskellPackages: update stackage and hackage
2024-10-02 18:47:58 +03:00 · 2023-06-07 19:42:01 +09:00 · 2023-06-07 19:42:01 +09:00 · bad1934edd
commit bad1934edd
parent 2be098ae40 a70b93f1d7
10 changed files with 200 additions and 52 deletions
--- a/pkgs/data/misc/hackage/pin.json
+++ b/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"
 }
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/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" ])
  ];

--- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix
+++ b/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;

--- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix
+++ b/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;
 }
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml
+++ b/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
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/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 ]
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
+++ b/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
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/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 { };

--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@ -3561,6 +3561,7 @@ self: {
       librarySystemDepends = [ libdevil ];
       description = "An FFI interface to the DevIL library";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libdevil;};

  "Color" = callPackage
@ -7019,6 +7020,7 @@ self: {
       librarySystemDepends = [ libGL libX11 ];
       description = "Open OpenGL context windows in X11 with libX11";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libGL; inherit (pkgs.xorg) libX11;};

  "GLM" = callPackage
@ -18376,6 +18378,7 @@ self: {
       librarySystemDepends = [ SDL_mixer ];
       description = "Binding to libSDL_mixer";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) SDL_mixer;};

  "SDL-mpeg" = callPackage
@ -18389,6 +18392,7 @@ self: {
       librarySystemDepends = [ smpeg ];
       description = "Binding to the SMPEG library";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) smpeg;};

  "SDL-ttf" = callPackage
@ -34505,10 +34509,8 @@ self: {
     }:
     mkDerivation {
       pname = "arch-hs";
-       version = "0.11.0.0";
-       sha256 = "0zl9lsz9bhzyd4vd61q0rkawb7iyghk9cb5pzm4gm4y9d9hayw0p";
-       revision = "1";
-       editedCabalFile = "0gkbiyqjslrfa6zfik9zhf3ccrgdv9fh29rbgsl3qky8vq88dg3h";
+       version = "0.11.1.0";
+       sha256 = "1f50id3xplp8zwi379n6xi4in01gms97qbqnfxnsqzrv47xszwj4";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -34540,10 +34542,8 @@ self: {
     }:
     mkDerivation {
       pname = "arch-web";
-       version = "0.1.1";
-       sha256 = "1qlx1md7hzxv5cxv3jsiyc0rrbrg2m38b0w27i7bdyd1dlpnyy0d";
-       revision = "1";
-       editedCabalFile = "1342nvrxz8g6q96swxvvbvs1g34s82lhrx02xq371cv70svyq2bk";
+       version = "0.2";
+       sha256 = "0axyb62pjgh1l60qx6z8mppiq5gam3g6c9wfbrww8wl7f2kamwrp";
       libraryHaskellDepends = [
         aeson base deriving-aeson exceptions http-client http-client-tls
         http-types lens mtl servant servant-client servant-client-core text
@ -37892,6 +37892,8 @@ self: {
       pname = "attoparsec-run";
       version = "0.0.2.0";
       sha256 = "0j9mj61aa4hw4j2z73fxjb1py8yhznk3irw2cqs9l40kmqlf0gz8";
+       revision = "1";
+       editedCabalFile = "1hvp37nr4pa8y3685444fhw8ah8b8bh65sbjca3cy15f99z9bbxp";
       libraryHaskellDepends = [ attoparsec base bytestring mtl text ];
       testHaskellDepends = [ attoparsec base bytestring hspec mtl text ];
       description = "Conveniently run Attoparsec parsers";
@ -40442,8 +40444,8 @@ self: {
     }:
     mkDerivation {
       pname = "balkon";
-       version = "1.0.0.1";
-       sha256 = "0w975sm45if3lwg1gfbcd6w5xamf4k3bz20anpvz3yyiknnd29p9";
+       version = "1.1.0.0";
+       sha256 = "0836mr88x8qqphv0mp9brbcggjpyz4id3z0n7rbrazg4gy343pyy";
       libraryHaskellDepends = [
         base harfbuzz-pure text text-icu unicode-data-scripts
       ];
@ -42105,6 +42107,28 @@ self: {
       license = lib.licenses.mit;
     }) {};

+  "bcp47-orphans_0_1_0_6" = callPackage
+    ({ mkDerivation, base, bcp47, cassava, errors, esqueleto, hashable
+     , hspec, http-api-data, path-pieces, persistent, QuickCheck
+     , serialise, text
+     }:
+     mkDerivation {
+       pname = "bcp47-orphans";
+       version = "0.1.0.6";
+       sha256 = "18r6wwj7sq5q1r9fg0kiss5p7h0qh485paginrc46lzygx4l5r3q";
+       libraryHaskellDepends = [
+         base bcp47 cassava errors esqueleto hashable http-api-data
+         path-pieces persistent serialise text
+       ];
+       testHaskellDepends = [
+         base bcp47 cassava hspec path-pieces persistent QuickCheck
+         serialise
+       ];
+       description = "BCP47 orphan instances";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "bcrypt" = callPackage
    ({ mkDerivation, base, bytestring, data-default, entropy, memory }:
     mkDerivation {
@ -48332,12 +48356,18 @@ self: {
     }) {};

  "bookhound" = callPackage
-    ({ mkDerivation, base, containers, text, time }:
+    ({ mkDerivation, base, containers, hspec, hspec-discover
+     , QuickCheck, quickcheck-instances, text, time
+     }:
     mkDerivation {
       pname = "bookhound";
-       version = "0.1.24.0";
-       sha256 = "1kyd574wyzgywsl5j6l6ji5vf3y82zf03qmawymjy5l0m6sg0gin";
+       version = "0.1.25.0";
+       sha256 = "0kdsr01iwnf9jzb4sfh7mcsnffzxmvfiziz5h2214py8ya3rbi5c";
       libraryHaskellDepends = [ base containers text time ];
+       testHaskellDepends = [
+         base containers hspec QuickCheck quickcheck-instances text time
+       ];
+       testToolDepends = [ hspec-discover ];
       description = "Simple Parser Combinators";
       license = "LGPL";
       hydraPlatforms = lib.platforms.none;
@ -53426,6 +53456,8 @@ self: {
       pname = "cabal-install-solver";
       version = "3.10.1.0";
       sha256 = "0dwzyjk9382wxxkmqf99mrpgbqpzxjqr4kxbz2dnwx6d9kfrw39c";
+       revision = "1";
+       editedCabalFile = "1l3qhaiv0m2xc5vscggd2drinam1k4x0l3vfvvz15xrpvxypdv4d";
       libraryHaskellDepends = [
         array base bytestring Cabal Cabal-syntax containers edit-distance
         filepath mtl pretty transformers
@ -53621,8 +53653,8 @@ self: {
     }:
     mkDerivation {
       pname = "cabal-plan-bounds";
-       version = "0.1.3";
-       sha256 = "0bngpl6j5q11axra38802qgyh1crghdq89dsfpfhyllyrkcmwci6";
+       version = "0.1.3.1";
+       sha256 = "0cyvmzgfzw6x2rl9jsswqgzxcvffjzc0px48ia22852vqa9qw1ax";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -60694,8 +60726,6 @@ self: {
       ];
       description = "Clash: a functional hardware description language - Prelude library";
       license = lib.licenses.bsd2;
-       hydraPlatforms = lib.platforms.none;
-       broken = true;
     }) {};

  "clash-prelude-hedgehog" = callPackage
@ -63730,6 +63760,7 @@ self: {
       description = "Linear Programming using COIN-OR/CLP and comfort-array";
       license = lib.licenses.bsd3;
       badPlatforms = [ "aarch64-linux" ];
+       maintainers = [ lib.maintainers.thielema ];
     }) {inherit (pkgs) clp;};

  "cointracking-imports" = callPackage
@ -82340,6 +82371,27 @@ self: {
       license = lib.licenses.bsd3;
     }) {};

+  "diagrams-rasterific_1_4_2_3" = callPackage
+    ({ mkDerivation, base, bytestring, containers, data-default-class
+     , diagrams-core, diagrams-lib, file-embed, filepath, FontyFruity
+     , hashable, JuicyPixels, lens, mtl, optparse-applicative
+     , Rasterific
+     }:
+     mkDerivation {
+       pname = "diagrams-rasterific";
+       version = "1.4.2.3";
+       sha256 = "0n46scybjs8mnhrnh5z3nkrah6f8v1rv4cca8k8mqzsf8ss30q5l";
+       libraryHaskellDepends = [
+         base bytestring containers data-default-class diagrams-core
+         diagrams-lib file-embed filepath FontyFruity hashable JuicyPixels
+         lens mtl optparse-applicative Rasterific
+       ];
+       testHaskellDepends = [ base diagrams-core diagrams-lib ];
+       description = "Rasterific backend for diagrams";
+       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+     }) {};
+
  "diagrams-reflex" = callPackage
    ({ mkDerivation, base, colour, containers, diagrams-core
     , diagrams-lib, lens, monoid-extras, mtl, reflex, reflex-dom
@ -98988,8 +99040,8 @@ self: {
     }:
     mkDerivation {
       pname = "fbrnch";
-       version = "1.3.1";
-       sha256 = "0rg9mlk999rch4a6v48bb8yvdmkfqmnh9q70j7jn6bnwl0hl0v0w";
+       version = "1.3.2";
+       sha256 = "0qzfn271ka46f11hrbzq8axc3npkx1n5y5pihpg1gdccqmw6aazq";
       isLibrary = false;
       isExecutable = true;
       executableHaskellDepends = [
@ -117238,6 +117290,7 @@ self: {
       librarySystemDepends = [ libGL ];
       description = "Complete OpenGL raw bindings";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) libGL;};

  "gl-capture" = callPackage
@ -124889,6 +124942,7 @@ self: {
       ];
       description = "Raylib bindings for Haskell";
       license = lib.licenses.asl20;
+       badPlatforms = lib.platforms.darwin;
     }) {c = null; inherit (pkgs) libGL; inherit (pkgs.xorg) libX11; 
         inherit (pkgs.xorg) libXcursor; inherit (pkgs.xorg) libXext; 
         inherit (pkgs.xorg) libXi; inherit (pkgs.xorg) libXinerama; 
@ -138007,8 +138061,8 @@ self: {
     }:
     mkDerivation {
       pname = "hedgehog-extras";
-       version = "0.4.5.1";
-       sha256 = "1qqy8g9vjsa50j2nrm17z4f3jhvn1f9d5bxshcm1pz7hdkisy5hh";
+       version = "0.4.5.2";
+       sha256 = "1kdgjxdf9irk7sd8nlqxzppvppp9q6fcffhwpw3n62rf5rnsb6g3";
       libraryHaskellDepends = [
         aeson aeson-pretty async base bytestring deepseq Diff directory
         exceptions filepath hedgehog http-conduit hw-aeson mmorph mtl
@ -143240,6 +143294,28 @@ self: {
       mainProgram = "hkgr";
     }) {};

+  "hkgr_0_4_3" = callPackage
+    ({ mkDerivation, base, bytestring, directory, extra, filepath
+     , simple-cabal, simple-cmd-args, simple-prompt, typed-process
+     , xdg-basedir
+     }:
+     mkDerivation {
+       pname = "hkgr";
+       version = "0.4.3";
+       sha256 = "0w9409hqjh8cl540dp60a0n2ci97qvq3iygvz9ys5v5j1jpj78rn";
+       isLibrary = false;
+       isExecutable = true;
+       enableSeparateDataOutput = true;
+       executableHaskellDepends = [
+         base bytestring directory extra filepath simple-cabal
+         simple-cmd-args simple-prompt typed-process xdg-basedir
+       ];
+       description = "Simple Hackage release workflow for package maintainers";
+       license = lib.licenses.gpl3Only;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "hkgr";
+     }) {};
+
  "hkt" = callPackage
    ({ mkDerivation, base, hspec, inspection-testing, protolude, text
     }:
@ -165875,6 +165951,7 @@ self: {
       executablePkgconfigDepends = [ ncurses ];
       description = "A game of competitive puzzle-design";
       license = lib.licenses.gpl3Only;
+       badPlatforms = lib.platforms.darwin;
       mainProgram = "intricacy";
     }) {inherit (pkgs) ncurses;};

@ -181671,6 +181748,8 @@ self: {
       libraryToolDepends = [ c2hs ];
       description = "FFI bindings to libssh2 SSH2 client library (http://libssh2.org/)";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
+       broken = true;
     }) {inherit (pkgs) libssh2;};

  "libssh2-conduit" = callPackage
@ -181688,6 +181767,7 @@ self: {
       ];
       description = "Conduit wrappers for libssh2 FFI bindings (see libssh2 package)";
       license = lib.licenses.bsd3;
+       hydraPlatforms = lib.platforms.none;
     }) {};

  "libstackexchange" = callPackage
@ -182917,6 +182997,7 @@ self: {
       ];
       description = "Linear Programming basic definitions";
       license = lib.licenses.bsd3;
+       maintainers = [ lib.maintainers.thielema ];
     }) {};

  "linear-smc" = callPackage
@ -192076,6 +192157,22 @@ self: {
       broken = true;
     }) {};

+  "md5" = callPackage
+    ({ mkDerivation, base, bytebuild, byteslice, natural-arithmetic
+     , primitive
+     }:
+     mkDerivation {
+       pname = "md5";
+       version = "0.1.0.0";
+       sha256 = "0h0m6wwis1p2dl689wllywp338yxyykghfnznsq6jfb9vdfavzs4";
+       libraryHaskellDepends = [ base bytebuild byteslice primitive ];
+       testHaskellDepends = [
+         base bytebuild byteslice natural-arithmetic primitive
+       ];
+       description = "MD5 Hash";
+       license = lib.licenses.bsd3;
+     }) {};
+
  "mdapi" = callPackage
    ({ mkDerivation, aeson, base, bytestring, data-default, lens
     , lens-aeson, text, transformers, wreq
@ -199373,6 +199470,7 @@ self: {
       ];
       description = "A GUI library for writing native Haskell applications";
       license = lib.licenses.bsd3;
+       badPlatforms = lib.platforms.darwin;
       mainProgram = "dev-test-app";
     }) {inherit (pkgs) glew;};

@ -199419,6 +199517,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "A datagrid widget for the Monomer library";
       license = lib.licenses.mit;
+       badPlatforms = lib.platforms.darwin;
     }) {};

  "monomorphic" = callPackage
@ -200665,7 +200764,7 @@ self: {
       executableHaskellDepends = [ base ];
       description = "Save your spot when watching movies with @mplayer@";
       license = lib.licenses.bsd3;
-       badPlatforms = [ "aarch64-linux" ];
+       badPlatforms = [ "aarch64-linux" ] ++ lib.platforms.darwin;
       mainProgram = "mplayer-spot";
     }) {};

@ -204758,6 +204857,7 @@ self: {
       testHaskellDepends = [ base containers hspec inline-c QuickCheck ];
       description = "Haskell bindings for nanovg";
       license = lib.licenses.isc;
+       badPlatforms = lib.platforms.darwin;
     }) {inherit (pkgs) freetype; inherit (pkgs) glew; 
         inherit (pkgs) libGL; inherit (pkgs) libGLU; 
         inherit (pkgs.xorg) libX11;};
@ -224177,6 +224277,8 @@ self: {
       pname = "phatsort";
       version = "0.6.0.0";
       sha256 = "1cjmamla9383fk9715jxzlw87qnd26hpkcqhk4vvgld51nraf2pl";
+       revision = "1";
+       editedCabalFile = "0ivqjrahwjg6bl6k2nwb58avvyz7643js3zprabla1znlss36alv";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -276857,6 +276959,8 @@ self: {
       pname = "statestack";
       version = "0.3.1.1";
       sha256 = "1747qzaj3xqc90fj4ddch3ra5kj52rfd1dn7a8c6fkdk68q76mfd";
+       revision = "1";
+       editedCabalFile = "0rxndmrq4gj1bc9cf20477n8d6kpri31dyl6x8f4h57yiwhblg55";
       libraryHaskellDepends = [ base mtl transformers ];
       description = "Simple State-like monad transformer with saveable and restorable state";
       license = lib.licenses.bsd3;
@ -282558,8 +282662,8 @@ self: {
    ({ mkDerivation, base, blaze-markup, blaze-svg, directory, text }:
     mkDerivation {
       pname = "svg-icons";
-       version = "2.9.3.0";
-       sha256 = "156nkyzkkfxvk21zdgfa20wmlisx9x8i798iljn76dv4zwqsslvq";
+       version = "2.10.0";
+       sha256 = "0r1xm2vn62crrhzn9kb64lz9d16ra9gj0qq208wmhz6906hz0kbf";
       isLibrary = true;
       isExecutable = true;
       libraryHaskellDepends = [
@ -325714,6 +325818,41 @@ self: {
       mainProgram = "zenacy-html-exe";
     }) {};

+  "zenacy-html_2_1_0" = callPackage
+    ({ mkDerivation, base, bytestring, containers, criterion
+     , data-default, dlist, extra, HUnit, mtl, pretty-show
+     , raw-strings-qq, safe, safe-exceptions, test-framework
+     , test-framework-hunit, text, transformers, vector, word8
+     }:
+     mkDerivation {
+       pname = "zenacy-html";
+       version = "2.1.0";
+       sha256 = "0xyzgklkjlmx8jq5r67vkjgay4xkb2941m0cq9a8s4s4yjknvfh5";
+       isLibrary = true;
+       isExecutable = true;
+       libraryHaskellDepends = [
+         base bytestring containers data-default dlist extra mtl pretty-show
+         safe safe-exceptions text transformers vector word8
+       ];
+       executableHaskellDepends = [
+         base bytestring containers data-default dlist extra pretty-show
+         text vector
+       ];
+       testHaskellDepends = [
+         base bytestring containers data-default dlist extra HUnit mtl
+         pretty-show raw-strings-qq test-framework test-framework-hunit text
+         transformers
+       ];
+       benchmarkHaskellDepends = [
+         base bytestring containers criterion data-default dlist pretty-show
+         raw-strings-qq text
+       ];
+       description = "A standard compliant HTML parsing library";
+       license = lib.licenses.mit;
+       hydraPlatforms = lib.platforms.none;
+       mainProgram = "zenacy-html-exe";
+     }) {};
+
  "zenacy-unicode" = callPackage
    ({ mkDerivation, base, bytestring, HUnit, test-framework
     , test-framework-hunit, text, vector, word8
--- a/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch
+++ b/pkgs/development/haskell-modules/patches/gtk2hs-buildtools-fix-ghc-9.4.x.patch
@ -1,12 +0,0 @@
-diff --git a/src/Gtk2HsSetup.hs b/src/Gtk2HsSetup.hs
-index 598048f..b652b76 100644
--- a/src/Gtk2HsSetup.hs
-+++ b/src/Gtk2HsSetup.hs
-@@ -300,6 +300,7 @@ ourC2hs :: BuildInfo -> LocalBuildInfo -> PreProcessor
- ourC2hs bi lbi = PreProcessor {
- #endif
-   platformIndependent = False,
-+  ppOrdering = (\ _ _ ms -> return ms),
-   runPreProcessor = runC2HS bi lbi
- }
-