[Git][haskell-team/DHG_packages][master] temporary downstream yi patches and rebuild for GHC 9.0
Marcel Fourné (@mfourne)
gitlab at salsa.debian.org
Fri Aug 26 15:39:11 BST 2022
Marcel Fourné pushed to branch master at Debian Haskell Group / DHG_packages
Commits:
74306d0e by Marcel Fourné at 2022-08-26T16:38:26+02:00
temporary downstream yi patches and rebuild for GHC 9.0
- - - - -
10 changed files:
- p/haskell-yi-core/debian/changelog
- p/haskell-yi-core/debian/patches/series
- + p/haskell-yi-core/debian/patches/yi-PR-1127
- p/haskell-yi-frontend-vty/debian/changelog
- p/haskell-yi-keymap-emacs/debian/changelog
- p/haskell-yi-keymap-vim/debian/changelog
- p/haskell-yi-misc-modes/debian/changelog
- p/haskell-yi-mode-haskell/debian/changelog
- p/haskell-yi-mode-javascript/debian/changelog
- p/yi/debian/changelog
Changes:
=====================================
p/haskell-yi-core/debian/changelog
=====================================
@@ -1,8 +1,14 @@
-haskell-yi-core (0.19.2-2) UNRELEASED; urgency=medium
+haskell-yi-core (0.19.2-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * patch to fix build with GHC 9.0
+ * rebuild for new haddock API
+ * Closes: #1017224
+
+ -- Marcel Fourné <debian at marcelfourne.de> Thu, 25 Aug 2022 15:47:19 +0200
haskell-yi-core (0.19.2-1) unstable; urgency=medium
=====================================
p/haskell-yi-core/debian/patches/series
=====================================
@@ -1 +1,2 @@
0001-add-nomonadfaildesugaring.patch
+yi-PR-1127
=====================================
p/haskell-yi-core/debian/patches/yi-PR-1127
=====================================
@@ -0,0 +1,102 @@
+Description: upstream PR to fix build with GHC 9.0
+Author: Marcel Fourné <debian at marcelfourne.de>
+Origin: other, https://github.com/yi-editor/yi/pull/1127
+Bug: https://github.com/yi-editor/yi/issues/1125
+Forwarded: https://github.com/yi-editor/yi/pull/1127
+Last-Update: 2022-08-25
+
+--- haskell-yi-core-0.19.2.orig/src/Yi/Buffer/Misc.hs
++++ haskell-yi-core-0.19.2/src/Yi/Buffer/Misc.hs
+@@ -1127,7 +1127,7 @@ savingExcursionB f = do
+ moveTo =<< use (markPointA m)
+ return res
+
+-markPointA :: Mark -> Lens' FBuffer Point
++markPointA :: forall f . Functor f => Mark -> (Point -> f Point) -> (FBuffer -> f FBuffer)
+ markPointA mark = lens getter setter where
+ getter b = markPoint $ getMarkValueRaw mark b
+ setter b pos = modifyMarkRaw mark (\v -> v {markPoint = pos}) b
+--- haskell-yi-core-0.19.2.orig/src/Yi/Eval.hs
++++ haskell-yi-core-0.19.2/src/Yi/Eval.hs
+@@ -121,28 +121,6 @@ infixl 1 <&>
+ a <&> f = f <$> a
+ -- TODO: should we be sticking Text here?
+
+--- | Runs the action, as written by the user.
+---
+--- The behaviour of this function can be customised by modifying the
+--- 'Evaluator' variable.
+-execEditorAction :: String -> YiM ()
+-execEditorAction = runHook execEditorActionImpl
+-
+--- | Lists the action names in scope, for use by 'execEditorAction',
+--- and 'help' index.
+---
+--- The behaviour of this function can be customised by modifying the
+--- 'Evaluator' variable.
+-getAllNamesInScope :: YiM [String]
+-getAllNamesInScope = runHook getAllNamesInScopeImpl
+-
+--- | Describes the named action in scope, for use by 'help'.
+---
+--- The behaviour of this function can be customised by modifying the
+--- 'Evaluator' variable.
+-describeNamedAction :: String -> YiM String
+-describeNamedAction = runHook describeNamedActionImpl
+-
+ -- | Config variable for customising the behaviour of
+ -- 'execEditorAction' and 'getAllNamesInScope'.
+ --
+@@ -157,11 +135,6 @@ data Evaluator = Evaluator
+ -- ^ describe named action (or at least its type.), simplest implementation is at least @return at .
+ } deriving (Typeable)
+
+--- | The evaluator to use for 'execEditorAction' and
+--- 'getAllNamesInScope'.
+-evaluator :: Field Evaluator
+-evaluator = customVariable
+-
+ -- * Evaluator based on GHCi
+ -- | Cached variable for getAllNamesInScopeImpl
+ newtype NamesCache = NamesCache [String] deriving (Typeable, Binary)
+@@ -413,3 +386,29 @@ instance Default Evaluator where
+ #endif
+
+ instance YiConfigVariable Evaluator
++-- | Runs the action, as written by the user.
++--
++-- The behaviour of this function can be customised by modifying the
++-- 'Evaluator' variable.
++execEditorAction :: String -> YiM ()
++execEditorAction = runHook execEditorActionImpl
++
++-- | Lists the action names in scope, for use by 'execEditorAction',
++-- and 'help' index.
++--
++-- The behaviour of this function can be customised by modifying the
++-- 'Evaluator' variable.
++getAllNamesInScope :: YiM [String]
++getAllNamesInScope = runHook getAllNamesInScopeImpl
++
++-- | Describes the named action in scope, for use by 'help'.
++--
++-- The behaviour of this function can be customised by modifying the
++-- 'Evaluator' variable.
++describeNamedAction :: String -> YiM String
++describeNamedAction = runHook describeNamedActionImpl
++
++-- | The evaluator to use for 'execEditorAction' and
++-- 'getAllNamesInScope'.
++evaluator :: Field Evaluator
++evaluator = customVariable
+--- haskell-yi-core-0.19.2.orig/src/Yi/Syntax/Layout.hs
++++ haskell-yi-core-0.19.2/src/Yi/Syntax/Layout.hs
+@@ -70,7 +70,7 @@ layoutHandler isSpecial parens isIgnored
+
+ parse :: IState t -> [(AlexState lexState, Tok t)] -> [(State t lexState, Tok t)]
+ parse iSt@(IState levels doOpen lastLine)
+- toks@((aSt, tok @ Tok {tokPosn = Posn _nextOfs line col}) : tokss)
++ toks@((aSt, tok at Tok {tokPosn = Posn _nextOfs line col}) : tokss)
+
+ -- ignore this token
+ | isIgnored tok
=====================================
p/haskell-yi-frontend-vty/debian/changelog
=====================================
@@ -1,15 +1,20 @@
-haskell-yi-frontend-vty (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-frontend-vty (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * fix last changelog entry
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:05:33 +0200
haskell-yi-frontend-vty (0.19.0-1) unstable; urgency=medium
[ Marcel Fourné]
* New upstream release
- * Closes: #964834
- * Add long description, fixing #908247
+ * Add long description
+ * Closes: #964834, #908247
-- Marcel Fourné <debian at marcelfourne.de> Sun, 06 Dec 2020 17:24:32 +0100
=====================================
p/haskell-yi-keymap-emacs/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-yi-keymap-emacs (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-keymap-emacs (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017208
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:07:41 +0200
haskell-yi-keymap-emacs (0.19.0-1) unstable; urgency=medium
=====================================
p/haskell-yi-keymap-vim/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-yi-keymap-vim (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-keymap-vim (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017228
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:23:53 +0200
haskell-yi-keymap-vim (0.19.0-1) unstable; urgency=medium
=====================================
p/haskell-yi-misc-modes/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-yi-misc-modes (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-misc-modes (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017194
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:24:53 +0200
haskell-yi-misc-modes (0.19.0-1) unstable; urgency=medium
=====================================
p/haskell-yi-mode-haskell/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-yi-mode-haskell (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-mode-haskell (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017230
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:25:59 +0200
haskell-yi-mode-haskell (0.19.0-1) unstable; urgency=medium
=====================================
p/haskell-yi-mode-javascript/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-haskell-yi-mode-javascript (0.19.0-2) UNRELEASED; urgency=medium
+haskell-yi-mode-javascript (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:27 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017198
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:26:54 +0200
haskell-yi-mode-javascript (0.19.0-1) unstable; urgency=medium
=====================================
p/yi/debian/changelog
=====================================
@@ -1,8 +1,13 @@
-yi (0.19.0-2) UNRELEASED; urgency=medium
+yi (0.19.0-2) unstable; urgency=medium
+ [ Ilias Tsitsimpis ]
* Declare compliance with Debian policy 4.6.1
- -- Ilias Tsitsimpis <iliastsi at debian.org> Tue, 28 Jun 2022 15:33:30 +0300
+ [ Marcel Fourné ]
+ * rebuild for new haddock API
+ * Closes: #1017202
+
+ -- Marcel Fourné <debian at marcelfourne.de> Fri, 26 Aug 2022 16:28:21 +0200
yi (0.19.0-1) unstable; urgency=medium
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/74306d0e77ba3cb380c4fa7acb64839dbb091d7c
--
View it on GitLab: https://salsa.debian.org/haskell-team/DHG_packages/-/commit/74306d0e77ba3cb380c4fa7acb64839dbb091d7c
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20220826/2b08eb6c/attachment-0001.htm>
More information about the Pkg-haskell-commits
mailing list