haskellPackages: Stackage LTS 22 -> 23; ghc: 9.6.6 -> 9.8.4

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.ghc966`:
+for `haskell.packages.ghc984`:
 
 Every package set also re-exposes the GHC used to build its packages as `haskell.packages.*.ghc`.
 
@@ -297,8 +297,8 @@ Defaults to `false`.
 : Whether to build (HTML) documentation using [haddock][haddock].
 Defaults to `true` if supported.
 
-`testTarget`
-: Name of the test suite to build and run. If unset, all test suites will be executed.
+`testTargets`
+: Names of the test suites to build and run. If unset, all test suites will be executed.
 
 `preCompileBuildDriver`
 : Shell code to run before compiling `Setup.hs`.
@@ -621,6 +621,12 @@ environment. This means you can reuse Nix expressions of packages included in
 nixpkgs, but also use local Nix expressions like this: `hpkgs: [
 (hpkgs.callPackage ./my-project.nix { }) ]`.
 
+`extraDependencies`
+: Extra dependencies, in the form of cabal2nix build attributes. An example use
+case is when you have Haskell scripts that use libraries that don't occur in
+your packages' dependencies. Example: `hpkgs: {libraryHaskellDepends =
+[ hpkgs.releaser ]}`. Defaults to `hpkgs: { }`.
+
 `nativeBuildInputs`
 : Expects a list of derivations to add as build tools to the build environment.
 This is the place to add packages like `cabal-install`, `doctest` or `hlint`.
@@ -773,7 +779,7 @@ that depend on that library, you may want to use:
 
 ```nix
 haskellPackages.haskell-ci.overrideScope (self: super: {
-  Cabal = self.Cabal_3_14_1_0;
+  Cabal = self.Cabal_3_14_1_1;
 })
 ```
 

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

@@ -15,6 +15,9 @@
 - GCC has been updated from GCC 13 to GCC 14.
   This introduces some backwards‐incompatible changes; see the [upstream porting guide](https://gcc.gnu.org/gcc-14/porting_to.html) for details.
 
+- The default GHC version has been updated from 9.6 to 9.8.
+  `haskellPackages` also uses Stackage LTS 23 (instead of LTS 22) as a baseline.
+
 - LLVM has been updated from LLVM 16 (on Darwin) and LLVM 18 (on other platforms) to LLVM 19.
   This introduces some backwards‐incompatible changes; see the [upstream release notes](https://releases.llvm.org/) for details.
 
@@ -403,6 +406,10 @@
     - `lib.types.coercedTo`
     - `lib.types.either`
 
+- The `testTarget` argument of `haskellPackages.mkDerivation` has been deprecated in favour of `testTargets`.
+  `testTarget` took a space separated string of targets, whereas the new `testTargets` argument takes a list of targets.
+  For instance, `testTarget = "foo bar baz"` should become `testTargets = [ "foo" "bar" "baz" ]`.
+
 - Plasma 5 and Qt 5 based versions of associated software are deprecated in NixOS 25.05, and will be removed in NixOS 25.11. Users are encouraged to upgrade to Plasma 6.
 
 - `rustPlatform.buildRustPackage` stops handling the deprecated argument `cargoSha256`. Out-of-tree packages that haven't migrated from `cargoSha256` to `cargoHash` now receive errors.

maintainers/scripts/haskell/merge-and-open-pr.sh

@@ -1,8 +1,8 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p git gh -I nixpkgs=.
 #
-# Script to merge the currently open haskell-updates PR into master, bump the
-# Stackage version and Hackage versions, and open the next haskell-updates PR.
+# Script to merge the currently open haskell-updates PR , bump the Stackage
+# version and Hackage versions, and open the next haskell-updates PR.
 
 set -eu -o pipefail
 
@@ -79,10 +79,6 @@ fi
 echo "Merging https://github.com/NixOS/nixpkgs/pull/${curr_haskell_updates_pr_num}..."
 gh pr merge --repo NixOS/nixpkgs --merge "$curr_haskell_updates_pr_num"
 
-# Update the list of Haskell package versions in NixOS on Hackage.
-echo "Updating list of Haskell package versions in NixOS on Hackage..."
-./maintainers/scripts/haskell/upload-nixos-package-list-to-hackage.sh
-
 # Update stackage, Hackage hashes, and regenerate Haskell package set
 echo "Updating Stackage..."
 ./maintainers/scripts/haskell/update-stackage.sh --do-commit
@@ -100,7 +96,7 @@ git push "$push_remote" haskell-updates
 new_pr_body=$(cat <<EOF
 ### This Merge
 
-This PR is the regular merge of the \`haskell-updates\` branch into \`master\`.
+This PR is the regular merge of the \`haskell-updates\` branch into \`staging\`.
 
 This branch is being continually built and tested by hydra at https://hydra.nixos.org/jobset/nixpkgs/haskell-updates. You may be able to find an up-to-date Hydra build report at [cdepillabout/nix-haskell-updates-status](https://github.com/cdepillabout/nix-haskell-updates-status).
 
@@ -113,7 +109,7 @@ Our workflow is currently described in [\`pkgs/development/haskell-modules/HACKI
 The short version is this:
 * We regularly update the Stackage and Hackage pins on \`haskell-updates\` (normally at the beginning of a merge window).
 * The community fixes builds of Haskell packages on that branch.
-* We aim at at least one merge of \`haskell-updates\` into \`master\` every two weeks.
+* We aim at at least one merge of \`haskell-updates\` into \`staging\` every two weeks.
 * We only do the merge if the [\`mergeable\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/mergeable) job is succeeding on hydra.
 * If a [\`maintained\`](https://hydra.nixos.org/job/nixpkgs/haskell-updates/maintained) package is still broken at the time of merge, we will only merge if the maintainer has been pinged 7 days in advance. (If you care about a Haskell package, become a maintainer!)
 
@@ -126,4 +122,4 @@ EOF
 )
 
 echo "Opening a PR for the next haskell-updates merge cycle..."
-gh pr create --repo NixOS/nixpkgs --base master --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"
+gh pr create --repo NixOS/nixpkgs --base staging --head haskell-updates --title "haskellPackages: update stackage and hackage" --body "$new_pr_body"

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 nix -I nixpkgs=.
+#! nix-shell -i bash -p coreutils haskellPackages.cabal2nix-unstable git nix nixfmt-rfc-style -I nixpkgs=.
 
 set -euo pipefail
 
@@ -102,6 +102,7 @@ run_hackage2nix
 
 fi
 
+nixfmt pkgs/development/haskell-modules/hackage-packages.nix
 
 if [[ "$DO_COMMIT" -eq 1 ]]; then
 git add pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml

maintainers/scripts/haskell/unbreak.nu

@@ -0,0 +1,31 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i nu -p nushell flock gnused -I nixpkgs=.
+
+# This script tests to build all packages listed in broken.yaml, expecting a build failure.
+# It will remove all packages that build fine from the list.
+
+# Attention: For unknown reasons, the script can't be easily cancelled and needs to be killed manually if it shouldn't run to completion.
+
+use std log
+
+let broken_config = "pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml"
+
+def is-broken [package : string]: nothing -> bool {
+    let res = with-env { NIXPKGS_ALLOW_BROKEN: "1" } {
+        # rather high timeout of half an hour, just to prevent never-ending builds
+        ^nix-build --no-out-link -j 1 --cores 1 --timeout 1800 -A $"haskellPackages.($package)" | complete
+    }
+    if $res.exit_code == 0 {
+      log warning $"($package) is not broken anymore!"
+      return false
+    } else {
+      log info $"($package) is still broken."
+      log debug $"($package) build log:\n($res.stderr)"
+      return true
+    }
+}
+
+def main [] {
+    $broken_config | open | get broken-packages
+      | par-each {|package| if not (is-broken $package) { ^flock -x $broken_config -c $"sed -i -e '/^  - ($package) /d' ($broken_config)" }}
+}

maintainers/scripts/haskell/update-stackage.sh

@@ -8,7 +8,7 @@ set -eu -o pipefail
 # (should be capitalized like the display name)
 SOLVER=LTS
 # Stackage solver verson, if any. Use latest if empty
-VERSION=22
+VERSION=
 TMP_TEMPLATE=update-stackage.XXXXXXX
 readonly SOLVER
 readonly VERSION

pkgs/applications/science/logic/tamarin-prover/default.nix

@@ -1,6 +1,5 @@
 {
   haskellPackages,
-  mkDerivation,
   fetchFromGitHub,
   lib,
   stdenv,
@@ -13,6 +12,8 @@
 }:
 
 let
+  inherit (haskellPackages) mkDerivation;
+
   version = "1.10.0";
   src = fetchFromGitHub {
     owner = "tamarin-prover";

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

@@ -0,0 +1,120 @@
+{
+  lib,
+  stdenv,
+  makeWrapper,
+  haskellPackages,
+  fetchFromGitHub,
+  # dependencies
+  slither-analyzer,
+}:
+
+haskellPackages.mkDerivation rec {
+  pname = "echidna";
+  version = "2.2.6";
+
+  src = fetchFromGitHub {
+    owner = "crytic";
+    repo = "echidna";
+    tag = "v${version}";
+    sha256 = "sha256-5nzis7MXOqs0bhx2jrEexjZYZI2qY6D0D7AWO+SPs+A=";
+  };
+
+  isExecutable = true;
+
+  buildTools = with haskellPackages; [
+    hpack
+  ];
+
+  executableHaskellDepends = with haskellPackages; [
+    # base dependencies
+    aeson
+    base
+    containers
+    directory
+    hevm
+    MonadRandom
+    mtl
+    text
+    # library dependencies
+    ansi-terminal
+    async
+    base16-bytestring
+    binary
+    brick
+    bytestring
+    data-bword
+    data-dword
+    deepseq
+    exceptions
+    extra
+    filepath
+    hashable
+    html-conduit
+    html-entities
+    http-conduit
+    ListLike
+    optics
+    optics-core
+    process
+    random
+    rosezipper
+    semver
+    signal
+    split
+    strip-ansi-escape
+    time
+    unliftio
+    utf8-string
+    vector
+    vty
+    vty-crossplatform
+    wai-extra
+    warp
+    word-wrap
+    xml-conduit
+    yaml
+    # executable dependencies
+    code-page
+    filepath
+    hashable
+    optparse-applicative
+    time
+    with-utf8
+  ];
+
+  executableToolDepends = [
+    makeWrapper
+  ];
+
+  preConfigure = ''
+    hpack
+  '';
+
+  postInstall =
+    with haskellPackages;
+    # https://github.com/NixOS/nixpkgs/pull/304352
+    lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
+      remove-references-to -t ${warp.out} "$out/bin/echidna"
+      remove-references-to -t ${wreq.out} "$out/bin/echidna"
+    ''
+    # make slither-analyzer a runtime dependency
+    + ''
+      wrapProgram $out/bin/echidna \
+        --prefix PATH : ${lib.makeBinPath [ slither-analyzer ]}
+    '';
+
+  doHaddock = false;
+
+  # tests depend on a specific version of solc
+  doCheck = false;
+
+  homepage = "https://github.com/crytic/echidna";
+  description = "Ethereum smart contract fuzzer";
+  license = lib.licenses.agpl3Plus;
+  maintainers = with lib.maintainers; [
+    arturcygan
+    hellwolf
+  ];
+  platforms = lib.platforms.unix;
+  mainProgram = "echidna";
+}

pkgs/by-name/ni/nix-output-monitor/package.nix

@@ -12,7 +12,7 @@ let
 
     # nom has unit-tests and golden-tests
     # golden-tests call nix and thus can’t be run in a nix build.
-    testTarget = "unit-tests";
+    testTargets = [ "unit-tests" ];
 
     buildTools = [ installShellFiles ];
     postInstall = ''

pkgs/by-name/pa/pandoc/package.nix

@@ -41,9 +41,6 @@ in
       remove-references-to \
         -t ${pandoc-cli.scope.pandoc} \
         $out/bin/pandoc
-    ''
-    # https://github.com/jgm/typst-hs/commit/9707b74ce60d71c2ba0f35249ffbd01dea197a6e
-    + lib.optionalString (lib.versionAtLeast pandoc-cli.scope.typst.version "0.6.1") ''
       remove-references-to \
         -t ${pandoc-cli.scope.typst} \
         $out/bin/pandoc

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "commit": "c9ce1cc4a029220ec3582fbcf69e082d245d78b6",
-  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/c9ce1cc4a029220ec3582fbcf69e082d245d78b6.tar.gz",
-  "sha256": "02x3z4rg4dwarzb6p88z7sff40bkbq41gxnczvzph8s3s8jq9iw1",
-  "msg": "Update from Hackage at 2024-12-23T18:27:47Z"
+  "commit": "6fc5e0d20fed4a6e8ec26f6956786d0077f028b4",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/6fc5e0d20fed4a6e8ec26f6956786d0077f028b4.tar.gz",
+  "sha256": "08vkrfn4s1jb680rq1flxas8hv04f5l715z0kh8sv909k3psbfak",
+  "msg": "Update from Hackage at 2025-03-30T11:13:14Z"
 }

pkgs/development/compilers/elm/default.nix

@@ -22,8 +22,8 @@ let
   # Haskell packages that require ghc 8.10
   hs810Pkgs = import ./packages/ghc8_10 { inherit pkgs lib; };
 
-  # Haskell packages that require ghc 9.2
-  hs92Pkgs = import ./packages/ghc9_2 { inherit pkgs lib; };
+  # Haskell packages that require ghc 9.4
+  hs94Pkgs = import ./packages/ghc9_4 { inherit pkgs lib; };
 
   # Patched, originally npm-downloaded, packages
   patchedNodePkgs = import ./packages/node {
@@ -38,7 +38,7 @@ let
   assembleScope =
     self: basics:
     (hs96Pkgs self).elmPkgs
-    // (hs92Pkgs self).elmPkgs
+    // (hs94Pkgs self).elmPkgs
     // (hs810Pkgs self).elmPkgs
     // (patchedNodePkgs self)
     // basics;

pkgs/development/compilers/elm/packages/ghc9_2/default.nix → pkgs/development/compilers/elm/packages/ghc9_4/default.nix

@@ -1,7 +1,7 @@
 { pkgs, lib }:
 
 self:
-pkgs.haskell.packages.ghc92.override {
+pkgs.haskell.packages.ghc94.override {
   overrides =
     self: super:
     let
@@ -49,12 +49,5 @@ pkgs.haskell.packages.ghc92.override {
       elm-format-lib = fixHaddock (doJailbreak (self.callPackage ./elm-format/elm-format-lib.nix { }));
       elm-format-test-lib = fixHaddock (self.callPackage ./elm-format/elm-format-test-lib.nix { });
       elm-format-markdown = fixHaddock (self.callPackage ./elm-format/elm-format-markdown.nix { });
-
-      # elm-format requires text >= 2.0
-      text = self.text_2_0_2;
-      # unordered-container's tests indirectly depend on text < 2.0
-      unordered-containers = overrideCabal (drv: { doCheck = false; }) super.unordered-containers;
-      # relude-1.1.0.0's tests depend on hedgehog < 1.2, which indirectly depends on text < 2.0
-      relude = overrideCabal (drv: { doCheck = false; }) super.relude;
     };
 }

pkgs/development/compilers/ghc/8.10.7.nix

@@ -299,6 +299,20 @@ stdenv.mkDerivation (
           sha256 = "0kmhfamr16w8gch0lgln2912r8aryjky1hfcda3jkcwa5cdzgjdv";
         })
 
+        # Determine size of time related types using hsc2hs instead of assuming CLong.
+        # Prevents failures when e.g. stat(2)ing on 32bit systems with 64bit time_t etc.
+        # https://github.com/haskell/ghcup-hs/issues/1107
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/25095
+        # Note that in normal situations this shouldn't be the case since nixpkgs
+        # doesn't set -D_FILE_OFFSET_BITS=64 and friends (yet).
+        (fetchpatch {
+          name = "unix-fix-ctimeval-size-32-bit.patch";
+          url = "https://github.com/haskell/unix/commit/8183e05b97ce870dd6582a3677cc82459ae566ec.patch";
+          sha256 = "17q5yyigqr5kxlwwzb95sx567ysfxlw6bp3j4ji20lz0947aw6gv";
+          stripLen = 1;
+          extraPrefix = "libraries/unix/";
+        })
+
         # See upstream patch at
         # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4885. Since we build
         # from source distributions, the auto-generated configure script needs to be

pkgs/development/compilers/ghc/9.12.2.nix

@@ -0,0 +1,4 @@
+import ./common-hadrian.nix rec {
+  version = "9.12.2";
+  sha256 = "0e49cd5dde43f348c5716e5de9a5d7a0f8d68d945dc41cf75dfdefe65084f933";
+}