diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2015-09-23 21:33:54 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2015-09-23 21:33:54 +0100 |
| commit | 7b64641d73f0cda39af37820e1db354bc3f33d6e (patch) | |
| tree | b1d32b1aef50c4be8b19ca1aef9882836bb22a58 | |
| parent | net-voip/yatebts: version bump for bug #547346 and fix net-wireless/yatebts dep (diff) | |
| download | gentoo-7b64641d73f0cda39af37820e1db354bc3f33d6e.tar.gz gentoo-7b64641d73f0cda39af37820e1db354bc3f33d6e.tar.bz2 gentoo-7b64641d73f0cda39af37820e1db354bc3f33d6e.zip | |
dev-haskell/persistent-sqlite: fix USE=build-sanity-exe, bug #561274
Reported-by: Nick Bowler
Bug: https://bugs.gentoo.org/561274
Package-Manager: portage-2.2.20
| -rw-r--r-- | dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch | 20 | ||||
| -rw-r--r-- | dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild | 4 |
2 files changed, 24 insertions, 0 deletions
diff --git a/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch new file mode 100644 index 000000000000..2bd856f5f786 --- /dev/null +++ b/dev-haskell/persistent-sqlite/files/persistent-sqlite-2.1.4.2-exe.patch @@ -0,0 +1,20 @@ +diff --git a/persistent-sqlite.cabal b/persistent-sqlite.cabal +index 39971e7..c0edfe3 100644 +--- a/persistent-sqlite.cabal ++++ b/persistent-sqlite.cabal +@@ -76,2 +76,2 @@ executable sanity + hs-source-dirs: test +- build-depends: base, persistent-sqlite ++ build-depends: base, persistent-sqlite, monad-logger +diff --git a/test/sanity.hs b/test/sanity.hs +index aed09a3..ce61fed 100644 +--- a/test/sanity.hs ++++ b/test/sanity.hs +@@ -3,2 +3,3 @@ + import Database.Persist.Sqlite ++import Control.Monad.Logger + +@@ -7,2 +8,2 @@ $(return []) -- just force TH to run + main :: IO () +-main = withSqliteConn ":memory:" $ const $ return () ++main = runStderrLoggingT $ withSqliteConn ":memory:" $ const $ return () diff --git a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild index cd129b046d37..dd0e105936c9 100644 --- a/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild +++ b/dev-haskell/persistent-sqlite/persistent-sqlite-2.1.4.2.ebuild @@ -38,6 +38,10 @@ DEPEND="${RDEPEND} dev-haskell/persistent-template ) " +src_prepare() { + epatch "${FILESDIR}"/${P}-exe.patch +} + src_configure() { haskell-cabal_src_configure \ $(cabal_flag build-sanity-exe build-sanity-exe) \ |