Updated Haskell packages.

 - abstract-deque: added version 0.1.5
 - abstract-par: added version 0.3
 - bits-atomic: added version 0.1.3
 - blaze-builder-conduit: updated to version 0.4.0.2
 - IORefCAS: added version 0.2
 - MemoTrie: updated to version 0.4.12
 - monad-par: added version 0.3
 - monad-par-extras: added version 0.3
 - repa: updated to version 3.1.4.2
 - texmath: updated to version 0.6.0.6

svn path=/nixpkgs/trunk/; revision=34003

12 files changed, 120 insertions, 10 deletions

diff --git a/pkgs/development/libraries/haskell/IORefCAS/default.nix b/pkgs/development/libraries/haskell/IORefCAS/default.nix
new file mode 100644
index 000000000000..6a11c4d6a1ce
--- /dev/null
+++ b/pkgs/development/libraries/haskell/IORefCAS/default.nix
@@ -0,0 +1,13 @@
+{ cabal, bitsAtomic }:
+
+cabal.mkDerivation (self: {
+  pname = "IORefCAS";
+  version = "0.2";
+  sha256 = "18hyy3jqr9yky5r873816fqnywrwba90sq6zx61i2vkqlfbll1k9";
+  buildDepends = [ bitsAtomic ];
+  meta = {
+    description = "Atomic compare and swap for IORefs and STRefs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/MemoTrie/default.nix b/pkgs/development/libraries/haskell/MemoTrie/default.nix
index 8f039b19e463..c7baa259e04e 100644
--- a/pkgs/development/libraries/haskell/MemoTrie/default.nix
+++ b/pkgs/development/libraries/haskell/MemoTrie/default.nix
@@ -1,9 +1,10 @@
-{ cabal }:
+{ cabal, void }:
 
 cabal.mkDerivation (self: {
   pname = "MemoTrie";
-  version = "0.4.11";
-  sha256 = "0wlrsz9bsb7lkw1ja8x8jbm1v7558fg8npas1rnc5ikgfi0szzw4";
+  version = "0.4.12";
+  sha256 = "0wjpfy1vlk3fjbdj924viv1wji28kx3w9hsaz7hd0gfs77y9vjza";
+  buildDepends = [ void ];
   meta = {
     homepage = "http://haskell.org/haskellwiki/MemoTrie";
     description = "Trie-based memo functions";
diff --git a/pkgs/development/libraries/haskell/abstract-deque/default.nix b/pkgs/development/libraries/haskell/abstract-deque/default.nix
new file mode 100644
index 000000000000..90d6f4c274ef
--- /dev/null
+++ b/pkgs/development/libraries/haskell/abstract-deque/default.nix
@@ -0,0 +1,14 @@
+{ cabal, HUnit, IORefCAS }:
+
+cabal.mkDerivation (self: {
+  pname = "abstract-deque";
+  version = "0.1.5";
+  sha256 = "1zp19kq3m72nx7rr00yyq8iwia4abg4x9kw4d5s5k0srp5f9fn3q";
+  buildDepends = [ HUnit IORefCAS ];
+  meta = {
+    description = "Abstract, parameterized interface to mutable Deques";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/abstract-par/default.nix b/pkgs/development/libraries/haskell/abstract-par/default.nix
new file mode 100644
index 000000000000..1c19e8e2aee4
--- /dev/null
+++ b/pkgs/development/libraries/haskell/abstract-par/default.nix
@@ -0,0 +1,14 @@
+{ cabal, deepseq }:
+
+cabal.mkDerivation (self: {
+  pname = "abstract-par";
+  version = "0.3";
+  sha256 = "1accd14hkpcvlfiv85swliyyrw9xm1dbkyn4vn2p5nf1h6js67xw";
+  buildDepends = [ deepseq ];
+  meta = {
+    homepage = "https://github.com/simonmar/monad-par";
+    description = "Type classes generalizing the functionality of the 'monad-par' library";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/bits-atomic/default.nix b/pkgs/development/libraries/haskell/bits-atomic/default.nix
new file mode 100644
index 000000000000..388136c03d2d
--- /dev/null
+++ b/pkgs/development/libraries/haskell/bits-atomic/default.nix
@@ -0,0 +1,14 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "bits-atomic";
+  version = "0.1.3";
+  sha256 = "13fbakkwcdk63dm7r0mcsanm5mijp73c7x1kxpay2f03rxb39b70";
+  isLibrary = true;
+  isExecutable = true;
+  meta = {
+    description = "Atomic bit operations on memory locations for low-level synchronization";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
index 63516f61681c..127ac09edf54 100644
--- a/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
+++ b/pkgs/development/libraries/haskell/blaze-builder-conduit/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "blaze-builder-conduit";
-  version = "0.4.0.1";
-  sha256 = "059i7k49vpwsd7dlm4di4k5xhiparq71h8qagssw8a4nsk9jglvp";
+  version = "0.4.0.2";
+  sha256 = "0wblkvh1v7275n1i66xmm3kg57i21s8m2sfwfnjarwbcjqbgrjih";
   buildDepends = [ blazeBuilder conduit text transformers ];
   meta = {
     homepage = "http://github.com/snoyberg/conduit";
diff --git a/pkgs/development/libraries/haskell/monad-par-extras/default.nix b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
new file mode 100644
index 000000000000..1bbeb47c6849
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-par-extras/default.nix
@@ -0,0 +1,16 @@
+{ cabal, abstractPar, cereal, deepseq, mtl, random, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-par-extras";
+  version = "0.3";
+  sha256 = "1nrxzqswb265slxq4dhm6bav7zb4zglbrh99w5x6hwx6drgsw10d";
+  buildDepends = [
+    abstractPar cereal deepseq mtl random transformers
+  ];
+  meta = {
+    homepage = "https://github.com/simonmar/monad-par";
+    description = "Combinators and extra features for Par monads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})
diff --git a/pkgs/development/libraries/haskell/monad-par/default.nix b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
index 1bfac2b13d2a..1bfac2b13d2a 100644
--- a/pkgs/development/libraries/haskell/monad-par/default.nix
+++ b/pkgs/development/libraries/haskell/monad-par/0.1.0.3.nix
diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.nix b/pkgs/development/libraries/haskell/monad-par/0.3.nix
new file mode 100644
index 000000000000..d6f83dd31683
--- /dev/null
+++ b/pkgs/development/libraries/haskell/monad-par/0.3.nix
@@ -0,0 +1,20 @@
+{ cabal, abstractDeque, abstractPar, deepseq, monadParExtras, mtl
+, mwcRandom, parallel
+}:
+
+cabal.mkDerivation (self: {
+  pname = "monad-par";
+  version = "0.3";
+  sha256 = "19vzz8qhv8z84grcb4myivmmaj0sn7rm956nqxv5dh2l8c279zsd";
+  buildDepends = [
+    abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom
+    parallel
+  ];
+  meta = {
+    homepage = "https://github.com/simonmar/monad-par";
+    description = "A library for parallel programming based on a monad";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+    maintainers = [ self.stdenv.lib.maintainers.andres ];
+  };
+})
diff --git a/pkgs/development/libraries/haskell/repa/default.nix b/pkgs/development/libraries/haskell/repa/default.nix
index 10a9c2414efc..678a5c83b3d3 100644
--- a/pkgs/development/libraries/haskell/repa/default.nix
+++ b/pkgs/development/libraries/haskell/repa/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "repa";
-  version = "3.1.3.3";
-  sha256 = "108zifbgngwd5a3bkvkm4sh2nhds748wqk227mcsxcw9y085da0f";
+  version = "3.1.4.2";
+  sha256 = "08vrrhaqhk03mmc2zddj4mm9dci9q7wkxwc3ilrh1p9q4j6r53qs";
   buildDepends = [ QuickCheck vector ];
   meta = {
     homepage = "http://repa.ouroborus.net";
diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix
index a519170ca85f..6820b2ed2473 100644
--- a/pkgs/development/libraries/haskell/texmath/default.nix
+++ b/pkgs/development/libraries/haskell/texmath/default.nix
@@ -2,8 +2,8 @@
 
 cabal.mkDerivation (self: {
   pname = "texmath";
-  version = "0.6.0.5";
-  sha256 = "08zryp5y2llhzwbp93wbm37c1lykqgrbq8h23bv39ql8idpym0wq";
+  version = "0.6.0.6";
+  sha256 = "0wxpz9vsgi4lfgjz5w96pn2r2jdflkvb4yd06nxshimxdr51974k";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [ parsec syb xml ];
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 7ae1a202c705..020814f6e1ae 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -211,6 +211,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; };
+      monadPar = self.monadPar_0_1_0_3;
     };
 
   haskellPlatform_2011_4_0_0 =
@@ -254,6 +255,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+      monadPar = self.monadPar_0_1_0_3;
     };
 
   haskellPlatform_2011_2_0_1 =
@@ -297,6 +299,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       mtl1 = self.mtl_1_1_1_1;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+      monadPar = self.monadPar_0_1_0_3;
     };
 
   haskellPlatform_2011_2_0_0 =
@@ -336,6 +339,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       haskellPlatform = self.haskellPlatform_2010_2_0_0;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
+      monadPar = self.monadPar_0_1_0_3;
       deepseq = self.deepseq_1_1_0_2;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
@@ -376,6 +380,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       extensibleExceptions = self.extensibleExceptions_0_1_1_0;
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       deepseq = self.deepseq_1_1_0_2;
+      monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
 
@@ -418,6 +423,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
       repaExamples = null;      # don't pick this version of 'repa-examples' during nix-env -u
       cabalInstall_0_14_0 = self.cabalInstall_0_14_0.override { Cabal = self.Cabal_1_14_0; zlib = self.zlib_0_5_3_3; };
       deepseq = self.deepseq_1_1_0_2;
+      monadPar = self.monadPar_0_1_0_3;
       # deviating from Haskell platform here, to make some packages (notably statistics) compile
     };
 
@@ -433,6 +439,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ACVector = callPackage ../development/libraries/haskell/AC-Vector {};
 
+  abstractDeque = callPackage ../development/libraries/haskell/abstract-deque {};
+
+  abstractPar = callPackage ../development/libraries/haskell/abstract-par {};
+
   aeson = callPackage ../development/libraries/haskell/aeson {};
 
   alternativeIo = callPackage ../development/libraries/haskell/alternative-io {};
@@ -482,6 +492,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   bitmap = callPackage ../development/libraries/haskell/bitmap {};
 
+  bitsAtomic = callPackage ../development/libraries/haskell/bits-atomic {};
+
   bktrees = callPackage ../development/libraries/haskell/bktrees {};
 
   blazeBuilder = callPackage ../development/libraries/haskell/blaze-builder {};
@@ -934,6 +946,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   ioChoice = callPackage ../development/libraries/haskell/io-choice {};
 
+  IORefCAS = callPackage ../development/libraries/haskell/IORefCAS {};
+
   ioStorage = callPackage ../development/libraries/haskell/io-storage {};
 
   irc = callPackage ../development/libraries/haskell/irc {
@@ -1003,7 +1017,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
 
   monadLoops = callPackage ../development/libraries/haskell/monad-loops {};
 
-  monadPar = callPackage ../development/libraries/haskell/monad-par {};
+  monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {};
+  monadPar_0_3 = callPackage ../development/libraries/haskell/monad-par/0.3.nix {};
+  monadPar = self.monadPar_0_3;
+
+  monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 
   monadPeel = callPackage ../development/libraries/haskell/monad-peel {};