ghc: 9.8.4 -> 9.10.3; Stackage LTS: 23.27 -> 24.9

.git-blame-ignore-revs

@@ -264,6 +264,9 @@ a4f7e161b380b35b2f7bc432659a95fd71254ad8
 # haskellPackages.hercules-ci-agent (cabal2nix -> nixfmt-rfc-style)
 9314da7ee8d2aedfb15193b8c489da51efe52bb5
 
+# haskell-updates: nixfmt-rfc-style
+9e296dcf846294e0aa94af7d3235e82eee7fe055
+
 # nix-builder-vm: nixfmt-rfc-style
 a034fb50f79816c6738fb48b48503b09ea3b0132
 

doc/languages-frameworks/haskell.section.md

@@ -58,7 +58,7 @@ Each of those compiler versions has a corresponding attribute set `packages` bui
 it. However, the non-standard package sets are not tested regularly and, as a
 result, contain fewer working packages. The corresponding package set for GHC
 9.4.8 is `haskell.packages.ghc948`. In fact, `haskellPackages` (at the time of writing) is just an alias
-for `haskell.packages.ghc984`:
+for `haskell.packages.ghc9103`.
 
 Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
 

doc/release-notes/rl-2511.section.md

@@ -9,6 +9,8 @@
   and newer series. However, embedded chips without LSX (Loongson SIMD eXtension), such as 2K0300 SoC, are not
   supported. `pkgsCross.loongarch64-linux-embedded` can be used to build software and systems for these platforms.
 - The official Nix formatter `nixfmt` is now stable and available as `pkgs.nixfmt`, deprecating the temporary `pkgs.nixfmt-rfc-style` attribute. The classic `nixfmt` will stay available for some more time as `pkgs.nixfmt-classic`.
+- The default GHC version has been updated from 9.8 to 9.10.
+  `haskellPackages` correspondingly uses Stackage LTS 24 (instead of LTS 23) as a baseline.
 
 ## Backward Incompatibilities {#sec-nixpkgs-release-25.11-incompatibilities}
 

maintainers/scripts/haskell/hydra-report.hs

@@ -1,6 +1,7 @@
 #! /usr/bin/env nix-shell
+#! nix-shell -I nixpkgs=.
 #! nix-shell -p "haskellPackages.ghcWithPackages (p: [p.aeson p.req])"
-#! nix-shell -p hydra
+#! nix-shell -p nix-eval-jobs
 #! nix-shell -i runhaskell
 
 {-
@@ -33,27 +34,30 @@ Because step 1) is quite expensive and takes roughly ~5 minutes the result is ca
 import Control.Monad (forM_, forM, (<=<))
 import Control.Monad.Trans (MonadIO (liftIO))
 import Data.Aeson (
-   FromJSON,
+   FromJSON (..),
+   withObject,
+   (.:),
    FromJSONKey,
    ToJSON,
    decodeFileStrict',
-   eitherDecodeStrict',
    encodeFile,
  )
