Prepare 2.1.4 release

haskell · Jan 18, 2025 · f1d16ff · f1d16ff
1 parent 4a04395
commit f1d16ff
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,16 @@
 # Revision history for Happy
 
+## 2.1.4
+
+Move `Paths_happy_lib` into `tabular` to prevent a Cabal bug concerning
+--libsubdir (#328). It is likely that this release fixes
+`cabal v1-install happy` as well, which was broken since happy-2.0 (#315).
+
+## 2.1.3
+
+Auto-resolve shift/reduce conflicts involving the catch token.
+This was to support on going work in GHC to utilise the catch token.
+
 ## 2.1.2
 
 Fix a breaking change (#325) introduced by the previous fix for #131.

diff --git a/happy.cabal b/happy.cabal
@@ -1,5 +1,5 @@
 name: happy
-version: 2.1.3
+version: 2.1.4
 license: BSD2
 license-file: LICENSE
 copyright: (c) Andy Gill, Simon Marlow
@@ -139,7 +139,7 @@ executable happy
                  array,
                  containers >= 0.4.2,
                  mtl >= 2.2.1,
-                 happy-lib == 2.1.3
+                 happy-lib == 2.1.4
 
   default-language: Haskell98
   default-extensions: CPP, MagicHash, FlexibleContexts, NamedFieldPuns

diff --git a/lib/happy-lib.cabal b/lib/happy-lib.cabal
@@ -1,6 +1,6 @@
 cabal-version: 3.0
 name: happy-lib
-version: 2.1.3
+version: 2.1.4
 license: BSD-2-Clause
 copyright: (c) Andy Gill, Simon Marlow
 author: Andy Gill and Simon Marlow