[DHG_packages] 21/34: cabal-install: Build with Cabal 1.24.2.0

[Ilias Tsitsimpis]

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

iliastsi-guest pushed a commit to branch ghc-8.0.2
in repository DHG_packages.

commit 915b4f803db02a9acba07ae5525f6ff8f0b4490d
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Wed Jan 25 21:25:15 2017 +0200

    cabal-install: Build with Cabal 1.24.2.0
---
 p/haskell-cabal-install/debian/changelog           |  1 +
 p/haskell-cabal-install/debian/control             |  6 ++---
 p/haskell-cabal-install/debian/patches/newer-cabal | 26 ++++++++++++++++++++++
 p/haskell-cabal-install/debian/patches/series      |  1 +
 4 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/p/haskell-cabal-install/debian/changelog b/p/haskell-cabal-install/debian/changelog
index c265fb8..51a984c 100644
--- a/p/haskell-cabal-install/debian/changelog
+++ b/p/haskell-cabal-install/debian/changelog
@@ -1,6 +1,7 @@
 haskell-cabal-install (1.24.0.1-4) unstable; urgency=medium
 
   * Bump bounds for newer directory, shipped with ghc-8.0.2.
+  * Patch to build with Cabal 1.24.2.0, shipped with ghc-8.0.2.
 
  -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Wed, 25 Jan 2017 19:33:29 +0200
 
diff --git a/p/haskell-cabal-install/debian/control b/p/haskell-cabal-install/debian/control
index 05bde4b..88be195 100644
--- a/p/haskell-cabal-install/debian/control
+++ b/p/haskell-cabal-install/debian/control
@@ -9,14 +9,14 @@ Build-Depends:
  bash-completion (>= 1.0),
  cdbs,
  debhelper (>= 9),
- ghc (>= 8),
+ ghc (>= 8.0.2),
  ghc-prof,
  haskell-devscripts (>= 0.13),
  libghc-async-dev (<< 3),
  libghc-async-dev (>= 2.0),
  libghc-base16-bytestring-dev (<< 0.2),
  libghc-base16-bytestring-dev (>= 0.1.1),
- libghc-cabal-dev (>= 1.24),
+ libghc-cabal-dev (>= 1.24.2.0),
  libghc-cabal-dev (<< 1.25),
  libghc-cryptohash-dev,
  libghc-hackage-security-dev (>= 0.5.2.2-5~),
@@ -47,7 +47,7 @@ Vcs-Git: https://anonscm.debian.org/git/pkg-haskell/DHG_packages.git
 Package: cabal-install
 Architecture: any
 Depends:
- ghc (>= 8) | libghc-cabal-dev (>= 1.24),
+ ghc (>= 8.0.2) | libghc-cabal-dev (>= 1.24.2.0),
  ${haskell:Depends},
  ${misc:Depends},
  ${shlibs:Depends},
diff --git a/p/haskell-cabal-install/debian/patches/newer-cabal b/p/haskell-cabal-install/debian/patches/newer-cabal
new file mode 100644
index 0000000..481bc1a
--- /dev/null
+++ b/p/haskell-cabal-install/debian/patches/newer-cabal
@@ -0,0 +1,26 @@
+Description: Build with newer Cabal
+ Build with Cabal 1.24.2.0, shipped with ghc-8.0.2.
+Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
+Forwarded: not-needed, fixed in newer versions
+Index: b/Main.hs
+===================================================================
+--- a/Main.hs
++++ b/Main.hs
+@@ -905,7 +905,7 @@ haddockAction haddockFlags extraArgs glo
+       setupScriptOptions = defaultSetupScriptOptions { useDistPref = distPref }
+   setupWrapper verbosity setupScriptOptions Nothing
+     haddockCommand (const haddockFlags') extraArgs
+-  when (haddockForHackage haddockFlags == Flag ForHackage) $ do
++  when (haddockForHackage haddockFlags == Flag True) $ do
+     pkg <- fmap LBI.localPkgDescr (getPersistBuildConfig distPref)
+     let dest = distPref </> name <.> "tar.gz"
+         name = display (packageId pkg) ++ "-docs"
+@@ -1112,7 +1112,7 @@ uploadAction uploadFlags extraArgs globa
+         ++ "If you need to customise Haddock options, "
+         ++ "run 'haddock --for-hackage' first "
+         ++ "to generate a documentation tarball."
+-      haddockAction (defaultHaddockFlags { haddockForHackage = Flag ForHackage })
++      haddockAction (defaultHaddockFlags { haddockForHackage = Flag True })
+                     [] globalFlags
+       distPref <- findSavedDistPref config NoFlag
+       pkg <- fmap LBI.localPkgDescr (getPersistBuildConfig distPref)
diff --git a/p/haskell-cabal-install/debian/patches/series b/p/haskell-cabal-install/debian/patches/series
index a9cedbd..6f35338 100644
--- a/p/haskell-cabal-install/debian/patches/series
+++ b/p/haskell-cabal-install/debian/patches/series
@@ -1,2 +1,3 @@
 use-cryptohash
 newer-directory
+newer-cabal

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