[DHG_packages] 01/03: hdevtools: Apply upstream patch to fix #846023

[Ilias Tsitsimpis]

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

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

commit b3a5722524e7de2cdbe75eccab4bea7222e7e844
Author: Ilias Tsitsimpis <i.tsitsimpis at gmail.com>
Date:   Mon Nov 28 13:12:18 2016 +0200

    hdevtools: Apply upstream patch to fix #846023
    
    Apply upstream patch that fixes ghc library directory lookup
    via stack for system installed ghc (Closes: #846023).
---
 p/hdevtools/debian/changelog                       |  7 +++++++
 .../debian/patches/fix_getStackGhcLibDir.patch     | 22 ++++++++++++++++++++++
 p/hdevtools/debian/patches/series                  |  1 +
 3 files changed, 30 insertions(+)

diff --git a/p/hdevtools/debian/changelog b/p/hdevtools/debian/changelog
index 30b0fd4..6fded0f 100644
--- a/p/hdevtools/debian/changelog
+++ b/p/hdevtools/debian/changelog
@@ -1,3 +1,10 @@
+hdevtools (0.1.4.1-2) UNRELEASED; urgency=medium
+
+  * Apply upstream patch that fixes ghc library directory lookup
+    via stack for system installed ghc (Closes: #846023).
+
+ -- Ilias Tsitsimpis <i.tsitsimpis at gmail.com>  Mon, 28 Nov 2016 13:08:04 +0200
+
 hdevtools (0.1.4.1-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch b/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch
new file mode 100644
index 0000000..fd39e64
--- /dev/null
+++ b/p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch
@@ -0,0 +1,22 @@
+Description: Fixed ghc lib dir lookup via stack for system installed ghc
+Author: Tomas Janousek <tomi at nomi.cz>
+Origin: upstream, https://github.com/hdevtools/hdevtools/commit/a436699b8587a
+Bug-Debian: https://bugs.debian.org/846023
+
+Index: b/src/Stack.hs
+===================================================================
+--- a/src/Stack.hs
++++ b/src/Stack.hs
+@@ -52,7 +52,11 @@ getStackGhcBinDir :: FilePath -> IO (May
+ getStackGhcBinDir = fmap (fmap trim) . execStackInPath "path --compiler-bin"
+ 
+ getStackGhcLibDir :: FilePath -> IO (Maybe FilePath)
+-getStackGhcLibDir = fmap (fmap takeDirectory) . execStackInPath "path --global-pkg-db"
++getStackGhcLibDir p = do
++    ghc <- (trim <$>) <$> execStackInPath "path --compiler-exe" p
++    case ghc of
++        Just exe -> (trim <$>) <$> execInPath (exe ++ " --print-libdir") p
++        Nothing -> return Nothing
+ 
+ getStackDist :: FilePath -> IO (Maybe FilePath)
+ getStackDist p = (trim <$>) <$> execStackInPath "path --dist-dir" p
diff --git a/p/hdevtools/debian/patches/series b/p/hdevtools/debian/patches/series
new file mode 100644
index 0000000..6362222
--- /dev/null
+++ b/p/hdevtools/debian/patches/series
@@ -0,0 +1 @@
+fix_getStackGhcLibDir.patch

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