44 lines
2.2 KiB
Diff
44 lines
2.2 KiB
Diff
diff -up shake-0.13.4/Development/Shake/FilePath.hs~ shake-0.13.4/Development/Shake/FilePath.hs
|
|
--- shake-0.13.4/Development/Shake/FilePath.hs~ 2014-09-20 05:31:36.000000000 +0900
|
|
+++ shake-0.13.4/Development/Shake/FilePath.hs 2016-07-11 17:01:35.869453434 +0900
|
|
@@ -18,7 +18,7 @@ module Development.Shake.FilePath(
|
|
|
|
import System.FilePath.Posix hiding
|
|
(normalise, (</>), combine
|
|
- ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath)
|
|
+ ,searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath, (-<.>))
|
|
import System.FilePath(searchPathSeparator, isSearchPathSeparator, splitSearchPath, getSearchPath)
|
|
import General.Base
|
|
import qualified System.FilePath as Native
|
|
diff -up shake-0.13.4/Development/Shake.hs~ shake-0.13.4/Development/Shake.hs
|
|
--- shake-0.13.4/Development/Shake.hs~ 2014-09-20 05:31:36.000000000 +0900
|
|
+++ shake-0.13.4/Development/Shake.hs 2016-07-11 17:07:18.543454380 +0900
|
|
@@ -159,3 +159,5 @@ import Development.Shake.Rules.Files
|
|
import Development.Shake.Rules.Oracle
|
|
import Development.Shake.Rules.OrderOnly
|
|
import Development.Shake.Rules.Rerun
|
|
+
|
|
+import Prelude hiding ((*>))
|
|
diff -up shake-0.13.4/Development/Shake/Rules/File.hs~ shake-0.13.4/Development/Shake/Rules/File.hs
|
|
--- shake-0.13.4/Development/Shake/Rules/File.hs~ 2014-09-20 05:31:36.000000000 +0900
|
|
+++ shake-0.13.4/Development/Shake/Rules/File.hs 2016-07-11 17:06:01.447454178 +0900
|
|
@@ -32,6 +32,7 @@ import Data.Maybe
|
|
import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong
|
|
import System.IO.Unsafe(unsafeInterleaveIO)
|
|
|
|
+import Prelude hiding ((*>))
|
|
|
|
infix 1 *>, ?>, |*>, **>, ~>
|
|
|
|
diff -up shake-0.13.4/Development/Shake/Rules/Files.hs~ shake-0.13.4/Development/Shake/Rules/Files.hs
|
|
--- shake-0.13.4/Development/Shake/Rules/Files.hs~ 2014-09-20 05:31:36.000000000 +0900
|
|
+++ shake-0.13.4/Development/Shake/Rules/Files.hs 2016-07-11 17:25:14.706417609 +0900
|
|
@@ -19,6 +19,7 @@ import Development.Shake.Types
|
|
|
|
import System.FilePath(takeDirectory) -- important that this is the system local filepath, or wrong slashes go wrong
|
|
|
|
+import Prelude hiding ((*>))
|
|
|
|
infix 1 ?>>, *>>, &?>, &*>
|
|
|