[Git][haskell-team/package-plan][master] Remove patches for hothasktags

[Sven Bartscher (@kritzefitz)]

Sven Bartscher pushed to branch master at Debian Haskell Group / package-plan


Commits:
7dfb47d6 by Sven Bartscher at 2022-05-18T14:38:41+02:00
Remove patches for hothasktags

- - - - -


2 changed files:

- − patches/hothasktags/0.3.8/0001-update-to-haskell-src-exts-1.19.1.patch
- − patches/hothasktags/0.3.8/series


Changes:

=====================================
patches/hothasktags/0.3.8/0001-update-to-haskell-src-exts-1.19.1.patch deleted
=====================================
@@ -1,70 +0,0 @@
-From: Joey Hess <joeyh at joeyh.name>
-Date: Fri, 7 Jul 2017 09:31:29 -0400
-Subject: update to haskell-src-exts 1.18.2 / 1.19.1
-
-Language.Haskell.Exts.Annotated has gone away, so used
-Language.Haskell.Exts.
-
-EThingAll constructor is no more, so removed that.
-
-Otherwise, just a matter of adjusting pattern matching where new fields
-have been added.
-
-Tested by running hothasktags in git-annex's source tree; the patched
-version generates an identical tags file to the old version.
----
- Main.hs           | 10 ++++------
- hothasktags.cabal |  2 +-
- 2 files changed, 5 insertions(+), 7 deletions(-)
-
---- a/Main.hs
-+++ b/Main.hs
-@@ -4,7 +4,7 @@
- module Main where
- 
- import Options.Applicative
--import qualified Language.Haskell.Exts.Annotated as L
-+import qualified Language.Haskell.Exts as L
- import System.IO
- import GHC.IO.Handle (HandlePosition)
- import qualified Data.Map.Strict as Map
-@@ -30,7 +30,7 @@ localDecls :: L.Module L.SrcSpanInfo -> Map.Map String Defn
- localDecls (L.Module _ _ _ _ decls) = Map.fromList $ concatMap extract decls
-     where
-     extract (L.TypeDecl _ hd _) = extractDeclHead hd
--    extract (L.TypeFamDecl _ hd _) = extractDeclHead hd
-+    extract (L.TypeFamDecl _ hd _ _) = extractDeclHead hd
-     extract (L.DataDecl _ _ _ hd decls' _) =
-       extractDeclHead hd ++ concatMap extractQualConDecl decls'
-     extract (L.GDataDecl _ _ _ hd _ decls' _) =
-@@ -73,7 +73,7 @@ localDecls (L.Module _ _ _ _ decls) = Map.fromList $ concatMap extract decls
- 
-     extractClassDecl (L.ClsDecl _ decl) = extract decl
-     extractClassDecl (L.ClsDataFam _ _ hd _) = extractDeclHead hd
--    extractClassDecl (L.ClsTyFam _ hd _) = extractDeclHead hd
-+    extractClassDecl (L.ClsTyFam _ hd _ _) = extractDeclHead hd
-     extractClassDecl _ = []
- 
-     extractName (L.Ident loc name) = [(name, getLoc loc)]
-@@ -134,9 +134,7 @@ exported mod'@(L.Module _
-   where
-     matchesSpec nm (L.EVar _ (L.UnQual _ (L.Ident _ name'))) = nm == name'
-     matchesSpec nm (L.EAbs _ _ (L.UnQual _ (L.Ident _ name'))) = nm == name'
--    matchesSpec nm (L.EThingAll _ (L.UnQual _ (L.Ident _ name'))) =
--      nm == name' || (nm `elem` thingMembers mod' name')
--    matchesSpec nm (L.EThingWith _ (L.UnQual _ (L.Ident _ name')) cnames) =
-+    matchesSpec nm (L.EThingWith _ _ (L.UnQual _ (L.Ident _ name')) cnames) =
-       nm == name' || any (matchesCName nm) cnames
-     -- XXX this is wrong, moduleScope handles it though
-     matchesSpec _ (L.EModuleContents _ (L.ModuleName _ _)) = False
---- a/hothasktags.cabal
-+++ b/hothasktags.cabal
-@@ -38,7 +38,7 @@ executable hothasktags
-         filepath,
-         filemanip,
-         Glob,
--        haskell-src-exts >= 1.17 && < 1.18,
-+        haskell-src-exts >= 1.18.2 && < 1.21,
-         cpphs >= 1.11 && < 1.21,
-         optparse-applicative >= 0.13,
-         split


=====================================
patches/hothasktags/0.3.8/series deleted
=====================================
@@ -1 +0,0 @@
-0001-update-to-haskell-src-exts-1.19.1.patch



View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/7dfb47d6772d493bab6289694fbceec6c50b7ebd

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/package-plan/-/commit/7dfb47d6772d493bab6289694fbceec6c50b7ebd
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/20220518/16cca5d8/attachment-0001.htm>