[DHG_packages] 01/01: agda: fix build with new ghc 8.0.2

[Gianfranco Costamagna]

This is an automated email from the git hooks/post-receive script.

locutusofborg pushed a commit to branch master
in repository DHG_packages.

commit 0f74fef5b181bfa6b7fdaa1081f1a788730479ae
Author: Gianfranco Costamagna <costamagnagianfranco at yahoo.it>
Date:   Wed Jun 21 00:12:36 2017 +0200

    agda: fix build with new ghc 8.0.2
---
 p/agda/debian/changelog                           | 14 +++++++++++---
 p/agda/debian/control                             |  2 +-
 p/agda/debian/patches/bump-directory-bounds.patch | 20 ++++++++++++++++++++
 p/agda/debian/patches/fix-build-ghc-8.0.2.patch   | 23 +++++++++++++++++++++++
 p/agda/debian/patches/series                      |  2 ++
 5 files changed, 57 insertions(+), 4 deletions(-)

diff --git a/p/agda/debian/changelog b/p/agda/debian/changelog
index c3f12db..8c0ca97 100644
--- a/p/agda/debian/changelog
+++ b/p/agda/debian/changelog
@@ -1,9 +1,17 @@
-agda (2.5.1.1-4) UNRELEASED; urgency=medium
+agda (2.5.1.1-4) unstable; urgency=medium
 
+  [ Sean Whitton ]
   * Remove myself as an uploader.
-    I do not expect to be able to look after this package for the buster cycle.
+    I do not expect to be able to look after this package for the buster
+    cycle.
+
+  [ Gianfranco Costamagna ]
+  * Team upload
+  * Bump directory bounds for ghc 8.0.2
+  * debian/patches/abcde448a31eaf9fac701689cbb49180c089b055.patch:
+    - upstream build fix with new ghc
 
- -- Sean Whitton <spwhitton at spwhitton.name>  Sun, 18 Jun 2017 22:02:34 +0100
+ -- Gianfranco Costamagna <locutusofborg at debian.org>  Fri, 27 Jan 2017 07:54:20 +0100
 
 agda (2.5.1.1-3) unstable; urgency=medium
 
diff --git a/p/agda/debian/control b/p/agda/debian/control
index c2f22f9..45a8e0c 100644
--- a/p/agda/debian/control
+++ b/p/agda/debian/control
@@ -2,7 +2,7 @@ Source: agda
 Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
 Uploaders:
  Iain Lane <laney at debian.org>,
- Kiwamu Okabe <kiwamu at debian.or.jp>,
+ Kiwamu Okabe <kiwamu at debian.or.jp>
 Priority: extra
 Section: haskell
 Build-Depends:
diff --git a/p/agda/debian/patches/bump-directory-bounds.patch b/p/agda/debian/patches/bump-directory-bounds.patch
new file mode 100644
index 0000000..6116edc
--- /dev/null
+++ b/p/agda/debian/patches/bump-directory-bounds.patch
@@ -0,0 +1,20 @@
+--- agda-2.5.1.1.orig/Agda.cabal
++++ agda-2.5.1.1/Agda.cabal
+@@ -121,7 +121,7 @@ library
+     , containers >= 0.5.0.0 && < 0.6
+     , data-hash >= 0.2.0.0 && < 0.3
+     , deepseq >= 1.3.0.1 && < 1.5
+-    , directory >= 1.2.0.1 && < 1.3
++    , directory >= 1.2.0.1 && < 1.4
+     -- Edison versioning scheme: http://rwd.rdockins.name/edison/home/.
+     -- EdisonAPI isn't used by Agda, but EdisonCore 1.3.1 doesn't
+     -- declare what version of EdisonAPI it depends on.
+@@ -554,7 +554,7 @@ executable agda-mode
+   other-modules:    Paths_Agda
+   build-depends:
+     base >= 4.6.0.1 && < 4.10
+-    , directory >= 1.2.0.1 && < 1.3
++    , directory >= 1.2.0.1 && < 1.4
+     , filepath >= 1.3.0.1 && < 1.5
+     , process >= 1.1.0.2 && < 1.5
+ 
diff --git a/p/agda/debian/patches/fix-build-ghc-8.0.2.patch b/p/agda/debian/patches/fix-build-ghc-8.0.2.patch
new file mode 100644
index 0000000..85b2055
--- /dev/null
+++ b/p/agda/debian/patches/fix-build-ghc-8.0.2.patch
@@ -0,0 +1,23 @@
+Origin: part of abcde448a31eaf9fac701689cbb49180c089b055
+
+--- agda-2.5.1.1.orig/src/full/Agda/Syntax/Abstract/Views.hs
++++ agda-2.5.1.1/src/full/Agda/Syntax/Abstract/Views.hs
+@@ -1,5 +1,7 @@
+ {-# LANGUAGE CPP                       #-}
+ {-# LANGUAGE DefaultSignatures         #-}
++{-# LANGUAGE GADTs                     #-}
++{-# LANGUAGE NoMonoLocalBinds          #-}
+ {-# LANGUAGE NoMonomorphismRestriction #-}
+ {-# LANGUAGE PatternGuards             #-}
+ {-# LANGUAGE TupleSections             #-}
+@@ -90,8 +92,8 @@ deepUnscopeDecl d
+ class ExprLike a where
+   -- | The first expression is pre-traversal, the second one post-traversal.
+   recurseExpr :: (Applicative m) => (Expr -> m Expr -> m Expr) -> a -> m a
+-  default recurseExpr :: (Traversable f, Applicative m)
+-                      => (Expr -> m Expr -> m Expr) -> f a -> m (f a)
++  default recurseExpr :: (Traversable f, ExprLike a', a ~ f a', Applicative m)
++                      => (Expr -> m Expr -> m Expr) -> a -> m a
+   recurseExpr = traverse . recurseExpr
+ 
+   foldExpr :: Monoid m => (Expr -> m) -> a -> m
diff --git a/p/agda/debian/patches/series b/p/agda/debian/patches/series
index 046950e..d9dce40 100644
--- a/p/agda/debian/patches/series
+++ b/p/agda/debian/patches/series
@@ -1,2 +1,4 @@
 add-elpa-pkg-el-file.patch
 newer-edison-api
+bump-directory-bounds.patch
+fix-build-ghc-8.0.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/DHG_packages.git