Accepting request 1297801 from devel:languages:haskell

version update OBS-URL: https://build.opensuse.org/request/show/1297801 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/happy?expand=0&rev=31
osc copypac from project:devel:languages:haskell:ghc-9.12.x package:happy revision:6, using keep-link
2025-08-06 12:34:01 +00:00 · 2025-08-05 16:03:08 +00:00 · 2023-10-11 21:56:34 +00:00 · 2023-10-04 12:44:00 +00:00 · 2023-04-04 19:25:15 +00:00 · 2023-03-30 17:39:01 +00:00
4 changed files with 131 additions and 34 deletions
--- a/happy-1.20.1.1.tar.gz
+++ b/happy-1.20.1.1.tar.gz
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8b4e7dc5a6c5fd666f8f7163232931ab28746d0d17da8fa1cbd68be9e878881b
-size 183409
--- a/happy-2.1.6.tar.gz
+++ b/happy-2.1.6.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9b473961010cb5673510f4133d914b9d5ad667b16aafe4a5555d9962dbf05b19
+size 61435
--- a/happy.changes
+++ b/happy.changes
@@ -1,3 +1,125 @@
+-------------------------------------------------------------------
+Thu Jul 17 09:15:57 UTC 2025 - Peter Simons <psimons@suse.com>
+
+- Update happy to version 2.1.6.
+  ## 2.1.6
+
+  * No longer emit `{-# LANGUAGE PartialTypeSignatures #-}` twice
+    ([#339](https://github.com/haskell/happy/issues/339)).
+
+  * No longer emit `import Data.Function` twice
+    ([#341](https://github.com/haskell/happy/issues/341)).
+
+  * Tested with GHC 8.0 - 9.12.2.
+    The Haskell code generated by Happy is for GHC 8.0 and up.
+
+  ## 2.1.5
+
+  Add `Data.Tuple` to `Happy_Prelude` in order to fix the `--debug` build (#330).
+
+  ## 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.
+  Prelude is no longer used by Happy.
+
+  ## 2.1.1
+
+  This release fixes two breaking changes:
+
+  * Properly qualify all uses of Prelude functions, fixing #131
+  * Bring back the old `%errorhandlertype` directive, the use of which is
+    discouraged in favour of the "Reporting expected tokens" mechanism
+    in Happy 2.1, accesible via `%error.expected`.
+
+  ## 2.1
+
+  * Added `--numeric-version` CLI flag.
+  * Documented and implemented the new feature "Resumptive parsing with ``catch``"
+  * Documented (and reimplemented) the "Reporting expected tokens" feature
+    (which turned to cause a breaking change in this release: #320)
+
+  ## 2.0.2
+
+  The 2.0.1 release in turn exposed two more regressions:
+
+  * Generated code uses PatternGuards without declaring it (#309)
+  * Use of `happy-lib:*` syntax to depend on private library components triggered
+    a bug in Cabal versions 3.0 and 3.2 (#311)
+
+  This release fixes both.
+
+  ## 2.0.1
+
+  The 2.0 release changed the indentation character from tabs to two spaces, triggering an
+  unforced breaking change in GHC (#303).
+  This release provides the fix by using eight spaces for indentation.
+
+  ## 2.0
+
+  There are two main breaking changes in this release:
+
+  1. Removed non-array, non-GHC modes, so flags `-ag` are the default now and
+     become no-ops.
+  2. Generated parsers now activate the language extension `-XNoStrictData` without
+     which every use of a happy parser would lead to an immediate crash (#273).
+     This causes us to drop support for GHC < 8.0.
+
+  Furthermore, the project structure was modularized and a library `happy-lib`
+  containing the implmentation of the `happy` executable was extracted.
+
+  Quite similar to the situation with GHC vs. the GHC API, we expect that `happy`
+  will continue to be a stable CLI tool with solid (if occasionally out of date)
+  documentation, while the design, documentation and implementation of `happy-lib`
+  is still in flux and use is only recommended to expert users.
+
+  Other, more minor changes:
+
+  * Revert the new bootstrapping system of 1.21.0 to mitigate build issues (#255, #274).
+
+  * Encode action table offsets in 32 bit instead of 16 bit (#93, #199, #266).
+    This increases the size of generated parsers a bit (about 250KB for GHC's
+    parser), but also manages to generate parsers for grammars that were
+    previously running into the size limit (#199).
+
+  * The documentation has been converted to ReStructuredText,
+    hosted at https://haskell-happy.readthedocs.io/en/latest/ (#226)
+
+  * A few internal refactorings to the structure of generated code.
+
+  ## 1.21.0
+
+  The main focus of this release was revamping the build system and bootstrapping.
+
+  * The release no longer contains generated source code. Instead of simply
+    requiring a pre-built bootstrap version of Happy in that event, we have a
+    parser-combination-based implementation of enough of Happy to bootstrap the
+    rest. (Currently, the bootstrap version is everything but attribute grammars,
+    and thus sufficient for e.g. GHC, but this is subject to change.) The
+    bootstrap version of Happy is then sufficient to build Happy once again with
+    all features enabled.
+
+    Note, this means users of attribute grammars will have to modify the way
+    they build happy if they were previously building from Hackage relying on the
+    pre-generated sources.
+
+  * Rather than creating many "templates" at build time, there is a single
+    combined template. Different implementations are chosen using CPP, as was
+    already done  within the templates before.
+
+  * Some imports were tightened down, which may help building with newer versions
+    of `base`.
+
 -------------------------------------------------------------------
 Wed Oct  4 08:34:54 UTC 2023 - Peter Simons <psimons@suse.com>

--- a/happy.spec
+++ b/happy.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package happy
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2025 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,15 +18,12 @@

 %bcond_with tests
 Name:           happy
-Version:        1.20.1.1
+Version:        2.1.6
 Release:        0
 Summary:        Happy is a parser generator for Haskell
 License:        BSD-2-Clause
 URL:            https://hackage.haskell.org/package/%{name}
 Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%{version}.tar.gz
-BuildRequires:  autoconf
-BuildRequires:  docbook-dtd
-BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  ghc-Cabal-devel
 BuildRequires:  ghc-array-devel
 BuildRequires:  ghc-array-prof
@@ -34,11 +31,12 @@ BuildRequires:  ghc-base-devel
 BuildRequires:  ghc-base-prof
 BuildRequires:  ghc-containers-devel
 BuildRequires:  ghc-containers-prof
+BuildRequires:  ghc-happy-lib-devel
+BuildRequires:  ghc-happy-lib-prof
 BuildRequires:  ghc-mtl-devel
 BuildRequires:  ghc-mtl-prof
 BuildRequires:  ghc-rpm-macros
-BuildRequires:  libxml2
-BuildRequires:  libxslt
+Requires:       ghc-happy-lib-templates
 ExcludeArch:    %{ix86}
 %if %{with tests}
 BuildRequires:  ghc-process-devel
@@ -56,39 +54,16 @@ to the 'yacc' tool for C.
 %build
 %define cabal_configure_options -f-bootstrap
 %ghc_bin_build
-cd doc
-autoreconf
-%configure
-%make_build html

 %install
 %ghc_bin_install
-# drop artifacts from autoconf that differ across builds to fix build-compare
-rm -rf doc/autom4te.cache doc/config.log doc/config.status
-
-install -D --mode=444 doc/%{name}.1 %{buildroot}%{_mandir}/man1/%{name}.1

 %check
 %cabal_test

 %files
 %license LICENSE
-%doc ChangeLog.md doc examples
+%doc ChangeLog.md README.md examples
 %{_bindir}/%{name}
-%dir %{_datadir}/%{name}-%{version}
-%{_mandir}/man1/*
-%{_datadir}/%{name}-%{version}/GLR_Base
-%{_datadir}/%{name}-%{version}/GLR_Lib
-%{_datadir}/%{name}-%{version}/GLR_Lib-ghc
-%{_datadir}/%{name}-%{version}/GLR_Lib-ghc-debug
-%{_datadir}/%{name}-%{version}/HappyTemplate
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays-coerce
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays-coerce-debug
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays-debug
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays-ghc
-%{_datadir}/%{name}-%{version}/HappyTemplate-arrays-ghc-debug
-%{_datadir}/%{name}-%{version}/HappyTemplate-coerce
-%{_datadir}/%{name}-%{version}/HappyTemplate-ghc

 %changelog