From a4cbfd11e2797deb0420510495074accc73d8c28 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 6 Aug 2025 13:51:14 +0200 Subject: [PATCH] haskell.packages.*.ghc-{toolchain,platform}: make sure attr exists These packages are new core packages starting with GHC 9.10, but there is no (simple) way to make them available for older GHCs. We just need to make sure the attributes exist, so we can evaluate packages that depend on them with all GHC versions (even if the build may fail). --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix | 3 +++ 6 files changed, 18 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 21b1a411550a..8817ba0c6528 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -70,6 +70,9 @@ self: super: { # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; # Becomes a core package in GHC >= 9.0 ghc-bignum = lib.pipe self.ghc-bignum_1_0 [ 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 013d3086063b..842037de9305 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -72,6 +72,9 @@ self: super: { # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; # Only required for ghc >= 9.2 nothunks = super.nothunks.override { diff --git a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix index 13a69e721cb0..f82aef3a706e 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -66,6 +66,9 @@ self: super: { # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = 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.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix index eb3f0b0c4bb8..85c11873024c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.4.x.nix @@ -61,6 +61,9 @@ self: super: { # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; # only broken for >= 9.6 calligraphy = doDistribute (unmarkBroken super.calligraphy); 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 c86ec1cd6781..395491eebe2a 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.6.x.nix @@ -69,6 +69,9 @@ in # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; # Needs base-orphans for GHC < 9.8 / base < 4.19 some = addBuildDepend self.base-orphans super.some; 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 b01b3665d923..24d99e75a43c 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.8.x.nix @@ -69,6 +69,9 @@ in # Becomes a core package in GHC >= 9.10, no release compatible with GHC < 9.10 is available ghc-internal = null; + # Become core packages in GHC >= 9.10, but aren't uploaded to Hackage + ghc-toolchain = null; + ghc-platform = null; # # Version upgrades