File tree Expand file tree Collapse file tree 4 files changed +21
-3
lines changed Expand file tree Collapse file tree 4 files changed +21
-3
lines changed Original file line number Diff line number Diff line change 2020 - ghc92
2121 - ghc96
2222 - ghc98
23+ - ghc910
2324 target-platform :
2425 - " "
2526 - " -static"
Original file line number Diff line number Diff line change 3939 - ghc92
4040 - ghc96
4141 - ghc98
42+ - ghc910
4243 target-platform :
4344 - " "
4445 - " -static"
Original file line number Diff line number Diff line change @@ -10,6 +10,13 @@ let tool-version-map = import ./tool-map.nix;
1010 zstdSupport = false ;
1111 pslSupport = false ;
1212 } ) ;
13+ # Haskell.nix pulls in cabal-install 3.10.3.0 which will not build with 9.10+. In that
14+ # case, build with 9.8
15+ native-cabal-install =
16+ if builtins . compareVersions compiler . version "9.10" >= 0 then
17+ pkgs . pkgsBuildBuild . haskell-nix . cabal-install . ghc982
18+ else
19+ pkgs . pkgsBuildBuild . haskell-nix . cabal-install . ${ compiler-nix-name } ;
1320 inherit ( pkgs . haskell-nix . iserv-proxy-exes . ${ compiler-nix-name } ) iserv-proxy iserv-proxy-interpreter ;
1421
1522 dllPkgs = [
@@ -165,10 +172,17 @@ pkgs.pkgsBuildBuild.mkShell ({
165172 '' + ( quirks . hint flavor ) + quirks . shellHook ;
166173 buildInputs = [ ] ;
167174
168- nativeBuildInputs = [ wrapped-ghc wrapped-hsc2hs wrapped-cabal wine-test-wrapper compiler ] ++ ( with pkgs ; [
175+ nativeBuildInputs = [
176+ wrapped-ghc
177+ wrapped-hsc2hs
178+ wrapped-cabal
179+ wine-test-wrapper
180+ compiler
181+ native-cabal-install
182+ ]
183+ ++ ( with pkgs ; [
169184 buildPackages . bintools . bintools
170185 stdenv . cc
171- pkgsBuildBuild . haskell-nix . cabal-install . ${ compiler-nix-name }
172186 ( pkgsBuildBuild . pkg-config or pkgsBuildBuild . pkgconfig )
173187 ( tool "happy" )
174188 ( tool "alex" )
Original file line number Diff line number Diff line change 100100 "ghc92"
101101 "ghc94"
102102 "ghc96"
103- "ghc98" ] ( short-name : rec {
103+ "ghc98"
104+ "ghc910" ] ( short-name : rec {
104105 inherit pkgs self toolsModule ;
105106 compiler-nix-name = pkgs . haskell-nix . resolve-compiler-name short-name ;
106107 compiler = pkgs . buildPackages . haskell-nix . compiler . ${ compiler-nix-name } ;
110111 "ghc90"
111112 "ghc92"
112113 "ghc94"
114+ "ghc910"
113115 ] ;
114116 windows-compilers = pkgs :
115117 pkgs . lib . optionalAttrs ( __elem system [ "x86_64-linux" ] )
You can’t perform that action at this time.
0 commit comments