[treewide] delete unused patches
This commit is contained in:
c0bw3b
@@ -1,37 +0,0 @@
|
||||
diff --git a/Setup.hs b/Setup.hs
|
||||
index ddf5a02..7ad1f26 100644
|
||||
--- a/Setup.hs
|
||||
+++ b/Setup.hs
|
||||
@@ -1,4 +1,4 @@
|
||||
-
|
||||
+{-# LANGUAGE CPP #-}
|
||||
import Control.Monad (when)
|
||||
import Language.Haskell.TH
|
||||
import Distribution.Simple (defaultMainWithHooks, simpleUserHooks, UserHooks(postConf), Args)
|
||||
@@ -6,14 +6,25 @@ import Distribution.Simple.Utils (cabalVersion)
|
||||
import Distribution.Simple.LocalBuildInfo
|
||||
import Distribution.Simple.Setup (ConfigFlags)
|
||||
import Distribution.Version (Version(..))
|
||||
+#if MIN_VERSION_Cabal(1,25,0)
|
||||
+import Distribution.Version (mkVersion)
|
||||
+#endif
|
||||
import Distribution.PackageDescription (PackageDescription)
|
||||
import Debug.Trace
|
||||
|
||||
+#if MIN_VERSION_Cabal(1,25,0)
|
||||
+versionBranch :: Version -> Version
|
||||
+versionBranch = id
|
||||
+#else
|
||||
+mkVersion :: [Int] -> Version
|
||||
+mkVersion vs = Version vs []
|
||||
+#endif
|
||||
+
|
||||
-- I couldn't figure out a way to do this check from the cabal file, so we drop down
|
||||
-- here to do it instead:
|
||||
checkGoodVersion :: IO ()
|
||||
checkGoodVersion =
|
||||
- if cabalVersion >= Version [1,17,0] []
|
||||
+ if cabalVersion >= mkVersion [1,17,0]
|
||||
then putStrLn (" [Setup.hs] This version of Cabal is ok for profiling: "++show cabalVersion)
|
||||
else error (" [Setup.hs] This package should not be used in profiling mode with cabal version "++
|
||||
show (versionBranch cabalVersion)++" < 1.17.0\n"++
|
||||
@@ -1,11 +0,0 @@
|
||||
diff -ru3 graphviz.old/Data/GraphViz/Algorithms.hs graphviz/Data/GraphViz/Algorithms.hs
|
||||
--- graphviz.old/Data/GraphViz/Algorithms.hs 2015-05-18 15:21:38.379771357 +0300
|
||||
+++ graphviz/Data/GraphViz/Algorithms.hs 2015-05-18 15:01:01.940122684 +0300
|
||||
@@ -38,6 +38,7 @@
|
||||
import Data.GraphViz.Types.Canonical
|
||||
import Data.GraphViz.Types.Internal.Common
|
||||
|
||||
+import Prelude hiding (traverse)
|
||||
import Control.Arrow (first, second, (***))
|
||||
import Control.Monad (unless)
|
||||
import Control.Monad.Trans.State
|
||||
@@ -1,40 +0,0 @@
|
||||
diff --git a/test/HaRePluginSpec.hs b/test/HaRePluginSpec.hs
|
||||
index 039c094..d0d1fa4 100644
|
||||
--- a/test/HaRePluginSpec.hs
|
||||
+++ b/test/HaRePluginSpec.hs
|
||||
@@ -326,35 +326,6 @@ hareSpec = do
|
||||
$ List [TextEdit (Range (Position 4 0) (Position 8 12))
|
||||
"parseStr = char '\"' *> (many1 (noneOf \"\\\"\")) <* char '\"'"])
|
||||
Nothing)
|
||||
- it "finds definition across components" $ do
|
||||
- let u = filePathToUri "./app/Main.hs"
|
||||
- let lreq = setTypecheckedModule u
|
||||
- let req = findDef u (toPos (7,8))
|
||||
- r <- dispatchRequestPGoto $ lreq >> req
|
||||
- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs")
|
||||
- (Range (toPos (6,1)) (toPos (6,9)))]
|
||||
- let req2 = findDef u (toPos (7,20))
|
||||
- r2 <- dispatchRequestPGoto $ lreq >> req2
|
||||
- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
|
||||
- (Range (toPos (5,1)) (toPos (5,2)))]
|
||||
- it "finds definition in the same component" $ do
|
||||
- let u = filePathToUri "./src/Lib2.hs"
|
||||
- let lreq = setTypecheckedModule u
|
||||
- let req = findDef u (toPos (6,5))
|
||||
- r <- dispatchRequestPGoto $ lreq >> req
|
||||
- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib.hs")
|
||||
- (Range (toPos (6,1)) (toPos (6,9)))]
|
||||
- it "finds local definitions" $ do
|
||||
- let u = filePathToUri "./src/Lib2.hs"
|
||||
- let lreq = setTypecheckedModule u
|
||||
- let req = findDef u (toPos (7,11))
|
||||
- r <- dispatchRequestPGoto $ lreq >> req
|
||||
- r `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
|
||||
- (Range (toPos (10,9)) (toPos (10,10)))]
|
||||
- let req2 = findDef u (toPos (10,13))
|
||||
- r2 <- dispatchRequestPGoto $ lreq >> req2
|
||||
- r2 `shouldBe` IdeResponseOk [Location (filePathToUri $ cwd </> "test/testdata/gototest/src/Lib2.hs")
|
||||
- (Range (toPos (9,9)) (toPos (9,10)))]
|
||||
|
||||
|
||||
-- ---------------------------------
|
||||
@@ -1,15 +0,0 @@
|
||||
index 60e134c..246d8ca 100644
|
||||
--- lambdabot-core/src/Lambdabot/Config.hs
|
||||
+++ lambdabot-core/src/Lambdabot/Config.hs
|
||||
@@ -29,9 +29,9 @@ import Data.Typeable
|
||||
import Data.Generics (everywhere, mkT)
|
||||
import Language.Haskell.TH
|
||||
|
||||
-data Config t where Config :: (Typeable1 k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
|
||||
+data Config t where Config :: (Typeable k, GCompare k) => !(k t) -> t -> (t -> t -> t) -> Config t
|
||||
|
||||
-cast1 :: (Typeable1 f, Typeable1 g) => f a -> Maybe (g a)
|
||||
+cast1 :: (Typeable f, Typeable g) => f a -> Maybe (g a)
|
||||
cast1 = fmap runIdentity . gcast1 . Identity
|
||||
|
||||
instance GEq Config where
|
||||
@@ -1,107 +0,0 @@
|
||||
From 86595e193e8d46c769ab2a1cee961e8e04dfd1b9 Mon Sep 17 00:00:00 2001
|
||||
From: Michiel Derhaeg <derhaeg.michiel@gmail.com>
|
||||
Date: Tue, 20 Mar 2018 22:06:18 +0100
|
||||
Subject: [PATCH] update to work with GHC 8.4.1
|
||||
|
||||
---
|
||||
XMonad/Hooks/FadeWindows.hs | 6 +++++-
|
||||
XMonad/Hooks/WallpaperSetter.hs | 6 +++++-
|
||||
XMonad/Layout/Mosaic.hs | 6 +++++-
|
||||
xmonad-contrib.cabal | 5 +++--
|
||||
5 files changed, 33 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/XMonad/Hooks/FadeWindows.hs b/XMonad/Hooks/FadeWindows.hs
|
||||
index 4b8e62b6..01d06792 100644
|
||||
--- a/XMonad/Hooks/FadeWindows.hs
|
||||
+++ b/XMonad/Hooks/FadeWindows.hs
|
||||
@@ -61,7 +61,8 @@ import Control.Monad.Reader (ask
|
||||
,asks)
|
||||
import Control.Monad.State (gets)
|
||||
import qualified Data.Map as M
|
||||
-import Data.Monoid
|
||||
+import Data.Monoid hiding ((<>))
|
||||
+import Data.Semigroup
|
||||
|
||||
import Graphics.X11.Xlib.Extras (Event(..))
|
||||
|
||||
@@ -134,6 +135,9 @@ instance Monoid Opacity where
|
||||
r `mappend` OEmpty = r
|
||||
_ `mappend` r = r
|
||||
|
||||
+instance Semigroup Opacity where
|
||||
+ (<>) = mappend
|
||||
+
|
||||
-- | A FadeHook is similar to a ManageHook, but records window opacity.
|
||||
type FadeHook = Query Opacity
|
||||
|
||||
diff --git a/XMonad/Hooks/WallpaperSetter.hs b/XMonad/Hooks/WallpaperSetter.hs
|
||||
index 00a3b1c3..d4f5ccb2 100644
|
||||
--- a/XMonad/Hooks/WallpaperSetter.hs
|
||||
+++ b/XMonad/Hooks/WallpaperSetter.hs
|
||||
@@ -41,7 +41,8 @@ import Data.Ord (comparing)
|
||||
import Control.Monad
|
||||
import Control.Applicative
|
||||
import Data.Maybe
|
||||
-import Data.Monoid
|
||||
+import Data.Monoid hiding ((<>))
|
||||
+import Data.Semigroup
|
||||
|
||||
-- $usage
|
||||
-- This module requires imagemagick and feh to be installed, as these are utilized
|
||||
@@ -86,6 +87,9 @@ instance Monoid WallpaperList where
|
||||
mappend (WallpaperList w1) (WallpaperList w2) =
|
||||
WallpaperList $ M.toList $ (M.fromList w2) `M.union` (M.fromList w1)
|
||||
|
||||
+instance Semigroup WallpaperList where
|
||||
+ (<>) = mappend
|
||||
+
|
||||
-- | Complete wallpaper configuration passed to the hook
|
||||
data WallpaperConf = WallpaperConf {
|
||||
wallpaperBaseDir :: FilePath -- ^ Where the wallpapers reside (if empty, will look in \~\/.wallpapers/)
|
||||
diff --git a/XMonad/Layout/Mosaic.hs b/XMonad/Layout/Mosaic.hs
|
||||
index 05655d4c..da44fc50 100644
|
||||
--- a/XMonad/Layout/Mosaic.hs
|
||||
+++ b/XMonad/Layout/Mosaic.hs
|
||||
@@ -38,7 +38,8 @@ import Control.Monad(mplus)
|
||||
import Data.Foldable(Foldable,foldMap, sum)
|
||||
import Data.Function(on)
|
||||
import Data.List(sortBy)
|
||||
-import Data.Monoid(Monoid,mempty, mappend)
|
||||
+import Data.Monoid(Monoid,mempty, mappend, (<>))
|
||||
+import Data.Semigroup
|
||||
|
||||
|
||||
-- $usage
|
||||
@@ -202,6 +203,9 @@ instance Monoid (Tree a) where
|
||||
mappend x Empty = x
|
||||
mappend x y = Branch x y
|
||||
|
||||
+instance Semigroup (Tree a) where
|
||||
+ (<>) = mappend
|
||||
+
|
||||
makeTree :: (Num a1, Ord a1) => (a -> a1) -> [a] -> Tree a
|
||||
makeTree _ [] = Empty
|
||||
makeTree _ [x] = Leaf x
|
||||
diff --git a/xmonad-contrib.cabal b/xmonad-contrib.cabal
|
||||
index dde3ccda..c401c6e6 100644
|
||||
--- a/xmonad-contrib.cabal
|
||||
+++ b/xmonad-contrib.cabal
|
||||
@@ -36,7 +36,7 @@ cabal-version: >= 1.6
|
||||
build-type: Simple
|
||||
bug-reports: https://github.com/xmonad/xmonad-contrib/issues
|
||||
|
||||
-tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1
|
||||
+tested-with: GHC==7.6.3, GHC==7.8.4, GHC==7.10.3, GHC==8.0.1, GHC==8.2.2, GHC==8.4.1
|
||||
|
||||
source-repository head
|
||||
type: git
|
||||
@@ -66,7 +66,8 @@ library
|
||||
unix,
|
||||
X11>=1.6.1 && < 1.9,
|
||||
xmonad>=0.13 && < 0.14,
|
||||
- utf8-string
|
||||
+ utf8-string,
|
||||
+ semigroups
|
||||
|
||||
if flag(use_xft)
|
||||
build-depends: X11-xft >= 0.2
|
||||
Reference in New Issue
Block a user