Gentoo Archives: gentoo-commits

From: "Mark Wright (gienah)" <gienah@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-vcs/darcs/files: darcs-2.8.3-tf-0.8.patch
Date: Fri, 28 Dec 2012 08:04:11
Message-Id: 20121228080356.CAFBE2171D@flycatcher.gentoo.org
1 gienah 12/12/28 08:03:56
2
3 Added: darcs-2.8.3-tf-0.8.patch
4 Log:
5 Fix build failure against dev-haskell/test-framework-0.8
6
7 (Portage version: 2.1.11.38/cvs/Linux x86_64, signed Manifest commit with key 618E971F)
8
9 Revision Changes Path
10 1.1 dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-vcs/darcs/files/darcs-2.8.3-tf-0.8.patch?rev=1.1&content-type=text/plain
14
15 Index: darcs-2.8.3-tf-0.8.patch
16 ===================================================================
17 Fix build failure against dev-haskell/test-framework-0.8
18
19 [147 of 147] Compiling Main ( src/test.hs, dist/build/darcs-test/darcs-test-tmp/Main.o )
20
21 src/test.hs:100:30:
22 No instance for (Typeable ShellTest) arising from a use of `Test'
23 Possible fix: add an instance declaration for (Typeable ShellTest)
24 In the expression: Test (file ++ " (" ++ show fmt ++ ")")
25 In the expression:
26 Test (file ++ " (" ++ show fmt ++ ")") $ ShellTest fmt file tdir dp
27 In an equation for `shellTest':
28 shellTest dp fmt tdir file
29 = Test (file ++ " (" ++ show fmt ++ ")")
30 $ ShellTest fmt file tdir dp
31 diff --git a/src/test.hs b/src/test.hs
32 index 39adcc1..9687074 100644
33 --- a/src/test.hs
34 +++ b/src/test.hs
35 @@ -49,6 +49,7 @@ data ShellTest = ShellTest { format :: Format
36 , testdir :: Maybe FilePath -- ^ only if you want to set it explicitly
37 , _darcspath :: FilePath
38 }
39 + deriving Typeable
40
41 runtest' :: ShellTest -> FilePath -> ShIO Result
42 runtest' (ShellTest fmt _ _ dp) srcdir =