From fcba3d3e5073dbedba3e578486bfb5d40bfa6cdd Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Wed, 13 Jul 2022 15:37:40 +0200 Subject: [PATCH] haskell.packages.ghc923.hlint: reflect 3.4 -> 3.4.1 update hlint 3.4.1 requires a very specific (and outdated) ghc-lib-parser-ex version which we need to provide. --- .../haskell-modules/configuration-common.nix | 8 ++++++++ .../configuration-ghc-9.2.x.nix | 2 +- .../configuration-hackage2nix/main.yaml | 1 + .../haskell-modules/hackage-packages.nix | 20 +++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index a9c435416b4b..832a7f349da4 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -2147,6 +2147,14 @@ self: super: { ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709; }; + ghc-lib-parser-ex_9_2_0_4 = super.ghc-lib-parser-ex_9_2_0_4.override { + ghc-lib-parser = super.ghc-lib-parser_9_2_3_20220709; + }; + + hlint_3_4_1 = doDistribute (super.hlint_3_4_1.override { + ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_2_0_4; + }); + # To strict bound on hspec # https://github.com/dagit/zenc/issues/5 zenc = doJailbreak super.zenc; 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 704cbc38766a..6513b63f3c0f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-9.2.x.nix @@ -180,7 +180,7 @@ self: super: { } super.memory); # Use hlint from git for GHC 9.2.1 support - hlint = self.hlint_3_4; + hlint = self.hlint_3_4_1; # https://github.com/sjakobi/bsb-http-chunked/issues/38 bsb-http-chunked = dontCheck super.bsb-http-chunked; diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index c10397ec1dd0..3e3a8172d1ab 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -123,6 +123,7 @@ extra-packages: - ghc-lib == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser == 8.10.7.* # 2022-02-17: preserve for GHC 8.10.7 - ghc-lib-parser-ex == 8.10.* # 2022-02-17: preserve for GHC 8.10.7 + - ghc-lib-parser-ex >= 9.2.0.3 && < 9.2.1 # 2022-07-13: needed by hlint 3.4.1 - doctest == 0.18.* # 2021-11-19: closest to stackage version for GHC 9.* - path == 0.9.0 # 2021-12-03: path version building with stackage genvalidity and GHC 9.0.2 - ormolu == 0.2.* # 2022-02-21: For ghc 8.8 and 8.10 diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 04b00364cad1..0fb9f98c271b 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -108182,6 +108182,26 @@ self: { license = lib.licenses.bsd3; }) {}; + "ghc-lib-parser-ex_9_2_0_4" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, extra + , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate + }: + mkDerivation { + pname = "ghc-lib-parser-ex"; + version = "9.2.0.4"; + sha256 = "138wkpy7qpdkp07028flab3lwq4b3mns0qcrkfrhclixlz8pi74v"; + libraryHaskellDepends = [ + base bytestring containers ghc-lib-parser uniplate + ]; + testHaskellDepends = [ + base directory extra filepath ghc-lib-parser tasty tasty-hunit + uniplate + ]; + description = "Algorithms on GHC parse trees"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "ghc-lib-parser-ex_9_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, directory, extra , filepath, ghc-lib-parser, tasty, tasty-hunit, uniplate