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

Merge remote-tracking branch 'origin/master' into stdenv-updates.

This commit is contained in:
Peter Simons 2013-09-09 09:51:12 +02:00
parent 7ca2ab26c6 2943574903
commit a4531a5dd5
45 changed files with 164 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/haskell/boomerang/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "boomerang"; pname = "boomerang";
version = "1.3.3"; version = "1.4.0";
sha256 = "1i44j3qyjkq69h65wfsrps5zp097i3nh9fwcb2f1spr8nznb5mff"; sha256 = "1z6sx2r886jms59ah31is0fqkwix2kwxmpnrc6bb2r6xazznxfc9";
buildDepends = [ mtl text ]; buildDepends = [ mtl text ];
meta = { meta = {
description = "Library for invertible parsing and printing"; description = "Library for invertible parsing and printing";

4
pkgs/development/libraries/haskell/cereal-conduit/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cereal-conduit"; pname = "cereal-conduit";
version = "0.7"; version = "0.7.1";
sha256 = "0cf0lp47qiilrdrzmn58hwh3q7fh7g55f2a1r1bw31xapp1cvbix"; sha256 = "0ry6vc3nkb1lj0p103b8pyd3472hx62s3c7yw3fk8mbjlygxyv43";
buildDepends = [ cereal conduit transformers ]; buildDepends = [ cereal conduit transformers ];
testDepends = [ cereal conduit HUnit mtl resourcet transformers ]; testDepends = [ cereal conduit HUnit mtl resourcet transformers ];
meta = { meta = {

4
pkgs/development/libraries/haskell/cipher-blowfish/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cipher-blowfish"; pname = "cipher-blowfish";
version = "0.0.1"; version = "0.0.2";
sha256 = "0bz8jd65idcalyzcbmgz16hr6y5mnw7mckk5yvrm9k19cr6mwq52"; sha256 = "08jc1qsvnyk7zm7bp0nibkc6lx3bkid79cn1r6fidmccf716r3sp";
buildDepends = [ byteable cryptoCipherTypes securemem vector ]; buildDepends = [ byteable cryptoCipherTypes securemem vector ];
testDepends = [ testDepends = [
byteable cryptoCipherTests cryptoCipherTypes QuickCheck byteable cryptoCipherTests cryptoCipherTypes QuickCheck

4
pkgs/development/libraries/haskell/cipher-des/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cipher-des"; pname = "cipher-des";
version = "0.0.3"; version = "0.0.4";
sha256 = "1gcpwfxrlgwl34yy7k3vhpmcrmyiirbmz40zssk2lv6cfrylc4z7"; sha256 = "18xpc7v0xyh0qb7p03ail1lyh376h1vg000xn22b5shpgp5kxiqq";
buildDepends = [ byteable cryptoCipherTypes securemem ]; buildDepends = [ byteable cryptoCipherTypes securemem ];
testDepends = [ testDepends = [
byteable cryptoCipherTests cryptoCipherTypes QuickCheck byteable cryptoCipherTests cryptoCipherTypes QuickCheck

1
pkgs/development/libraries/haskell/citeproc-hs/default.nix
View File

@ -10,6 +10,7 @@ cabal.mkDerivation (self: {
filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec filepath hexpat hsBibutils HTTP json mtl network pandocTypes parsec
syb time utf8String syb time utf8String
]; ];
jailbreak = true;
meta = { meta = {
homepage = "http://gorgias.mine.nu/repos/citeproc-hs/"; homepage = "http://gorgias.mine.nu/repos/citeproc-hs/";
description = "A Citation Style Language implementation in Haskell"; description = "A Citation Style Language implementation in Haskell";

4
pkgs/development/libraries/haskell/conduit/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "conduit"; pname = "conduit";
version = "1.0.7.3"; version = "1.0.7.4";
sha256 = "0ih3ymv5m3c66wr9xydc1dxgpvh5b92dyyc7v67li6n3w7dzi6fp"; sha256 = "1bvi9gw9sfi1fml339rn3cfq4i3yd9j9vw41p5cpz5pnv3gw225x";
buildDepends = [ buildDepends = [
liftedBase mmorph monadControl mtl resourcet text transformers liftedBase mmorph monadControl mtl resourcet text transformers
transformersBase void transformersBase void

4
pkgs/development/libraries/haskell/cprng-aes/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cprng-aes"; pname = "cprng-aes";
version = "0.5.1"; version = "0.5.2";
sha256 = "1bw76y2krcshimvwzph76d69bdfaxfi21w4dxfslmqm78knlls47"; sha256 = "1nf8dd83ywriq2ynv48f2s5lvc9s3srq4j5vbspmf0kc74kmq2pf";
buildDepends = [ byteable cipherAes cryptoRandom random ]; buildDepends = [ byteable cipherAes cryptoRandom random ];
meta = { meta = {
homepage = "http://github.com/vincenthz/hs-cprng-aes"; homepage = "http://github.com/vincenthz/hs-cprng-aes";

4
pkgs/development/libraries/haskell/crypto-numbers/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "crypto-numbers"; pname = "crypto-numbers";
version = "0.2.0"; version = "0.2.1";
sha256 = "1s4q9qqb7qb0shaxmhhxixsnhgwn2h6nxxblkfqqqvkdiwis278j"; sha256 = "1bc24xk101x7npv083gzh3vjzwjh65ql85h4z0vxk3lnd0pmdmnq";
buildDepends = [ cryptoRandom vector ]; buildDepends = [ cryptoRandom vector ];
testDepends = [ testDepends = [
byteable cryptoRandom HUnit QuickCheck testFramework byteable cryptoRandom HUnit QuickCheck testFramework

4
pkgs/development/libraries/haskell/crypto-random/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "crypto-random"; pname = "crypto-random";
version = "0.0.5"; version = "0.0.7";
sha256 = "1wvbbqqfqaylq9w8pyiz243d06ivh982mhb2ci5yhjl06vqv2gk3"; sha256 = "1dj63y85l3f1x7fw8j7hykz56ajd38iikl3f8ygaz8r95pd1zjxw";
buildDepends = [ securemem vector ]; buildDepends = [ securemem vector ];
meta = { meta = {
homepage = "http://github.com/vincenthz/hs-crypto-random"; homepage = "http://github.com/vincenthz/hs-crypto-random";

4
pkgs/development/libraries/haskell/derive/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "derive"; pname = "derive";
version = "2.5.12"; version = "2.5.13";
sha256 = "17agsdarxm22z4g911layb5g11gg8r1p2ar86pg1ch1q0jnhfqxr"; sha256 = "0lmwj66s4krh29qqmkyc3cn3j4b4mhyqvlngvmy1xaigmgib5aci";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

1
pkgs/development/libraries/haskell/digestive-functors-heist/default.nix
View File

@ -8,6 +8,7 @@ cabal.mkDerivation (self: {
buildDepends = [ buildDepends = [
blazeBuilder digestiveFunctors heist mtl text xmlhtml blazeBuilder digestiveFunctors heist mtl text xmlhtml
]; ];
jailbreak = true;
meta = { meta = {
homepage = "http://github.com/jaspervdj/digestive-functors"; homepage = "http://github.com/jaspervdj/digestive-functors";
description = "Heist frontend for the digestive-functors library"; description = "Heist frontend for the digestive-functors library";

4
pkgs/development/libraries/haskell/gnutls/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "gnutls"; pname = "gnutls";
version = "0.1.4"; version = "0.1.5";
sha256 = "0xgjp274m4z005z77lhmh7blg6rw9g28jm0sd376rr49hykbxwd1"; sha256 = "1sf6b4g0jwk1jrzjq4vwwak57lzm1zc43ggysp973q5icm6gs8wp";
buildDepends = [ monadsTf transformers ]; buildDepends = [ monadsTf transformers ];
extraLibraries = [ gnutls ]; extraLibraries = [ gnutls ];
pkgconfigDepends = [ gnutls ]; pkgconfigDepends = [ gnutls ];

4
pkgs/development/libraries/haskell/hamlet/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hamlet"; pname = "hamlet";
version = "1.1.7.1"; version = "1.1.7.2";
sha256 = "1kcjzvslxis8qapy7g1cqkqqamrnkyammy33pan7ckzv5fd59q5p"; sha256 = "1pfpygbabfmgx01vjkxhf3p9map2v7x8jys06jd6qgc4j90dnk1c";
buildDepends = [ buildDepends = [
blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text blazeBuilder blazeHtml blazeMarkup failure parsec shakespeare text
]; ];

4
pkgs/development/libraries/haskell/heist/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "heist"; pname = "heist";
version = "0.12.0"; version = "0.13.0";
sha256 = "0fdqvippsxljylchfcr32lw367i17cpv4yavjvmhfd923vgmmfj9"; sha256 = "1f406i7jdz45s88n0nrd76vj927a0fx02nf1f98r4in0ic5anp11";
buildDepends = [ buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors aeson attoparsec blazeBuilder blazeHtml directoryTree dlist errors
filepath hashable MonadCatchIOTransformers mtl random text time filepath hashable MonadCatchIOTransformers mtl random text time

4
pkgs/development/libraries/haskell/hspec-meta/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hspec-meta"; pname = "hspec-meta";
version = "1.7.1"; version = "1.7.2";
sha256 = "08g327jnv7alamabxafhsv7ssisgymgsf91khr73zja5x8idfkxc"; sha256 = "03ksxx7w61iw3hf055mjb47bjh8srwxpqxs5bxqdqrilfd1cixmj";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

4
pkgs/development/libraries/haskell/hspec/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hspec"; pname = "hspec";
version = "1.7.1"; version = "1.7.2";
sha256 = "0fc8phc36876f8qydc5iwz3i7nri0n6b4dlxv0w4rcxgv9hp7ls0"; sha256 = "0f0l5kzkpn957v7ibaxz9bxmjmbjaw50z2xs23g2w06zwnxii90h";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

8
pkgs/development/libraries/haskell/http-reverse-proxy/default.nix
View File

@ -1,4 +1,4 @@
{ cabal, blazeBuilder, caseInsensitive, classyPrelude, conduit { cabal, basicPrelude, blazeBuilder, caseInsensitive, conduit
, dataDefault, hspec, httpConduit, httpTypes, liftedBase , dataDefault, hspec, httpConduit, httpTypes, liftedBase
, monadControl, network, networkConduit, text, transformers, wai , monadControl, network, networkConduit, text, transformers, wai
, waiLogger, warp, word8 , waiLogger, warp, word8
@ -6,10 +6,10 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "http-reverse-proxy"; pname = "http-reverse-proxy";
version = "0.2.1"; version = "0.2.1.1";
sha256 = "1f1087igr4kisb3z3lxznb85sfhzr2s08am1za3jg8cgffmrais8"; sha256 = "12hfbl8239ivrqvd5pi1avlcb381q861958qwyf20jc5jpwvjjgj";
buildDepends = [ buildDepends = [
blazeBuilder caseInsensitive classyPrelude conduit dataDefault basicPrelude blazeBuilder caseInsensitive conduit dataDefault
httpConduit httpTypes liftedBase monadControl network httpConduit httpTypes liftedBase monadControl network
networkConduit text wai waiLogger warp word8 networkConduit text wai waiLogger warp word8
]; ];

7
pkgs/development/libraries/haskell/lens/default.nix
View File

@ -10,8 +10,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "lens"; pname = "lens";
version = "3.9.0.2"; version = "3.9.1";
sha256 = "0ch38z33zgdyzjmc7jqwabwq68iidicpzhbwzpd4fvcqdp27apl2"; sha256 = "141v7b5ag6jxnim1hdyxqi5m2sm1j5fpspkcs8qnznfcd33gyfja";
buildDepends = [ buildDepends = [
bifunctors comonad comonadsFd comonadTransformers contravariant bifunctors comonad comonadsFd comonadTransformers contravariant
distributive filepath genericDeriving hashable distributive filepath genericDeriving hashable
@ -26,9 +26,6 @@ cabal.mkDerivation (self: {
transformers unorderedContainers vector transformers unorderedContainers vector
]; ];
doCheck = false; doCheck = false;
patchPhase = ''
sed -i -e 's|generic-deriving.*,|generic-deriving,|' lens.cabal
'';
meta = { meta = {
homepage = "http://github.com/ekmett/lens/"; homepage = "http://github.com/ekmett/lens/";
description = "Lenses, Folds and Traversals"; description = "Lenses, Folds and Traversals";

8
pkgs/development/libraries/haskell/pandoc-types/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, syb }: { cabal, aeson, syb }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "pandoc-types"; pname = "pandoc-types";
version = "1.10"; version = "1.12";
sha256 = "1xbqvgb95h0jhqx2y0jzds3xvycx5gwi3xn6agdmfkg7xhx9hnz6"; sha256 = "1dn5zl6r1vvnqcsdxdd5cv0n44rbffg3sm2jxpvcv9846wpaj8qj";
buildDepends = [ syb ]; buildDepends = [ aeson syb ];
meta = { meta = {
homepage = "http://johnmacfarlane.net/pandoc"; homepage = "http://johnmacfarlane.net/pandoc";
description = "Types for representing a structured document"; description = "Types for representing a structured document";

12
pkgs/development/libraries/haskell/project-template/default.nix
View File

@ -1,19 +1,19 @@
{ cabal, base64Bytestring, base64Conduit, classyPrelude, conduit { cabal, base64Bytestring, base64Conduit, basicPrelude, conduit
, hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath , hspec, mtl, QuickCheck, resourcet, systemFileio, systemFilepath
, text, transformers , text, transformers
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "project-template"; pname = "project-template";
version = "0.1.3"; version = "0.1.3.2";
sha256 = "1nsc4i3s9a7d0nysswhylvnr79z0ax9biiwr7b6jn7jzx0f2bdmm"; sha256 = "076xq5hwi7bfn3cmx8zd19vnj6lj2p7qm2waam94qqw2m466xq50";
buildDepends = [ buildDepends = [
base64Bytestring base64Conduit classyPrelude conduit mtl resourcet base64Bytestring base64Conduit basicPrelude conduit mtl resourcet
systemFileio systemFilepath text transformers systemFileio systemFilepath text transformers
]; ];
testDepends = [ testDepends = [
base64Bytestring classyPrelude conduit hspec QuickCheck base64Bytestring basicPrelude conduit hspec QuickCheck
transformers systemFilepath text transformers
]; ];
meta = { meta = {
homepage = "https://github.com/fpco/haskell-ide"; homepage = "https://github.com/fpco/haskell-ide";

4
pkgs/development/libraries/haskell/resourcet/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "resourcet"; pname = "resourcet";
version = "0.4.7.2"; version = "0.4.8";
sha256 = "0gchdip4srilgqwxdzlamplwqsyrn4df0m72i8pjqpk7zwn96q1w"; sha256 = "10pp4hm5c2k2fqzqpagy03gmr526ac2ji8h7k0mcypf4v0ga620m";
buildDepends = [ buildDepends = [
liftedBase mmorph monadControl mtl transformers transformersBase liftedBase mmorph monadControl mtl transformers transformersBase
]; ];

4
pkgs/development/libraries/haskell/shakespeare-css/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "shakespeare-css"; pname = "shakespeare-css";
version = "1.0.6.2"; version = "1.0.6.3";
sha256 = "1w29k0k5124vygydavb6a5szrv5a6n9qqhf1f27bkk86br55vnw6"; sha256 = "1zwvrdb8kgknp2ri3ws6m0jg41d8kdprvjdimwxh98san7vmk744";
buildDepends = [ parsec shakespeare text transformers ]; buildDepends = [ parsec shakespeare text transformers ];
testDepends = [ hspec HUnit shakespeare text ]; testDepends = [ hspec HUnit shakespeare text ];
meta = { meta = {

4
pkgs/development/libraries/haskell/shakespeare-i18n/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "shakespeare-i18n"; pname = "shakespeare-i18n";
version = "1.0.0.3"; version = "1.0.0.4";
sha256 = "0k5daz6ayc4d6zxsq7p27bp5fq4qr31qxw9z9mwb5xcz2404d00r"; sha256 = "1ia73rq9kva2v4vxcyc2nzbvvkrbwrx48gjhnljx39szx1klyk3l";
buildDepends = [ parsec shakespeare text ]; buildDepends = [ parsec shakespeare text ];
testDepends = [ hspec text ]; testDepends = [ hspec text ];
meta = { meta = {

4
pkgs/development/libraries/haskell/shakespeare-js/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "shakespeare-js"; pname = "shakespeare-js";
version = "1.1.4.1"; version = "1.2.0";
sha256 = "1mvsdbc3c6vgdpdb4m8b2d28vrh79v64vb9wkpnvhfg0jn7kb5c0"; sha256 = "1g37m7shqxfv7i2dk5qhvxldfzh1xipd91vcyqhks1jwa5byarzj";
buildDepends = [ aeson shakespeare text ]; buildDepends = [ aeson shakespeare text ];
testDepends = [ aeson hspec HUnit shakespeare text ]; testDepends = [ aeson hspec HUnit shakespeare text ];
meta = { meta = {

4
pkgs/development/libraries/haskell/shakespeare-text/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "shakespeare-text"; pname = "shakespeare-text";
version = "1.0.0.6"; version = "1.0.0.7";
sha256 = "1qlf51rpyzgnxdhyfs6g3vh8zq5vyq263qhm577w7rc9s4hjxk45"; sha256 = "0vl8884a0x927svvkza5xzjn4g1rip8dak1zh9wkm4d0q7lhv2px";
buildDepends = [ shakespeare text ]; buildDepends = [ shakespeare text ];
testDepends = [ hspec HUnit text ]; testDepends = [ hspec HUnit text ];
meta = { meta = {

4
pkgs/development/libraries/haskell/shakespeare/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "shakespeare"; pname = "shakespeare";
version = "1.0.5.1"; version = "1.2.0";
sha256 = "1qsg23jqv6lzwqk42yapqydx3fn6crkrzim8wr7ds55z6iblxbq6"; sha256 = "0lzzdkry3sm5i5hhdygsikpnaps66k1sfdxi2mp0ly5aqi1n1blz";
buildDepends = [ parsec systemFileio systemFilepath text time ]; buildDepends = [ parsec systemFileio systemFilepath text time ];
testDepends = [ testDepends = [
hspec parsec systemFileio systemFilepath text time hspec parsec systemFileio systemFilepath text time

4
pkgs/development/libraries/haskell/snap/snap.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "snap"; pname = "snap";
version = "0.12.1"; version = "0.13.0";
sha256 = "0mmmai257r3ssmy58v4c3hds0i0hwrww6r495j8yb2r90b31b1gg"; sha256 = "03m6fi8dbc69i6mafyq2xxdmqp1zm0akfilahvjd7cknf4qhdyq7";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

12
pkgs/development/libraries/haskell/system-posix-redirect/default.nix Normal file
View File

@ -0,0 +1,12 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "system-posix-redirect";
version = "1.1";
sha256 = "08l8n671ypmharmkm9s8wv5ipcznn7hv5zadf96liml3v16d8fcr";
meta = {
description = "A toy module that allows you to temporarily redirect a program's stdout";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

4
pkgs/development/libraries/haskell/tagsoup/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "tagsoup"; pname = "tagsoup";
version = "0.12.8"; version = "0.13";
sha256 = "05cm9h80qmxvk7xhlgly9zcmpbsajagspaa8p6k4ddch6q9lj7m3"; sha256 = "1pfkcfrmhzxplfkdzb0zj24dfsddw91plqp3mg2gqkv82y8blzk1";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ text ]; buildDepends = [ text ];

10
pkgs/development/libraries/haskell/thyme/default.nix
View File

@ -1,5 +1,5 @@
{ cabal, attoparsec, deepseq, lens, QuickCheck { cabal, attoparsec, Cabal, deepseq, filepath, lens, QuickCheck
, random, text, time, transformers, vector , random, systemPosixRedirect, text, time, transformers, vector
, vectorSpace , vectorSpace
}: }:
@ -11,8 +11,10 @@ cabal.mkDerivation (self: {
attoparsec deepseq lens QuickCheck random text time transformers attoparsec deepseq lens QuickCheck random text time transformers
vector vectorSpace vector vectorSpace
]; ];
# have some strange test depends testDepends = [
doCheck = false; attoparsec Cabal filepath lens QuickCheck random
systemPosixRedirect text time vectorSpace
];
meta = { meta = {
homepage = "https://github.com/liyang/thyme"; homepage = "https://github.com/liyang/thyme";
description = "A faster time library"; description = "A faster time library";

4
pkgs/development/libraries/haskell/tls/default.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "tls"; pname = "tls";
version = "1.1.4"; version = "1.1.5";
sha256 = "0fq6hnc3j54kkzlvcvhskjrj740p44y65fggnj3m4kgfiwjphw5p"; sha256 = "1ja03x3i7dgjpy22h4shnni1xslph8i8q4accqq8njpqpz54c84c";
buildDepends = [ buildDepends = [
cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network cereal certificate cryptohash cryptoPubkey cryptoRandom mtl network
]; ];

4
pkgs/development/libraries/haskell/unordered-containers/0.2.3.1.nix → pkgs/development/libraries/haskell/unordered-containers/0.2.3.2.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "unordered-containers"; pname = "unordered-containers";
version = "0.2.3.1"; version = "0.2.3.2";
sha256 = "10wz5y42r9b2ym7vl5sqrcawyjixmhy370h0kzpvczs8mlzvrlx8"; sha256 = "0fgfb2zqa2zi2hb9nkj92nwnxr54wkqa6gmqbcn4h5zks5anfvn5";
buildDepends = [ deepseq hashable ]; buildDepends = [ deepseq hashable ];
testDepends = [ testDepends = [
ChasingBottoms hashable HUnit QuickCheck testFramework ChasingBottoms hashable HUnit QuickCheck testFramework

14
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@ -1,19 +1,19 @@
{ cabal, ansiTerminal, base64Bytestring, blazeBuilder { cabal, ansiTerminal, base64Bytestring, blazeBuilder
, blazeBuilderConduit, caseInsensitive, conduit, dataDefault , blazeBuilderConduit, caseInsensitive, conduit, dataDefault
, dateCache, fastLogger, hspec, httpTypes, HUnit, network , dateCache, fastLogger, hspec, httpTypes, HUnit, liftedBase
, resourcet, stringsearch, text, time, transformers, void, wai , network, resourcet, stringsearch, text, time, transformers, void
, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit , wai, waiLogger, waiTest, word8, zlib, zlibBindings, zlibConduit
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "wai-extra"; pname = "wai-extra";
version = "1.3.4.4"; version = "1.3.4.5";
sha256 = "0x7nm3vrp1jhcdvcspdpgpgm12rcafng81f9kq9c01z5270myg2f"; sha256 = "062d7f8p2xgzn94fllgfc2bhbjv4vgp9j1adjaw9f0s1asnsdmnj";
buildDepends = [ buildDepends = [
ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit ansiTerminal base64Bytestring blazeBuilder blazeBuilderConduit
caseInsensitive conduit dataDefault dateCache fastLogger httpTypes caseInsensitive conduit dataDefault dateCache fastLogger httpTypes
network resourcet stringsearch text time transformers void wai liftedBase network resourcet stringsearch text time transformers
waiLogger word8 zlibConduit void wai waiLogger word8 zlibConduit
]; ];
testDepends = [ testDepends = [
blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit blazeBuilder conduit dataDefault fastLogger hspec httpTypes HUnit

4
pkgs/development/libraries/haskell/xml-hamlet/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "xml-hamlet"; pname = "xml-hamlet";
version = "0.4.0.4"; version = "0.4.0.5";
sha256 = "1s4s5z1xir9zmcbfz8mrznf2byclmg0qjjhwmpal2r9ly9g3na98"; sha256 = "1w1ixjdbpbny332j24d5yjxc4i7cg83jc4yjdm6yl94y1sr90yc5";
buildDepends = [ parsec shakespeare text xmlConduit ]; buildDepends = [ parsec shakespeare text xmlConduit ];
testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ]; testDepends = [ hspec HUnit parsec shakespeare text xmlConduit ];
meta = { meta = {

9
pkgs/development/libraries/haskell/yaml/default.nix
View File

@ -4,14 +4,17 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yaml"; pname = "yaml";
version = "0.8.4.1"; version = "0.8.5";
sha256 = "0zbnyf5hp206ywqkdd7c1hsdbn4wxwk7p3rzn53m7rzxvfshlbbx"; sha256 = "12jj785gzcnrif460cx2k69pc2h9h956g0w1gp8pcr5hawrvd6rg";
isLibrary = true;
isExecutable = true;
buildDepends = [ buildDepends = [
aeson attoparsec conduit resourcet text transformers aeson attoparsec conduit resourcet text transformers
unorderedContainers vector unorderedContainers vector
]; ];
testDepends = [ testDepends = [
conduit hspec HUnit text transformers unorderedContainers aeson conduit hspec HUnit text transformers unorderedContainers
vector
]; ];
meta = { meta = {
homepage = "http://github.com/snoyberg/yaml/"; homepage = "http://github.com/snoyberg/yaml/";

4
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@ -8,8 +8,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-auth"; pname = "yesod-auth";
version = "1.2.1"; version = "1.2.2.1";
sha256 = "0xvb2v1c7zih4r1acd21s0fl18ygcajry5w6yiqqhnhx8wcniiqv"; sha256 = "1f3zdqywak54f2s11v26iyzb3svb0mdpfskxhps30jmkji2ph2iz";
buildDepends = [ buildDepends = [
aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate aeson authenticate blazeHtml blazeMarkup dataDefault emailValidate
fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network fileEmbed hamlet httpConduit httpTypes liftedBase mimeMail network

4
pkgs/development/libraries/haskell/yesod-bin/default.nix
View File

@ -10,8 +10,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-bin"; pname = "yesod-bin";
version = "1.2.2.1"; version = "1.2.3.2";
sha256 = "0m68wm46qh8bwaccq2y8l4hh4xby0kczvhgd7caaxhmv6j3srrf2"; sha256 = "10q4xjhcrskz3h0nay2vxfz2b3c2d532bvbggl2615aih05zdhwc";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

4
pkgs/development/libraries/haskell/yesod-core/default.nix
View File

@ -10,8 +10,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-core"; pname = "yesod-core";
version = "1.2.4"; version = "1.2.4.2";
sha256 = "0vgxspdxdjfdfgyx20lp460np7v1qjv6wzw95kj5cb5yiqv1nr9d"; sha256 = "0zrhqh3phla8p7fjv30n4ypicbd6x6rwkrhpag79p1w4wwvkjxnn";
buildDepends = [ buildDepends = [
aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup
caseInsensitive cereal clientsession conduit cookie dataDefault caseInsensitive cereal clientsession conduit cookie dataDefault

4
pkgs/development/libraries/haskell/yesod-form/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-form"; pname = "yesod-form";
version = "1.3.1"; version = "1.3.2.1";
sha256 = "0zkwpymxwxca2p8i0fhq58wq7ic0dlyc3z89ypqglnp6h2mv2lwx"; sha256 = "0lybrw244y2ca1jvz218jh2kfypj4wblpdvk4n8wllll79dm3pq7";
buildDepends = [ buildDepends = [
aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi aeson attoparsec blazeBuilder blazeHtml blazeMarkup cryptoApi
dataDefault emailValidate hamlet network persistent resourcet dataDefault emailValidate hamlet network persistent resourcet

54
pkgs/development/libraries/haskell/yesod-platform/default.nix
View File

@ -3,9 +3,10 @@
, baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml , baseUnicodeSymbols, blazeBuilder, blazeBuilderConduit, blazeHtml
, blazeMarkup, byteable, byteorder, caseInsensitive, cereal , blazeMarkup, byteable, byteorder, caseInsensitive, cereal
, certificate, cipherAes, cipherRc4, clientsession, conduit, cookie , certificate, cipherAes, cipherRc4, clientsession, conduit, cookie
, cprngAes, cryptoApi, cryptoConduit, cryptohash, cryptoNumbers , cprngAes, cryptoApi, cryptoCipherTypes, cryptoConduit, cryptohash
, cryptoPubkey, cryptoPubkeyTypes, cryptoRandomApi, cssText , cryptohashCryptoapi, cryptoNumbers, cryptoPubkey
, dataDefault, dataDefaultClass, dataDefaultInstancesBase , cryptoPubkeyTypes, cryptoRandom, cssText, dataDefault
, dataDefaultClass, dataDefaultInstancesBase
, dataDefaultInstancesContainers, dataDefaultInstancesDlist , dataDefaultInstancesContainers, dataDefaultInstancesDlist
, dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate , dataDefaultInstancesOldLocale, dateCache, dlist, emailValidate
, entropy, failure, fastLogger, fileEmbed, filesystemConduit , entropy, failure, fastLogger, fileEmbed, filesystemConduit
@ -15,7 +16,7 @@
, monadControl, monadLogger, networkConduit, pathPieces, pem , monadControl, monadLogger, networkConduit, pathPieces, pem
, persistent, persistentTemplate, poolConduit, primitive , persistent, persistentTemplate, poolConduit, primitive
, publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo , publicsuffixlist, pureMD5, pwstoreFast, quickcheckIo
, resourcePool, resourcet, safe, semigroups, setenv, SHA , resourcePool, resourcet, safe, securemem, semigroups, setenv, SHA
, shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs , shakespeare, shakespeareCss, shakespeareI18n, shakespeareJs
, shakespeareText, silently, simpleSendfile, skein, socks , shakespeareText, silently, simpleSendfile, skein, socks
, stringsearch, systemFileio, systemFilepath, tagged, tagsoup , stringsearch, systemFileio, systemFilepath, tagged, tagsoup
@ -29,33 +30,34 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod-platform"; pname = "yesod-platform";
version = "1.2.3"; version = "1.2.4.1";
sha256 = "16hp64gqgvpmlrwg6h8ldakw2n3x985cnv4pzmv9akjq27jq8rjl"; sha256 = "13fw1svs3769m8rf5mnks0ibgdd73s1qq9dgg4h49xkzrdgs31rk";
buildDepends = [ buildDepends = [
aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit aeson ansiTerminal asn1Data asn1Types attoparsec attoparsecConduit
authenticate base64Bytestring baseUnicodeSymbols blazeBuilder authenticate base64Bytestring baseUnicodeSymbols blazeBuilder
blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder blazeBuilderConduit blazeHtml blazeMarkup byteable byteorder
caseInsensitive cereal certificate cipherAes cipherRc4 caseInsensitive cereal certificate cipherAes cipherRc4
clientsession conduit cookie cprngAes cryptoApi cryptoConduit clientsession conduit cookie cprngAes cryptoApi cryptoCipherTypes
cryptohash cryptoNumbers cryptoPubkey cryptoPubkeyTypes cryptoConduit cryptohash cryptohashCryptoapi cryptoNumbers
cryptoRandomApi cssText dataDefault dataDefaultClass cryptoPubkey cryptoPubkeyTypes cryptoRandom cssText dataDefault
dataDefaultInstancesBase dataDefaultInstancesContainers dataDefaultClass dataDefaultInstancesBase
dataDefaultInstancesDlist dataDefaultInstancesOldLocale dateCache dataDefaultInstancesContainers dataDefaultInstancesDlist
dlist emailValidate entropy failure fastLogger fileEmbed dataDefaultInstancesOldLocale dateCache dlist emailValidate entropy
filesystemConduit hamlet hjsmin hspec hspecExpectations htmlConduit failure fastLogger fileEmbed filesystemConduit hamlet hjsmin hspec
httpAttoparsec httpConduit httpDate httpTypes languageJavascript hspecExpectations htmlConduit httpAttoparsec httpConduit httpDate
liftedBase mimeMail mimeTypes mmorph monadControl monadLogger httpTypes languageJavascript liftedBase mimeMail mimeTypes mmorph
networkConduit pathPieces pem persistent persistentTemplate monadControl monadLogger networkConduit pathPieces pem persistent
poolConduit primitive publicsuffixlist pureMD5 pwstoreFast persistentTemplate poolConduit primitive publicsuffixlist pureMD5
quickcheckIo resourcePool resourcet safe semigroups setenv SHA pwstoreFast quickcheckIo resourcePool resourcet safe securemem
shakespeare shakespeareCss shakespeareI18n shakespeareJs semigroups setenv SHA shakespeare shakespeareCss shakespeareI18n
shakespeareText silently simpleSendfile skein socks stringsearch shakespeareJs shakespeareText silently simpleSendfile skein socks
systemFileio systemFilepath tagged tagsoup tagstreamConduit tls stringsearch systemFileio systemFilepath tagged tagsoup
tlsExtra transformersBase unixCompat unorderedContainers utf8Light tagstreamConduit tls tlsExtra transformersBase unixCompat
utf8String vault vector void wai waiAppStatic waiExtra waiLogger unorderedContainers utf8Light utf8String vault vector void wai
waiTest warp word8 xmlConduit xmlTypes xssSanitize yaml yesod waiAppStatic waiExtra waiLogger waiTest warp word8 xmlConduit
yesodAuth yesodCore yesodForm yesodPersistent yesodRoutes xmlTypes xssSanitize yaml yesod yesodAuth yesodCore yesodForm
yesodStatic yesodTest zlibBindings zlibConduit yesodPersistent yesodRoutes yesodStatic yesodTest zlibBindings
zlibConduit
]; ];
jailbreak = true; jailbreak = true;
meta = { meta = {

4
pkgs/development/libraries/haskell/yesod/default.nix
View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "yesod"; pname = "yesod";
version = "1.2.2"; version = "1.2.2.1";
sha256 = "06ac99srh44rwj6mwyl7h0d0ckyb19dvpabylbawmks25v5ig0y3"; sha256 = "0xhpsqfshnay7kaz0czr7ass84cbjlgz2n13jk08hs8g8dw72as4";
buildDepends = [ buildDepends = [
aeson blazeHtml blazeMarkup dataDefault hamlet monadControl aeson blazeHtml blazeMarkup dataDefault hamlet monadControl
networkConduit safe shakespeareCss shakespeareJs text transformers networkConduit safe shakespeareCss shakespeareJs text transformers

28
pkgs/development/tools/haskell/keter/default.nix
View File

@ -1,23 +1,25 @@
{ cabal, attoparsec, blazeBuilder, caseInsensitive, conduit { cabal, aeson, async, attoparsec, blazeBuilder, caseInsensitive
, dataDefault, filepath, fsnotify, httpConduit, httpReverseProxy , conduit, dataDefault, filepath, fsnotify, httpConduit
, httpTypes, mtl, network, networkConduit, networkConduitTls , httpReverseProxy, httpTypes, mtl, network, networkConduit
, random, regexTdfa, systemFileio, systemFilepath, tar, text, time , networkConduitTls, random, regexTdfa, stm, systemFileio
, transformers, unixCompat, unixProcessConduit, wai, waiAppStatic , systemFilepath, tar, text, time, transformers, unixCompat
, warp, warpTls, yaml, zlib , unixProcessConduit, unorderedContainers, vector, wai
, waiAppStatic, waiExtra, warp, warpTls, yaml, zlib
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "keter"; pname = "keter";
version = "0.4.0"; version = "1.0.1";
sha256 = "0ny8z2rfn090vci262xvyrdbkmdb7qjb4x15r81l2691ibf09ppv"; sha256 = "0ghgwp1winf0jj70jrwsk4b85f8m4v78n8kijhqghh4kskh457b5";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
attoparsec blazeBuilder caseInsensitive conduit dataDefault aeson async attoparsec blazeBuilder caseInsensitive conduit
filepath fsnotify httpConduit httpReverseProxy httpTypes mtl dataDefault filepath fsnotify httpConduit httpReverseProxy
network networkConduit networkConduitTls random regexTdfa httpTypes mtl network networkConduit networkConduitTls random
systemFileio systemFilepath tar text time transformers unixCompat regexTdfa stm systemFileio systemFilepath tar text time
unixProcessConduit wai waiAppStatic warp warpTls yaml zlib transformers unixCompat unixProcessConduit unorderedContainers
vector wai waiAppStatic waiExtra warp warpTls yaml zlib
]; ];
meta = { meta = {
homepage = "http://www.yesodweb.com/"; homepage = "http://www.yesodweb.com/";

7
pkgs/development/tools/haskell/splot/default.nix
View File

@ -1,5 +1,5 @@
{ cabal, bytestringLexing, cairo, colour, HUnit, mtl { cabal, bytestringLexing, cairo, colour, HUnit, mtl, strptime
, strptime, time, vcsRevision , time, vcsRevision
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
@ -9,8 +9,7 @@ cabal.mkDerivation (self: {
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
bytestringLexing cairo colour HUnit mtl strptime time bytestringLexing cairo colour HUnit mtl strptime time vcsRevision
vcsRevision
]; ];
meta = { meta = {
homepage = "http://www.haskell.org/haskellwiki/Splot"; homepage = "http://www.haskell.org/haskellwiki/Splot";

4
pkgs/tools/package-management/cabal-install/1.18.0.nix → pkgs/tools/package-management/cabal-install/1.18.0.1.nix
View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cabal-install"; pname = "cabal-install";
version = "1.18.0"; version = "1.18.0.1";
sha256 = "14c4i8cy2rnvjj2krv3swna53k2674xhpzqkmcr56lxnyzych5wh"; sha256 = "0b44w4iqzaq5119zjkpagd3a2279kz6xq5pk5rqnlnfn8a8ihdbb";
isLibrary = false; isLibrary = false;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [

12
pkgs/top-level/haskell-packages.nix
View File

@ -160,11 +160,11 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
syb = self.syb_0_4_1; syb = self.syb_0_4_1;
text = self.text_0_11_3_1; text = self.text_0_11_3_1;
transformers = null; # this has become a core package in GHC 7.7 transformers = null; # this has become a core package in GHC 7.7
unorderedContainers = self.unorderedContainers_0_2_3_0; unorderedContainers = self.unorderedContainers_0_2_3_2;
vector = self.vector_0_10_0_1; vector = self.vector_0_10_0_1;
xhtml = self.xhtml_3000_2_1; xhtml = self.xhtml_3000_2_1;
zlib = self.zlib_0_5_4_1; zlib = self.zlib_0_5_4_1;
cabalInstall = self.cabalInstall_1_18_0; cabalInstall = self.cabalInstall_1_18_0_1;
alex = self.alex_3_0_5; alex = self.alex_3_0_5;
haddock = self.haddock_2_13_2; haddock = self.haddock_2_13_2;
happy = self.happy_1_18_10; happy = self.happy_1_18_10;
@ -1954,6 +1954,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
systemFileio = callPackage ../development/libraries/haskell/system-fileio {}; systemFileio = callPackage ../development/libraries/haskell/system-fileio {};
systemPosixRedirect = callPackage ../development/libraries/haskell/system-posix-redirect {};
TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {}; TableAlgebra = callPackage ../development/libraries/haskell/TableAlgebra {};
tabular = callPackage ../development/libraries/haskell/tabular {}; tabular = callPackage ../development/libraries/haskell/tabular {};
@ -2070,8 +2072,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
unlambda = callPackage ../development/libraries/haskell/unlambda {}; unlambda = callPackage ../development/libraries/haskell/unlambda {};
unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {}; unorderedContainers_0_2_3_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.0.nix {};
unorderedContainers_0_2_3_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.1.nix {}; unorderedContainers_0_2_3_2 = callPackage ../development/libraries/haskell/unordered-containers/0.2.3.2.nix {};
unorderedContainers = self.unorderedContainers_0_2_3_1; unorderedContainers = self.unorderedContainers_0_2_3_2;
url = callPackage ../development/libraries/haskell/url {}; url = callPackage ../development/libraries/haskell/url {};
@ -2389,7 +2391,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.finalReturn x
cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {}; cabalInstall_0_10_2 = callPackage ../tools/package-management/cabal-install/0.10.2.nix {};
cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {}; cabalInstall_0_14_0 = callPackage ../tools/package-management/cabal-install/0.14.0.nix {};
cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {}; cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix {};
cabalInstall_1_18_0 = callPackage ../tools/package-management/cabal-install/1.18.0.nix {}; cabalInstall_1_18_0_1 = callPackage ../tools/package-management/cabal-install/1.18.0.1.nix {};
cabalInstall = self.cabalInstall_1_18_0; cabalInstall = self.cabalInstall_1_18_0;
gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {}; gitAnnex = callPackage ../applications/version-management/git-and-tools/git-annex {};