Gentoo Archives: gentoo-commits

From: Sergei Trofimovich <slyfox@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-haskell/happy/files/
Date: Fri, 04 Sep 2020 19:42:33
Message-Id: 1599248545.b56ef92481ede97a407f1ab2dd08dfd81e4ecbac.slyfox@gentoo
1 commit: b56ef92481ede97a407f1ab2dd08dfd81e4ecbac
2 Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
3 AuthorDate: Fri Sep 4 18:20:01 2020 +0000
4 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 4 19:42:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b56ef924
7
8 dev-haskell/happy: remove unused patch(es)
9
10 Package-Manager: Portage-3.0.4, Repoman-3.0.1
11 Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
12 Closes: https://github.com/gentoo/gentoo/pull/17416
13 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org>
14
15 .../happy/files/happy-1.19.5-ghc-7.10.2.patch | 27 ----------------------
16 1 file changed, 27 deletions(-)
17
18 diff --git a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch b/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
19 deleted file mode 100644
20 index dee216b029f..00000000000
21 --- a/dev-haskell/happy/files/happy-1.19.5-ghc-7.10.2.patch
22 +++ /dev/null
23 @@ -1,27 +0,0 @@
24 -I'm not sure if it's a ghc feature or a bug.
25 -Should happy emable that extension for -g option?
26 -
27 -The build error is Kind mismatch:
28 -
29 - monad002.g.hs:296:26:
30 - Couldn't match kind ‘*’ with ‘#’
31 - When matching types
32 - t0 :: *
33 - Happy_GHC_Exts.Int# :: #
34 - Relevant bindings include
35 - cont :: t0 -> [Char] -> Int -> ParseResult a
36 - (bound at monad002.g.hs:293:13)
37 - In the first argument of ‘cont’, namely ‘8#’
38 - In the expression: cont 8#
39 - In a case alternative: TokenLet -> cont 8#
40 -
41 -Slightly related bug: https://ghc.haskell.org/trac/ghc/ticket/8739
42 -
43 -diff --git a/tests/monad002.ly b/tests/monad002.ly
44 -index 35cc5b0..4c526ca 100644
45 ---- a/tests/monad002.ly
46 -+++ b/tests/monad002.ly
47 -@@ -5,2 +5,3 @@ Test for monadic Happy Parsers, Simon Marlow 1996.
48 - > {-# OPTIONS_GHC -fglasgow-exts #-}
49 -+> {-# LANGUAGE MonoLocalBinds #-}
50 - > -- -fglasgow-exts required because P is a type synonym, and Happy uses it