about summary refs log tree commit diff
path: root/pkgs/openlab/gitit/filestore.patch
blob: 5146f80b5f52bbef3a7325594c15dde3c5e43529 (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
From 6aef6646deb703e27228968855d7d9e460e31ef9 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <siarheit@google.com>
Date: Sat, 28 May 2016 21:45:05 +0100
Subject: [PATCH] filestore.cabal: refresh for ghc-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GHC now requires explicit quantification.

Patch fixes the following build failure:
  [ 3 of 11] Compiling Data.FileStore.Types ( Data/FileStore/Types.hs, dist/build/Data/FileStore/Types.o )

  Data/FileStore/Types.hs:153:32: error:
    Not in scope: type variable ‘a’

Updated upper bounds for packages bundled with ghc-8.

Signed-off-by: Sergei Trofimovich <siarheit@google.com>
---
 Data/FileStore/Types.hs | 4 ++--
 filestore.cabal         | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Data/FileStore/Types.hs b/Data/FileStore/Types.hs
index e950c7a..e116761 100644
--- a/Data/FileStore/Types.hs
+++ b/Data/FileStore/Types.hs
@@ -150,7 +150,7 @@ data FileStore = FileStore {
     initialize     :: IO ()
 
     -- | Save contents in the filestore.
-  , save           :: Contents a
+  , save           :: forall a . Contents a
                    => FilePath          -- Resource to save.
                    -> Author            --  Author of change.
                    -> Description       --  Description of change.
@@ -158,7 +158,7 @@ data FileStore = FileStore {
                    -> IO ()
 
     -- | Retrieve the contents of the named resource.
-  , retrieve       :: Contents a
+  , retrieve       :: forall a . Contents a
                    => FilePath          -- Resource to retrieve.
                    -> Maybe RevisionId  -- @Just@ a particular revision ID,
                                         -- or @Nothing@ for latest
diff --git a/filestore.cabal b/filestore.cabal
index 999851c..6b65967 100644
--- a/filestore.cabal
+++ b/filestore.cabal
@@ -35,8 +35,8 @@ Library
                          filepath >= 1.1 && < 1.5,
                          directory >= 1.0 && < 1.3,
                          parsec >= 2 && < 3.2,
-                         process >= 1.0 && < 1.3,
-                         time >= 1.1 && < 1.6,
+                         process >= 1.0 && < 1.5,
+                         time >= 1.1 && < 1.7,
                          xml >= 1.3 && < 1.4,
                          split >= 0.1 && < 0.3,
                          Diff >= 0.2 && < 0.4,
@@ -65,7 +65,7 @@ Test-suite test-filestore
     Main-is:        Tests.hs
     Default-Language:  Haskell98
     Build-depends:  base >= 4 && < 5,
-                    HUnit >= 1.2 && < 1.3,
+                    HUnit >= 1.2 && < 1.4,
                     mtl,
                     time,
                     Diff >= 0.2 && < 0.4,