public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6220 from joachifm/haskell-updates

Browse Source 
Fix several haskellPackages build failures
This commit is contained in:
Peter Simons
2015-02-08 12:43:45 +01:00
parent 53a4fc8cd8 9cc3a7771c
commit 8515b5ca7a
19 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/haskell/EitherT/default.nix
+2
View File
@@ -12,5 +12,7 @@ cabal.mkDerivation (self: {
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; maintainers = with self.stdenv.lib.maintainers; [ ocharles ];
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
}; };
}) })
pkgs/development/libraries/haskell/distributed-process-monad-control/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "distributed-process-monad-control"; pname = "distributed-process-monad-control";
version = "0.5.0"; version = "0.5.1";
sha256 = "1ja6xwdpssm7wafv2id6c3f49iw7pkks2smk6l1n1dxkh029z8nk"; sha256 = "01sdzmb8izsycxshhsg0pbx0mgn10y41df1dj1s66ish0qszw07m";
buildDepends = [ buildDepends = [
distributedProcess monadControl transformers transformersBase distributedProcess monadControl transformers transformersBase
]; ];
pkgs/development/libraries/haskell/fb/default.nix
+2 -3
View File
@@ -10,8 +10,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "fb"; pname = "fb";
version = "1.0.7"; version = "1.0.8";
sha256 = "0ghyddxf4aqidqvbm93pjgaban0whfj4y1w11b7nxy89srhyjhh8"; sha256 = "1cv722kkp6lbxajv3ka4088x2491yy41cfypqqkq753mm59x6s9m";
buildDepends = [ buildDepends = [
aeson attoparsec base16Bytestring base64Bytestring cereal conduit aeson attoparsec base16Bytestring base64Bytestring cereal conduit
conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault conduitExtra cryptoApi cryptohash cryptohashCryptoapi dataDefault
@@ -22,7 +22,6 @@ cabal.mkDerivation (self: {
aeson conduit dataDefault hspec httpConduit HUnit liftedBase aeson conduit dataDefault hspec httpConduit HUnit liftedBase
monadControl QuickCheck resourcet text time transformers monadControl QuickCheck resourcet text time transformers
]; ];
jailbreak = true;
doCheck = false; doCheck = false;
meta = { meta = {
homepage = "https://github.com/prowdsponsor/fb"; homepage = "https://github.com/prowdsponsor/fb";
pkgs/development/libraries/haskell/happstack/happstack-server.nix
+2 -4
View File
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "happstack-server"; pname = "happstack-server";
version = "7.3.9"; version = "7.4.0";
sha256 = "10js2kmxw5lyy1h5xyz7qx852d29cl48qxyvadc4bdad6w06gdlz"; sha256 = "009y87g4wika9g0p58v8sdayh41rixkivhvi7j1dnxbm4qy89qpk";
buildDepends = [ buildDepends = [
base64Bytestring blazeHtml extensibleExceptions filepath hslogger base64Bytestring blazeHtml extensibleExceptions filepath hslogger
html monadControl mtl network networkUri parsec sendfile syb html monadControl mtl network networkUri parsec sendfile syb
@@ -18,8 +18,6 @@ cabal.mkDerivation (self: {
transformersBase utf8String xhtml zlib transformersBase utf8String xhtml zlib
]; ];
testDepends = [ HUnit parsec zlib ]; testDepends = [ HUnit parsec zlib ];
jailbreak = true;
doCheck = false;
meta = { meta = {
homepage = "http://happstack.com"; homepage = "http://happstack.com";
description = "Web related tools and services"; description = "Web related tools and services";
pkgs/development/libraries/haskell/hcltest/default.nix
+2
View File
@@ -21,5 +21,7 @@ cabal.mkDerivation (self: {
description = "A testing library for command line applications"; description = "A testing library for command line applications";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
}; };
}) })
pkgs/development/libraries/haskell/higher-leveldb/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "higher-leveldb"; pname = "higher-leveldb";
version = "0.2.0.0"; version = "0.2.1.0";
sha256 = "1al8l96ysmcjx3g93ryfr939jqhjqk8g5bvww5gj9mx6pdkqrcm3"; sha256 = "13bwh9jg7smh8vwgrih79ivi073690l9nn478r5m0w64gbkvdm5p";
buildDepends = [ buildDepends = [
cereal dataDefault leveldbHaskell liftedBase monadControl mtl cereal dataDefault leveldbHaskell liftedBase monadControl mtl
resourcet transformers transformersBase resourcet transformers transformersBase
pkgs/development/libraries/haskell/hsc3-server/default.nix
+2
View File
@@ -26,5 +26,7 @@ cabal.mkDerivation (self: {
description = "SuperCollider server resource management and synchronization"; description = "SuperCollider server resource management and synchronization";
license = "GPL"; license = "GPL";
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
}; };
}) })
pkgs/development/libraries/haskell/iteratee/default.nix
+2
View File
@@ -23,5 +23,7 @@ cabal.mkDerivation (self: {
description = "Iteratee-based I/O"; description = "Iteratee-based I/O";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
}; };
}) })
pkgs/development/libraries/haskell/jwt/default.nix
+5 -5
View File
@@ -1,9 +1,9 @@
# This file was auto-generated by cabal2nix. Please do NOT edit manually! # This file was auto-generated by cabal2nix. Please do NOT edit manually!
{ cabal, aeson, base64Bytestring, cryptohash, dataDefault { cabal, aeson, base64Bytestring, cryptohash, dataDefault
, httpTypes, HUnit, network, networkUri, QuickCheck, scientific , httpTypes, HUnit, lens, lensAeson, network, networkUri
, semigroups, tasty, tastyHunit, tastyQuickcheck, tastyTh, text , QuickCheck, scientific, semigroups, tasty, tastyHunit
, time, unorderedContainers, vector , tastyQuickcheck, tastyTh, text, time, unorderedContainers, vector
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@@ -16,8 +16,8 @@ cabal.mkDerivation (self: {
vector vector
]; ];
testDepends = [ testDepends = [
aeson base64Bytestring cryptohash dataDefault httpTypes HUnit aeson base64Bytestring cryptohash dataDefault httpTypes HUnit lens
network networkUri QuickCheck scientific semigroups tasty lensAeson network networkUri QuickCheck scientific semigroups tasty
tastyHunit tastyQuickcheck tastyTh text time unorderedContainers tastyHunit tastyQuickcheck tastyTh text time unorderedContainers
vector vector
]; ];
pkgs/development/libraries/haskell/list-t/default.nix
+3 -3
View File
@@ -6,12 +6,12 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "list-t"; pname = "list-t";
version = "0.3.0"; version = "0.4.2";
sha256 = "091gz47gisajd2p0iwx0mw99bivfl7wpyddg1ypsvjv2qax94cm9"; sha256 = "0n6zc7n5znjas9mgh3a9bn44xv55910i6c3b2l83n4pl9fnad03v";
buildDepends = [ buildDepends = [
basePrelude mmorph monadControl transformers transformersBase basePrelude mmorph monadControl transformers transformersBase
]; ];
testDepends = [ basePrelude HTF mtlPrelude ]; testDepends = [ basePrelude HTF mmorph mtlPrelude ];
meta = { meta = {
homepage = "https://github.com/nikita-volkov/list-t"; homepage = "https://github.com/nikita-volkov/list-t";
description = "ListT done right"; description = "ListT done right";
pkgs/development/libraries/haskell/persistent/default.nix
+2 -2
View File
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "persistent"; pname = "persistent";
version = "2.1.1"; version = "2.1.1.4";
sha256 = "0wmvjizz0zx5i9q5sh8hvsks14q6if4s0dnk63f9mw03jb8jpdd1"; sha256 = "0nknyrxh28i4cf50fj6mclgd4qnrqsby1w1bzj8jmg8snbyp69d2";
buildDepends = [ buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
exceptions fastLogger liftedBase monadControl monadLogger mtl exceptions fastLogger liftedBase monadControl monadLogger mtl
pkgs/development/libraries/haskell/resource-pool/default.nix
+2 -2
View File
@@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "resource-pool"; pname = "resource-pool";
version = "0.2.3.1"; version = "0.2.3.2";
sha256 = "02fpw5jfzcdhijx8mfpb6j4c8sxl36f04i2nx3cbivh9yhbgqr92"; sha256 = "04mw8b9djb14zp4rdi6h7mc3zizh597ffiinfbr4m0m8psifw9w6";
buildDepends = [ buildDepends = [
hashable monadControl stm time transformers transformersBase vector hashable monadControl stm time transformers transformersBase vector
]; ];
pkgs/development/libraries/haskell/rest-client/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "rest-client"; pname = "rest-client";
version = "0.4.0.1"; version = "0.4.0.5";
sha256 = "1bn2kgyr6q0wxlp3kman20wn7jgz5dc6m8rq5xf0mknpbh8rrnpc"; sha256 = "11rsy9an7ck94ijafqd2ddichz0xgb01w2ybyg3iiwy5ckiy384s";
buildDepends = [ buildDepends = [
aesonUtils caseInsensitive dataDefault exceptionTransformers aesonUtils caseInsensitive dataDefault exceptionTransformers
httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive httpConduit httpTypes hxt hxtPickleUtils monadControl mtl primitive
pkgs/development/libraries/haskell/shell-conduit/default.nix
+2
View File
@@ -19,5 +19,7 @@ cabal.mkDerivation (self: {
description = "Write shell scripts with Conduit"; description = "Write shell scripts with Conduit";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;
hydraPlatforms = self.stdenv.lib.platforms.none;
broken = true;
}; };
}) })
pkgs/development/libraries/haskell/simple-conduit/default.nix
+1
View File
@@ -16,6 +16,7 @@ cabal.mkDerivation (self: {
primitive semigroups stm streamingCommons text transformers primitive semigroups stm streamingCommons text transformers
transformersBase vector transformersBase vector
]; ];
jailbreak = true;
meta = { meta = {
homepage = "http://github.com/jwiegley/simple-conduit"; homepage = "http://github.com/jwiegley/simple-conduit";
description = "A simple streaming I/O library based on monadic folds"; description = "A simple streaming I/O library based on monadic folds";
pkgs/development/libraries/haskell/stm-conduit/default.nix
+2 -2
View File
@@ -8,8 +8,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "stm-conduit"; pname = "stm-conduit";
version = "2.5.2"; version = "2.5.3";
sha256 = "1r8l9nznavxd0cg30mj7qdp9nq8jlcr0vcv8ljn6lfw67s0pk82x"; sha256 = "1jsij92i3rw2wz1166i58p0lxrbx0jndf1hi3kj92ccvnc3zg1iw";
buildDepends = [ buildDepends = [
async cereal cerealConduit conduit conduitExtra liftedAsync async cereal cerealConduit conduit conduitExtra liftedAsync
liftedBase monadControl monadLoops resourcet stm stmChans liftedBase monadControl monadLoops resourcet stm stmChans
pkgs/development/libraries/haskell/webdriver/default.nix
+2 -3
View File
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "webdriver"; pname = "webdriver";
version = "0.6.0.3"; version = "0.6.0.4";
sha256 = "1q0l9rs5j4cxzyqsy6r40y425359s246spk3g3pks7s47yynjn4q"; sha256 = "1miy65dl60gymf0a65kjykdmsl3cwcjrfg1iiyk6vkjz39y6y7qf";
buildDepends = [ buildDepends = [
aeson attoparsec base64Bytestring cond dataDefault directoryTree aeson attoparsec base64Bytestring cond dataDefault directoryTree
exceptions filepath httpClient httpTypes liftedBase monadControl exceptions filepath httpClient httpTypes liftedBase monadControl
@@ -18,7 +18,6 @@ cabal.mkDerivation (self: {
transformersBase unorderedContainers vector zipArchive transformersBase unorderedContainers vector zipArchive
]; ];
testDepends = [ parallel text ]; testDepends = [ parallel text ];
jailbreak = true;
doCheck = false; doCheck = false;
meta = { meta = {
homepage = "https://github.com/kallisti-dev/hs-webdriver"; homepage = "https://github.com/kallisti-dev/hs-webdriver";
pkgs/development/libraries/haskell/yesod-core/default.nix
+12 -12
View File
@@ -3,18 +3,18 @@
{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml { cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml
, blazeMarkup, caseInsensitive, cereal, clientsession, conduit , blazeMarkup, caseInsensitive, cereal, clientsession, conduit
, conduitExtra, cookie, dataDefault, deepseq, exceptions , conduitExtra, cookie, dataDefault, deepseq, exceptions
, fastLogger, hspec, httpTypes, HUnit, liftedBase, monadControl , fastLogger, hspec, hspecExpectations, httpTypes, HUnit
, monadLogger, mtl, mwcRandom, network, parsec, pathPieces , liftedBase, monadControl, monadLogger, mtl, mwcRandom, network
, primitive, QuickCheck, random, resourcet, safe, shakespeare , parsec, pathPieces, primitive, QuickCheck, random, resourcet
, streamingCommons, text, time, transformers, transformersBase , safe, shakespeare, streamingCommons, text, time, transformers
, unixCompat, unorderedContainers, vector, wai, waiExtra, waiLogger , transformersBase, unixCompat, unorderedContainers, vector, wai
, warp, word8 , waiExtra, waiLogger, warp, word8
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-core"; pname = "yesod-core";
version = "1.4.6"; version = "1.4.7.2";
sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g"; sha256 = "0k6zsjds594zy0cvnryz071nis3zmv1sjiyn14cc80j0rvjll46y";
buildDepends = [ buildDepends = [
aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive
cereal clientsession conduit conduitExtra cookie dataDefault cereal clientsession conduit conduitExtra cookie dataDefault
@@ -25,11 +25,11 @@ cabal.mkDerivation (self: {
word8 word8
]; ];
testDepends = [ testDepends = [
async blazeBuilder conduit conduitExtra hspec httpTypes HUnit async blazeBuilder clientsession conduit conduitExtra cookie hspec
liftedBase mwcRandom network pathPieces QuickCheck random resourcet hspecExpectations httpTypes HUnit liftedBase mwcRandom network
shakespeare streamingCommons text transformers wai waiExtra pathPieces QuickCheck random resourcet shakespeare streamingCommons
text transformers wai waiExtra
]; ];
jailbreak = true;
meta = { meta = {
homepage = "http://www.yesodweb.com/"; homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications"; description = "Creation of type-safe, RESTful web applications";
pkgs/development/libraries/haskell/yesod/default.nix
+2 -2
View File
@@ -9,8 +9,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod"; pname = "yesod";
version = "1.4.1.1"; version = "1.4.1.4";
sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx"; sha256 = "1av6s5nanq5y9fqlzq2yq95989gg1fyqlpzg6y5pl4dcc45srm1x";
buildDepends = [ buildDepends = [
aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger
monadControl monadLogger safe semigroups shakespeare monadControl monadLogger safe semigroups shakespeare