From afed9dbda55b776a60cb576062828376ade55246 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 12 Jan 2026 08:15:02 +0100 Subject: [PATCH 1/2] Bump cabal-version to 1.18 --- happy.cabal | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/happy.cabal b/happy.cabal index ae9cef27..42a77935 100644 --- a/happy.cabal +++ b/happy.cabal @@ -1,3 +1,4 @@ +cabal-version: 1.18 name: happy version: 2.1.7 license: BSD2 @@ -10,7 +11,6 @@ stability: stable homepage: https://www.haskell.org/happy/ synopsis: Happy is a parser generator for Haskell category: Development -cabal-version: >= 1.10 build-type: Simple Description: @@ -34,10 +34,12 @@ tested-with: GHC == 8.2.2 GHC == 8.0.2 -extra-source-files: +extra-doc-files: ChangeLog.md - Makefile README.md + +extra-source-files: + Makefile examples/glr/nlp/Main.lhs examples/glr/nlp/Makefile examples/glr/nlp/README From a0d35468a1b933c3de0fad6392138f341ef797b5 Mon Sep 17 00:00:00 2001 From: Andreas Abel Date: Mon, 12 Jan 2026 08:16:43 +0100 Subject: [PATCH 2/2] Remove unused packages from happy executable --- .github/workflows/haskell-ci.yml | 4 ++++ cabal.haskell-ci | 2 +- happy.cabal | 3 --- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/haskell-ci.yml b/.github/workflows/haskell-ci.yml index 51b85bf2..34d105b0 100644 --- a/.github/workflows/haskell-ci.yml +++ b/.github/workflows/haskell-ci.yml @@ -227,6 +227,10 @@ jobs: if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "package happy" >> cabal.project ; fi if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods -Werror=missing-fields" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package happy-lib" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo "package happy" >> cabal.project ; fi + if [ $((HCNUMVER >= 90000)) -ne 0 ] ; then echo " ghc-options: -Werror=unused-packages" >> cabal.project ; fi cat >> cabal.project <> cabal.project.local diff --git a/cabal.haskell-ci b/cabal.haskell-ci index 40d844cb..b87d9fd0 100644 --- a/cabal.haskell-ci +++ b/cabal.haskell-ci @@ -1,6 +1,6 @@ branches: master error-incomplete-patterns: False -error-unused-packages: False +error-unused-packages: >=9 -- Specify 'constraint: ... installed' packages installed: +all -transformers -mtl diff --git a/happy.cabal b/happy.cabal index 42a77935..c94b18e5 100644 --- a/happy.cabal +++ b/happy.cabal @@ -141,9 +141,6 @@ executable happy main-is: Main.lhs build-depends: base >= 4.9 && < 5, - array, - containers >= 0.4.2, - mtl >= 2.2.1, happy-lib == 2.1.7 default-language: Haskell98