diff options
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/patches/fix-newer-happy.patch | 45 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 52 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog index 6458893..bd39674 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +haskell-language-python (0.5.8-6) unstable; urgency=medium + + * Fix FTBFS with newer happy + + -- Scott Talbert <swt@techie.net> Mon, 09 Feb 2026 15:06:43 -0500 + haskell-language-python (0.5.8-5) unstable; urgency=medium [ Scott Talbert ] diff --git a/debian/patches/fix-newer-happy.patch b/debian/patches/fix-newer-happy.patch new file mode 100644 index 0000000..91d321b --- /dev/null +++ b/debian/patches/fix-newer-happy.patch @@ -0,0 +1,45 @@ +From 58f62c9e09d5a239b2502469923c6d87a227d9de Mon Sep 17 00:00:00 2001 +From: Bram Vandenbogaerde <bram@vdb.space> +Date: Tue, 24 Sep 2024 22:46:53 +0200 +Subject: [PATCH] fix: stop redefining the GHC version to fix incompatibilities + between Int# and Int32# in happy + +--- + language-python/src/Language/Python/Version2/Parser/Parser.y | 5 ++++- + language-python/src/Language/Python/Version3/Parser/Parser.y | 4 ++++ + 2 files changed, 8 insertions(+), 1 deletion(-) + +diff --git a/language-python/src/Language/Python/Version2/Parser/Parser.y b/language-python/src/Language/Python/Version2/Parser/Parser.y +index b06d47e..b312349 100644 +--- a/src/Language/Python/Version2/Parser/Parser.y ++++ b/src/Language/Python/Version2/Parser/Parser.y +@@ -1,8 +1,11 @@ + { + {-# LANGUAGE CPP #-} + +-#undef __GLASGOW_HASKELL__ ++-- For legacy reasons ++#if __GLASGOW_HASKELL__ < 901 ++#undef __GLASGOW_HASKELL_ + #define __GLASGOW_HASKELL__ 709 ++#endif + ----------------------------------------------------------------------------- + -- | + -- 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 +index 214faeb..d473be4 100644 +--- a/src/Language/Python/Version3/Parser/Parser.y ++++ b/src/Language/Python/Version3/Parser/Parser.y +@@ -1,8 +1,12 @@ + { + {-# LANGUAGE CPP #-} + ++-- For legacy reasons ++#if __GLASGOW_HASKELL__ < 901 + #undef __GLASGOW_HASKELL__ + #define __GLASGOW_HASKELL__ 709 ++#endif ++ + ----------------------------------------------------------------------------- + -- | + -- Module : Language.Python.Version3.Parser.Parser diff --git a/debian/patches/series b/debian/patches/series index 58889b7..307930e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ newer-deps +fix-newer-happy.patch |