From f5b41dbf42850aae42cbb26864a3729c9ca76172 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sat, 25 Jul 2015 01:46:11 +0300 Subject: haskellPackages.gnuplot: remove reduntant patch --- .../haskell-modules/configuration-ghc-7.10.x.nix | 3 -- .../haskell-modules/gnuplot-fix-new-time.patch | 60 ---------------------- 2 files changed, 63 deletions(-) delete mode 100644 pkgs/development/haskell-modules/gnuplot-fix-new-time.patch (limited to 'pkgs/development/haskell-modules') 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 ca7c0f56bc17..b223eeb134b9 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-7.10.x.nix @@ -117,9 +117,6 @@ self: super: { sha256 = "1vn3xm38v2f4lzyzkadvq322f3s2yf8c88v56wpdpzfxmvlzaqr8"; }); - # 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 deleted file mode 100644 index 1b4a60e59418..000000000000 --- a/pkgs/development/haskell-modules/gnuplot-fix-new-time.patch +++ /dev/null @@ -1,60 +0,0 @@ -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 -- cgit 1.4.1