[Pkg-haskell-commits] darcs: haskell-distributive: Let it build without GHCi (thx to Joey Hess for the patch) (Closes: #726173)
Joachim Breitner
mail at joachim-breitner.de
Sun Oct 13 09:05:54 UTC 2013
Sun Oct 13 08:51:48 UTC 2013 Joachim Breitner <mail at joachim-breitner.de>
* Let it build without GHCi (thx to Joey Hess for the patch) (Closes: #726173)
M ./changelog +2
M ./control -2
A ./patches/0001-fix-build-on-armel.patch
M ./patches/series +1
Sun Oct 13 08:51:48 UTC 2013 Joachim Breitner <mail at joachim-breitner.de>
* Let it build without GHCi (thx to Joey Hess for the patch) (Closes: #726173)
diff -rN -u old-haskell-distributive/changelog new-haskell-distributive/changelog
--- old-haskell-distributive/changelog 2013-10-13 09:05:54.469539178 +0000
+++ new-haskell-distributive/changelog 2013-10-13 09:05:54.501565416 +0000
@@ -1,6 +1,8 @@
haskell-distributive (0.3-3) UNRELEASED; urgency=low
* Adjust watch file to new hackage layout
+ * Let it build without GHCi (thx to Joey Hess for the patch) (Closes:
+ #726173)
-- Joachim Breitner <nomeata at debian.org> Sat, 05 Oct 2013 18:20:10 +0200
diff -rN -u old-haskell-distributive/control new-haskell-distributive/control
--- old-haskell-distributive/control 2013-10-13 09:05:54.453557477 +0000
+++ new-haskell-distributive/control 2013-10-13 09:05:54.485543852 +0000
@@ -3,13 +3,11 @@
Priority: extra
Maintainer: Debian Haskell Group <pkg-haskell-maintainers at lists.alioth.debian.org>
Uploaders: Iulian Udrea <iulian at linux.com>
-DM-Upload-Allowed: yes
Build-Depends: debhelper (>= 9)
, cdbs
, haskell-devscripts (>= 0.8.15)
, ghc
, ghc-prof
- , ghc-ghci
, libghc-transformers-dev (>> 0.3)
, libghc-transformers-dev (<< 0.4)
, libghc-transformers-prof
diff -rN -u old-haskell-distributive/patches/0001-fix-build-on-armel.patch new-haskell-distributive/patches/0001-fix-build-on-armel.patch
--- old-haskell-distributive/patches/0001-fix-build-on-armel.patch 1970-01-01 00:00:00.000000000 +0000
+++ new-haskell-distributive/patches/0001-fix-build-on-armel.patch 2013-10-13 09:05:54.485543852 +0000
@@ -0,0 +1,48 @@
+From ef79f8fbbff8501b99ff08addfef752176f61117 Mon Sep 17 00:00:00 2001
+From: Joey Hess <joey at kitenet.net>
+Date: Sat, 12 Oct 2013 22:26:45 -0400
+Subject: [PATCH] fix build on armel
+
+---
+ distributive.cabal | 1 +
+ src/Data/Distributive.hs | 4 ++++
+ 2 files changed, 5 insertions(+)
+
+diff --git a/distributive.cabal b/distributive.cabal
+index 316962a..562f99a 100644
+--- a/distributive.cabal
++++ b/distributive.cabal
+@@ -37,6 +37,7 @@ library
+
+ hs-source-dirs: src
+ exposed-modules: Data.Distributive
++ extensions: CPP
+
+ if flag(lib-Werror)
+ ghc-options: -Werror
+diff --git a/src/Data/Distributive.hs b/src/Data/Distributive.hs
+index 6f5613d..171ec2f 100644
+--- a/src/Data/Distributive.hs
++++ b/src/Data/Distributive.hs
+@@ -15,6 +15,8 @@ module Data.Distributive
+ , comapM
+ ) where
+
++{-# LANGUAGE CPP #-}
++
+ import Control.Applicative
+ import Control.Applicative.Backwards
+ import Control.Monad (liftM)
+@@ -26,7 +28,9 @@ import Data.Functor.Identity
+ import Data.Functor.Product
+ import Data.Functor.Reverse
+
++#ifndef DEBIAN_NO_GHCI
+ {-# ANN module "ignore Use section" #-}
++#endif
+
+ -- | This is the categorical dual of 'Traversable'. However, there appears
+ -- to be little benefit to allow the distribution via an arbitrary comonad
+--
+1.7.10.4
+
diff -rN -u old-haskell-distributive/patches/series new-haskell-distributive/patches/series
--- old-haskell-distributive/patches/series 2013-10-13 09:05:54.453557477 +0000
+++ new-haskell-distributive/patches/series 2013-10-13 09:05:54.489549680 +0000
@@ -1 +1,2 @@
no-transformers-compat.diff
+0001-fix-build-on-armel.patch
More information about the Pkg-haskell-commits
mailing list