diff --git a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix index 48529707ce4..dcfa8b08c91 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -255,6 +255,9 @@ self: super: { sha256 = "1gs8p89d1qsrd1qycbhf6kv4qw0sbb8m6dy106dqkmdzcjzcyq74"; }); + # Already applied in darcs repository. + gnuplot = appendPatch super.gnuplot ./gnuplot-fix-new-time.patch; + ghcjs-prim = self.callPackage ({ mkDerivation, fetchgit, primitive }: mkDerivation { pname = "ghcjs-prim"; version = "0.1.0.0"; diff --git a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch new file mode 100644 index 00000000000..1b4a60e5941 --- /dev/null +++ b/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch @@ -0,0 +1,60 @@ +diff -ru3 gnuplot-0.5.3.1-old/gnuplot.cabal gnuplot-0.5.3.1/gnuplot.cabal +--- gnuplot-0.5.3.1-old/gnuplot.cabal 2015-04-17 22:25:06.561715968 +0300 ++++ gnuplot-0.5.3.1/gnuplot.cabal 2015-04-17 22:27:07.610913755 +0300 +@@ -75,7 +75,7 @@ + + Library + Build-Depends: +- filepath >=1.1 && <1.4, ++ filepath >=1.1 && <1.5, + temporary >=1.1 && <1.3, + array >=0.1 && <0.6, + containers >=0.1 && <0.6, +@@ -83,12 +83,11 @@ + data-accessor-transformers >=0.2.1 && <0.3, + data-accessor >=0.2.2 && <0.3, + transformers >=0.3 && <0.5, +- deepseq >=1.0 && <1.4 ++ deepseq >=1.0 && <1.5 + If flag(splitBase) + Build-Depends: +- process >=1.0, +- time >=1.1, +- old-locale >=1.0, ++ process >=1.0 && <1.3, ++ time >=1.1 && <1.6, + base >=2 && <5 + Else + Build-Depends: +diff -ru3 gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs +--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:25:06.560715975 +0300 ++++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Time.hs 2015-04-17 22:27:49.872542430 +0300 +@@ -1,7 +1,6 @@ + module Graphics.Gnuplot.Time where + +-import System.Locale (defaultTimeLocale, ) +-import Data.Time.Format (FormatTime, formatTime, ) ++import Data.Time.Format (FormatTime, formatTime, defaultTimeLocale, ) + import Data.Tuple.HT (mapFst, ) + + {- | +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 +--- gnuplot-0.5.3.1-old/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:25:06.560715975 +0300 ++++ gnuplot-0.5.3.1/src/Graphics/Gnuplot/Value/Tuple.hs 2015-04-17 22:28:24.426238829 +0300 +@@ -9,7 +9,6 @@ + ColumnCount(ColumnCount), + ) where + +-import System.Locale (defaultTimeLocale, ) + import qualified Data.Time as Time + + import Data.Word (Word8, Word16, Word32, Word64, ) +@@ -82,7 +81,7 @@ + instance C Time.Day where + text d = text $ Time.UTCTime d 0 + instance C Time.UTCTime where +- text = singleton . showString . Time.formatTime defaultTimeLocale "%s" ++ text = singleton . showString . Time.formatTime Time.defaultTimeLocale "%s" + + + instance (C a, C b) => C (a,b) where