From bc4fb072b8808109137925f54df105327057fa7b Mon Sep 17 00:00:00 2001 From: Vladislav Zavialov Date: Sun, 1 Oct 2023 13:54:35 +0300 Subject: [PATCH] Bump version to 2.0 --- ChangeLog.md | 5 ++++- happy.cabal | 14 +++++++------- packages/backend-glr/happy-backend-glr.cabal | 8 ++++---- packages/backend-lalr/happy-backend-lalr.cabal | 8 ++++---- packages/codegen-common/happy-codegen-common.cabal | 2 +- packages/frontend/happy-frontend.cabal | 6 +++--- packages/grammar/happy-grammar.cabal | 2 +- packages/tabular/happy-tabular.cabal | 4 ++-- 8 files changed, 26 insertions(+), 23 deletions(-) diff --git a/ChangeLog.md b/ChangeLog.md index 30882a99..318ff4ce 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,6 +1,6 @@ # Revision history for Happy -## Unreleased +## 2.0 The main focus of this release was modularizing Happy. @@ -12,6 +12,9 @@ The main focus of this release was modularizing Happy. - `happy-grammar` - `happy-tabular` +* Partially revert the new bootstrapping system of 1.21.0 to mitigate + build issues. + ## 1.21.0 The main focus of this release was revamping the build system and bootstrapping. diff --git a/happy.cabal b/happy.cabal index fac0dc7c..b49fbddc 100644 --- a/happy.cabal +++ b/happy.cabal @@ -1,5 +1,5 @@ name: happy -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow @@ -142,12 +142,12 @@ executable happy array, containers >= 0.4.2, mtl >= 2.2.1, - happy-codegen-common == 1.21.0, - happy-grammar == 1.21.0, - happy-tabular == 1.21.0, - happy-frontend == 1.21.0, - happy-backend-lalr == 1.21.0, - happy-backend-glr == 1.21.0 + happy-codegen-common == 2.0, + happy-grammar == 2.0, + happy-tabular == 2.0, + happy-frontend == 2.0, + happy-backend-lalr == 2.0, + happy-backend-glr == 2.0 default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns diff --git a/packages/backend-glr/happy-backend-glr.cabal b/packages/backend-glr/happy-backend-glr.cabal index 9ee76d98..933abd67 100644 --- a/packages/backend-glr/happy-backend-glr.cabal +++ b/packages/backend-glr/happy-backend-glr.cabal @@ -1,5 +1,5 @@ name: happy-backend-glr -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow @@ -49,9 +49,9 @@ library Happy.Backend.GLR.ProduceCode build-depends: base < 5, array, - happy-codegen-common == 1.21.0, - happy-grammar == 1.21.0, - happy-tabular == 1.21.0 + happy-codegen-common == 2.0, + happy-grammar == 2.0, + happy-tabular == 2.0 default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts diff --git a/packages/backend-lalr/happy-backend-lalr.cabal b/packages/backend-lalr/happy-backend-lalr.cabal index e1eee857..75afb1d2 100644 --- a/packages/backend-lalr/happy-backend-lalr.cabal +++ b/packages/backend-lalr/happy-backend-lalr.cabal @@ -1,5 +1,5 @@ name: happy-backend-lalr -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow @@ -49,9 +49,9 @@ library Happy.Backend.LALR.ProduceCode build-depends: base < 5, array, - happy-codegen-common == 1.21.0, - happy-grammar == 1.21.0, - happy-tabular == 1.21.0 + happy-codegen-common == 2.0, + happy-grammar == 2.0, + happy-tabular == 2.0 default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts diff --git a/packages/codegen-common/happy-codegen-common.cabal b/packages/codegen-common/happy-codegen-common.cabal index 2efc392d..519e7bc3 100644 --- a/packages/codegen-common/happy-codegen-common.cabal +++ b/packages/codegen-common/happy-codegen-common.cabal @@ -1,5 +1,5 @@ name: happy-codegen-common -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow diff --git a/packages/frontend/happy-frontend.cabal b/packages/frontend/happy-frontend.cabal index 8a5149e2..04197ca4 100644 --- a/packages/frontend/happy-frontend.cabal +++ b/packages/frontend/happy-frontend.cabal @@ -1,5 +1,5 @@ name: happy-frontend -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow @@ -54,8 +54,8 @@ library containers >= 0.4.2, transformers >= 0.5.6.2, mtl >= 2.2.2, - happy-codegen-common == 1.21.0, - happy-grammar == 1.21.0 + happy-codegen-common == 2.0, + happy-grammar == 2.0 default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts diff --git a/packages/grammar/happy-grammar.cabal b/packages/grammar/happy-grammar.cabal index f9f41229..7bad54bd 100644 --- a/packages/grammar/happy-grammar.cabal +++ b/packages/grammar/happy-grammar.cabal @@ -1,5 +1,5 @@ name: happy-grammar -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow diff --git a/packages/tabular/happy-tabular.cabal b/packages/tabular/happy-tabular.cabal index 0f572144..e68b4498 100644 --- a/packages/tabular/happy-tabular.cabal +++ b/packages/tabular/happy-tabular.cabal @@ -1,5 +1,5 @@ name: happy-tabular -version: 1.21.0 +version: 2.0 license: BSD2 license-file: LICENSE copyright: (c) Andy Gill, Simon Marlow @@ -47,7 +47,7 @@ library build-depends: base < 5, array, containers >= 0.4.2, - happy-grammar == 1.21.0 + happy-grammar == 2.0 default-language: Haskell98 default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns