Add MHS as a recognized compiler. (#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
haskell · Jun 15, 2024 · 243a69e · 243a69e
1 parent f669d09
commit 243a69e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/Cabal-syntax/src/Distribution/Compiler.hs b/Cabal-syntax/src/Distribution/Compiler.hs
@@ -75,6 +75,7 @@ data CompilerFlavor
   | LHC
   | UHC
   | Eta
+  | MHS -- MicroHS, see https://github.com/augustss/MicroHs
   | HaskellSuite String -- string is the id of the actual compiler
   | OtherCompiler String
   deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
@@ -85,7 +86,7 @@ instance NFData CompilerFlavor where rnf = genericRnf
 
 knownCompilerFlavors :: [CompilerFlavor]
 knownCompilerFlavors =
-  [GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta]
+  [GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta, MHS]
 
 instance Pretty CompilerFlavor where
   pretty (OtherCompiler name) = Disp.text name

diff --git a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
@@ -33,15 +33,27 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
 md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
 md5CheckGenericPackageDescription proxy = md5Check proxy
 #if MIN_VERSION_base(4,19,0)
+<<<<<<< HEAD
     0x7559521b9eb2e2fa4a608a86c629dc17
 #else
     0xa78ea118e2e29b5809d359c9431df3ba
+=======
+    0x44f8430d7366cf849e09669627573040
+#else
+    0x8ed837568017bde3abb4fcee244b9c9f
+>>>>>>> 3169b879c (Add MHS as a recognized compiler. (#9878))
 #endif
 
 md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
 md5CheckLocalBuildInfo proxy = md5Check proxy
 #if MIN_VERSION_base(4,19,0)
+<<<<<<< HEAD
     0x8a8e81b52a34b8610acdcd0b9d488940
 #else
     0xb53fbd58281a6f329f7b659d91fcd86e
+=======
+    0xdff58fe5e7f9568c67cd982eaba7edc2
+#else
+    0x4e50a4a95779b862edde3d6696797251
+>>>>>>> 3169b879c (Add MHS as a recognized compiler. (#9878))
 #endif
diff --git a/changelog.d/pr-9878 b/changelog.d/pr-9878
@@ -0,0 +1,8 @@
+synopsis: Add mhs as a known Haskell compiler
+packages: Cabal
+issues:
+prs: #9878
+
+description: {
+This simply add MHS to the enumeration of known Haskell compilers.
+}