on master help sign in
add support for GHC 8.10.2
commitbd179c618ffdcb917dc3306c7630025ee5042cb9 authorAgentM <agentm@themactionfaction.com> dateSun 4 Oct 2020, 23:55 (6 years ago) parent76effd4
3 files changed+15−9
project-m36.cabal+6−6 src/lib/ProjectM36/ScriptSession.hs+8−2 src/lib/ProjectM36/Server/ParseArgs.hs+1−1
project-m36.cabal+6−6
@@ -1,5 +1,5 @@
11Name: project-m36
2−Version: 0.8
2+Version: 0.8.1
33License: PublicDomain
44Build-Type: Simple
55Homepage: https://github.com/agentm/project-m36
@@ -34,9 +34,9 @@ Flag haskell-scripting
3434 Default: True
3535
3636Library
37− Build-Depends: base>=4.8 && < 4.14, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, binary, filepath, zlib, directory, vector-binary-instances, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, network-transport, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, distributed-process-client-server >= 0.2.3, distributed-process >= 0.7.4, distributed-process-extras >= 0.3.2, distributed-process-async >= 0.2.4.1, network-transport-tcp >= 0.6.0, network-transport, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.3
37+ Build-Depends: base>=4.8 && < 4.15, ghc-paths, mtl, containers, unordered-containers, hashable, haskeline, directory, MonadRandom, random-shuffle, uuid >= 1.3.12, cassava >= 0.4.5.1 && < 0.6, text, bytestring, deepseq, deepseq-generics, vector, parallel, monad-parallel, exceptions, transformers, gnuplot, binary, filepath, zlib, directory, vector-binary-instances, temporary, stm, time, hashable-time, old-locale, rset, attoparsec, either, base64-bytestring, data-interval, extended-reals, network-transport, aeson >= 1.1, path-pieces, conduit, resourcet, http-api-data, semigroups, QuickCheck, quickcheck-instances, distributed-process-client-server >= 0.2.3, distributed-process >= 0.7.4, distributed-process-extras >= 0.3.2, distributed-process-async >= 0.2.4.1, network-transport-tcp >= 0.6.0, network-transport, list-t, stm-containers >= 0.2.15, foldl, optparse-applicative, Glob, cryptohash-sha256, text-manipulate >= 0.2.0.1 && < 0.3
3838 if flag(haskell-scripting)
39− Build-Depends: ghc >= 8.2 && < 8.9
39+ Build-Depends: ghc >= 8.2 && < 8.11
4040 CPP-Options: -DPM36_HASKELL_SCRIPTING
4141 if impl(ghc>= 8) && flag(haskell-scripting)
4242 build-depends:
@@ -140,7 +140,7 @@ Library
140140
141141Executable tutd
142142 if flag(haskell-scripting)
143− Build-Depends: ghc >= 8.2 && < 8.9
143+ Build-Depends: ghc >= 8.2 && < 8.11
144144 Build-Depends: base >=4.8 && <5.0,
145145 ghc-paths,
146146 project-m36,
@@ -173,7 +173,7 @@ Executable tutd
173173 haskeline,
174174 random, MonadRandom,
175175 base64-bytestring,
176− optparse-applicative,
176+ optparse-applicative >= 0.16,
177177 attoparsec,
178178 stm-containers >= 1.0.0,
179179 list-t,
@@ -205,7 +205,7 @@ Executable tutd
205205
206206Executable project-m36-server
207207 if flag(haskell-scripting)
208− Build-Depends: ghc >= 8.2 && < 8.9
208+ Build-Depends: ghc >= 8.2 && < 8.11
209209 Build-Depends: base,
210210 ghc-paths,
211211 project-m36,
src/lib/ProjectM36/ScriptSession.hs+8−2
@@ -147,7 +147,9 @@ initScriptSession ghcPkgPaths = do
147147 ideclSourceSrc = Nothing,
148148#endif
149149
150−#if __GLASGOW_HASKELL__ >= 806
150+#if __GLASGOW_HASKELL__ >= 810
151+ ideclExt = noExtField,
152+#elif __GLASGOW_HASKELL__ >= 806
151153 ideclExt = NoExt,
152154#endif
153155 ideclName = noLoc mn,
@@ -155,7 +157,11 @@ initScriptSession ghcPkgPaths = do
155157 ideclSource = False,
156158 ideclSafe = True,
157159 ideclImplicit = False,
158− ideclQualified = isJust mQual,
160+#if __GLASGOW_HASKELL__ >= 810
161+ ideclQualified = if isJust mQual then QualifiedPre else NotQualified,
162+#else
163+ ideclQualified = isJust mQual
164+#endif
159165 ideclAs = mQual,
160166 ideclHiding = Nothing
161167 }
src/lib/ProjectM36/Server/ParseArgs.hs+1−1
@@ -73,7 +73,7 @@ parseConfigWithDefaults defaults = execParser (info (parseArgsWithDefaults defau
7373
7474
7575helpOption :: Parser (a -> a)
76−helpOption = abortOption ShowHelpText $ mconcat
76+helpOption = abortOption (ShowHelpText Nothing) $ mconcat
7777 [ long "help"
7878 , help "Show this help text"
7979 , hidden ]