-import Data.Foldable (Foldable (toList), foldl')
+import Data.Aeson.Decoding (eitherDecodeStrictText)
+import Data.Foldable (Foldable (toList))
+import Data.Either (rights)
+import Data.Functor ((<&>))
 import Data.List.NonEmpty (NonEmpty, nonEmpty)
 import qualified Data.List.NonEmpty as NonEmpty
 import Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
-import Data.Maybe (fromMaybe, mapMaybe, isNothing)
+import Data.Maybe (fromMaybe, mapMaybe, isNothing, catMaybes)
 import Data.Monoid (Sum (Sum, getSum))
 import Data.Sequence (Seq)
 import qualified Data.Sequence as Seq
 import Data.Set (Set)
 import qualified Data.Set as Set
 import Data.Text (Text)
 import qualified Data.Text as Text
-import Data.Text.Encoding (encodeUtf8)
 import qualified Data.Text.IO as Text
 import Data.Time (defaultTimeLocale, formatTime, getCurrentTime)
 import Data.Time.Clock (UTCTime)
@@ -206,7 +210,7 @@ hydraQuery responseType option query = do
   let customHeaderOpt =
         header
           "User-Agent"
-          "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell) pls fix https://github.com/NixOS/nixos-org-configurations/issues/270"
+          "hydra-report.hs/v1 (nixpkgs;maintainers/scripts/haskell)"
       customTimeoutOpt = responseTimeout 900_000_000 -- 15 minutes
       opts = customHeaderOpt <> customTimeoutOpt <> option
       url = foldl' (/:) (https "hydra.nixos.org") query
@@ -218,59 +222,50 @@ hydraJSONQuery = hydraQuery jsonResponse
 hydraPlainQuery :: [Text] -> Req ByteString
 hydraPlainQuery = hydraQuery bsResponse mempty
 
-hydraEvalCommand :: FilePath
-hydraEvalCommand = "hydra-eval-jobs"
+nixEvalJobsCommand :: FilePath
+nixEvalJobsCommand = "nix-eval-jobs"
 
-hydraEvalParams :: [String]
-hydraEvalParams = ["-I", ".", "pkgs/top-level/release-haskell.nix"]
+nixEvalJobsParams :: [String]
+nixEvalJobsParams =
+  [
+    -- options necessary to make nix-eval-jobs behave like hydra-eval-jobs used to
+    -- https://github.com/NixOS/hydra/commit/d84ff32ce600204c6473889a3ff16cd6053533c9
+    "--meta",
+    "--force-recurse",
+    "--no-instantiate",
+    "--workers", "3",
+
+    "-I", ".",
+   "pkgs/top-level/release-haskell.nix"
+  ]
 
 nixExprCommand :: FilePath
 nixExprCommand = "nix-instantiate"
 
 nixExprParams :: [String]
 nixExprParams = ["--eval", "--strict", "--json"]
 
--- | This newtype is used to parse a Hydra job output from @hydra-eval-jobs@.
--- The only field we are interested in is @maintainers@, which is why this
--- is just a newtype.
+-- | Holds a list of the GitHub handles of the maintainers of a given 'JobName'.
 --
--- Note that there are occasionally jobs that don't have a maintainers
--- field, which is why this has to be @Maybe Text@.
-newtype Maintainers = Maintainers { maintainers :: Maybe Text }
+--   @
+--     JobMaintainers (JobName "haskellPackages.cabal-install.x86_64-linux") ["sternenseemann"]
+--   @
+data JobMaintainers = JobMaintainers JobName [Text]
   deriving stock (Generic, Show)
-  deriving anyclass (FromJSON, ToJSON)
-
--- | This is a 'Map' from Hydra job name to maintainer email addresses.
---
--- It has values similar to the following:
---
--- @@
---  fromList
---    [ ("arion.aarch64-linux", Maintainers (Just "robert@example.com"))
---    , ("bench.x86_64-linux", Maintainers (Just ""))
---    , ("conduit.x86_64-linux", Maintainers (Just "snoy@man.com, web@ber.com"))
---    , ("lens.x86_64-darwin", Maintainers (Just "ek@category.com"))
---    ]
--- @@
---
--- Note that Hydra jobs without maintainers will have an empty string for the
--- maintainer list.
-type HydraJobs = Map JobName Maintainers
 
--- | Map of email addresses to GitHub handles.
--- This is built from the file @../../maintainer-list.nix@.
---
--- It has values similar to the following:
---
--- @@
---  fromList
---    [ ("robert@example.com", "rob22")
---    , ("ek@category.com", "edkm")
---    ]
--- @@
-type EmailToGitHubHandles = Map Text Text
-
--- | Map of Hydra jobs to maintainer GitHub handles.
+-- | Parse the entries produced by @nix-eval-jobs@, discarding all information
+--   except the name of the job (@attr@) and the @github@ attributes of the
+--   maintainer objects in @meta.maintainers@.
+instance FromJSON JobMaintainers where
+  parseJSON = withObject "HydraJob" $ \h -> do
+    jobName <- h .: "attr"
+    maintainers <- (h .: "meta")
+      >>= (withObject "Meta" $ \meta ->
+        meta .: "maintainers"
+        >>= mapM (withObject "Maintainer" $ \mt -> mt .: "github"))
+    pure $ JobMaintainers jobName maintainers
+
+-- | Map of maintained Hydra jobs to maintainer GitHub handles.
 --
 -- It has values similar to the following:
 --
@@ -331,22 +326,16 @@ calculateReverseDependencies depMap =
        go pkg = IntSet.unions (oneStep:((resultList IntMap.!) <$> IntSet.toList oneStep))
         where oneStep = IntMap.findWithDefault mempty pkg oneStepMap
 
--- | Generate a mapping of Hydra job names to maintainer GitHub handles. Calls
--- hydra-eval-jobs and the nix script ./maintainer-handles.nix.
+-- | Generate a mapping of Hydra job names to maintainer GitHub handles.
 getMaintainerMap :: IO MaintainerMap
-getMaintainerMap = do
-   hydraJobs :: HydraJobs <-
-      readJSONProcess hydraEvalCommand hydraEvalParams "Failed to decode hydra-eval-jobs output: "
-   handlesMap :: EmailToGitHubHandles <-
-      readJSONProcess nixExprCommand ("maintainers/scripts/haskell/maintainer-handles.nix":nixExprParams) "Failed to decode nix output for lookup of github handles: "
-   pure $ Map.mapMaybe (splitMaintainersToGitHubHandles handlesMap) hydraJobs
-  where
-   -- Split a comma-spearated string of Maintainers into a NonEmpty list of
-   -- GitHub handles.
-   splitMaintainersToGitHubHandles
-      :: EmailToGitHubHandles -> Maintainers -> Maybe (NonEmpty Text)
-   splitMaintainersToGitHubHandles handlesMap (Maintainers maint) =
-      nonEmpty .  mapMaybe (`Map.lookup` handlesMap) .  Text.splitOn ", " $ fromMaybe "" maint
+getMaintainerMap =
+  readJSONLinesProcess nixEvalJobsCommand nixEvalJobsParams
+  -- we ignore unparseable lines since fromJSON will fail on { "attr": …, "error": … }
+  -- entries since they don't have a @meta@ attribute.
+  <&> rights
+  <&> map (\(JobMaintainers name maintainers) -> (,) name <$> nonEmpty maintainers)
+  <&> catMaybes
+  <&> Map.fromList
 
 -- | Get the a map of all dependencies of every package by calling the nix
 -- script ./dependencies.nix.
@@ -369,11 +358,23 @@ readJSONProcess
    -> IO a
 readJSONProcess exe args err = do
    output <- readProcess exe args ""
-   let eitherDecodedOutput = eitherDecodeStrict' . encodeUtf8 . Text.pack $ output
+   let eitherDecodedOutput = eitherDecodeStrictText . Text.pack $ output
    case eitherDecodedOutput of
      Left decodeErr -> error $ err <> decodeErr <> "\nRaw: '" <> take 1000 output <> "'"
      Right decodedOutput -> pure decodedOutput
 
+-- | Run a process that produces many JSON values, one per line.
+--   Error and success is reported per line via a list of 'Either's.
+readJSONLinesProcess
+   :: FromJSON a
+   => FilePath -- ^ Filename of executable.
+   -> [String] -- ^ Arguments
+   -> IO [Either String a]
+readJSONLinesProcess exe args = do
+  output <- readProcess exe args ""
+  -- TODO: slow, doesn't stream at all
+  pure . map (eitherDecodeStrictText . Text.pack) . lines $ output
+
 -- BuildStates are sorted by subjective importance/concerningness
 data BuildState
   = Failed

maintainers/scripts/haskell/regenerate-hackage-packages.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git -I nixpkgs=.
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable.bin git -I nixpkgs=.
 
 set -euo pipefail
 

maintainers/scripts/haskell/update-cabal2nix-unstable.sh

@@ -1,5 +1,5 @@
 #! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable -I nixpkgs=.
+#! nix-shell -i bash -p coreutils curl jq gnused haskellPackages.cabal2nix-unstable.bin nix-prefetch-scripts -I nixpkgs=.
 
 # Updates cabal2nix-unstable to the latest master of the nixos/cabal2nix repository.
 # See regenerate-hackage-packages.sh for details on the purpose of this script.

maintainers/scripts/haskell/update-stackage.sh

@@ -98,6 +98,7 @@ sed -r \
     -e '/ ShellCheck /d' \
     -e '/ Agda /d' \
     -e '/ stack /d' \
+    -e '/ git-annex /d' \
     < "${tmpfile_new}" >> $stackage_config
 # Explanations:
 # cabal2nix, distribution-nixpkgs, jailbreak-cabal, language-nix: These are our packages and we know what we are doing.

pkgs/by-name/ec/echidna/package.nix

@@ -3,24 +3,34 @@
   stdenv,
   makeWrapper,
   haskellPackages,
+  fetchpatch,
   fetchFromGitHub,
   # dependencies
   slither-analyzer,
 }:
 
 haskellPackages.mkDerivation rec {
   pname = "echidna";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchFromGitHub {
     owner = "crytic";
     repo = "echidna";
     tag = "v${version}";
-    sha256 = "sha256-5nzis7MXOqs0bhx2jrEexjZYZI2qY6D0D7AWO+SPs+A=";
+    sha256 = "sha256-rDtxyUpWfdMvS5BY1y8nydkQk/eCdmtjCqGJ+I4vy0I=";
   };
 
   isExecutable = true;
 
+  patches = [
+    # Fix build with GHC 9.10
+    # https://github.com/crytic/echidna/pull/1446
+    (fetchpatch {
+      url = "https://github.com/crytic/echidna/commit/1b498bdb8c86d8297aa34de8f48b6dce2f4dd84d.patch";
+      hash = "sha256-JeKPv2Q2gIt1XpI81XPFu80/x8QcOI4k1QN/mTf+bqk=";
+    })
+  ];
+
   buildTools = with haskellPackages; [
     hpack
   ];

pkgs/by-name/hl/hledger-check-fancyassertions/package.nix

@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation rec {
   src = fetchurl {
     name = "hledger-check-fancyassertion-${version}.hs";
     url = "https://raw.githubusercontent.com/simonmichael/hledger/hledger-lib-${version}/bin/hledger-check-fancyassertions.hs";
-    sha256 = "0lyyz8dqkknd9d073l613kdkaqd9r6ymdw94d7mwp17pxvfr17wf";
+    hash = "sha256-p1JvPHSB5hkfZsTq1sSL0mxCRkhZu1zkpXTELVNFE64=";
   };
 
   dontUnpack = true;

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "e184dedb360769d6e8e041e711559185f39ab55c",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/e184dedb360769d6e8e041e711559185f39ab55c.tar.gz",
-  "sha256": "16qlwrw96lf52yvmmhfl948wpimbnqm9z87j27agcdmigf5icg1s",
-  "msg": "Update from Hackage at 2025-07-07T21:33:55Z"
+  "commit": "c074fec58a2c83bfb17c273302005fe2625207f1",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c074fec58a2c83bfb17c273302005fe2625207f1.tar.gz",
+  "sha256": "1my6xrg3m694fr3k5386yx5wqd2j0wdxfx6g3scnh5af0sx2hx0w",
+  "msg": "Update from Hackage at 2025-09-14T21:34:10Z"
 }