Add several new Haskell expressions

pkgs/development/libraries/haskell/CC-delcont/default.nix

@@ -0,0 +1,14 @@
+{ cabal, mtl }:
+
+cabal.mkDerivation (self: {
+  pname = "CC-delcont";
+  version = "0.2";
+  sha256 = "0bl71vj1ypzplx92kz27hhbpnwnxkz5g2q86m4fcmjmp4fym8kc1";
+  buildDepends = [ mtl ];
+  meta = {
+    homepage = "http://code.haskell.org/~dolio/CC-delcont";
+    description = "Delimited continuations and dynamically scoped variables";
+    license = "unknown";
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/composition/default.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "composition";
+  version = "1.0.1.0";
+  sha256 = "1gx27vz2djiiwygcjaygjmiwjnls084b5v9km3jpimlz312qh5hc";
+  meta = {
+    homepage = "http://patch-tag.com/r/DanBurton/composition/home";
+    description = "Combinators for unorthodox function composition";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/cond/default.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "cond";
+  version = "0.4.0.2";
+  sha256 = "13m7bcsx4nch767kf9wza0vqql711b8vjd3m5cahrvb7xbh3g593";
+  meta = {
+    homepage = "https://github.com/kallisti-dev/cond";
+    description = "Basic conditional and boolean operators with monadic variants";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/conduit-combinators/default.nix

@@ -6,8 +6,8 @@
 
 cabal.mkDerivation (self: {
   pname = "conduit-combinators";
-  version = "0.2.5";
-  sha256 = "1by9jjflascchs7gf53fk5srv3ihrir8jqac6zyq74fjclx3b6z0";
+  version = "0.2.5.1";
+  sha256 = "1xz8vh9pvh3897lnv1vs69g079q6qvbh334gpfnkc5lb7hvdw7qv";
   buildDepends = [
     base16Bytestring base64Bytestring chunkedData conduit conduitExtra
     monadControl monoTraversable mwcRandom primitive resourcet

pkgs/development/libraries/haskell/doctest-prop/default.nix

@@ -0,0 +1,14 @@
+{ cabal, doctest, HUnit, QuickCheck }:
+
+cabal.mkDerivation (self: {
+  pname = "doctest-prop";
+  version = "0.2";
+  sha256 = "09wxkhcmh297hqnx3g4x8ff0w5dcmls9y383417rc8wawf5q288n";
+  buildDepends = [ HUnit QuickCheck ];
+  testDepends = [ doctest HUnit QuickCheck ];
+  meta = {
+    description = "Allow QuickCheck-style property testing within doctest";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/kan-extensions/default.nix

@@ -0,0 +1,19 @@
+{ cabal, adjunctions, comonad, contravariant, distributive, free
+, mtl, pointed, semigroupoids, speculation, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "kan-extensions";
+  version = "4.0.2";
+  sha256 = "05invi86i2a115jdy2nzdkc0i6g170j0xcxycw2z2qjigvjsaizi";
+  buildDepends = [
+    adjunctions comonad contravariant distributive free mtl pointed
+    semigroupoids speculation transformers
+  ];
+  meta = {
+    homepage = "http://github.com/ekmett/kan-extensions/";
+    description = "Kan extensions, Kan lifts, various forms of the Yoneda lemma, and (co)density (co)monads";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/monad-coroutine/default.nix

@@ -0,0 +1,14 @@
+{ cabal, monadParallel, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-coroutine";
+  version = "0.8";
+  sha256 = "0nirp5c3vi529ap142zs29j10j9m609ippi3chv6a87h51avkhzx";
+  buildDepends = [ monadParallel transformers ];
+  meta = {
+    homepage = "http://trac.haskell.org/SCC/wiki/monad-coroutine";
+    description = "Coroutine monad transformer for suspending and resuming monadic computations";
+    license = "GPL";
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/monad-parallel/default.nix

@@ -0,0 +1,14 @@
+{ cabal, parallel, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-parallel";
+  version = "0.7.1.2";
+  sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj";
+  buildDepends = [ parallel transformers ];
+  meta = {
+    homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel";
+    description = "Parallel execution of monadic computations";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/monad-stm/default.nix

@@ -0,0 +1,13 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "monad-stm";
+  version = "0.1.0.2";
+  sha256 = "09bbhbj9zg928j3dnvvxsrv8hw1c7s0vj0wffrhs810aqlf1m9xp";
+  buildDepends = [ stm transformers ];
+  meta = {
+    description = "MonadSTM class analogous to MonadIO";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/multimap/default.nix

@@ -0,0 +1,13 @@
+{ cabal }:
+
+cabal.mkDerivation (self: {
+  pname = "multimap";
+  version = "1.2.1";
+  sha256 = "0d3l5q4yvmywl6i9ip96zz0fvhjdh00mfbbniphbjxsi8wlwack3";
+  meta = {
+    homepage = "http://hub.darcs.net/scravy/multimap";
+    description = "A multimap";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/regex-applicative/default.nix

@@ -0,0 +1,19 @@
+{ cabal, HUnit, smallcheck, tasty, tastyHunit, tastySmallcheck
+, transformers
+}:
+
+cabal.mkDerivation (self: {
+  pname = "regex-applicative";
+  version = "0.3.0.2";
+  sha256 = "0bzf8lnb5568glppk8bajh4c3a08baav5r0qhyn3vnfybi02c4d2";
+  buildDepends = [ transformers ];
+  testDepends = [
+    HUnit smallcheck tasty tastyHunit tastySmallcheck transformers
+  ];
+  meta = {
+    homepage = "https://github.com/feuerbach/regex-applicative";
+    description = "Regex-based parsing with applicative interface";
+    license = self.stdenv.lib.licenses.mit;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/rex/default.nix

@@ -0,0 +1,14 @@
+{ cabal, haskellSrcExts, haskellSrcMeta, pcreLight }:
+
+cabal.mkDerivation (self: {
+  pname = "rex";
+  version = "0.5.1";
+  sha256 = "18g09pg7hhj052v72vncjvy900h3xhza8hl2g3akad8asn9k6jl6";
+  buildDepends = [ haskellSrcExts haskellSrcMeta pcreLight ];
+  meta = {
+    homepage = "http://github.com/mgsloan/rex";
+    description = "A quasi-quoter for typeful results of regex captures";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/speculation/default.nix

@@ -0,0 +1,14 @@
+{ cabal, stm, transformers }:
+
+cabal.mkDerivation (self: {
+  pname = "speculation";
+  version = "1.5.0.1";
+  sha256 = "1kjshccmfnigb2dxq0czn3c1ckdflz6bl1q60h38qp3rc7250ml0";
+  buildDepends = [ stm transformers ];
+  meta = {
+    homepage = "http://github.com/ekmett/speculation";
+    description = "A framework for safe, programmable, speculative parallelism";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/stm-stats/default.nix

@@ -0,0 +1,13 @@
+{ cabal, stm, time }:
+
+cabal.mkDerivation (self: {
+  pname = "stm-stats";
+  version = "0.2.0.0";
+  sha256 = "0i8ky2l8lvh7nymxglvbifp0ylbyjw20p75avzb51zpzx6qkjkqa";
+  buildDepends = [ stm time ];
+  meta = {
+    description = "retry statistics for STM transactions";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/development/libraries/haskell/th-expand-syns/default.nix

@@ -0,0 +1,13 @@
+{ cabal, syb }:
+
+cabal.mkDerivation (self: {
+  pname = "th-expand-syns";
+  version = "0.3.0.4";
+  sha256 = "05qgfam7zq02848icvddds67ch5d8py7r30izg4lp0df0kzn08yq";
+  buildDepends = [ syb ];
+  meta = {
+    description = "Expands type synonyms in Template Haskell ASTs";
+    license = self.stdenv.lib.licenses.bsd3;
+    platforms = self.ghc.meta.platforms;
+  };
+})

pkgs/top-level/haskell-packages.nix

@@ -739,6 +739,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   cautiousFile = callPackage ../development/libraries/haskell/cautious-file {};
 
+  CCdelcont = callPackage ../development/libraries/haskell/CC-delcont {};
+
   cereal = callPackage ../development/libraries/haskell/cereal {};
 
   cerealConduit = callPackage ../development/libraries/haskell/cereal-conduit {};
@@ -816,10 +818,14 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   compactStringFix = callPackage ../development/libraries/haskell/compact-string-fix {};
 
+  composition = callPackage ../development/libraries/haskell/composition {};
+
   concatenative = callPackage ../development/libraries/haskell/concatenative {};
 
   concreteTyperep = callPackage ../development/libraries/haskell/concreteTyperep {};
 
+  cond = callPackage ../development/libraries/haskell/cond {};
+
   conduit = callPackage ../development/libraries/haskell/conduit {};
 
   conduitCombinators = callPackage ../development/libraries/haskell/conduit-combinators {};
@@ -1012,6 +1018,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   doctest = callPackage ../development/libraries/haskell/doctest {};
 
+  doctestProp = callPackage ../development/libraries/haskell/doctest-prop {};
+
   dotgen = callPackage ../development/libraries/haskell/dotgen {};
 
   doubleConversion = callPackage ../development/libraries/haskell/double-conversion {};
@@ -1616,6 +1624,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   jsonTypes = callPackage ../development/libraries/haskell/jsonTypes {};
 
+  kanExtensions = callPackage ../development/libraries/haskell/kan-extensions {};
+
   kansasLava = callPackage ../development/libraries/haskell/kansas-lava {};
 
   keys = callPackage ../development/libraries/haskell/keys {};
@@ -1774,6 +1784,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   monadControl = callPackage ../development/libraries/haskell/monad-control {};
 
+  monadCoroutine = callPackage ../development/libraries/haskell/monad-coroutine {};
+
   monadcryptorandom = callPackage ../development/libraries/haskell/monadcryptorandom {};
 
   monadExtras = callPackage ../development/libraries/haskell/monad-extras {};
@@ -1790,6 +1802,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
   monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {};
   monadPar = self.monadPar_0_3_4_6;
 
+  monadParallel = callPackage ../development/libraries/haskell/monad-parallel {};
+
   monadParExtras = callPackage ../development/libraries/haskell/monad-par-extras {};
 
   monadPeel = callPackage ../development/libraries/haskell/monad-peel {};
@@ -1798,6 +1812,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {};
 
+  monadStm = callPackage ../development/libraries/haskell/monad-stm {};
+
   monadsTf = callPackage ../development/libraries/haskell/monads-tf {};
 
   monoidExtras = callPackage ../development/libraries/haskell/monoid-extras {};
@@ -1834,6 +1850,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   multiarg = callPackage ../development/libraries/haskell/multiarg {};
 
+  multimap = callPackage ../development/libraries/haskell/multimap {};
+
   multiplate = callPackage ../development/libraries/haskell/multiplate {};
 
   multirec = callPackage ../development/libraries/haskell/multirec {};
@@ -2189,6 +2207,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   reflection = callPackage ../development/libraries/haskell/reflection {};
 
+  regexApplicative = callPackage ../development/libraries/haskell/regex-applicative {};
+
   regexBase_0_72_0_2 = callPackage ../development/libraries/haskell/regex-base/0.72.0.2.nix {};
   regexBase_0_93_1   = callPackage ../development/libraries/haskell/regex-base/0.93.1.nix {};
   regexBase_0_93_2   = callPackage ../development/libraries/haskell/regex-base/0.93.2.nix {};
@@ -2241,6 +2261,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   rethinkdb = callPackage ../development/libraries/haskell/rethinkdb {};
 
+  rex = callPackage ../development/libraries/haskell/rex {};
+
   rfc5051 = callPackage ../development/libraries/haskell/rfc5051 {};
 
   robotsTxt = callPackage ../development/libraries/haskell/robots-txt {};
@@ -2321,6 +2343,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   sparse = callPackage ../development/libraries/haskell/sparse {};
 
+  speculation = callPackage ../development/libraries/haskell/speculation {};
+
   spoon = callPackage ../development/libraries/haskell/spoon {};
 
   srcloc = callPackage ../development/libraries/haskell/srcloc {};
@@ -2443,6 +2467,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   stmConduit = callPackage ../development/libraries/haskell/stm-conduit {};
 
+  stmStats = callPackage ../development/libraries/haskell/stm-stats {};
+
   storableComplex = callPackage ../development/libraries/haskell/storable-complex {};
 
   storableRecord = callPackage ../development/libraries/haskell/storable-record {};
@@ -2555,6 +2581,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
 
   thDesugar = callPackage ../development/libraries/haskell/th-desugar {};
 
+  thExpandSyns = callPackage ../development/libraries/haskell/th-expand-syns {};
+
   thExtras = callPackage ../development/libraries/haskell/th-extras {};
 
   thLift = callPackage ../development/libraries/haskell/th-lift {};