diff options
| author | Ilias Tsitsimpis <i.tsitsimpis@gmail.com> | 2016-11-28 13:12:18 +0200 |
|---|---|---|
| committer | Ilias Tsitsimpis <i.tsitsimpis@gmail.com> | 2016-11-28 13:12:18 +0200 |
| commit | b3a5722524e7de2cdbe75eccab4bea7222e7e844 (patch) | |
| tree | da7431063357b49ca9108a152e849082a950ac11 /p/hdevtools | |
| parent | ea358f9e93d490de63b09d6641672a24f41d6c24 (diff) | |
| download | DHG_packages-b3a5722524e7de2cdbe75eccab4bea7222e7e844.tar.gz | |
hdevtools: Apply upstream patch to fix #846023
Apply upstream patch that fixes ghc library directory lookup
via stack for system installed ghc (Closes: #846023).
Diffstat (limited to 'p/hdevtools')
| -rw-r--r-- | p/hdevtools/debian/changelog | 7 | ||||
| -rw-r--r-- | p/hdevtools/debian/patches/fix_getStackGhcLibDir.patch | 22 | ||||
| -rw-r--r-- | p/hdevtools/debian/patches/series | 1 |
3 files changed, 30 insertions, 0 deletions
diff --git a/p/hdevtools/debian/changelog b/p/hdevtools/debian/changelog index 30b0fd438..6fded0f50 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@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 000000000..fd39e64a4 --- /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@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 000000000..636222235 --- /dev/null +++ b/p/hdevtools/debian/patches/series @@ -0,0 +1 @@ +fix_getStackGhcLibDir.patch |