From 1d4e0690fbc07f77286fd910c09564caf4921b62 Mon Sep 17 00:00:00 2001 From: Wolfgang Walther Date: Sat, 19 Jul 2025 11:37:39 +0200 Subject: [PATCH] haskell.packages.ghc{90,92}.haskell-language-server: make throw an alias Same reasoning as commits before. --- .../haskell-modules/configuration-ghc-9.0.x.nix | 11 +++++++++-- .../haskell-modules/configuration-ghc-9.2.x.nix | 11 +++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) 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 7c6439d1746e..a476886358b1 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.0.x.nix @@ -1,4 +1,8 @@ -{ pkgs, haskellLib }: +{ + config, + pkgs, + haskellLib, +}: with haskellLib; @@ -108,7 +112,10 @@ self: super: { doctest = dontCheck super.doctest; - haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version"; + haskell-language-server = + lib.throwIf config.allowAliases + "haskell-language-server has dropped support for ghc 9.0 in version 2.4.0.0, please use a newer ghc version or an older nixpkgs version" + (markBroken super.haskell-language-server); # Needs to use ghc-lib due to incompatible GHC ghc-tags = doDistribute self.ghc-tags_1_5; 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 6d85d85a8617..cd67a884e853 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -1,4 +1,8 @@ -{ pkgs, haskellLib }: +{ + config, + pkgs, + haskellLib, +}: with haskellLib; @@ -74,7 +78,10 @@ self: super: { } ); - haskell-language-server = throw "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version"; + haskell-language-server = + lib.throwIf config.allowAliases + "haskell-language-server has dropped support for ghc 9.2 in version 2.10.0.0, please use a newer ghc version or an older nixpkgs version" + (markBroken super.haskell-language-server); # For GHC < 9.4, some packages need data-array-byte as an extra dependency hashable = addBuildDepends [ self.data-array-byte ] super.hashable;