@@ -104,14 +104,80 @@ self: super: {
104104 # https://github.com/Soostone/retry/issues/71
105105 retry = dontCheck super.retry;
106106
107− # hlint 3.3 needs a ghc-lib-parser newer than the one from stackage
108− hlint = super.hlint_3_3_4.overrideScope (self: super: {
109− ghc-lib-parser = overrideCabal self.ghc-lib-parser_9_0_1_20210324 {
110− doHaddock = false;
111− };
112− ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
113− });
107+ # Hlint needs >= 3.3.4 for ghc 9 support.
108+ hlint = super.hlint_3_3_4;
114109
115− # pick right version for compiler
110+ # 2021-09-18: ghc-api-compat and ghc-lib-* need >= 9.0.x versions for hls and hlint
116111 ghc-api-compat = doDistribute super.ghc-api-compat_9_0_1;
112+ ghc-lib-parser = self.ghc-lib-parser_9_0_1_20210324;
113+ ghc-lib-parser-ex = self.ghc-lib-parser-ex_9_0_0_4;
114+ ghc-lib = self.ghc-lib_9_0_1_20210324;
115+
116+ # 2021-09-18: Need semialign >= 1.2 for correct bounds
117+ semialign = super.semialign_1_2;
118+
119+ # Will probably be needed for brittany support
120+ # https://github.com/lspitzner/czipwith/pull/2
121+ #czipwith = appendPatch super.czipwith
122+ # (pkgs.fetchpatch {
123+ # url = "https://github.com/lspitzner/czipwith/commit/b6245884ae83e00dd2b5261762549b37390179f8.patch";
124+ # sha256 = "08rpppdldsdwzb09fmn0j55l23pwyls2dyzziw3yjc1cm0j5vic5";
125+ # });
126+
127+ # 2021-09-18: https://github.com/mokus0/th-extras/pull/8
128+ # Release is missing, but asked for in the above PR.
129+ th-extras = overrideCabal super.th-extras (old: {
130+ version = assert old.version == "0.0.0.4"; "unstable-2021-09-18";
131+ src = pkgs.fetchFromGitHub {
132+ owner = "mokus0";
133+ repo = "th-extras";
134+ rev = "0d050b24ec5ef37c825b6f28ebd46787191e2a2d";
135+ sha256 = "045f36yagrigrggvyb96zqmw8y42qjsllhhx2h20q25sk5h44xsd";
136+ };
137+ libraryHaskellDepends = old.libraryHaskellDepends ++ [self.th-abstraction];
138+ });
139+
140+ # 2021-09-18: GHC 9 compat release is missing
141+ # Issue: https://github.com/obsidiansystems/dependent-sum/issues/65
142+ dependent-sum-template = dontCheck (appendPatch super.dependent-sum-template
143+ (pkgs.fetchpatch {
144+ url = "https://github.com/obsidiansystems/dependent-sum/commit/8cf4c7fbc3bfa2be475a17bb7c94a1e1e9a830b5.patch";
145+ sha256 = "02wyy0ciicq2x8lw4xxz3x5i4a550mxfidhm2ihh60ni6am498ff";
146+ stripLen = 2;
147+ extraPrefix = "";
148+ }));
149+
150+ # 2021-09-18: cabal2nix does not detect the need for ghc-api-compat.
151+ hiedb = overrideCabal super.hiedb (old: {
152+ libraryHaskellDepends = old.libraryHaskellDepends ++ [self.ghc-api-compat];
153+ });
154+
155+ # 2021-09-18: Need path >= 0.9.0 for ghc 9 compat
156+ path = self.path_0_9_0;
157+ # 2021-09-18: Need ormolu >= 0.3.0.0 for ghc 9 compat
158+ ormolu = self.ormolu_0_3_0_0;
159+ # 2021-09-18: https://github.com/haskell/haskell-language-server/issues/2206
160+ # Restrictive upper bound on ormolu
161+ hls-ormolu-plugin = doJailbreak super.hls-ormolu-plugin;
162+
163+ # 2021-09-18: The following plugins don‘t work yet on ghc9.
164+ haskell-language-server = appendConfigureFlags (super.haskell-language-server.override {
165+ hls-tactics-plugin = null; # No upstream support, generic-lens-core fail
166+ hls-splice-plugin = null; # No upstream support in hls 1.4.0, should be fixed in 1.5
167+ hls-refine-imports-plugin = null; # same issue es splice-plugin
168+ hls-class-plugin = null; # No upstream support
169+
170+ hls-fourmolu-plugin = null; # No upstream support, needs new fourmolu release
171+ hls-stylish-haskell-plugin = null; # No upstream support
172+ hls-brittany-plugin = null; # No upstream support, needs new brittany release
173+ }) [
174+ "-f-tactic"
175+ "-f-splice"
176+ "-f-refineimports"
177+ "-f-class"
178+
179+ "-f-fourmolu"
180+ "-f-brittany"
181+ "-f-stylishhaskell"
182+ ];
117183}