haskell.compiler: backport patch for unix 32bit type size issue

sternenseemann · sternenseemann · commit 43ff75c408b7 · 2025-01-16T23:54:36.000+01:00
Cabal has recently introduced a lower bound for unix so a certain bug fix for 32bit platforms (in combination with a toolchain that sets _FILE_OFFSET_BITS=64) is included: haskell/cabal#10664 haskell/cabal#10677 I don't think it's actually possible to encounter this problem with nixpkgs since we haven't transitioned to 64bit time_t for 32bit platforms unlike Debian. To prevent confusing behavior in edge cases, backport the patch to all GHC versions that lack it and lift the bound on Cabal 3.14 (which is honestly a strange way to “fix” this problem).
diff --git a/pkgs/development/compilers/ghc/8.10.7.nix b/pkgs/development/compilers/ghc/8.10.7.nix
@@ -296,6 +296,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
diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -182,6 +182,26 @@
            then ./docs-sphinx-7-ghc98.patch
            else ./docs-sphinx-7.patch )
         ]
+
+        ++ lib.optional (
+          # 2025-01-16: unix >= 2.8.6.0 is unaffected which is shipped by GHC 9.12.1 and 9.8.4
+          lib.versionOlder version "9.11"
+          && !(lib.versionAtLeast version "9.8.4" && lib.versionOlder version "9.9")
+        ) [
+          # 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/";
+          })
+        ]
         ++ lib.optionals (lib.versionAtLeast version "9.6" && lib.versionOlder version "9.6.6") [
           (fetchpatch {
             name = "fix-fully_static.patch";
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -288,7 +288,22 @@ stdenv.mkDerivation (
     ];
 
     patches =
-      lib.optionals (lib.versionOlder version "9.4") [
+      [
+        # 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/";
+        })
+      ]
+      ++ lib.optionals (lib.versionOlder version "9.4") [
         # fix hyperlinked haddock sources: https://github.com/haskell/haddock/pull/1482
         (fetchpatch {
           url = "https://patch-diff.githubusercontent.com/raw/haskell/haddock/pull/1482.patch";
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
@@ -29,9 +29,15 @@ self: super: {
   Cabal_3_12_1_0 = doDistribute (super.Cabal_3_12_1_0.override {
     Cabal-syntax = self.Cabal-syntax_3_12_1_0;
   });
-  Cabal_3_14_1_1 = doDistribute (super.Cabal_3_14_1_1.override {
+  Cabal_3_14_1_1 = overrideCabal (drv: {
+    # Revert increased lower bound on unix since we have backported
+    # the required patch to all GHC bundled versions of unix.
+    postPatch = drv.postPatch or "" + ''
+      substituteInPlace Cabal.cabal --replace-fail "unix  >= 2.8.6.0" "unix >= 2.6.0.0"
+    '';
+  }) (doDistribute (super.Cabal_3_14_1_1.override {
     Cabal-syntax = self.Cabal-syntax_3_14_1_0;
-  });
+  }));
 
   # cabal-install needs most recent versions of Cabal and Cabal-syntax,
   # so we need to put some extra work for non-latest GHCs
