Skip to content

Commit 2338e1d

Browse files
mergify[bot]augustssgeekosaur
authored
Add MHS as a recognized compiler. (backport haskell#9878) (haskell#10119)
* Add MHS as a recognized compiler. (haskell#9878) * Add MHS as a recognized compiler. * Add Changelog entry * Add comment. * Update checksums. * Update more checksums. --------- Co-authored-by: Lennart Augustsson <[email protected]> (cherry picked from commit 3169b87) # Conflicts: # Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs * fixup! Add MHS as a recognized compiler. (haskell#9878) --------- Co-authored-by: Lennart Augustsson <[email protected]> Co-authored-by: brandon s allbery kf8nh <[email protected]>
1 parent f669d09 commit 2338e1d

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

Cabal-syntax/src/Distribution/Compiler.hs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ data CompilerFlavor
7575
| LHC
7676
| UHC
7777
| Eta
78+
| MHS -- MicroHS, see https://github.com/augustss/MicroHs
7879
| HaskellSuite String -- string is the id of the actual compiler
7980
| OtherCompiler String
8081
deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
@@ -85,7 +86,7 @@ instance NFData CompilerFlavor where rnf = genericRnf
8586

8687
knownCompilerFlavors :: [CompilerFlavor]
8788
knownCompilerFlavors =
88-
[GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta]
89+
[GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta, MHS]
8990

9091
instance Pretty CompilerFlavor where
9192
pretty (OtherCompiler name) = Disp.text name

Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,15 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
3333
md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
3434
md5CheckGenericPackageDescription proxy = md5Check proxy
3535
#if MIN_VERSION_base(4,19,0)
36-
0x7559521b9eb2e2fa4a608a86c629dc17
36+
0x4d8ea0a071f0d5a3aca3fbdfef91bae2
3737
#else
38-
0xa78ea118e2e29b5809d359c9431df3ba
38+
0x0e3685f57e01297a9aa9637729681b94
3939
#endif
4040

4141
md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
4242
md5CheckLocalBuildInfo proxy = md5Check proxy
4343
#if MIN_VERSION_base(4,19,0)
44-
0x8a8e81b52a34b8610acdcd0b9d488940
44+
0x1be858ee00c3e2d4be5331d5f07bfdf7
4545
#else
46-
0xb53fbd58281a6f329f7b659d91fcd86e
46+
0x8a5431ab053f8f48c15b303444fa2c39
4747
#endif

changelog.d/pr-9878

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
synopsis: Add mhs as a known Haskell compiler
2+
packages: Cabal
3+
issues:
4+
prs: #9878
5+
6+
description: {
7+
This simply add MHS to the enumeration of known Haskell compilers.
8+
}

0 commit comments

Comments
 (0)