From 498eedea21878ef262940bc67f622ef323b6d2d9 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 27 Mar 2014 18:21:44 +0200 Subject: [PATCH] Cloud Haskell patches --- Stackage/Config.hs | 5 +- .../patches/distributed-process-0.4.2.patch | 89 ++++++++++++++----- ...buted-process-simplelocalnet-0.2.0.9.patch | 21 +++++ 3 files changed, 89 insertions(+), 26 deletions(-) create mode 100644 patching/patches/distributed-process-simplelocalnet-0.2.0.9.patch diff --git a/Stackage/Config.hs b/Stackage/Config.hs index 61edef63..eb9d1eb1 100644 --- a/Stackage/Config.hs +++ b/Stackage/Config.hs @@ -169,11 +169,8 @@ defaultStablePackages ghcVer requireHP = unPackageMap $ execWriter $ do , "cairo diagrams-cairo" , "persistent-mongoDB fpco-api" , "threepenny-gui base16-bytestring convertible" + , "distributed-process distributed-process-simplelocalnet" ] - when (ghcVer == GhcMajorVersion 7 4 && requireHP) $ - mapM_ (add "FP Complete ") $ words =<< - [ "distributed-process distributed-process-simplelocalnet" - ] -- Deprecated version addRange "FP Complete " "persistent-mongoDB" "< 1.3.1 || > 1.3.1" when (ghcVer < GhcMajorVersion 7 6) $ do diff --git a/patching/patches/distributed-process-0.4.2.patch b/patching/patches/distributed-process-0.4.2.patch index bb4e4f0e..89ee2ac9 100644 --- a/patching/patches/distributed-process-0.4.2.patch +++ b/patching/patches/distributed-process-0.4.2.patch @@ -1,30 +1,75 @@ diff -ru orig/distributed-process.cabal new/distributed-process.cabal ---- orig/distributed-process.cabal 2014-03-25 06:24:53.476644211 +0200 -+++ new/distributed-process.cabal 2014-03-25 06:24:53.000000000 +0200 -@@ -90,7 +90,7 @@ - Main-Is: TestCH.hs +--- orig/distributed-process.cabal 2014-03-27 18:20:56.752359087 +0200 ++++ new/distributed-process.cabal 2014-03-27 18:20:56.000000000 +0200 +@@ -39,7 +39,7 @@ + + Library Build-Depends: base >= 4.4 && < 5, - random >= 1.0 && < 1.1, -- ansi-terminal >= 0.5 && < 0.6, -+ ansi-terminal >= 0.5, +- binary >= 0.5 && < 0.7, ++ binary >= 0.5, + network-transport >= 0.3 && < 0.4, + stm >= 2.3 && < 2.5, + transformers >= 0.2 && < 0.4, +@@ -53,7 +53,7 @@ + ghc-prim >= 0.2 && < 0.4, + distributed-static >= 0.2 && < 0.3, + rank1dynamic >= 0.1 && < 0.2, +- syb >= 0.3 && < 0.4 ++ syb >= 0.3 + Exposed-modules: Control.Distributed.Process, + Control.Distributed.Process.Serializable, + Control.Distributed.Process.Closure, +@@ -94,7 +94,7 @@ distributed-process, network-transport >= 0.3 && < 0.4, network-transport-tcp >= 0.3 && < 0.4, -@@ -111,7 +111,7 @@ - Main-Is: TestClosure.hs - Build-Depends: base >= 4.4 && < 5, - random >= 1.0 && < 1.1, -- ansi-terminal >= 0.5 && < 0.6, -+ ansi-terminal >= 0.5, - distributed-static >= 0.2 && < 0.3, +- binary >= 0.5 && < 0.7, ++ binary >= 0.5, + network >= 2.3 && < 2.5, + HUnit >= 1.2 && < 1.3, + test-framework >= 0.6 && < 0.9, +@@ -137,7 +137,7 @@ distributed-process, network-transport >= 0.3 && < 0.4, -@@ -131,7 +131,7 @@ - Main-Is: TestStats.hs - Build-Depends: base >= 4.4 && < 5, - random >= 1.0 && < 1.1, -- ansi-terminal >= 0.5 && < 0.6, -+ ansi-terminal >= 0.5, - containers >= 0.4 && < 0.6, - stm >= 2.3 && < 2.5, + network-transport-tcp >= 0.3 && < 0.4, +- binary >= 0.5 && < 0.7, ++ binary >= 0.5, + network >= 2.3 && < 2.5, + HUnit >= 1.2 && < 1.3, + test-framework >= 0.6 && < 0.9, +@@ -156,7 +156,7 @@ distributed-process, + network-transport-tcp >= 0.3 && < 0.4, + bytestring >= 0.9 && < 0.11, +- binary >= 0.5 && < 0.7 ++ binary >= 0.5 + else + buildable: False + Main-Is: benchmarks/Throughput.hs +@@ -169,7 +169,7 @@ + distributed-process, + network-transport-tcp >= 0.3 && < 0.4, + bytestring >= 0.9 && < 0.11, +- binary >= 0.5 && < 0.7 ++ binary >= 0.5 + else + buildable: False + Main-Is: benchmarks/Latency.hs +@@ -182,7 +182,7 @@ + distributed-process, + network-transport-tcp >= 0.3 && < 0.4, + bytestring >= 0.9 && < 0.11, +- binary >= 0.5 && < 0.7 ++ binary >= 0.5 + else + buildable: False + Main-Is: benchmarks/Channels.hs +@@ -195,7 +195,7 @@ + distributed-process, + network-transport-tcp >= 0.3 && < 0.4, + bytestring >= 0.9 && < 0.11, +- binary >= 0.5 && < 0.7 ++ binary >= 0.5 + else + buildable: False + Main-Is: benchmarks/Spawns.hs diff --git a/patching/patches/distributed-process-simplelocalnet-0.2.0.9.patch b/patching/patches/distributed-process-simplelocalnet-0.2.0.9.patch new file mode 100644 index 00000000..3836680f --- /dev/null +++ b/patching/patches/distributed-process-simplelocalnet-0.2.0.9.patch @@ -0,0 +1,21 @@ +diff -ru orig/distributed-process-simplelocalnet.cabal new/distributed-process-simplelocalnet.cabal +--- orig/distributed-process-simplelocalnet.cabal 2014-03-27 18:20:56.944359088 +0200 ++++ new/distributed-process-simplelocalnet.cabal 2014-03-27 18:20:56.000000000 +0200 +@@ -33,7 +33,7 @@ + network >= 2.3 && < 2.5, + network-multicast >= 0.0 && < 0.1, + data-accessor >= 0.2 && < 0.3, +- binary >= 0.5 && < 0.7, ++ binary >= 0.5, + containers >= 0.4 && < 0.6, + transformers >= 0.2 && < 0.4, + network-transport >= 0.3 && < 0.4, +@@ -55,7 +55,7 @@ + network >= 2.3 && < 2.5, + network-multicast >= 0.0 && < 0.1, + data-accessor >= 0.2 && < 0.3, +- binary >= 0.5 && < 0.7, ++ binary >= 0.5, + containers >= 0.4 && < 0.6, + transformers >= 0.2 && < 0.4, + network-transport >= 0.3 && < 0.4,