From 31d32ab7b60cc19df34de0e1ca0efc0d865b94ed Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Tue, 27 Jan 2015 23:52:38 +0300 Subject: [PATCH 1/6] haskell-resource-pool: update to version 0.2.3.2 --- pkgs/development/libraries/haskell/resource-pool/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resource-pool/default.nix b/pkgs/development/libraries/haskell/resource-pool/default.nix index cb43b927c2e..76492381c7a 100644 --- a/pkgs/development/libraries/haskell/resource-pool/default.nix +++ b/pkgs/development/libraries/haskell/resource-pool/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resource-pool"; - version = "0.2.3.1"; - sha256 = "02fpw5jfzcdhijx8mfpb6j4c8sxl36f04i2nx3cbivh9yhbgqr92"; + version = "0.2.3.2"; + sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6"; buildDepends = [ hashable monadControl stm time transformers transformersBase vector ]; From 05ab046db920784ef1183c3ad3a1b0a2b8f45bf0 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Tue, 27 Jan 2015 23:59:36 +0300 Subject: [PATCH 2/6] haskell-monad-logger: update to version 0.3.11.1 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 68e3c0164c0..7988819b81c 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.11"; - sha256 = "0ydxv4pdq660dh3cdmsd5lgjkfhh7c62kb5vcl8jl6qmjf8kvmdq"; + version = "0.3.11.1"; + sha256 = "1vh847ivymhb20sly9aplcm35zcmn7xmibv8lkv1ws9y7s1951p7"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text From 559a7c8f38fdc100195a8aaf210306d22bb2ccb0 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 28 Jan 2015 00:04:14 +0300 Subject: [PATCH 3/6] haskell-persistent: update to version 2.1.1.4 --- pkgs/development/libraries/haskell/persistent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent/default.nix b/pkgs/development/libraries/haskell/persistent/default.nix index 21c49c457f9..9775f510d42 100644 --- a/pkgs/development/libraries/haskell/persistent/default.nix +++ b/pkgs/development/libraries/haskell/persistent/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "persistent"; - version = "2.1.1"; - sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1"; + version = "2.1.1.4"; + sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2"; buildDepends = [ aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit exceptions fastLogger liftedBase monadControl monadLogger mtl From fcdcb01d02709648189d8fac0ac62f03b8ec2a9d Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 28 Jan 2015 00:16:13 +0300 Subject: [PATCH 4/6] haskell-yesod-core: update to version 1.4.7.2 --- .../libraries/haskell/yesod-core/default.nix | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 8c87981a693..571778cfdc4 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -3,18 +3,18 @@ { cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml , blazeMarkup, caseInsensitive, cereal, clientsession, conduit , conduitExtra, cookie, dataDefault, deepseq, exceptions -, fastLogger, hspec, httpTypes, HUnit, liftedBase, monadControl -, monadLogger, mtl, mwcRandom, network, parsec, pathPieces -, primitive, QuickCheck, random, resourcet, safe, shakespeare -, streamingCommons, text, time, transformers, transformersBase -, unixCompat, unorderedContainers, vector, wai, waiExtra, waiLogger -, warp, word8 +, fastLogger, hspec, hspecExpectations, httpTypes, HUnit +, liftedBase, monadControl, monadLogger, mtl, mwcRandom, network +, parsec, pathPieces, primitive, QuickCheck, random, resourcet +, safe, shakespeare, streamingCommons, text, time, transformers +, transformersBase, unixCompat, unorderedContainers, vector, wai +, waiExtra, waiLogger, warp, word8 }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.6"; - sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g"; + version = "1.4.7.2"; + sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y"; buildDepends = [ aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault @@ -25,11 +25,11 @@ cabal.mkDerivation (self: { word8 ]; testDepends = [ - async blazeBuilder conduit conduitExtra hspec httpTypes HUnit - liftedBase mwcRandom network pathPieces QuickCheck random resourcet - shakespeare streamingCommons text transformers wai waiExtra + async blazeBuilder clientsession conduit conduitExtra cookie hspec + hspecExpectations httpTypes HUnit liftedBase mwcRandom network + pathPieces QuickCheck random resourcet shakespeare streamingCommons + text transformers wai waiExtra ]; - jailbreak = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; From a2f6a768f2d1bdfe4b0e37b435cf41b877f89249 Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Wed, 28 Jan 2015 00:28:29 +0300 Subject: [PATCH 5/6] haskell-yesod: update to version 1.4.1.4 --- pkgs/development/libraries/haskell/yesod/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 04b4ebee52f..4b5679512a9 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.4.1.1"; - sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx"; + version = "1.4.1.4"; + sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger monadControl monadLogger safe semigroups shakespeare From 8f8258eeab0ba80b0a72ed4918455134f61ba18c Mon Sep 17 00:00:00 2001 From: Nikita Karetnikov Date: Thu, 29 Jan 2015 00:26:17 +0300 Subject: [PATCH 6/6] haskell-xml-conduit: update to version 1.2.3.1 --- pkgs/development/libraries/haskell/xml-conduit/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-conduit/default.nix b/pkgs/development/libraries/haskell/xml-conduit/default.nix index a6e0cdfa3b0..8a352a27ba3 100644 --- a/pkgs/development/libraries/haskell/xml-conduit/default.nix +++ b/pkgs/development/libraries/haskell/xml-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "xml-conduit"; - version = "1.2.3"; - sha256 = "1knwmvs9hczlknyi27hciy1xkn219s6niv3w7q0wkw6rxz2q555v"; + version = "1.2.3.1"; + sha256 = "10cqhqpc85zx87jc0hapzkvwm76drpxqsjliipvlah2a0x8l4ai8"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup conduit conduitExtra dataDefault deepseq monadControl resourcet systemFilepath text @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { blazeMarkup conduit hspec HUnit resourcet text transformers xmlTypes ]; - jailbreak = true; meta = { homepage = "http://github.com/snoyberg/xml"; description = "Pure-Haskell utilities for dealing with XML with the conduit package";