Skip to content

Commit df86a22

Browse files
committed
Portage.GHCCore: Add ghc versions 9.4.6 and 9.6.2
Signed-off-by: hololeap <hololeap@users.noreply.github.com>
1 parent 6f90b87 commit df86a22

1 file changed

Lines changed: 82 additions & 1 deletion

File tree

src/Portage/GHCCore.hs

Lines changed: 82 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import Debug.Trace
4040
-- The first @GHC@ version in this list is a minimum default.
4141
ghcs :: [(DC.CompilerInfo, InstalledPackageIndex)]
4242
ghcs =
43-
[ ghc8106, ghc902, ghc924, ghc925, ghc926, ghc927, ghc945
43+
[ ghc8106, ghc902, ghc924, ghc925, ghc926, ghc927, ghc945, ghc946, ghc962
4444
]
4545

4646
-- | Maybe determine the appropriate 'Cabal.Version' of the @Cabal@ package
@@ -59,6 +59,8 @@ cabalFromGHC ver = lookup ver table
5959
, ([9,2,6], Cabal.mkVersion [3,6,3,0])
6060
, ([9,2,7], Cabal.mkVersion [3,6,3,0])
6161
, ([9,4,5], Cabal.mkVersion [3,8,1,0])
62+
, ([9,4,6], Cabal.mkVersion [3,8,1,0])
63+
, ([9,6,2], Cabal.mkVersion [3,10,1,0])
6264
]
6365

6466
platform :: Platform
@@ -140,6 +142,12 @@ ghc :: [Int] -> DC.CompilerInfo
140142
ghc nrs = DC.unknownCompilerInfo c_id DC.NoAbiTag
141143
where c_id = CompilerId GHC (mkVersion nrs)
142144

145+
ghc962 :: (DC.CompilerInfo, InstalledPackageIndex)
146+
ghc962 = (ghc [9,6,2], mkIndex ghc962_pkgs)
147+
148+
ghc946 :: (DC.CompilerInfo, InstalledPackageIndex)
149+
ghc946 = (ghc [9,4,6], mkIndex ghc946_pkgs)
150+
143151
ghc945 :: (DC.CompilerInfo, InstalledPackageIndex)
144152
ghc945 = (ghc [9,4,5], mkIndex ghc945_pkgs)
145153

@@ -171,6 +179,79 @@ ghc8106 = (ghc [8,10,6], mkIndex ghc8106_pkgs)
171179
-- * https://gitlab.haskell.org/ghc/ghc/-/blob/ghc-9.0.2-release/compiler/ghc.cabal.in#L60-77
172180
-- * https://flora.pm/packages/%40hackage/ghc/9.0.2/dependencies
173181
-- * https://gitlab.haskell.org/ghc/ghc/-/wikis/commentary/libraries/version-history
182+
ghc962_pkgs :: [Cabal.PackageIdentifier]
183+
ghc962_pkgs =
184+
[ p "array" [0,5,5,0]
185+
, p "base" [4,18,0,0]
186+
, p "binary" [0,8,9,1] -- used by libghc
187+
, p "bytestring" [0,11,5,1] -- MUST BE PATCHED on ghc-9.6.2
188+
-- , p "Cabal" [3,6,3,0] package is upgradeable
189+
, p "containers" [0,6,7]
190+
, p "deepseq" [1,4,8,1] -- used by time
191+
, p "directory" [1,3,8,1]
192+
, p "exceptions" [0,10,7] -- used by libghc
193+
, p "filepath" [1,4,100,1]
194+
, p "ghc-bignum" [1,3]
195+
, p "ghc-boot" [9,6,2]
196+
, p "ghc-boot-th" [9,6,2]
197+
, p "ghc-compact" [0,1,0,0]
198+
, p "ghc-prim" [0,10,0]
199+
, p "ghc-heap" [9,6,2]
200+
, p "ghci" [9,6,2]
201+
-- , p "haskeline" [0,8,2] package is upgradeable
202+
, p "hpc" [0,6,2,0] -- used by libghc
203+
, p "integer-gmp" [1,1]
204+
, p "mtl" [2,3,1] -- used by exceptions
205+
-- , p "parsec" [3,1,15,0] -- package is upgradeable
206+
, p "pretty" [1,1,3,6]
207+
, p "process" [1,6,17,0]
208+
, p "stm" [2,5,1,0]
209+
, p "template-haskell" [2,20,0,0] -- used by libghc
210+
, p "terminfo" [0,4,1,6] -- used by libghc
211+
-- , p "text" [1,2,5,0] -- package is upgradeable
212+
, p "time" [1,12,2] -- used by unix, directory, hpc, ghc. unsafe to upgrade
213+
, p "transformers" [0,6,1,0] -- used by libghc
214+
, p "unix" [2,8,1,0]
215+
-- , p "xhtml" [3000,2,2,1]
216+
]
217+
218+
ghc946_pkgs :: [Cabal.PackageIdentifier]
219+
ghc946_pkgs =
220+
[ p "array" [0,5,4,0]
221+
, p "base" [4,17,2,0]
222+
, p "binary" [0,8,9,1] -- used by libghc
223+
, p "bytestring" [0,11,5,1]
224+
-- , p "Cabal" [3,6,3,0] package is upgradeable
225+
, p "containers" [0,6,7]
226+
, p "deepseq" [1,4,8,0] -- used by time
227+
, p "directory" [1,3,7,1]
228+
, p "exceptions" [0,10,5] -- used by libghc
229+
, p "filepath" [1,4,2,2]
230+
, p "ghc-bignum" [1,3]
231+
, p "ghc-boot" [9,4,6]
232+
, p "ghc-boot-th" [9,4,6]
233+
, p "ghc-compact" [0,1,0,0]
234+
, p "ghc-prim" [0,9,1]
235+
, p "ghc-heap" [9,4,6]
236+
, p "ghci" [9,4,6]
237+
-- , p "haskeline" [0,8,2] package is upgradeable
238+
, p "hpc" [0,6,1,0] -- used by libghc
239+
, p "integer-gmp" [1,1]
240+
, p "mtl" [2,2,2] -- used by exceptions
241+
-- , p "parsec" [3,1,15,0] -- package is upgradeable
242+
, p "pretty" [1,1,3,6]
243+
, p "process" [1,6,17,0]
244+
, p "stm" [2,5,1,0]
245+
, p "template-haskell" [2,19,0,0] -- used by libghc
246+
, p "terminfo" [0,4,1,5] -- used by libghc
247+
-- , p "text" [1,2,5,0] -- package is upgradeable
248+
, p "time" [1,12,2] -- used by unix, directory, hpc, ghc. unsafe to upgrade
249+
, p "transformers" [0,5,6,2] -- used by libghc
250+
, p "unix" [2,7,3]
251+
-- , p "xhtml" [3000,2,2,1]
252+
]
253+
254+
174255
ghc945_pkgs :: [Cabal.PackageIdentifier]
175256
ghc945_pkgs =
176257
[ p "array" [0,5,4,0]

0 commit comments

Comments
 (0)