Getting cabal build working

bjpop · Nov 22, 2024 · 1765d0a · 1765d0a
1 parent 8e0a43d
commit 1765d0a
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 6 deletions.
diff --git a/language-python-test/Setup.lhs b/language-python-test/Setup.lhs
diff --git a/language-python-test/test/CPython_test_suite_v2/UserString.py b/language-python-test/test/CPython_test_suite_v2/UserString.py
diff --git a/language-python-test/test/CPython_test_suite_v2/base64.py b/language-python-test/test/CPython_test_suite_v2/base64.py
diff --git a/language-python-test/test/CPython_test_suite_v2/cProfile.py b/language-python-test/test/CPython_test_suite_v2/cProfile.py
diff --git a/language-python-test/test/CPython_test_suite_v2/cgi.py b/language-python-test/test/CPython_test_suite_v2/cgi.py
diff --git a/language-python-test/test/CPython_test_suite_v2/fractions.py b/language-python-test/test/CPython_test_suite_v2/fractions.py
diff --git a/language-python-test/test/CPython_test_suite_v2/keyword.py b/language-python-test/test/CPython_test_suite_v2/keyword.py
diff --git a/language-python-test/test/CPython_test_suite_v2/mailbox.py b/language-python-test/test/CPython_test_suite_v2/mailbox.py
diff --git a/language-python-test/test/CPython_test_suite_v2/make_test.sh b/language-python-test/test/CPython_test_suite_v2/make_test.sh
diff --git a/language-python-test/test/CPython_test_suite_v2/mimify.py b/language-python-test/test/CPython_test_suite_v2/mimify.py
diff --git a/language-python-test/test/CPython_test_suite_v2/pdb.py b/language-python-test/test/CPython_test_suite_v2/pdb.py
diff --git a/language-python-test/test/CPython_test_suite_v2/platform.py b/language-python-test/test/CPython_test_suite_v2/platform.py
diff --git a/language-python-test/test/CPython_test_suite_v2/profile.py b/language-python-test/test/CPython_test_suite_v2/profile.py
diff --git a/language-python-test/test/CPython_test_suite_v2/pydoc.py b/language-python-test/test/CPython_test_suite_v2/pydoc.py
diff --git a/language-python-test/test/CPython_test_suite_v2/quopri.py b/language-python-test/test/CPython_test_suite_v2/quopri.py
diff --git a/language-python-test/test/CPython_test_suite_v2/runpy.py b/language-python-test/test/CPython_test_suite_v2/runpy.py
diff --git a/language-python-test/test/CPython_test_suite_v2/smtpd.py b/language-python-test/test/CPython_test_suite_v2/smtpd.py
diff --git a/language-python-test/test/CPython_test_suite_v2/smtplib.py b/language-python-test/test/CPython_test_suite_v2/smtplib.py
diff --git a/language-python-test/test/CPython_test_suite_v2/symbol.py b/language-python-test/test/CPython_test_suite_v2/symbol.py
diff --git a/language-python-test/test/CPython_test_suite_v2/tabnanny.py b/language-python-test/test/CPython_test_suite_v2/tabnanny.py
diff --git a/language-python-test/test/CPython_test_suite_v2/token.py b/language-python-test/test/CPython_test_suite_v2/token.py
diff --git a/language-python-test/test/CPython_test_suite_v2/uu.py b/language-python-test/test/CPython_test_suite_v2/uu.py
diff --git a/language-python-test/test/CPython_test_suite_v3/make_test.sh b/language-python-test/test/CPython_test_suite_v3/make_test.sh
diff --git a/language-python-test/test/CPython_test_suite_v3/test_userstring.py b/language-python-test/test/CPython_test_suite_v3/test_userstring.py
diff --git a/language-python-test/test/make_utf8.sh b/language-python-test/test/make_utf8.sh
diff --git a/language-python/Setup.lhs b/language-python/Setup.lhs
diff --git a/language-python/language-python.cabal b/language-python/language-python.cabal
@@ -43,7 +43,8 @@ Library
       transformers >= 0.3 && < 0.7,
       monads-tf == 0.1.*,
       utf8-string >= 1 && < 2
-   build-tools: happy, alex
+   build-tools: happy >= 1.20, alex
+   build-tool-depends: happy:happy
    exposed-modules:
       Language.Python.Common
       Language.Python.Common.ParseError

diff --git a/language-python/src/Language/Python/Version2/Parser/Parser.y b/language-python/src/Language/Python/Version2/Parser/Parser.y
@@ -1,8 +1,9 @@
 {
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
 
-#undef __GLASGOW_HASKELL__
-#define __GLASGOW_HASKELL__ 709
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Language.Python.Version2.Parser.Parser 

diff --git a/language-python/src/Language/Python/Version3/Parser/Parser.y b/language-python/src/Language/Python/Version3/Parser/Parser.y
@@ -1,8 +1,9 @@
 {
+{-# LANGUAGE BangPatterns #-}
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
 
-#undef __GLASGOW_HASKELL__
-#define __GLASGOW_HASKELL__ 709
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Language.Python.Version3.Parser.Parser 

diff --git a/language-python/stack.yaml b/language-python/stack.yaml
@@ -1,10 +1,13 @@
-resolver: lts-10.2
+resolver: lts-20.26
 
 packages:
 - .
 
 extra-deps: []
 
+system-ghc: false
+install-ghc: true
+
 # Override default flag values for local packages and extra-deps
 # flags: {}