From 3169b879c518cea9711fbb1296e44dab1439179b Mon Sep 17 00:00:00 2001 From: Lennart Augustsson Date: Sun, 16 Jun 2024 00:01:44 +0200 Subject: [PATCH] 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 --- Cabal-syntax/src/Distribution/Compiler.hs | 3 ++- .../tests/UnitTests/Distribution/Utils/Structured.hs | 8 ++++---- changelog.d/pr-9878 | 8 ++++++++ 3 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 changelog.d/pr-9878 diff --git a/Cabal-syntax/src/Distribution/Compiler.hs b/Cabal-syntax/src/Distribution/Compiler.hs index 8fb3f88851e..d715efbf951 100644 --- 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 index 641551473e8..54624a617c3 100644 --- a/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs +++ b/Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs @@ -33,15 +33,15 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion md5CheckGenericPackageDescription proxy = md5Check proxy #if MIN_VERSION_base(4,19,0) - 0x4acd7857947385180d814f36dc1a759e + 0x44f8430d7366cf849e09669627573040 #else - 0x3ff3fa6c3c570bcafa10b457b1208cc8 + 0x8ed837568017bde3abb4fcee244b9c9f #endif md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion md5CheckLocalBuildInfo proxy = md5Check proxy #if MIN_VERSION_base(4,19,0) - 0x552eca9ce2e4a34e74deff571f279fc4 + 0xdff58fe5e7f9568c67cd982eaba7edc2 #else - 0x48497d6b3f15df06f1107b81b98febe1 + 0x4e50a4a95779b862edde3d6696797251 #endif diff --git a/changelog.d/pr-9878 b/changelog.d/pr-9878 new file mode 100644 index 00000000000..c4c5de13f61 --- /dev/null +++ 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. +}