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 f37b83ae2459..30cc6fb9efe3 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -209,11 +209,21 @@ self: super: { # Tests have a circular dependency on quickcheck-instances text-short = dontCheck super.text-short_0_1_4; - # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage - hlint = super.hlint_3_3_4.overrideScope (self: super: { + # Use hlint from git for GHC 9.2.1 support + hlint = overrideCabal { + version = "unstable-2021-12-12"; + src = pkgs.fetchFromGitHub { + owner = "ndmitchell"; + repo = "hlint"; + rev = "77a9702e10b772a7695c08682cd4f450fd0e9e46"; + sha256 = "0hpp3iw7m7w2abr8vb86gdz3x6c8lj119zxln933k90ia7bmk8jc"; + }; + revision = null; + editedCabalFile = null; + } (super.hlint_3_3_4.overrideScope (self: super: { ghc-lib-parser = self.ghc-lib-parser_9_2_1_20211101; ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_1; - }); + })); # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; diff --git a/pkgs/top-level/release-haskell.nix b/pkgs/top-level/release-haskell.nix index c1179072fb47..72f981b7845a 100644 --- a/pkgs/top-level/release-haskell.nix +++ b/pkgs/top-level/release-haskell.nix @@ -311,6 +311,7 @@ let funcmp = released ++ [ compilerNames.ghc921 ]; haskell-language-server = released; hoogle = released ++ [ compilerNames.ghc921 ]; + hlint = released ++ [ compilerNames.ghc921 ]; hsdns = released ++ [ compilerNames.ghc921 ]; jailbreak-cabal = released ++ [ compilerNames.ghc921 ]; language-nix = released ++ [ compilerNames.ghc921 ];