Merge branch 'haskell-updates' into staging

Author: wolfgangwalther

doc/languages-frameworks/haskell.section.md

@@ -260,6 +260,14 @@ the same package with the `previousIntermediates` argument to support
 incremental builds. See [“Incremental builds”](#haskell-incremental-builds) for
 more information. Defaults to `false`.
 
+`dontConvertCabalFileToUnix`
+: By default, `haskellPackages.mkDerivation` converts the `.cabal` file of a
+given package to Unix line endings.
+This is intended to work around
+[Hackage converting revised `.cabal` files to DOS line endings](https://github.com/haskell/hackage-server/issues/316)
+which frequently causes patches to stop applying.
+You can pass `true` to disable this behavior.
+
 `enableLibraryProfiling`
 : Whether to enable [profiling][profiling] for libraries contained in the
 package. Enabled by default if supported.
@@ -1249,8 +1257,8 @@ it does for the unstable branches.
 ### Why is topic X not covered in this section? Why is section Y missing? {#haskell-why-not-covered}
 
 We have been working on [moving the nixpkgs Haskell documentation back into the
-nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). Since this
-process has not been completed yet, you may find some topics missing here
+nixpkgs manual](https://github.com/NixOS/nixpkgs/issues/121403). <!-- krank:ignore-line -->
+Since this process has not been completed yet, you may find some topics missing here
 covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/).
 
 If you feel any important topic is not documented at all, feel free to comment

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

@@ -49,6 +49,8 @@
 
 - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.
 
+- The `haskellPackages.mkDerivation` builder now converts packages' cabal files to Unix line endings before `patchPhase`. This behavior can be disabled using `dontConvertCabalFileToUnix`.
+
 - Support for bootstrapping native GHC compilers on 32‐bit ARM and little‐endian 64‐bit PowerPC has been dropped.
   The latter was probably broken anyway.
   If there is interest in restoring support for these architectures, it should be possible to cross‐compile a bootstrap GHC binary.

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

@@ -96,7 +96,7 @@ haskellPackages.mkDerivation rec {
     makeWrapper
   ];
 
-  preConfigure = ''
+  prePatch = ''
     hpack
   '';
 

pkgs/data/misc/hackage/pin.json

@@ -1,6 +1,6 @@
 {
-  "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"
+  "commit": "bea83e4ce667f3d0652a67d1f8e13f5c644d6551",
+  "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/bea83e4ce667f3d0652a67d1f8e13f5c644d6551.tar.gz",
+  "sha256": "10lfqcjrckxjb74xwcm73hphw1y53n080pwmjf7xzyga9hf594cn",
+  "msg": "Update from Hackage at 2025-09-25T14:09:07Z"
 }

pkgs/development/compilers/ghc/common-hadrian.nix

@@ -187,7 +187,7 @@
 
       lib.optionals (lib.versionOlder version "9.8") [
         # Fix unlit being installed under a different name than is used in the
-        # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317
+        # settings file: https://gitlab.haskell.org/ghc/ghc/-/issues/23317 krank:ignore-line
         (fetchpatch {
           name = "ghc-9.6-fix-unlit-path.patch";
           url = "https://gitlab.haskell.org/ghc/ghc/-/commit/8fde4ac84ec7b1ead238cb158bbef48555d12af9.patch";
@@ -200,7 +200,7 @@
         #
         # These cause problems as they're not eliminated by GHC's dead code
         # elimination on aarch64-darwin. (see
-        # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+        # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
         (
           if lib.versionOlder version "9.10" then
             ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
@@ -216,12 +216,17 @@
           hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
         })
       ]
+      ++ lib.optionals stdenv.targetPlatform.isGhcjs [
+        # https://gitlab.haskell.org/ghc/ghc/-/issues/26290
+        ./export-heap-methods.patch
+      ]
       # Prevents passing --hyperlinked-source to haddock. Note that this can
       # be configured via a user defined flavour now. Unfortunately, it is
       # impossible to import an existing flavour in UserSettings, so patching
       # the defaults is actually simpler and less maintenance intensive
       # compared to keeping an entire flavour definition in sync with upstream
-      # manually. See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625
+      # manually.
+      # See also https://gitlab.haskell.org/ghc/ghc/-/issues/23625 krank:ignore-line
       ++ lib.optionals (!enableHyperlinkedSource) [
         (
           if lib.versionOlder version "9.8" then
@@ -256,7 +261,7 @@
           ]
       # Fixes stack overrun in rts which crashes an process whenever
       # freeHaskellFunPtr is called with nixpkgs' hardening flags.
-      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
       # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
       ++ lib.optionals (lib.versionOlder version "9.13") [
         (fetchpatch {
@@ -779,7 +784,8 @@ stdenv.mkDerivation (
 
     ''
     # the bindist configure script uses different env variables than the GHC configure script
-    # see https://github.com/NixOS/nixpkgs/issues/267250 and https://gitlab.haskell.org/ghc/ghc/-/issues/24211
+    # see https://github.com/NixOS/nixpkgs/issues/267250 krank:ignore-line
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/24211  krank:ignore-line
     + lib.optionalString (stdenv.targetPlatform.linker == "cctools") ''
       export InstallNameToolCmd=$INSTALL_NAME_TOOL
       export OtoolCmd=$OTOOL

pkgs/development/compilers/ghc/common-make-native-bignum.nix

@@ -134,7 +134,7 @@ let
     # program is built (which we generally always want to have a complete GHC install)
     # and whether it is run on the GHC sources to generate hyperlinked source code
     # (which is impossible for cross-compilation); see:
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/20077 krank:ignore-line
     # This implies that currently a cross-compiled GHC will never have a `haddock`
     # program, so it can never generate haddocks for any packages.
     # If this is solved in the future, we'd like to unconditionally
@@ -292,8 +292,8 @@ stdenv.mkDerivation (
     patches = [
       # 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
+      # https://github.com/haskell/ghcup-hs/issues/1107   krank:ignore-line
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25095 krank:ignore-line
       # 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 {
@@ -304,7 +304,7 @@ stdenv.mkDerivation (
         extraPrefix = "libraries/unix/";
       })
 
-      # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+      # Fix docs build with Sphinx >= 7 https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
       ./docs-sphinx-7.patch
 
       # Correctly record libnuma's library and include directories in the
@@ -328,7 +328,7 @@ stdenv.mkDerivation (
     # the solution is to backport those changes from GHC 9.6 that skip the intermediate
     # assembly step.
     #
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25608#note_622589 krank:ignore-line
     # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/6877
     ++ [
       # Need to use this patch so the next one applies, passes file location info to the cc phase
@@ -369,7 +369,7 @@ stdenv.mkDerivation (
 
     # Fixes stack overrun in rts which crashes an process whenever
     # freeHaskellFunPtr is called with nixpkgs' hardening flags.
-    # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25485 krank:ignore-line
     # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13599
     # TODO: patch doesn't apply for < 9.4, but may still be necessary?
     ++ [
@@ -386,7 +386,7 @@ stdenv.mkDerivation (
       #
       # These cause problems as they're not eliminated by GHC's dead code
       # elimination on aarch64-darwin. (see
-      # https://github.com/NixOS/nixpkgs/issues/140774 for details).
+      # https://github.com/NixOS/nixpkgs/issues/140774 for details). krank:ignore-line
       ./Cabal-at-least-3.6-paths-fix-cycle-aarch64-darwin.patch
     ];
 

pkgs/development/compilers/ghc/docs-sphinx-7.patch

@@ -1,6 +1,6 @@
 Fix build of docs after sphinx update.
 https://github.com/sphinx-doc/sphinx/pull/11381
-https://gitlab.haskell.org/ghc/ghc/-/issues/24129
+https://gitlab.haskell.org/ghc/ghc/-/issues/24129 krank:ignore-line
 --- a/docs/users_guide/rtd-theme/layout.html
 +++ b/docs/users_guide/rtd-theme/layout.html
 @@ -67 +67 @@

pkgs/development/compilers/ghc/export-heap-methods.patch

@@ -0,0 +1,11 @@
+diff --git a/rts/js/mem.js b/rts/js/mem.js
+index 44c5c37ac4..1f150c5d55 100644
+--- a/rts/js/mem.js
++++ b/rts/js/mem.js
+@@ -1,5 +1,5 @@
+ //#OPTIONS:CPP
+-//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot
++//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8
+ 
+ // #define GHCJS_TRACE_META 1
+ 

pkgs/development/compilers/ghc/subopt.bash

@@ -14,8 +14,9 @@
 #
 # No attempt is made to support custom LLVM optimization flags, or the
 # undocumented flag to disable TBAA, or avoid
-# <https://gitlab.haskell.org/ghc/ghc/-/issues/23870>, as these are not
-# required to bootstrap GHC and at worst will produce an error message.
+# <https://gitlab.haskell.org/ghc/ghc/-/issues/23870> (krank:ignore-line),
+# as these are not required to bootstrap GHC and at worst will produce an
+# error message.
 #
 # It is called `subopt` to reflect the fact that it uses `opt(1)` as a
 # subprocess, and the fact that the GHC build system situation

pkgs/development/haskell-modules/HACKING.md

@@ -199,10 +199,6 @@ opening the next one.  When you want to merge the currently open
     $ gh auth status
     ```
 
-1.  Make sure you have setup your `~/.cabal/config` file for authentication
-    for uploading the NixOS package versions to Hackage.  See the following
-    section for details on how to do this.
-
 1.  Make sure you have correctly marked packages broken.  One of the previous
     sections explains how to do this.
 
@@ -237,8 +233,6 @@ opening the next one.  When you want to merge the currently open
 
     1.  Merges the currently open `haskell-updates` PR.
 
-    1.  Updates the version of Haskell packages in NixOS on Hackage.
-
     1.  Updates Stackage and Hackage snapshots.  Regenerates the Haskell package set.
 
     1.  Pushes the commits updating Stackage and Hackage and opens a new