Merge pull request #249708 from NixOS/haskell-updates

haskellPackages: update stackage and hackage

maintainers/scripts/haskell/hydra-report.hs

@@ -30,7 +30,7 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca
 {-# OPTIONS_GHC -Wall #-}
 {-# LANGUAGE DataKinds #-}
 
-import Control.Monad (forM_, (<=<))
+import Control.Monad (forM_, forM, (<=<))
 import Control.Monad.Trans (MonadIO (liftIO))
 import Data.Aeson (
    FromJSON,
@@ -108,6 +108,7 @@ newtype JobsetEvalInputs = JobsetEvalInputs {nixpkgs :: Nixpkgs}
 data Eval = Eval
    { id :: Int
    , jobsetevalinputs :: JobsetEvalInputs
+   , builds :: Seq Int
    }
    deriving (Generic, ToJSON, FromJSON, Show)
 
@@ -151,15 +152,20 @@ data Build = Build
    }
    deriving (Generic, ToJSON, FromJSON, Show)
 
+data HydraSlownessWorkaroundFlag = HydraSlownessWorkaround | NoHydraSlownessWorkaround
+data RequestLogsFlag = RequestLogs | NoRequestLogs
+
 main :: IO ()
 main = do
    args <- getArgs
    case args of
-      ["get-report"] -> getBuildReports
+      ["get-report", "--slow"] -> getBuildReports HydraSlownessWorkaround
+      ["get-report"] -> getBuildReports NoHydraSlownessWorkaround
       ["ping-maintainers"] -> printMaintainerPing
-      ["mark-broken-list"] -> printMarkBrokenList
+      ["mark-broken-list", "--no-request-logs"] -> printMarkBrokenList NoRequestLogs
+      ["mark-broken-list"] -> printMarkBrokenList RequestLogs
       ["eval-info"] -> printEvalInfo
-      _ -> putStrLn "Usage: get-report | ping-maintainers | mark-broken-list | eval-info"
+      _ -> putStrLn "Usage: get-report [--slow] | ping-maintainers | mark-broken-list [--no-request-logs] | eval-info"
 
 reportFileName :: IO FilePath
 reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
@@ -167,18 +173,27 @@ reportFileName = getXdgDirectory XdgCache "haskell-updates-build-report.json"
 showT :: Show a => a -> Text
 showT = Text.pack . show
 
-getBuildReports :: IO ()
-getBuildReports = runReq defaultHttpConfig do
+getBuildReports :: HydraSlownessWorkaroundFlag -> IO ()
+getBuildReports opt = runReq defaultHttpConfig do
    evalMay <- Seq.lookup 0 . evals <$> hydraJSONQuery mempty ["jobset", "nixpkgs", "haskell-updates", "evals"]
-   eval@Eval{id} <- maybe (liftIO $ fail "No Evalution found") pure evalMay
+   eval@Eval{id} <- maybe (liftIO $ fail "No Evaluation found") pure evalMay
    liftIO . putStrLn $ "Fetching evaluation " <> show id <> " from Hydra. This might take a few minutes..."
-   buildReports :: Seq Build <- hydraJSONQuery (responseTimeout 600000000) ["eval", showT id, "builds"]
+   buildReports <- getEvalBuilds opt id
    liftIO do
       fileName <- reportFileName
       putStrLn $ "Finished fetching all builds from Hydra, saving report as " <> fileName
       now <- getCurrentTime
       encodeFile fileName (eval, now, buildReports)
 
+getEvalBuilds :: HydraSlownessWorkaroundFlag -> Int -> Req (Seq Build)
+getEvalBuilds NoHydraSlownessWorkaround id =
+  hydraJSONQuery (responseTimeout 900000000) ["eval", showT id, "builds"]
+getEvalBuilds HydraSlownessWorkaround id = do
+  Eval{builds} <- hydraJSONQuery mempty [ "eval", showT id ]
+  forM builds $ \buildId -> do
+    liftIO $ putStrLn $ "Querying build " <> show buildId
+    hydraJSONQuery mempty [ "build", showT buildId ]
+
 hydraQuery :: HttpResponse a => Proxy a -> Option 'Https -> [Text] -> Req (HttpResponseBody a)
 hydraQuery responseType option query =
    responseBody
@@ -187,7 +202,7 @@ hydraQuery responseType option query =
          (foldl' (/:) (https "hydra.nixos.org") query)
          NoReqBody
          responseType
-         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)" <> option)
+         (header "User-Agent" "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270" <> option)
 
 hydraJSONQuery :: FromJSON a => Option 'Https -> [Text] -> Req a
 hydraJSONQuery = hydraQuery jsonResponse
@@ -775,16 +790,20 @@ printMaintainerPing = do
        textBuildSummary = printBuildSummary eval fetchTime buildSum topBrokenRdeps
    Text.putStrLn textBuildSummary
 
-printMarkBrokenList :: IO ()
-printMarkBrokenList = do
+printMarkBrokenList :: RequestLogsFlag -> IO ()
+printMarkBrokenList reqLogs = do
    (_, fetchTime, buildReport) <- readBuildReports
    runReq defaultHttpConfig $ forM_ buildReport \build@Build{job, id} ->
       case (getBuildState build, Text.splitOn "." $ unJobName job) of
          (Failed, ["haskellPackages", name, "x86_64-linux"]) -> do
-            -- Fetch build log from hydra to figure out the cause of the error.
-            build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"]
             -- We use the last probable error cause found in the build log file.
-            let error_message = fromMaybe " failure " $ safeLast $ mapMaybe probableErrorCause build_log
+            error_message <- fromMaybe "failure" <$>
+              case reqLogs of
+                NoRequestLogs -> pure Nothing
+                RequestLogs -> do
+                  -- Fetch build log from hydra to figure out the cause of the error.
+                  build_log <- ByteString.lines <$> hydraPlainQuery ["build", showT id, "nixlog", "1", "raw"]
+                  pure $ safeLast $ mapMaybe probableErrorCause build_log
             liftIO $ putStrLn $ "  - " <> Text.unpack name <> " # " <> error_message <> " in job https://hydra.nixos.org/build/" <> show id <> " at " <> formatTime defaultTimeLocale "%Y-%m-%d" fetchTime
          _ -> pure ()
 

maintainers/scripts/haskell/mark-broken.sh

@@ -10,6 +10,24 @@
 
 set -euo pipefail
 
+do_commit=false
+mark_broken_list_flags=""
+
+for arg in "$@"; do
+    case "$arg" in
+        --do-commit)
+            do_commit=true
+            ;;
+        --no-request-logs)
+            mark_broken_list_flags="$mark_broken_list_flags $arg"
+            ;;
+        *)
+            echo "$0: unknown flag: $arg"
+            exit 100
+            ;;
+    esac
+done
+
 broken_config="pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"
 
 tmpfile=$(mktemp)
@@ -17,7 +35,7 @@ trap "rm ${tmpfile}" 0
 
 echo "Remember that you need to manually run 'maintainers/scripts/haskell/hydra-report.hs get-report' sometime before running this script."
 echo "Generating a list of broken builds and displaying for manual confirmation ..."
-maintainers/scripts/haskell/hydra-report.hs mark-broken-list | sort -i > "$tmpfile"
+maintainers/scripts/haskell/hydra-report.hs mark-broken-list $mark_broken_list_flags | sort -i > "$tmpfile"
 
 $EDITOR "$tmpfile"
 
@@ -34,7 +52,7 @@ clear="env -u HOME -u NIXPKGS_CONFIG"
 $clear maintainers/scripts/haskell/regenerate-hackage-packages.sh
 evalline=$(maintainers/scripts/haskell/hydra-report.hs eval-info)
 
-if [[ "${1:-}" == "--do-commit" ]]; then
+if $do_commit; then
 git add $broken_config
 git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml
 git add pkgs/development/haskell-modules/hackage-packages.nix

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/4cdb9878496fdb36b8b9c5f2ab0ef8a44a0f859f.tar.gz",
-  "sha256": "0yhymzcsls48hf44ncd79xn786rfh4k70h78w7b0ihn7lrjgsynv",
-  "msg": "Update from Hackage at 2023-07-24T19:28:29Z"
+  "commit": "69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/69066b0daf2bbb4ca6f2b6de0bc9b8f27fffe4bc.tar.gz",
+  "sha256": "16ij50f7cx8gl3ypzwy50f5dr68y6m6n732sa1hwsng5db4vqzv7",
+  "msg": "Update from Hackage at 2023-08-17T07:12:25Z"
 }

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

