gitit: remove filestore patch

2 files changed, 0 insertions, 73 deletions

diff --git a/pkgs/openlab/gitit/default.nix b/pkgs/openlab/gitit/default.nix
index 9edb81c1..29889e29 100644
--- a/pkgs/openlab/gitit/default.nix
+++ b/pkgs/openlab/gitit/default.nix
@@ -12,9 +12,6 @@ let hp = haskellPackages.override {
       platforms = [ "x86_64-linux" ];
       hydraPlatforms = platforms;
     }));
-    filestore = (hlib.overrideCabal super.filestore (drv: {
-      patches = [ ./filestore.patch ];
-    }));
   });
 };
 in hp.gitit
diff --git a/pkgs/openlab/gitit/filestore.patch b/pkgs/openlab/gitit/filestore.patch
deleted file mode 100644
index 5146f80b..00000000
--- a/pkgs/openlab/gitit/filestore.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-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,