From e9385023d749aa96f00c4e06e9bdad1d655af0f9 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 16:37:02 +0300 Subject: [PATCH 1/4] Added distributed-process 0.5. Bump binary version dependency of rank1dynamic, distributed-static, network-transport-* to 0.7.2.1. --- .../haskell/distributed-process/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 20 +++++++++++++++---- 2 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/libraries/haskell/distributed-process/default.nix diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix new file mode 100644 index 00000000000..80458c808a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -0,0 +1,20 @@ +{ cabal, binary, dataAccessor, deepseq, distributedStatic, hashable +, mtl, networkTransport, random, rank1dynamic, stm, syb, time +, transformers +}: + +cabal.mkDerivation (self: { + pname = "distributed-process"; + version = "0.5.0"; + sha256 = "16lfmkhc6jk2n46w39vf0q1ql426h5jrjgdi6cyjgwy1d5kaqcny"; + buildDepends = [ + binary dataAccessor deepseq distributedStatic hashable mtl + networkTransport random rank1dynamic stm syb time transformers + ]; + meta = { + homepage = "http://haskell-distributed.github.com/"; + description = "Cloud Haskell: Erlang-style concurrency in Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4441a85b199..07ba2332335 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,7 +635,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; - distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; + distributedStatic = callPackage ../development/libraries/haskell/distributed-static { + binary = self.binary_0_7_2_1; + }; + + distributedProcess = callPackage ../development/libraries/haskell/distributed-process { + binary = self.binary_0_7_2_1; + }; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -1573,9 +1579,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkSimple = callPackage ../development/libraries/haskell/network-simple { }; - networkTransport = callPackage ../development/libraries/haskell/network-transport {}; + networkTransport = callPackage ../development/libraries/haskell/network-transport { + binary = self.binary_0_7_2_1; + }; - networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; + networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp { + binary = self.binary_0_7_2_1; + }; networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; @@ -1834,7 +1844,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; - rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {}; + rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic { + binary = self.binary_0_7_2_1; + }; ranges = callPackage ../development/libraries/haskell/ranges {}; From 88050e4a41b8dc140d307f52375e34e66f4d5268 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 17:44:29 +0300 Subject: [PATCH 2/4] Moved package overrides from haskell-packages.nix to haskell-defaults.nix. --- pkgs/top-level/haskell-defaults.nix | 5 +++++ pkgs/top-level/haskell-packages.nix | 20 +++++--------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index beeee5663dc..652a826e95a 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -44,6 +44,11 @@ haddock = self.haddock_2_13_2; modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; + rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; + networkTransportTcp = super.networkTransportTcp.override { binary = self.binary_0_7_2_1; }; + distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; + distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; }; transformers = self.transformers_0_3_0_0; # core packagen in ghc > 7.6.x diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 07ba2332335..73d5f060f35 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -635,13 +635,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; - distributedStatic = callPackage ../development/libraries/haskell/distributed-static { - binary = self.binary_0_7_2_1; - }; + distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; - distributedProcess = callPackage ../development/libraries/haskell/distributed-process { - binary = self.binary_0_7_2_1; - }; + distributedProcess = callPackage ../development/libraries/haskell/distributed-process {}; distributive = callPackage ../development/libraries/haskell/distributive {}; @@ -1579,13 +1575,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkSimple = callPackage ../development/libraries/haskell/network-simple { }; - networkTransport = callPackage ../development/libraries/haskell/network-transport { - binary = self.binary_0_7_2_1; - }; + networkTransport = callPackage ../development/libraries/haskell/network-transport {}; - networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp { - binary = self.binary_0_7_2_1; - }; + networkTransportTcp = callPackage ../development/libraries/haskell/network-transport-tcp {}; networkTransportTests = callPackage ../development/libraries/haskell/network-transport-tests {}; @@ -1844,9 +1836,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in randomShuffle = callPackage ../development/libraries/haskell/random-shuffle {}; - rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic { - binary = self.binary_0_7_2_1; - }; + rank1dynamic = callPackage ../development/libraries/haskell/rank1dynamic {}; ranges = callPackage ../development/libraries/haskell/ranges {}; From 719d0b64e03a46eabc0cc460baa2d8faaf7d3584 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 18:01:51 +0300 Subject: [PATCH 3/4] Removed binary argument from networkTransport and networkTransportTcp --- pkgs/top-level/haskell-defaults.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 652a826e95a..7cbe57c49c7 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -45,8 +45,6 @@ modularArithmetic = null; # requires base >= 4.7 pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; - networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; - networkTransportTcp = super.networkTransportTcp.override { binary = self.binary_0_7_2_1; }; distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 From 8fe08c34a4bfb440e4288ec8728ae0910e78e88d Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 21 Jun 2014 18:06:24 +0300 Subject: [PATCH 4/4] Add binary to networkTransport again. --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 7cbe57c49c7..a770cbdda8f 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -46,6 +46,7 @@ pipesBinary = super.pipesBinary.override { binary = self.binary_0_7_2_1; }; rank1dynamic = super.rank1dynamic.override { binary = self.binary_0_7_2_1; }; distributedStatic = super.distributedStatic.override { binary = self.binary_0_7_2_1; }; + networkTransport = super.networkTransport.override { binary = self.binary_0_7_2_1; }; distributedProcess = super.distributedProcess.override { binary = self.binary_0_7_2_1; }; singletons = null; # requires base >= 4.7 vty_5_1_0 = super.vty_5_1_0.override { cabal = self.cabal.override { Cabal = self.Cabal_1_18_1_3; }; };