diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2017-02-15 23:08:31 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2017-02-16 10:21:45 +0000 |
| commit | cf41c64c8da32535b27e97ba93123cd2c7543e39 (patch) | |
| tree | 4c04e80cf80a9cf7096d9f2f10f42517e8637b3b /dev-haskell/doctest/files | |
| parent | dev-haskell/with-location: new package, a depend of doctest-0.11.1 (diff) | |
| download | gentoo-cf41c64c8da32535b27e97ba93123cd2c7543e39.tar.gz gentoo-cf41c64c8da32535b27e97ba93123cd2c7543e39.tar.bz2 gentoo-cf41c64c8da32535b27e97ba93123cd2c7543e39.zip | |
dev-haskell/doctest: bump up to 0.11.1
Package-Manager: Portage-2.3.3, Repoman-2.3.1
Diffstat (limited to 'dev-haskell/doctest/files')
| -rw-r--r-- | dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch | 26 | ||||
| -rw-r--r-- | dev-haskell/doctest/files/doctest-0.11.0-unamb.patch | 35 |
2 files changed, 61 insertions, 0 deletions
diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch new file mode 100644 index 000000000000..9e8de3fe994a --- /dev/null +++ b/dev-haskell/doctest/files/doctest-0.11.0-unamb-2.patch @@ -0,0 +1,26 @@ +diff --git a/src/GhcUtil.hs b/src/GhcUtil.hs +index baa9193..1792227 100644 +--- a/src/GhcUtil.hs ++++ b/src/GhcUtil.hs +@@ -1,2 +1,3 @@ + {-# LANGUAGE CPP #-} ++{-# LANGUAGE PackageImports #-} + module GhcUtil (withGhc) where +@@ -12,3 +13,3 @@ import DynFlags (gopt_set) + #endif +-import Panic (throwGhcException) ++import "ghc" Panic (throwGhcException) + +diff --git a/src/Run.hs b/src/Run.hs +index fa9096f..dca590a 100644 +--- a/src/Run.hs ++++ b/src/Run.hs +@@ -1,2 +1,3 @@ + {-# LANGUAGE CPP #-} ++{-# LANGUAGE PackageImports #-} + module Run ( +@@ -23,3 +24,3 @@ import System.IO + import qualified Control.Exception as E +-import Panic ++import "ghc" Panic + diff --git a/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch new file mode 100644 index 000000000000..88c5f89fb9b0 --- /dev/null +++ b/dev-haskell/doctest/files/doctest-0.11.0-unamb.patch @@ -0,0 +1,35 @@ +commit c3194e5e874bf7da4d9d1db3f435e902eeb60993 +Author: Sergei Trofimovich <siarheit@google.com> +Date: Wed Apr 13 09:35:29 2016 +0100 + + fix tests when config-value is present in system + + ghci fails to disambiguate 'Config' in this case as: + + src/Help.hs:8:18: + Ambiguous module name ‘Config’: + it was found in multiple packages: + config-value-0.4.0.1@confi_JzUyuyr9gPE2bcxdUwNhUS ghc-7.10.3 + + Fixed by explicitly importing moduls from 'ghc' package. + + Signed-off-by: Sergei Trofimovich <siarheit@google.com> + +diff --git a/src/Help.hs b/src/Help.hs +index b8e76cf..4c11f85 100644 +--- a/src/Help.hs ++++ b/src/Help.hs +@@ -1,3 +1,4 @@ ++{-# LANGUAGE PackageImports #-} + module Help ( + usage + , printVersion +@@ -5,7 +6,7 @@ module Help ( + + import Paths_doctest (version) + import Data.Version (showVersion) +-import Config as GHC ++import "ghc" Config as GHC + import Interpreter (ghc) + + usage :: String |