From 48104ded6457f19c44fa6af7a8c97bb3bb9fc4f3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 5 Feb 2021 22:37:50 +0100 Subject: [PATCH] hls-hlint-plugin: add new ghc-lib dependency when building with older compilers --- pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix | 1 + pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix | 3 +++ pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix | 4 ++++ 3 files changed, 8 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix index 27bf04b914e7..6831c7c327d7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.4.x.nix @@ -88,5 +88,6 @@ self: super: { # ghc versions prior to 8.8.x needs additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix index 8e87134f617c..ad6c17cbd103 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix @@ -95,5 +95,8 @@ self: super: { # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore. exceptions = super.exceptions_0_10_4; + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + mmorph = super.mmorph_1_1_3; } diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index d1099c56b2c8..c23d875dea38 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -123,4 +123,8 @@ self: super: { # ghc versions which don‘t match the ghc-lib-parser-ex version need the # additional dependency to compile successfully. ghc-lib-parser-ex = addBuildDepend super.ghc-lib-parser-ex self.ghc-lib-parser; + + # Older compilers need the latest ghc-lib to build this package. + hls-hlint-plugin = addBuildDepend super.hls-hlint-plugin self.ghc-lib; + }