diff options
| author | Arianna Masciolini <uzkamascio@gmail.com> | 2025-08-08 18:17:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-08 18:17:45 +0200 |
| commit | 726fb3467c1d1c1b6c15afc54ec81ad06528e7ac (patch) | |
| tree | bef97a1d1d005d96d23382225cd8dd47dfb467b7 /src | |
| parent | e7c0b6dada71f16160aa60e6fed6251280cbaf16 (diff) | |
| parent | b02bb08532705fac2b803e7a739edd643264c547 (diff) | |
Merge pull request #191 from GrammaticalFramework/minor-updates-binary-packages
Update release scripts for 3.12
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/GF/Interactive2.hs | 2 | ||||
| -rw-r--r-- | src/runtime/haskell-bind/pgf2.cabal | 4 | ||||
| -rw-r--r-- | src/runtime/python/setup.py | 2 | ||||
| -rw-r--r-- | src/server/PGFService.hs | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/GF/Interactive2.hs b/src/compiler/GF/Interactive2.hs index d429b4530..f0c3f6043 100644 --- a/src/compiler/GF/Interactive2.hs +++ b/src/compiler/GF/Interactive2.hs @@ -12,7 +12,7 @@ import GF.Command.Abstract import GF.Command.Parse(readCommandLine,pCommand) import GF.Data.Operations (Err(..)) import GF.Data.Utilities(whenM,repeatM) - +import Control.Monad (join, when, (<=<)) import GF.Infra.UseIO(ioErrorText,putStrLnE) import GF.Infra.SIO import GF.Infra.Option diff --git a/src/runtime/haskell-bind/pgf2.cabal b/src/runtime/haskell-bind/pgf2.cabal index 83c990bf3..d7a98489e 100644 --- a/src/runtime/haskell-bind/pgf2.cabal +++ b/src/runtime/haskell-bind/pgf2.cabal @@ -15,7 +15,7 @@ homepage: https://www.grammaticalframework.org/ bug-reports: https://github.com/GrammaticalFramework/gf-core/issues author: Krasimir Angelov extra-source-files: CHANGELOG.md, README.md -tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4 +tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4, GHC=9.6.6 library exposed-modules: @@ -26,7 +26,7 @@ library PGF2.Expr, PGF2.Type build-depends: - base >= 4.9.1 && < 4.16, + base >= 4.9.1 && < 4.22, containers >= 0.5.7 && < 0.7, pretty >= 1.1.3 && < 1.2 default-language: Haskell2010 diff --git a/src/runtime/python/setup.py b/src/runtime/python/setup.py index fdc2fe8c5..52078649d 100644 --- a/src/runtime/python/setup.py +++ b/src/runtime/python/setup.py @@ -1,4 +1,4 @@ -from distutils.core import setup, Extension +from setuptools import setup, Extension import os includes = os.getenv('EXTRA_INCLUDE_DIRS','').split(':') diff --git a/src/server/PGFService.hs b/src/server/PGFService.hs index 6e72ce5ea..fda611fdc 100644 --- a/src/server/PGFService.hs +++ b/src/server/PGFService.hs @@ -159,13 +159,13 @@ cpgfMain qsem command (t,(pgf,pc)) = -> out t=<< bracketedLin # tree % to "c-linearizeAll"-> out t=<< linAll # tree % to "c-translate" -> withQSem qsem $ - out t=<<join(trans # input % cat % to % start % limit%treeopts) + out t=<<join(trans # input % cat % to % start % limit % treeopts) "c-lookupmorpho"-> out t=<< morpho # from1 % textInput "c-lookupcohorts"->out t=<< cohorts # from1 % getInput "filter" % textInput "c-flush" -> out t=<< flush "c-grammar" -> out t grammar "c-abstrtree" -> outputGraphviz=<< C.graphvizAbstractTree pgf C.graphvizDefaults # tree - "c-parsetree" -> outputGraphviz=<< (\cnc -> C.graphvizParseTree cnc C.graphvizDefaults) . snd # from1 %tree + "c-parsetree" -> outputGraphviz=<< (\cnc -> C.graphvizParseTree cnc C.graphvizDefaults) . snd # from1 % tree "c-wordforword" -> out t =<< wordforword # input % cat % to _ -> badRequest "Unknown command" command where |