@@ -116,10 +116,6 @@ self: super: {
   # There will probably be a new revision soon.
   hls-brittany-plugin = assert super.hls-brittany-plugin.version == "1.1.0.0"; doJailbreak super.hls-brittany-plugin;
 
-  hls-hlint-plugin = super.hls-hlint-plugin.override {
-    apply-refact = self.apply-refact_0_11_0_0;
-  };
-
   # For -f-auto see cabal.project in haskell-language-server.
   ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser (disableCabalFlag "auto" super.ghc-lib-parser-ex);
 
@@ -205,6 +201,11 @@ self: super: {
     })
   ] super.aeson);
 
+  # aeson 2.2.0.0 requires th-abstraction >= 0.5 & < 0.6
+  aeson_2_2_0_0 = super.aeson_2_2_0_0.overrideScope (hfinal: hprev: {
+    th-abstraction = hfinal.th-abstraction_0_5_0_0;
+  });
+
   # 2023-06-28: Test error: https://hydra.nixos.org/build/225565149
   orbits = dontCheck super.orbits;
 
@@ -237,8 +238,7 @@ self: super: {
   # Arion's test suite needs a Nixpkgs, which is cumbersome to do from Nixpkgs
   # itself. For instance, pkgs.path has dirty sources and puts a huge .git in the
   # store. Testing is done upstream.
-  # 2023-07-27: Allow base-4.17
-  arion-compose = dontCheck (assert super.arion-compose.version == "0.2.0.0"; doJailbreak super.arion-compose);
+  arion-compose = dontCheck super.arion-compose;
 
   # 2023-07-17: Outdated base bound https://github.com/srid/lvar/issues/5
   lvar = doJailbreak super.lvar;
@@ -253,6 +253,10 @@ self: super: {
   # https://github.com/glguy/config-value/commit/c5558c8258598fab686c259bff510cc1b19a0c50#commitcomment-119514821
   config-value = doJailbreak super.config-value;
 
+  # path-io bound is adjusted in 0.6.1 release
+  # https://github.com/tek/hix/commit/019426f6a3db256e4c96558ffe6fa2114e2f19a0
+  hix = doJailbreak super.hix;
+
   # waiting for release: https://github.com/jwiegley/c2hsc/issues/41
   c2hsc = appendPatch (fetchpatch {
     url = "https://github.com/jwiegley/c2hsc/commit/490ecab202e0de7fc995eedf744ad3cb408b53cc.patch";
@@ -312,7 +316,12 @@ self: super: {
 
   # Overriding the version pandoc dependency uses as the latest release has version bounds
   # defined as >= 3.1  && < 3.2, can be removed once pandoc gets bumped by Stackage.
-  patat = super.patat.override { pandoc = self.pandoc_3_1_6; };
+  patat = super.patat.override { pandoc = self.pandoc_3_1_6_1; };
+
+  # http2 also overridden in all-packages.nix for mailctl.
+  # twain is currently only used by mailctl, so the .overrideScope shouldn't
+  # negatively affect any other packages, at least currently...
+  twain = super.twain.overrideScope (self: _: { http2 = self.http2_3_0_3; });
 
   # The latest release on hackage has an upper bound on containers which
   # breaks the build, though it works with the version of containers present
@@ -338,7 +347,7 @@ self: super: {
       name = "git-annex-${super.git-annex.version}-src";
       url = "git://git-annex.branchable.com/";
       rev = "refs/tags/" + super.git-annex.version;
-      sha256 = "1i14mv8z9sr5sckckwiba4cypgs3iwk19pyrl9xzcrzz426dxrba";
+      sha256 = "0fg3q7apdijnlgyb0yps1znjjd2nv3016r9cyxyw209sqn3whnx5";
       # delete android and Android directories which cause issues on
       # darwin (case insensitive directory). Since we don't need them
       # during the build process, we can delete it to prevent a hash
@@ -856,9 +865,6 @@ self: super: {
   elm-server = markBroken super.elm-server;
   elm-yesod = markBroken super.elm-yesod;
 
-  # Tests failure with GHC >= 9.0.1, fixed in 1.6.24.4
-  yesod-core = assert super.yesod-core.version == "1.6.24.3"; dontCheck super.yesod-core;
-
   # https://github.com/Euterpea/Euterpea2/issues/40
   Euterpea = doJailbreak super.Euterpea;
 
@@ -896,6 +902,22 @@ self: super: {
   # It does not support aeson 2.0
   descriptive = super.descriptive.override { aeson = self.aeson_1_5_6_0; };
 
+  # Apply compatibility patches until a new release arrives
+  # https://github.com/phadej/spdx/issues/33
+  spdx = appendPatches [
+    (fetchpatch {
+      name = "spdx-ghc-9.4.patch";
+      url = "https://github.com/phadej/spdx/pull/30/commits/545dc69f433225c837375fba4cbbdb7f9cc7b09b.patch";
+      sha256 = "0p2h8dxkjy2v0dx7h6v62clmx5n5j3c4zh4myh926fijympi1glz";
+    })
+    (fetchpatch {
+      name = "spdx-ghc-9.6.patch";
+      url = "https://github.com/phadej/spdx/pull/32/commits/b51f665e9960614274ff6a9ac658802c1a785687.patch";
+      sha256 = "01vf1h0djr84yxsjfhym715ncx0w5q4l02k3dkbmg40pnc62ql4h";
+      excludes = [ ".github/**" ];
+    })
+  ] super.spdx;
+
   # 2022-03-19: Testsuite is failing: https://github.com/puffnfresh/haskell-jwt/issues/2
   jwt = dontCheck super.jwt;
 
@@ -935,25 +957,6 @@ self: super: {
   # https://github.com/basvandijk/concurrent-extra/issues/12
   concurrent-extra = dontCheck super.concurrent-extra;
 
-  bloomfilter = appendPatches [
-    # https://github.com/bos/bloomfilter/issues/7
-    ./patches/bloomfilter-fix-on-32bit.patch
-    # Fix build with GHC >= 9.2 by using stock unsafeShift* functions
-    # https://github.com/bos/bloomfilter/pull/20
-    (pkgs.fetchpatch {
-      name = "bloomfilter-ghc-9.2-shift.patch";
-      url = "https://github.com/bos/bloomfilter/pull/20/commits/fb79b39c44404fd791a3bed973e9d844fb084f1e.patch";
-      sha256 = "0clmr5iar4mhp8nbgh1c1rh4fl7dy0g2kbqqh0af8aqmhjpqzrq3";
-    })
-  ] (overrideCabal (drv: {
-    # Make sure GHC 9.2 patch applies correctly
-    revision = null;
-    editedCabalFile = null;
-    prePatch = drv.prePatch or "" + ''
-      "${pkgs.buildPackages.dos2unix}/bin/dos2unix" *.cabal
-    '';
-  }) super.bloomfilter);
-
   # https://github.com/pxqr/base32-bytestring/issues/4
   base32-bytestring = dontCheck super.base32-bytestring;
 
@@ -1161,9 +1164,11 @@ self: super: {
   github-backup = doJailbreak super.github-backup;
 
   # dontCheck: https://github.com/haskell-servant/servant-auth/issues/113
-  # doJailbreak: waiting on revision 1 to hit hackage
-  servant-auth-client = doJailbreak (dontCheck super.servant-auth-client);
+  servant-auth-client = dontCheck super.servant-auth-client;
+  # Allow lens-aeson >= 1.2 https://github.com/haskell-servant/servant/issues/1703
   servant-auth-server = doJailbreak super.servant-auth-server;
+  # Allow hspec >= 2.10 https://github.com/haskell-servant/servant/issues/1704
+  servant-foreign = doJailbreak super.servant-foreign;
 
   # Generate cli completions for dhall.
   dhall = self.generateOptparseApplicativeCompletions [ "dhall" ] super.dhall;
@@ -1918,27 +1923,23 @@ self: super: {
   inherit (let
     pandoc-cli-overlay = self: super: {
       # pandoc-cli requires pandoc >= 3.1
-      pandoc = self.pandoc_3_1_6;
+      pandoc = self.pandoc_3_1_6_1;
 
       # pandoc depends on crypton-connection, which requires tls >= 1.7
-      tls = self.tls_1_7_0;
+      tls = self.tls_1_7_1;
       crypton-connection = unmarkBroken super.crypton-connection;
 
       # pandoc depends on http-client-tls, which only starts depending
       # on crypton-connection in http-client-tls-0.3.6.2.
-      http-client-tls = self.http-client-tls_0_3_6_2;
-
-      # pandoc and skylighting are developed in tandem
-      skylighting-core = self.skylighting-core_0_13_4_1;
-      skylighting = self.skylighting_0_13_4_1;
+      http-client-tls = self.http-client-tls_0_3_6_3;
     };
   in {
     pandoc-cli = super.pandoc-cli.overrideScope pandoc-cli-overlay;
-    pandoc_3_1_6 = doDistribute (super.pandoc_3_1_6.overrideScope pandoc-cli-overlay);
+    pandoc_3_1_6_1 = doDistribute (super.pandoc_3_1_6_1.overrideScope pandoc-cli-overlay);
     pandoc-lua-engine = super.pandoc-lua-engine.overrideScope pandoc-cli-overlay;
   })
     pandoc-cli
-    pandoc_3_1_6
+    pandoc_3_1_6_1
     pandoc-lua-engine
     ;
 
@@ -2539,13 +2540,6 @@ self: super: {
   })
   super.polynomial);
 
-  # Unreleased bound relaxing patch allowing scotty 0.12
-  taffybar = appendPatch (pkgs.fetchpatch {
-    name = "taffybar-allow-scotty-0.12.patch";
-    url = "https://github.com/taffybar/taffybar/commit/2e428ba550fc51067526a0350b91185acef72d19.patch";
-    sha256 = "1lpcz671mk5cwqffjfi9ncc0d67bmwgzypy3i37a2fhfmxd0y3nl";
-  }) ((p: assert p.version == "4.0.0"; p) super.taffybar);
-
   # Tests likely broke because of https://github.com/nick8325/quickcheck/issues/359,
   # but fft is not on GitHub, so no issue reported.
   fft = dontCheck super.fft;
@@ -2562,12 +2556,6 @@ self: super: {
   # has been resolved.
   lucid-htmx = doJailbreak super.lucid-htmx;
 
-  # Needs lsp >= 2.1
-  futhark = super.futhark.overrideScope (fself: _: {
-    lsp = fself.lsp_2_1_0_0;
-    lsp-types = fself.lsp-types_2_0_1_0;
-  });
-
   # Too strict bounds on hspec
   # https://github.com/klapaucius/vector-hashtables/issues/11
   vector-hashtables = doJailbreak super.vector-hashtables;
@@ -2777,12 +2765,7 @@ self: super: {
 
   # Tests fail due to the newly-build fourmolu not being in PATH
   # https://github.com/fourmolu/fourmolu/issues/231
-  fourmolu_0_13_1_0 = dontCheck (super.fourmolu_0_13_1_0.overrideScope (lself: lsuper: {
-    Cabal-syntax = lself.Cabal-syntax_3_10_1_0;
-    ghc-lib-parser = lself.ghc-lib-parser_9_6_2_20230523;
-    parsec = lself.parsec_3_1_16_1;
-    text = lself.text_2_0_2;
-  }));
+  fourmolu_0_13_1_0 = dontCheck super.fourmolu_0_13_1_0;
 
   # Merged upstream, but never released. Allows both intel and aarch64 darwin to build.
   # https://github.com/vincenthz/hs-gauge/pull/106

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

@@ -103,7 +103,6 @@ self: super: {
     # These aren't included in hackage-packages.nix because hackage2nix is configured for GHC 9.2, under which these plugins aren't supported.
     # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
     additionalDeps = with self.haskell-language-server.scope; [
-      hls-brittany-plugin
       hls-haddock-comments-plugin
       (unmarkBroken hls-splice-plugin)
       hls-tactics-plugin
@@ -112,17 +111,21 @@ self: super: {
     Cabal = lself.Cabal_3_6_3_0;
     aeson = lself.aeson_1_5_6_0;
     lens-aeson = doJailbreak lself.lens-aeson_1_1_3;
-    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
+    lsp-types = dontCheck (doJailbreak lsuper.lsp-types); # Checks require aeson >= 2.0
     hls-overloaded-record-dot-plugin = null;
   }));
 
-  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_7_20230228;
+  ghc-lib-parser = doDistribute self.ghc-lib-parser_9_2_8_20230729;
   ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_2_1_1;
-  ghc-lib = doDistribute self.ghc-lib_9_2_7_20230228;
+  ghc-lib = doDistribute self.ghc-lib_9_2_8_20230729;
 
   mod = super.mod_0_1_2_2;
   path-io = doJailbreak super.path-io;
 
+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
   ormolu = self.ormolu_0_5_0_1;
   fourmolu = dontCheck self.fourmolu_0_9_0_0;
   hlint = self.hlint_3_4_1;
@@ -134,15 +137,6 @@ self: super: {
     parser-combinators prettyprinter refinery retrie syb unagi-chan unordered-containers
   ]) super.hls-tactics-plugin);
 
-  hls-brittany-plugin =  unmarkBroken (addBuildDepends (with self.hls-brittany-plugin.scope; [
-    brittany czipwith extra ghc-exactprint ghcide hls-plugin-api hls-test-utils lens lsp-types
-    ]) (super.hls-brittany-plugin.overrideScope (lself: lsuper: {
-    brittany = doJailbreak (unmarkBroken lself.brittany_0_13_1_2);
-    aeson = lself.aeson_1_5_6_0;
-    multistate = unmarkBroken (dontCheck lsuper.multistate);
-    lsp-types = doJailbreak lsuper.lsp-types; # Checks require aeson >= 2.0
-  })));
-
   # This package is marked as unbuildable on GHC 9.2, so hackage2nix doesn't include any dependencies.
   # See https://github.com/NixOS/nixpkgs/pull/205902 for why we use `self.<package>.scope`
   hls-haddock-comments-plugin =  unmarkBroken (addBuildDepends (with self.hls-haddock-comments-plugin.scope; [

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

@@ -68,6 +68,10 @@ self: super: {
   tuple = addBuildDepend self.base-orphans super.tuple;
   vector-th-unbox = doJailbreak super.vector-th-unbox;
 
+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
   ormolu = self.ormolu_0_5_2_0.override {
     Cabal-syntax = self.Cabal-syntax_3_8_1_0;
   };

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

@@ -63,6 +63,10 @@ self: super: {
     algebraic-graphs = dontCheck self.algebraic-graphs_0_6_1;
   };
 
+  hls-cabal-plugin = super.hls-cabal-plugin.override {
+    Cabal-syntax = self.Cabal-syntax_3_8_1_0;
+  };
+
   ormolu = self.ormolu_0_5_2_0.override {
     Cabal-syntax = self.Cabal-syntax_3_8_1_0;
   };

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

@@ -68,20 +68,27 @@ self: super: {
   doctest = doDistribute super.doctest_0_22_0;
   http-api-data = doDistribute self.http-api-data_0_6; # allows base >= 4.18
   some = doDistribute self.some_1_0_5;
-  th-abstraction = doDistribute self.th-abstraction_0_5_0_0;
+  th-abstraction = doDistribute self.th-abstraction_0_6_0_0;
   th-desugar = doDistribute self.th-desugar_1_15;
   semigroupoids = doDistribute self.semigroupoids_6_0_0_1;
   bifunctors = doDistribute self.bifunctors_5_6_1;
   base-compat = doDistribute self.base-compat_0_13_0;
   base-compat-batteries = doDistribute self.base-compat-batteries_0_13_0;
 
+  # Because we bumped the version of th-abstraction above.^
+  aeson = doJailbreak super.aeson;
+  free = doJailbreak super.free;
+
+  # Requires filepath >= 1.4.100.0 <=> GHC >= 9.6
+  file-io = unmarkBroken super.file-io;
+
   # Too strict upper bound on template-haskell
   # https://github.com/mokus0/th-extras/pull/21
   th-extras = doJailbreak super.th-extras;
 
   ghc-lib = doDistribute self.ghc-lib_9_6_2_20230523;
   ghc-lib-parser = doDistribute self.ghc-lib-parser_9_6_2_20230523;
-  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_0;
+  ghc-lib-parser-ex = doDistribute self.ghc-lib-parser-ex_9_6_0_1;
 
   # v0.1.6 forbids base >= 4.18
   singleton-bool = doDistribute super.singleton-bool_0_1_7;
@@ -164,23 +171,14 @@ self: super: {
 
   # 2023-04-03: plugins disabled for hls 1.10.0.0 based on
   #
-  haskell-language-server =
-    let
-      # TODO: HLS-2.0.0.0 added support for the foumolu plugin for ghc-9.6.
-      # However, putting together all the overrides to get the latest
-      # version of fourmolu compiling together with ghc-9.6 and HLS is a
-      # little annoying, so currently fourmolu has been disabled.  We should
-      # try to enable this at some point in the future.
-      hlsWithFlags = disableCabalFlag "fourmolu" super.haskell-language-server;
-    in
-    hlsWithFlags.override {
-      hls-ormolu-plugin = null;
+  haskell-language-server = super.haskell-language-server.override {
       hls-floskell-plugin = null;
-      hls-fourmolu-plugin = null;
-      hls-hlint-plugin = null;
-      hls-stylish-haskell-plugin = null;
     };
 
+  fourmolu = super.fourmolu_0_13_1_0;
+  ormolu = super.ormolu_0_7_1_0;
+  stylish-haskell = super.stylish-haskell_0_14_5_0;
+
   # Newer version of servant required for GHC 9.6
   servant = self.servant_0_20;
   servant-server = self.servant-server_0_20;
@@ -216,6 +214,8 @@ self: super: {
    HUnit Diff data-default extra fail free ghc-paths ordered-containers silently syb
   ]) super.ghc-exactprint_1_7_0_1);
 
+  hlint = super.hlint_3_6_1;
+
   inherit (pkgs.lib.mapAttrs (_: doJailbreak ) super)
     hls-cabal-plugin
     algebraic-graphs

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

@@ -41,11 +41,6 @@ default-package-overrides:
   - dhall-nixpkgs == 1.0.9
   - dhall-nix == 1.1.25
 
-  # 2023-06-24: HLS at large can't deal with lsp-2.0.0.0 yet
-  - lsp == 1.6.*
-  - lsp-types == 1.6.*
-  - lsp-test == 0.14.*
-
   # 2023-07-06: ghcide-2.0.0.1 explicitly needs implicit-hie < 0.1.3, because some sort of
   # breaking change was introduced in implicit-hie-0.1.3.0.
   # https://github.com/haskell/haskell-language-server/blob/feb596592de95f09cf4ee885f3e74178161919f1/ghcide/ghcide.cabal#L107-L111
@@ -112,6 +107,7 @@ extra-packages:
   - hspec-discover < 2.8                # 2022-04-07: Needed for tasty-hspec 1.1.6
   - hspec-meta < 2.8                    # 2022-12-07: Needed for elmPackages.elm / hspec-discover
   - hspec-golden == 0.1.*               # 2022-04-07: Needed for elm-format
+  - http2 < 3.3                         # 2023-08-24: Needed for twain <https://github.com/alexmingoia/twain/issues/5>
   - immortal == 0.2.2.1                 # required by Hasura 1.3.1, 2020-08-20
   - language-docker == 11.0.0           # required by hadolint 2.12.0, 2022-11-16
   - language-javascript == 0.7.0.0      # required by purescript
@@ -132,6 +128,7 @@ extra-packages:
   - sbv == 7.13                         # required for pkgs.petrinizer
   - stylish-haskell == 0.14.3.0         # 2022-09-19: needed for hls on ghc 8.8
   - tasty-hspec == 1.1.6                # 2022-04-07: Needed for elm-format
+  - th-abstraction < 0.6                # 2023-09-11: needed for aeson-2.2.0.0
   - vty == 5.35.1                       # 2022-07-08: needed for glirc-2.39.0.1
   - weeder == 2.2.*                     # 2022-02-21: preserve for GHC 8.10.7
   - weeder == 2.3.*                     # 2022-05-31: preserve for GHC 9.0.2
@@ -173,6 +170,7 @@ package-maintainers:
     - patat
     - svgcairo
   danielrolls:
+    - byte-count-reader
     - shellify
   domenkozar:
     - cachix
@@ -580,6 +578,8 @@ unsupported-platforms:
   bustle:                                       [ platforms.darwin ] # uses glibc-specific ptsname_r
   bytelog:                                      [ platforms.darwin ] # due to posix-api
   camfort:                                      [ aarch64-linux ]
+  chalkboard:                                   [ platforms.darwin ] # depends on Codec-Image-DevIL
+  chalkboard-viewer:                            [ platforms.darwin ] # depends on chalkboard
   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
@@ -596,6 +596,7 @@ unsupported-platforms:
   gi-dbusmenugtk3:                              [ platforms.darwin ]
   gi-dbusmenu:                                  [ platforms.darwin ]
   gi-ggit:                                      [ platforms.darwin ]
+  gi-gtk-layer-shell:                           [ platforms.darwin ] # depends on gtk-layer-shell which is not supported on darwin
   gi-ibus:                                      [ platforms.darwin ]
   gi-javascriptcore:                            [ platforms.darwin ] # webkitgtk marked broken on darwin
   gi-ostree:                                    [ platforms.darwin ]
@@ -610,7 +611,6 @@ unsupported-platforms:
   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 ]
   HDRUtils:                                     [ platforms.darwin ]
   hidapi:                                       [ platforms.darwin ]
@@ -664,6 +664,7 @@ unsupported-platforms:
   SDL-mpeg:                                     [ platforms.darwin ] # depends on mesa
   sdl2-mixer:                                   [ platforms.darwin ]
   sdl2-ttf:                                     [ platforms.darwin ]
+  sdr:                                          [ platforms.darwin ] # depends on rtlsdr
   sensei:                                       [ platforms.darwin ]
   spade:                                        [ platforms.darwin ] # depends on sdl2-mixer, which doesn't work on darwin
   synthesizer-alsa:                             [ platforms.darwin ]
@@ -711,12 +712,14 @@ supported-platforms:
   gtk3-mac-integration:                         [ platforms.darwin ]
   halide-haskell:                               [ platforms.linux ]
   halide-JuicyPixels:                           [ platforms.linux ]
+  hb3sum:                                       [ platforms.x86 ] # due to blake3
   hommage-ds:                                   [ platforms.windows ]
   hpapi:                                        [ platforms.linux ] # limited by pkgs.papi
   hsignal:                                      [ platforms.x86 ] # -msse2
   HFuse:                                        [ platforms.linux ]
   HQu:                                          [ platforms.x86 ] # vendored C++ library needs i686/x86_64
   hs-swisstable-hashtables-class:               [ platforms.x86_64 ] # depends on swisstable, which Needs AVX2
+  htune:                                        [ platforms.linux ] # depends on alsa-pcm
   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, …)
@@ -844,7 +847,9 @@ dont-distribute-packages:
 
   # Packages that (transitively) depend on insecure packages
   - distributed-process-zookeeper # depends on hzk
+  - HDRUtils # depends on pfstools, which depends on imagemagick
   - hzk # depends on zookeeper_mt, which depends on openssl-1.1
-  - persistent-zookeper # depends on hzk
+  - jobqueue # depends on hzk
+  - persistent-zookeeper # depends on hzk
   - pocket-dns # depends on persistent-zookeeper
   - zoovisitor # depends on zookeeper_mt, which depends on openssl-1.1

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

@@ -1,4 +1,4 @@
-# Stackage LTS 21.3
+# Stackage LTS 21.7
 # This file is auto-generated by
 # maintainers/scripts/haskell/update-stackage.sh
 default-package-overrides:
@@ -8,7 +8,7 @@ default-package-overrides:
   - AC-Angle ==1.0
   - acc ==0.2.0.2
   - ace ==0.6
-  - acid-state ==0.16.1.2
+  - acid-state ==0.16.1.3
   - action-permutations ==0.0.0.1
   - active ==0.2.0.18
   - ad ==4.5.4
@@ -104,11 +104,12 @@ default-package-overrides:
   - atomic-primops ==0.8.4
   - atomic-write ==0.2.0.7
   - attoparsec ==0.14.4
+  - attoparsec-aeson ==2.1.0.0
   - attoparsec-base64 ==0.0.0
   - attoparsec-binary ==0.2
   - attoparsec-data ==1.0.5.3
   - attoparsec-expr ==0.1.1.2
-  - attoparsec-framer ==0.1.0.0
+  - attoparsec-framer ==0.1.0.1
   - attoparsec-iso8601 ==1.1.0.0
   - attoparsec-path ==0.0.0.1
   - attoparsec-run ==0.0.2.0
@@ -116,7 +117,7 @@ default-package-overrides:
   - audacity ==0.0.2.1
   - authenticate ==1.3.5.1
   - authenticate-oauth ==1.7
-  - autodocodec ==0.2.0.3
+  - autodocodec ==0.2.0.4
   - autodocodec-openapi3 ==0.2.1.1
   - autodocodec-schema ==0.1.0.3
   - autodocodec-yaml ==0.2.0.3
@@ -166,7 +167,7 @@ default-package-overrides:
   - benri-hspec ==0.1.0.1
   - between ==0.11.0.0
   - bhoogle ==0.1.4.2
-  - bibtex ==0.1.0.6
+  - bibtex ==0.1.0.7
   - bifunctor-classes-compat ==0.1
   - bifunctors ==5.5.15
   - bimap ==0.5.0
@@ -195,7 +196,7 @@ default-package-overrides:
   - bitset-word8 ==0.1.1.2
   - bits-extra ==0.0.2.3
   - bitvec ==1.1.4.0
-  - bitwise-enum ==1.0.1.0
+  - bitwise-enum ==1.0.1.2
   - blake2 ==0.3.0
   - Blammo ==1.1.2.1
   - blank-canvas ==0.7.3
@@ -215,7 +216,7 @@ default-package-overrides:
   - bm ==0.2.0.0
   - bmp ==1.2.6.3
   - bnb-staking-csvs ==0.2.1.0
-  - BNFC ==2.9.4.1
+  - BNFC ==2.9.5
   - BNFC-meta ==0.6.1
   - board-games ==0.4
   - bodhi ==0.1.0
@@ -226,11 +227,11 @@ default-package-overrides:
   - boots ==0.2.0.1
   - bordacount ==0.1.0.0
   - boring ==0.2.1
-  - bound ==2.0.6
+  - bound ==2.0.7
   - BoundedChan ==1.0.3.0
   - bounded-queue ==1.0.0
   - boundingboxes ==0.2.3
-  - box ==0.9.1
+  - box ==0.9.2.0
   - boxes ==0.1.5
   - breakpoint ==0.1.2.1
   - brick ==1.9
@@ -251,16 +252,16 @@ default-package-overrides:
   - burrito ==2.0.1.6
   - bv ==0.5
   - byteable ==0.1.1
-  - bytebuild ==0.3.13.0
+  - bytebuild ==0.3.14.0
   - byte-count-reader ==0.10.1.10
   - bytedump ==1.0
   - bytehash ==0.1.0.0
   - byte-order ==0.1.3.0
   - byteorder ==1.0.4
-  - bytes ==0.17.2
+  - bytes ==0.17.3
   - byteset ==0.1.1.0
-  - byteslice ==0.2.10.0
-  - bytesmith ==0.3.9.1
+  - byteslice ==0.2.11.1
+  - bytesmith ==0.3.10.0
   - bytestring-builder ==0.10.8.2.0
   - bytestring-lexing ==0.5.0.10
   - bytestring-mmap ==0.2.2
@@ -270,7 +271,7 @@ default-package-overrides:
   - bytestring-trie ==0.2.7.2
   - bz2 ==1.0.1.0
   - bzlib-conduit ==0.3.0.2
-  - c14n ==0.1.0.2
+  - c14n ==0.1.0.3
   - c2hs ==0.28.8
   - cabal2spec ==2.7.0
   - cabal-appimage ==0.4.0.1
@@ -278,7 +279,7 @@ default-package-overrides:
   - cabal-doctest ==1.0.9
   - cabal-file ==0.1.1
   - cabal-install-solver ==3.8.1.0
-  - cabal-rpm ==2.1.1
+  - cabal-rpm ==2.1.2
   - cache ==0.1.3.0
   - cached-json-file ==0.1.1
   - cacophony ==0.10.1
@@ -316,7 +317,7 @@ default-package-overrides:
   - cgi ==3001.5.0.1
   - chan ==0.0.4.1
   - character-cases ==0.1.0.6
-  - charset ==0.3.9
+  - charset ==0.3.10
   - charsetdetect-ae ==1.1.0.4
   - Chart ==1.9.4
   - Chart-diagrams ==1.9.4
@@ -336,13 +337,13 @@ default-package-overrides:
   - circle-packing ==0.1.0.6
   - circular ==0.4.0.3
   - citeproc ==0.8.1
-  - classy-prelude ==1.5.0.2
+  - classy-prelude ==1.5.0.3
   - classy-prelude-conduit ==1.5.0
   - classy-prelude-yesod ==1.5.0
   - cleff ==0.3.3.0
-  - clientsession ==0.9.1.2
+  - clientsession ==0.9.2.0
   - Clipboard ==2.3.2.0
-  - clock ==0.8.3
+  - clock ==0.8.4
   - closed ==0.2.0.2
   - clumpiness ==0.17.0.2
   - ClustalParser ==1.3.0
@@ -461,6 +462,7 @@ default-package-overrides:
   - cryptohash-sha256 ==0.11.102.1
   - cryptohash-sha512 ==0.11.102.0
   - crypton ==0.32
+  - crypton-conduit ==0.2.3
   - cryptonite ==0.30
   - cryptonite-conduit ==0.2.2
   - cryptonite-openssl ==0.7
@@ -519,7 +521,7 @@ default-package-overrides:
   - data-hash ==0.2.0.1
   - data-interval ==2.1.1
   - data-inttrie ==0.1.4
-  - data-lens-light ==0.1.2.3
+  - data-lens-light ==0.1.2.4
   - data-memocombinators ==0.5.1
   - data-msgpack ==0.0.13
   - data-msgpack-types ==0.0.3
@@ -555,7 +557,7 @@ default-package-overrides:
   - derive-storable ==0.3.1.0
   - derive-topdown ==0.0.3.0
   - deriving-aeson ==0.2.9
-  - deriving-compat ==0.6.3
+  - deriving-compat ==0.6.5
   - deriving-trans ==0.5.2.0
   - detour-via-sci ==1.0.0
   - df1 ==0.4.1
@@ -597,7 +599,7 @@ default-package-overrides:
   - distributive ==0.6.2.1
   - diversity ==0.8.1.0
   - djinn-lib ==0.0.1.4
-  - dl-fedora ==0.9.5
+  - dl-fedora ==0.9.5.1
   - dlist ==1.0
   - dlist-instances ==0.1.1.1
   - dlist-nonempty ==0.1.3
@@ -609,7 +611,7 @@ default-package-overrides:
   - doctest-discover ==0.2.0.0
   - doctest-driver-gen ==0.3.0.7
   - doctest-exitcode-stdio ==0.0
-  - doctest-extract ==0.1.1
+  - doctest-extract ==0.1.1.1
   - doctest-lib ==0.1
   - doctest-parallel ==0.3.0.1
   - doldol ==0.4.1.2
@@ -634,7 +636,7 @@ default-package-overrides:
   - dsp ==0.2.5.2
   - dual ==0.1.1.1
   - dual-tree ==0.2.3.1
-  - dublincore-xml-conduit ==0.1.0.2
+  - dublincore-xml-conduit ==0.1.0.3
   - dunai ==0.11.1
   - duration ==0.2.0.0
   - dvorak ==0.1.0.0
@@ -674,8 +676,8 @@ default-package-overrides:
   - elynx-tools ==0.7.2.1
   - elynx-tree ==0.7.2.2
   - emacs-module ==0.1.1.1
-  - email-validate ==2.3.2.18
-  - emojis ==0.1.2
+  - email-validate ==2.3.2.19
+  - emojis ==0.1.3
   - enclosed-exceptions ==1.0.3
   - ENIG ==0.0.1.0
   - entropy ==0.4.1.10
@@ -698,7 +700,7 @@ default-package-overrides:
   - errors ==2.3.0
   - errors-ext ==0.4.2
   - ersatz ==0.4.13
-  - esqueleto ==3.5.10.0
+  - esqueleto ==3.5.10.1
   - event-list ==0.1.2
   - eventstore ==1.4.2
   - every ==0.0.1
@@ -753,7 +755,7 @@ default-package-overrides:
   - fields-json ==0.4.0.0
   - file-embed ==0.0.15.0
   - file-embed-lzma ==0.0.1
-  - filelock ==0.1.1.6
+  - filelock ==0.1.1.7
   - filemanip ==0.3.6.3
   - file-modules ==0.1.2.4
   - filepath-bytestring ==1.4.2.1.13
@@ -838,7 +840,7 @@ default-package-overrides:
   - generic-constraints ==1.1.1.1
   - generic-data ==1.1.0.0
   - generic-data-surgery ==0.3.0.0
-  - generic-deriving ==1.14.4
+  - generic-deriving ==1.14.5
   - generic-functor ==1.1.0.0
   - generic-lens ==2.2.2.0
   - generic-lens-core ==2.2.1.0
@@ -892,8 +894,8 @@ default-package-overrides:
   - ghci-hexcalc ==0.1.1.0
   - ghcjs-codemirror ==0.0.0.2
   - ghcjs-perch ==0.3.3.3
-  - ghc-lib ==9.4.5.20230430
-  - ghc-lib-parser ==9.4.5.20230430
+  - ghc-lib ==9.4.6.20230808
+  - ghc-lib-parser ==9.4.6.20230808
   - ghc-lib-parser-ex ==9.4.0.0
   - ghc-paths ==0.1.0.12
   - ghc-prof ==1.4.1.12
@@ -999,7 +1001,7 @@ default-package-overrides:
   - harp ==0.4.3.6
   - HasBigDecimal ==0.2.0.0
   - hasbolt ==0.1.6.2
-  - hashable ==1.4.2.0
+  - hashable ==1.4.3.0
   - hashing ==0.1.1.0
   - hashmap ==1.3.3
   - hashtables ==1.3.1
@@ -1018,7 +1020,7 @@ default-package-overrides:
   - haskoin-node ==0.18.1
   - haskoin-store-data ==0.65.5
   - hasktags ==0.72.0
-  - hasql ==1.6.3
+  - hasql ==1.6.3.2
   - hasql-dynamic-statements ==0.3.1.2
   - hasql-implicits ==0.1.1
   - hasql-interpolate ==0.1.0.4
@@ -1054,7 +1056,7 @@ default-package-overrides:
   - hedis ==0.15.2
   - hedn ==0.3.0.4
   - heist ==1.1.1.1
-  - here ==1.2.13
+  - here ==1.2.14
   - heredoc ==0.2.0.0
   - heterocephalus ==1.0.5.7
   - hetzner ==0.2.1.1
@@ -1126,7 +1128,7 @@ default-package-overrides:
   - hset ==2.2.0
   - hs-GeoIP ==0.3
   - hsignal ==0.2.7.5
-  - hsini ==0.5.1.2
+  - hsini ==0.5.2.1
   - hsinstall ==2.8
   - HSlippyMap ==3.0.1
   - hslogger ==1.3.1.0
@@ -1156,7 +1158,7 @@ default-package-overrides:
   - hspec-core ==2.10.10
   - hspec-discover ==2.10.10
   - hspec-expectations ==0.8.2
-  - hspec-expectations-json ==1.0.0.7
+  - hspec-expectations-json ==1.0.2.0
   - hspec-expectations-lifted ==0.10.0
   - hspec-expectations-pretty-diff ==0.7.2.6
   - hspec-golden ==0.2.1.0
@@ -1256,7 +1258,7 @@ default-package-overrides:
   - hxt-regex-xmlschema ==9.2.0.7
   - hxt-tagsoup ==9.1.4
   - hxt-unicode ==9.0.2.4
-  - hybrid-vectors ==0.2.3
+  - hybrid-vectors ==0.2.4
   - hyper ==0.2.1.1
   - hyperloglog ==0.4.6
   - hyphenation ==0.8.2
@@ -1298,7 +1300,7 @@ default-package-overrides:
   - integer-roots ==1.0.2.0
   - integer-types ==0.1.4.0
   - integration ==0.2.1
-  - intern ==0.9.4
+  - intern ==0.9.5
   - interpolate ==0.2.1
   - interpolatedstring-perl6 ==1.0.2
   - interpolation ==0.1.1.2
@@ -1306,7 +1308,7 @@ default-package-overrides:
   - IntervalMap ==0.6.2.1
   - intervals ==0.9.2
   - intset-imperative ==0.1.0.0
-  - invariant ==0.6.1
+  - invariant ==0.6.2
   - invert ==1.0.0.4
   - invertible-grammar ==0.1.3.4
   - io-machine ==0.2.0.0
@@ -1366,7 +1368,7 @@ default-package-overrides:
   - kazura-queue ==0.1.0.4
   - kdt ==0.2.5
   - keep-alive ==0.2.1.0
-  - keter ==2.1.1
+  - keter ==2.1.2
   - keycode ==0.2.2
   - keyed-vals ==0.2.2.0
   - keyed-vals-hspec-tests ==0.2.2.0
@@ -1376,7 +1378,7 @@ default-package-overrides:
   - ki ==1.0.1.0
   - kind-apply ==0.4.0.0
   - kind-generics ==0.5.0.0
-  - kind-generics-th ==0.2.3.2
+  - kind-generics-th ==0.2.3.3
   - ki-unlifted ==1.0.0.1
   - kleene ==0.1
   - kmeans ==0.1.3
@@ -1428,11 +1430,11 @@ default-package-overrides:
   - lens-properties ==4.11.1
   - lens-regex ==0.1.3
   - lens-regex-pcre ==1.1.0.0
-  - lentil ==1.5.5.4
+  - lentil ==1.5.6.0
   - LetsBeRational ==1.0.0.0
   - leveldb-haskell ==0.6.5
   - lexer-applicative ==2.1.0.2
-  - libBF ==0.6.5.1
+  - libBF ==0.6.6
   - libffi ==0.2.1
   - libgit ==0.3.1
   - liboath-hs ==0.0.1.2
@@ -1570,7 +1572,7 @@ default-package-overrides:
   - misfortune ==0.1.2.1
   - missing-foreign ==0.1.1
   - MissingH ==1.6.0.0
-  - mixed-types-num ==0.5.11
+  - mixed-types-num ==0.5.12
   - mmap ==0.5.9
   - mmark ==0.0.7.6
   - mmark-cli ==0.0.5.1
@@ -1692,7 +1694,7 @@ default-package-overrides:
   - network-messagepack-rpc ==0.1.2.0
   - network-messagepack-rpc-websocket ==0.1.1.1
   - network-multicast ==0.3.2
-  - Network-NineP ==0.4.7.2
+  - Network-NineP ==0.4.7.3
   - network-run ==0.2.6
   - network-simple ==0.4.5
   - network-simple-tls ==0.4.1
@@ -1799,7 +1801,7 @@ default-package-overrides:
   - pandoc-plot ==1.7.0
   - pandoc-symreg ==0.2.0.0
   - pandoc-throw ==0.1.0.0
-  - pandoc-types ==1.23.0.1
+  - pandoc-types ==1.23.1
   - pango ==0.13.10.0
   - pantry ==0.8.3
   - parallel ==3.2.2.0
@@ -1966,7 +1968,7 @@ default-package-overrides:
   - profunctors ==5.6.2
   - projectroot ==0.2.0.1
   - project-template ==0.2.1.0
-  - prometheus-client ==1.1.0
+  - prometheus-client ==1.1.1
   - prometheus-metrics-ghc ==1.0.1.2
   - promises ==0.3
   - prompt ==0.1.1.2
@@ -2049,7 +2051,7 @@ default-package-overrides:
   - rawfilepath ==1.0.1
   - rawstring-qm ==0.2.3.0
   - raw-strings-qq ==1.1
-  - rcu ==0.2.6
+  - rcu ==0.2.7
   - rdf ==0.1.0.7
   - rdtsc ==1.3.0.1
   - re2 ==0.3
@@ -2090,7 +2092,7 @@ default-package-overrides:
   - regex-pcre-builtin ==0.95.2.3.8.44
   - regex-posix ==0.96.0.1
   - regex-posix-clib ==2.7
-  - regex-tdfa ==1.3.2.1
+  - regex-tdfa ==1.3.2.2
   - regex-with-pcre ==1.1.0.2
   - reinterpret-cast ==0.1.0
   - rel8 ==1.4.1.0
@@ -2170,7 +2172,7 @@ default-package-overrides:
   - sandwich-hedgehog ==0.1.3.0
   - sandwich-quickcheck ==0.1.0.7
   - sandwich-slack ==0.1.2.0
-  - sandwich-webdriver ==0.2.2.0
+  - sandwich-webdriver ==0.2.3.0
   - say ==0.1.0.1
   - sbp ==4.15.0
   - sbv ==10.2
@@ -2279,10 +2281,10 @@ default-package-overrides:
   - simple-cabal ==0.1.3.1
   - simple-cmd ==0.2.7
   - simple-cmd-args ==0.1.8
-  - simple-expr ==0.1.0.2
+  - simple-expr ==0.1.1.0
   - simple-media-timestamp ==0.2.1.0
   - simple-media-timestamp-attoparsec ==0.1.0.0
-  - simple-prompt ==0.2.0.1
+  - simple-prompt ==0.2.1
   - simple-reflect ==0.3.3
   - simple-sendfile ==0.2.32
   - simple-session ==2.0.0
@@ -2302,8 +2304,8 @@ default-package-overrides:
   - skein ==1.0.9.4
   - skews ==0.1.0.3
   - skip-var ==0.1.1.0
-  - skylighting ==0.13.4
-  - skylighting-core ==0.13.4
+  - skylighting ==0.13.4.1
+  - skylighting-core ==0.13.4.1
   - skylighting-format-ansi ==0.1
   - skylighting-format-blaze-html ==0.1.1
   - skylighting-format-context ==0.1.0.2
@@ -2408,7 +2410,7 @@ default-package-overrides:
   - strict-base-types ==0.8
   - strict-concurrency ==0.2.4.3
   - strict-lens ==0.4.0.3
-  - strict-list ==0.1.7.1
+  - strict-list ==0.1.7.2
   - strict-tuple ==0.1.5.2
   - strict-wrapper ==0.0.0.0
   - stringable ==0.1.3
@@ -2428,7 +2430,7 @@ default-package-overrides:
   - stripe-signature ==1.0.0.16
   - stripe-wreq ==1.0.1.16
   - strive ==6.0.0.9
-  - structs ==0.1.8
+  - structs ==0.1.9
   - structured ==0.1.1
   - structured-cli ==2.7.0.1
   - subcategories ==0.2.0.1
@@ -2439,8 +2441,8 @@ default-package-overrides:
   - svg-tree ==0.6.2.4
   - swagger2 ==2.8.7
   - swish ==0.10.4.0
-  - syb ==0.7.2.3
-  - sydtest ==0.15.0.0
+  - syb ==0.7.2.4
+  - sydtest ==0.15.1.0
   - sydtest-aeson ==0.1.0.0
   - sydtest-amqp ==0.1.0.0
   - sydtest-autodocodec ==0.0.0.0
@@ -2563,8 +2565,8 @@ default-package-overrides:
   - text-regex-replace ==0.1.1.5
   - text-rope ==0.2
   - text-short ==0.1.5
-  - text-show ==3.10.3
-  - text-show-instances ==3.9.5
+  - text-show ==3.10.4
+  - text-show-instances ==3.9.6
   - text-zipper ==0.13
   - tfp ==1.0.2
   - tf-random ==0.5
@@ -2581,7 +2583,7 @@ default-package-overrides:
   - these-skinny ==0.7.5
   - th-expand-syns ==0.4.11.0
   - th-lego ==0.3.0.2
-  - th-lift ==0.8.3
+  - th-lift ==0.8.4
   - th-lift-instances ==0.1.20
   - th-nowq ==0.1.0.5
   - th-orphans ==0.13.14
@@ -2632,7 +2634,7 @@ default-package-overrides:
   - token-bucket ==0.1.0.1
   - toml-reader ==0.2.1.0
   - toml-reader-parse ==0.1.1.1
-  - tophat ==1.0.5.1
+  - tophat ==1.0.6.0
   - topograph ==1.0.0.2
   - torrent ==10000.1.3
   - torsor ==0.1
@@ -2650,7 +2652,7 @@ default-package-overrides:
   - tree-fun ==0.8.1.0
   - tree-view ==0.5.1
   - trie-simple ==0.4.2
-  - trifecta ==2.1.2
+  - trifecta ==2.1.3
   - trimdent ==0.1.0.0
   - triplesec ==0.2.2.1
   - trivial-constraint ==0.7.0.0
@@ -2718,7 +2720,7 @@ default-package-overrides:
   - unique-logic ==0.4.0.1
   - unique-logic-tf ==0.5.1
   - unit-constraint ==0.0.0
-  - units-parser ==0.1.1.4
+  - units-parser ==0.1.1.5
   - universe ==1.2.2
   - universe-base ==1.1.3.1
   - universe-dependent-sum ==1.3
@@ -2861,7 +2863,7 @@ default-package-overrides:
   - within ==0.2.0.1
   - with-location ==0.1.0
   - with-utf8 ==1.0.2.4
-  - witness ==0.6.1
+  - witness ==0.6.2
   - wizards ==1.0.3
   - wl-pprint ==1.2.1
   - wl-pprint-annotated ==0.1.0.1
@@ -2873,7 +2875,7 @@ default-package-overrides:
   - word-wrap ==0.5
   - world-peace ==1.0.2.0
   - wrap ==0.0.0
-  - wreq ==0.5.4.0
+  - wreq ==0.5.4.1
   - wreq-stringless ==0.5.9.1
   - writer-cps-exceptions ==0.1.0.1
   - writer-cps-mtl ==0.1.1.6
@@ -2913,26 +2915,26 @@ default-package-overrides:
   - xml-types ==0.3.8
   - xmonad ==0.17.2
   - xmonad-contrib ==0.17.1
-  - xor ==0.0.1.1
+  - xor ==0.0.1.2
   - xss-sanitize ==0.3.7.2
   - xxhash-ffi ==0.2.0.0
   - yaml ==0.11.11.2
   - yaml-unscrambler ==0.1.0.17
-  - Yampa ==0.14.3
+  - Yampa ==0.14.4
   - yarn-lock ==0.6.5
   - yeshql-core ==4.2.0.0
   - yesod ==1.6.2.1
   - yesod-auth ==1.6.11.1
   - yesod-auth-basic ==0.1.0.3
   - yesod-auth-hashdb ==1.7.1.7
-  - yesod-auth-oauth2 ==0.7.1.0
+  - yesod-auth-oauth2 ==0.7.1.1
   - yesod-auth-oidc ==0.1.4
   - yesod-bin ==1.6.2.2
-  - yesod-core ==1.6.24.3
+  - yesod-core ==1.6.24.4
   - yesod-eventsource ==1.6.0.1
   - yesod-fb ==0.6.1
   - yesod-form ==1.7.4
-  - yesod-form-bootstrap4 ==3.0.1
+  - yesod-form-bootstrap4 ==3.0.1.1
   - yesod-gitrepo ==0.3.0
   - yesod-gitrev ==0.2.2
   - yesod-markdown ==0.12.6.13
@@ -2941,7 +2943,7 @@ default-package-overrides:
   - yesod-page-cursor ==2.0.1.0
   - yesod-paginator ==1.1.2.2
   - yesod-persistent ==1.6.0.8
-  - yesod-recaptcha2 ==1.0.2
+  - yesod-recaptcha2 ==1.0.2.1
   - yesod-routes-flow ==3.0.0.2
   - yesod-sitemap ==1.6.0
   - yesod-static ==1.6.1.0

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

@@ -69,7 +69,7 @@ self: super: builtins.intersectAttrs super {
         -e "s/@@GHC_VERSION@@/${self.ghc.version}/" \
         -e "s/@@BOOT_PKGS@@/$BOOT_PKGS/" \
         -e "s/@@ABI_HASHES@@/$(for dep in $BOOT_PKGS; do printf "%s:" "$dep" && ghc-pkg-${self.ghc.version} field $dep abi --simple-output ; done | tr '\n' ' ' | xargs)/" \
-        -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://haskell4nix.readthedocs.io/nixpkgs-users-guide.html#how-to-install-haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
+        -e "s!Consider installing ghc.* via ghcup or build HLS from source.!Visit https://nixos.org/manual/nixpkgs/unstable/#haskell-language-server to learn how to correctly install a matching hls for your ghc with nix.!" \
         bindist/wrapper.in > "$out/bin/haskell-language-server"
       ln -s "$out/bin/haskell-language-server" "$out/bin/haskell-language-server-${self.ghc.version}"
       chmod +x "$out/bin/haskell-language-server"
@@ -123,7 +123,6 @@ self: super: builtins.intersectAttrs super {
     hls-brittany-plugin
     hls-floskell-plugin
     hls-fourmolu-plugin
-    hls-cabal-plugin
     hls-overloaded-record-dot-plugin
   ;
 
@@ -134,6 +133,7 @@ self: super: builtins.intersectAttrs super {
     hls-gadt-plugin
 
     # https://github.com/haskell/haskell-language-server/pull/3431
+    hls-cabal-plugin
     hls-cabal-fmt-plugin
     hls-code-range-plugin
     hls-explicit-record-fields-plugin
@@ -452,6 +452,8 @@ self: super: builtins.intersectAttrs super {
   wxc = (addBuildDepend self.split super.wxc).override { wxGTK = pkgs.wxGTK32; };
   wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK32; };
 
+  shellify = enableSeparateBinOutput super.shellify;
+
   # Test suite wants to connect to $DISPLAY.
   bindings-GLFW = dontCheck super.bindings-GLFW;
   gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
@@ -599,7 +601,17 @@ self: super: builtins.intersectAttrs super {
   #
   # Additional note: nixpkgs' freeglut and macOS's OpenGL implementation do not cooperate,
   # so disable this on Darwin only
-  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = addPkgconfigDepend pkgs.freeglut (appendPatch ./patches/GLUT.patch super.GLUT);
+  ${if pkgs.stdenv.isDarwin then null else "GLUT"} = overrideCabal (drv: {
+    pkg-configDepends = drv.pkg-configDepends or [] ++ [
+      pkgs.freeglut
+    ];
+    patches = drv.patches or [] ++ [
+      ./patches/GLUT.patch
+    ];
+    prePatch = drv.prePatch or "" + ''
+      ${lib.getBin pkgs.buildPackages.dos2unix}/bin/dos2unix *.cabal
+    '';
+  }) super.GLUT;
 
   libsystemd-journal = doJailbreak (addExtraLibrary pkgs.systemd super.libsystemd-journal);
 

pkgs/development/haskell-modules/patches/bloomfilter-fix-on-32bit.patch

@@ -1,28 +0,0 @@
-From 35d972b3dc5056110d55315f2256d9c5046299c7 Mon Sep 17 00:00:00 2001
-From: Peter Simons <simons@cryp.to>
-Date: Tue, 1 Sep 2015 17:58:36 +0200
-Subject: [PATCH] Revert "Fix maximum sizing calculation."
-
-This reverts commit 44b01ba38b4fcdb5a85f44fa2f3af1f29cde8f40. The change breaks
-this package on 32 bit platforms. See https://github.com/bos/bloomfilter/issues/7
-for further details.
----
- Data/BloomFilter/Easy.hs | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Data/BloomFilter/Easy.hs b/Data/BloomFilter/Easy.hs
-index 5143c6e..a349168 100644
---- a/Data/BloomFilter/Easy.hs
-+++ b/Data/BloomFilter/Easy.hs
-@@ -72,7 +72,7 @@ safeSuggestSizing capacity errRate
-             minimum [((-k) * cap / log (1 - (errRate ** (1 / k))), k)
-                      | k <- [1..100]]
-         roundedBits = nextPowerOfTwo (ceiling bits)
--    in if roundedBits <= 0 || roundedBits > 0xffffffff
-+    in if roundedBits <= 0
-        then Left  "capacity too large to represent"
-        else Right (roundedBits, truncate hashes)
- 
--- 
-2.5.1
-

pkgs/development/misc/haskell/hasura/ekg-core.nix

@@ -29,5 +29,7 @@ mkDerivation {
   homepage = "https://github.com/tibbe/ekg-core";
   description = "Tracking of system metrics";
   license = lib.licenses.bsd3;
+  hydraPlatforms = lib.platforms.none;
   maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }

pkgs/development/misc/haskell/hasura/ekg-json.nix

@@ -21,5 +21,7 @@ mkDerivation {
   homepage = "https://github.com/tibbe/ekg-json";
   description = "JSON encoding of ekg metrics";
   license = lib.licenses.bsd3;
+  hydraPlatforms = lib.platforms.none;
   maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }

pkgs/development/misc/haskell/hasura/pg-client.nix

@@ -33,5 +33,7 @@ mkDerivation {
   ];
   homepage = "https://github.com/hasura/platform";
   license = lib.licenses.asl20;
+  hydraPlatforms = lib.platforms.none;
   maintainers = with lib.maintainers; [ lassulus ];
+  broken = true;
 }

pkgs/development/tools/purescript/spago/default.nix

@@ -17,8 +17,6 @@ let
         (haskell.lib.compose.overrideCabal (oldAttrs: {
           changelog = "https://github.com/purescript/spago/releases/tag/${oldAttrs.version}";
         }))
-        haskell.lib.compose.unmarkBroken
-        haskell.lib.compose.doDistribute
       ];
 in
 

pkgs/tools/security/echidna/default.nix

@@ -1,6 +1,7 @@
 { lib
 , mkDerivation
 , fetchFromGitHub
+, fetchpatch
 , haskellPackages
 , haskell
 , slither-analyzer
@@ -34,6 +35,15 @@ in mkDerivation rec {
     sha256 = "sha256-5d9ttPR3rRHywBeLM85EGCEZLNZNZzOAhIN6AJToJyI=";
   };
 
+  # Note: pending PR https://github.com/crytic/echidna/pull/1096
+  patches = [
+     (fetchpatch {
+       name = "brick-1.9-update";
+       url = "https://github.com/crytic/echidna/pull/1096/commits/36657d54943727e569691a6b3d85b83130480a2e.patch";
+       sha256 = "sha256-AOmB/fAZCF7ruXW1HusRe7wWWsLyMCWw+j3qIPARIAc=";
+     })
+  ];
+
   isLibrary = true;
   isExecutable = true;
 

pkgs/top-level/all-packages.nix

@@ -2674,8 +2674,11 @@ with pkgs;
 
   mainsail = callPackage ../applications/misc/mainsail { };
 
-  # Does not build with default Haskell version because upstream uses a newer Cabal version.
-  mailctl = haskell.packages.ghc94.callPackage ../tools/networking/mailctl { };
+  mailctl = (haskellPackages.callPackage ../tools/networking/mailctl {}).overrideScope (final: prev: {
+    # Dependency twain requires an older version of http2, and we cannot mix
+    # versions of transitive dependencies.
+    http2 = final.http2_3_0_3;
+  });
 
   mame = libsForQt5.callPackage ../applications/emulators/mame { };
 
@@ -13102,6 +13105,8 @@ with pkgs;
 
   shelldap = callPackage ../tools/misc/shelldap { };
 
+  shellify = haskellPackages.shellify.bin;
+
   shellspec = callPackage ../tools/misc/shellspec { };
 
   schema2ldif = callPackage ../tools/text/schema2ldif { };

pkgs/top-level/release-haskell.nix

@@ -316,6 +316,7 @@ let
         lambdabot
         lhs2tex
         madlang
+        mailctl
         matterhorn
         mueval
         naproche