From 996980f7ca79d86bb8649319daf15e0eb2c17f5c Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Mon, 23 Sep 2024 14:42:23 +0200 Subject: [PATCH] Remove `happy-lib:` prefix to support Cabal < 3.2 --- lib/happy-lib.cabal | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lib/happy-lib.cabal b/lib/happy-lib.cabal index cfccd29a..209fac8f 100644 --- a/lib/happy-lib.cabal +++ b/lib/happy-lib.cabal @@ -87,7 +87,7 @@ library frontend Happy.Frontend.AbsSyn, Happy.Frontend.Mangler, Happy.Frontend.PrettyGrammar - build-depends: base < 5, array, transformers, containers, mtl, happy-lib:grammar + build-depends: base < 5, array, transformers, containers, mtl, grammar other-modules: Happy.Frontend.ParseMonad Happy.Frontend.ParseMonad.Class @@ -107,7 +107,7 @@ library tabular Happy.Tabular.Info, Happy.Tabular.LALR, Happy.Tabular.NameSet - build-depends: base < 5, array, containers, happy-lib:grammar + build-depends: base < 5, array, containers, grammar library backend-lalr @@ -115,7 +115,7 @@ library backend-lalr hs-source-dirs: backend-lalr/src exposed-modules: Happy.Backend.LALR, Happy.Backend.LALR.ProduceCode - build-depends: base < 5, array, happy-lib:grammar, happy-lib:tabular + build-depends: base < 5, array, grammar, tabular other-modules: Paths_happy_lib autogen-modules: Paths_happy_lib @@ -124,7 +124,7 @@ library backend-glr hs-source-dirs: backend-glr/src exposed-modules: Happy.Backend.GLR, Happy.Backend.GLR.ProduceCode - build-depends: base < 5, array, happy-lib:grammar, happy-lib:tabular + build-depends: base < 5, array, grammar, tabular other-modules: Paths_happy_lib autogen-modules: Paths_happy_lib @@ -150,8 +150,10 @@ library containers >= 0.4.2, transformers >= 0.5.6.2, mtl >= 2.2.1, - happy-lib:grammar, - happy-lib:tabular, - happy-lib:frontend, - happy-lib:backend-lalr, - happy-lib:backend-glr + -- NB: omit the `happy-lib:` prefix in happy-lib:grammar. + -- Otherwise we unnecessarily break Cabal < 3.4 + grammar, + tabular, + frontend, + backend-lalr, + backend-glr