diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 4f82feb47374..b0c0dc633e87 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1156,7 +1156,6 @@ with haskellLib; Cabal-ide-backend = dontCheck super.Cabal-ide-backend; # This package can't be built on non-Windows systems. - Win32 = overrideCabal (drv: { broken = !pkgs.stdenv.hostPlatform.isCygwin; }) super.Win32; inline-c-win32 = dontDistribute super.inline-c-win32; Southpaw = dontDistribute super.Southpaw; 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 e7f0342aa470..1454ea63b514 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -36,4 +36,5 @@ self: super: { transformers = null; unix = null; xhtml = null; + Win32 = null; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix index ea22d88a9e40..7dc391912154 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.10.x.nix @@ -63,6 +63,7 @@ in transformers = null; unix = null; xhtml = null; + Win32 = null; # “Unfortunately we are unable to support GHC 9.10.” apply-refact = dontDistribute (markBroken super.apply-refact); diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix index c0a06d50b478..82630d5da2c8 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.12.x.nix @@ -66,6 +66,7 @@ with haskellLib; transformers = null; unix = null; xhtml = null; + Win32 = null; # # Hand pick versions that are compatible with ghc 9.12 and base 4.21 diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix index 0ff76cae4892..2a09d3f258c0 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.16.x.nix @@ -51,4 +51,5 @@ self: super: { transformers = null; unix = null; xhtml = null; + Win32 = null; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index 347cf2dee573..0b723af7b578 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -50,6 +50,7 @@ self: super: { # GHC only bundles the xhtml library if haddock is enabled, check if this is # still the case when updating: https://gitlab.haskell.org/ghc/ghc/-/blob/0198841877f6f04269d6050892b98b5c3807ce4c/ghc.mk#L463 xhtml = if self.ghc.hasHaddock or true then null else doDistribute self.xhtml_3000_4_0_0; + Win32 = null; # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix index 4e479de6d087..987897276982 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -58,6 +58,7 @@ in transformers = null; unix = null; xhtml = null; + Win32 = null; # Becomes a core package in GHC >= 9.8 semaphore-compat = doDistribute self.semaphore-compat_1_0_0; diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix index 82e1aa15642e..58e801c64ba9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -61,6 +61,7 @@ in transformers = null; unix = null; xhtml = null; + Win32 = null; # Becomes a core package in GHC >= 9.10 os-string = doDistribute self.os-string_2_0_8;