From 1236b61f3c5266cf1fa8d8b255c971b00a02f423 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 6 Feb 2025 14:32:45 +0100 Subject: [PATCH] haskell.packages.ghc{90,810}.nothunks:don't pull in wherefrom-compat Upstream only requests the package for ghc >= 9.2 since (?) wherefrom-compat doesn't support ghc < 9.2. --- .../development/haskell-modules/configuration-ghc-8.10.x.nix | 5 +++++ pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 3a986e3daeeb..f5d378ca84cf 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -64,6 +64,11 @@ self: super: { # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Only required for ghc >= 9.2 + nothunks = super.nothunks.override { + wherefrom-compat = null; + }; + # For GHC < 9.4, some packages need data-array-byte as an extra dependency # For GHC < 9.2, os-string is not required. primitive = addBuildDepends [ self.data-array-byte ] super.primitive; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix index 0cf930918f83..e9b2eb225fa0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -63,6 +63,11 @@ self: super: { # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; + # Only required for ghc >= 9.2 + nothunks = super.nothunks.override { + wherefrom-compat = null; + }; + # Jailbreaks & Version Updates # For GHC < 9.4, some packages need data-array-byte as an extra dependency