pyrox.dev
haskellPackages.gnuplot: remove reduntant patch
-3
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
-3
pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix
···
117
117
sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8";
118
118
});
119
119
120
-
# Already applied in darcs repository.
121
-
gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch;
122
-
123
120
ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation {
124
121
pname = "ghcjs-prim";
125
122
version = "0.1.0.0";
-60
pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
-60
pkgs/development/haskell-modules/gnuplot-fix-new-time.patch
···
1
-
diff -ru3 gnuplot-0.5.3.1-old/gnuplot.cabal gnuplot-0.5.3.1/gnuplot.cabal
2
-
--- gnuplot-0.5.3.1-old/gnuplot.cabal 2015-04-17 22:25:06.561715968 +0300
3
-
+++ gnuplot-0.5.3.1/gnuplot.cabal 2015-04-17 22:27:07.610913755 +0300
4
-
@@ -75,7 +75,7 @@
5
-
6
-
Library
7
-
Build-Depends:
8
-
- filepath >=1.1 && <1.4,
9
-
+ filepath >=1.1 && <1.5,
10
-
temporary >=1.1 && <1.3,
11
-
array >=0.1 && <0.6,
12
-
containers >=0.1 && <0.6,
13
-
@@ -83,12 +83,11 @@
14
-
data-accessor-transformers >=0.2.1 && <0.3,
15
-
data-accessor >=0.2.2 && <0.3,
16
-
transformers >=0.3 && <0.5,
17
-
- deepseq >=1.0 && <1.4
18
-
+ deepseq >=1.0 && <1.5
19
-
If flag(splitBase)
20
-
Build-Depends:
21
-
- process >=1.0,
22
-
- time >=1.1,
23
-
- old-locale >=1.0,
24
-
+ process >=1.0 && <1.3,
25
-
+ time >=1.1 && <1.6,
26
-
base >=2 && <5
27
-
Else
28
-
Build-Depends:
29
-
diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs
30
-
--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:25:06.560715975 +0300
31
-
+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:27:49.872542430 +0300
32
-
@@ -1,7 +1,6 @@
33
-
module Graphics.Gnuplot.Time where
34
-
35
-
-import System.Locale (defaultTimeLocale, )
36
-
-import Data.Time.Format (FormatTime, formatTime, )
37
-
+import Data.Time.Format (FormatTime, formatTime, defaultTimeLocale, )
38
-
import Data.Tuple.HT (mapFst, )
39
-
40
-
{- |
41
-
diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs
42
-
--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:25:06.560715975 +0300
43
-
+++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:28:24.426238829 +0300
44
-
@@ -9,7 +9,6 @@
45
-
ColumnCount(ColumnCount),
46
-
) where
47
-
48
-
-import System.Locale (defaultTimeLocale, )
49
-
import qualified Data.Time as Time
50
-
51
-
import Data.Word (Word8, Word16, Word32, Word64, )
52
-
@@ -82,7 +81,7 @@
53
-
instance C Time.Day where
54
-
text d = text $ Time.UTCTime d 0
55
-
instance C Time.UTCTime where
56
-
- text = singleton . showString . Time.formatTime defaultTimeLocale "%s"
57
-
+ text = singleton . showString . Time.formatTime Time.defaultTimeLocale "%s"
58
-
59
-
60
-
instance (C a, C b) => C (a,b) where