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 20
20
- ghc92
21
21
- ghc96
22
22
- ghc98
23
+ - ghc910
23
24
target-platform :
24
25
- " "
25
26
- " -static"
Original file line number Diff line number Diff line change 39
39
- ghc92
40
40
- ghc96
41
41
- ghc98
42
+ - ghc910
42
43
target-platform :
43
44
- " "
44
45
- " -static"
Original file line number Diff line number Diff line change @@ -10,6 +10,13 @@ let tool-version-map = import ./tool-map.nix;
10
10
zstdSupport = false ;
11
11
pslSupport = false ;
12
12
} ) ;
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 } ;
13
20
inherit ( pkgs . haskell-nix . iserv-proxy-exes . ${ compiler-nix-name } ) iserv-proxy iserv-proxy-interpreter ;
14
21
15
22
dllPkgs = [
@@ -165,10 +172,17 @@ pkgs.pkgsBuildBuild.mkShell ({
165
172
'' + ( quirks . hint flavor ) + quirks . shellHook ;
166
173
buildInputs = [ ] ;
167
174
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 ; [
169
184
buildPackages . bintools . bintools
170
185
stdenv . cc
171
- pkgsBuildBuild . haskell-nix . cabal-install . ${ compiler-nix-name }
172
186
( pkgsBuildBuild . pkg-config or pkgsBuildBuild . pkgconfig )
173
187
( tool "happy" )
174
188
( tool "alex" )
Original file line number Diff line number Diff line change 100
100
"ghc92"
101
101
"ghc94"
102
102
"ghc96"
103
- "ghc98" ] ( short-name : rec {
103
+ "ghc98"
104
+ "ghc910" ] ( short-name : rec {
104
105
inherit pkgs self toolsModule ;
105
106
compiler-nix-name = pkgs . haskell-nix . resolve-compiler-name short-name ;
106
107
compiler = pkgs . buildPackages . haskell-nix . compiler . ${ compiler-nix-name } ;
110
111
"ghc90"
111
112
"ghc92"
112
113
"ghc94"
114
+ "ghc910"
113
115
] ;
114
116
windows-compilers = pkgs :
115
117
pkgs . lib . optionalAttrs ( __elem system [ "x86_64-linux" ] )
You can’t perform that action at this time.
0 commit comments