Updated Haskell packages.

- attoparsec: updated to version 0.10.2.0
 - blaze-html: dropped obsolete version 0.4.3.4
 - cairo: updated to version 0.12.3.1
 - cryptocipher: updated to version 0.3.4
 - file-embed: updated to version 0.0.4.4
 - glib: updated to version 0.12.3.1
 - gtk2hs-buildtools: updated to version 0.12.3.1
 - gtksourceview2: updated to version 0.12.3.1
 - hakyll: updated to version 3.3.0.0
 - happstack-server: updated to version 7.0.2
 - hjsmin: updated to version 0.1.2
 - http-conduit: updated to version 1.4.1.7
 - http-types: updated to version 0.6.11
 - language-c-quote: updated to version 0.3.1.2
 - parallel: added version 3.2.0.3
 - regex-pcre: updated to version 0.94.3
 - regex-posix: added version 0.95.2
 - shakespeare-js: updated to version 1.0.0.3
 - svgcairo: updated to version 0.12.1.1
 - text: added version 0.11.2.1
 - vty: updated to version 4.7.0.14
 - warp: updated to version 1.2.1.1
 - yaml: updated to version 0.7.0.2
 - yesod-static: updated to version 1.0.0.3

svn path=/nixpkgs/trunk/; revision=34255
This commit is contained in:
Peter Simons 2012-05-28 10:23:20 +00:00
parent 472808c5f9
commit c664157e7d
29 changed files with 112 additions and 94 deletions

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "attoparsec";
version = "0.10.1.1";
sha256 = "07zl85nkimpswlb4rxycisaphhyrlq4la2limxxi7sk21gyh88b0";
version = "0.10.2.0";
sha256 = "0hvkx63knhxdc06lkv2avz2dblbvn0hhvckfqyr22ls1qrpgz71c";
buildDepends = [ deepseq text ];
meta = {
homepage = "https://github.com/bos/attoparsec";

View File

@ -1,15 +0,0 @@
{ cabal, blazeBuilder, text }:
cabal.mkDerivation (self: {
pname = "blaze-html";
version = "0.4.3.4";
sha256 = "1xd8l28rriczd5zxgmjif393kjzqibrp68pfah0kknrjmc3ybn20";
buildDepends = [ blazeBuilder text ];
meta = {
homepage = "http://jaspervdj.be/blaze";
description = "A blazingly fast HTML combinator library for Haskell";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -12,5 +12,6 @@ cabal.mkDerivation (self: {
description = "Cabal support for creating Mac OSX application bundles";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "cairo";
version = "0.12.3";
sha256 = "0kgy6907vs41ws51dwqv6lwvfnvmgd1mns12cxzsifmli1jglswd";
version = "0.12.3.1";
sha256 = "173pql0n51a9z46vzpwd9q67nblhb61qirynjra9vzydiy79bfwi";
buildDepends = [ mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ cairo libc pkgconfig zlib ];

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "cryptocipher";
version = "0.3.2";
sha256 = "0nw7rwlnakdslzg4z6ik9hfylwnrbn103n677w0xr5b81wj19a5j";
version = "0.3.4";
sha256 = "12ndzvb9sa37yn118f9ixm3qka36x6whvmxc5wax97rfm7y49p6r";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -10,5 +10,6 @@ cabal.mkDerivation (self: {
description = "Finding out the full path of the executable";
license = self.stdenv.lib.licenses.publicDomain;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "file-embed";
version = "0.0.4.3";
sha256 = "0iagibsab18czvam36si88swzf5sijm4phwy4za6gnn4z71nb9s6";
version = "0.0.4.4";
sha256 = "1czwa5vpafhvif4gv7bwa7hrxkrbrvvybgyjckd0hdpl6bpd4nhp";
meta = {
homepage = "https://github.com/snoyberg/file-embed";
description = "Use Template Haskell to embed file contents directly";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "glib";
version = "0.12.3";
sha256 = "1hv7wnxsjzlr2bchl8ir967iv9qjzlv9lnlyvrilagzafr7nximb";
version = "0.12.3.1";
sha256 = "1k5s1d05kv0amvkjr644pqvicvmcgr5fffsz0xyljbj5jk4iv0py";
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];
pkgconfigDepends = [ glib ];

View File

@ -1,18 +0,0 @@
{ cabal, alex, filepath, happy, random }:
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
version = "0.12.3";
sha256 = "1129p2b0hvmin7zpq43ik670v2c63jv704bnmnh3cr0bw06qrrbi";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath random ];
buildTools = [ alex happy ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Tools to build the Gtk2Hs suite of User Interface libraries";
license = self.stdenv.lib.licenses.gpl2;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gtk2hs-buildtools";
version = "0.12.1";
sha256 = "003d48q8q6ji4axa69bh0sp95fic19cgw3hwigsjbl46qgh6n9gl";
version = "0.12.3.1";
sha256 = "0a5lay1zy1pi6inaqjvhn8v0by2z5dpy3dssqsxwbq2hkfxizzy6";
isLibrary = false;
isExecutable = true;
buildDepends = [ filepath random ];

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "gtksourceview2";
version = "0.12.3";
sha256 = "0bhwvhwsg3mf4w94fl6z6qkn67i68hh3zwwhzqa59lia0nc233gd";
version = "0.12.3.1";
sha256 = "1c91ja753dzr2c7sv13wn47sjbjg45jv8xx9ybx1q3188xrldqng";
buildDepends = [ glib gtk mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc pkgconfig ];

View File

@ -1,15 +1,16 @@
{ cabal, binary, blazeHtml, citeprocHs, cryptohash, filepath
, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa, snapCore
, snapServer, tagsoup, time
{ cabal, binary, blazeHtml, blazeMarkup, citeprocHs, cryptohash
, filepath, hamlet, mtl, pandoc, parsec, regexBase, regexTdfa
, snapCore, snapServer, tagsoup, text, time
}:
cabal.mkDerivation (self: {
pname = "hakyll";
version = "3.2.7.2";
sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw";
version = "3.3.0.0";
sha256 = "0ljfdmmqigdzg8vaj502vrsz4i6ynaw3vhc9ys24m9xcqdmyha4h";
buildDepends = [
binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
parsec regexBase regexTdfa snapCore snapServer tagsoup time
binary blazeHtml blazeMarkup citeprocHs cryptohash filepath hamlet
mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup
text time
];
meta = {
homepage = "http://jaspervdj.be/hakyll";

View File

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "happstack-server";
version = "7.0.1";
sha256 = "0sjcfxcpv9sssk5fr5np57b10rajcid7x582s5ialf3yc9n1fshj";
version = "7.0.2";
sha256 = "0p4vy1h3nkq7riipizljc9wz64y3jfiyq5vzv1r963badk3q0xzb";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.1.1";
sha256 = "0v28z5l5fraf09b65j0fm75b702xp1s4ar8p5g9kigfn1wh8b62k";
version = "0.1.2";
sha256 = "04yk383504blg8x10x5j1fd5mzyybqkhz7jfsyimvz2wz2v86qsb";
buildDepends = [ blazeBuilder languageJavascript text ];
meta = {
homepage = "http://github.com/alanz/hjsmin";

View File

@ -1,21 +1,21 @@
{ cabal, asn1Data, attoparsec, attoparsecConduit, base64Bytestring
, blazeBuilder, blazeBuilderConduit, caseInsensitive, certificate
, conduit, cookie, cprngAes, dataDefault, failure, httpTypes
, liftedBase, monadControl, mtl, network, regexCompat, resourcet
, socks, text, time, tls, tlsExtra, transformers, transformersBase
, utf8String, void, zlibConduit
, conduit, cookie, cprngAes, dataDefault, deepseq, failure
, httpTypes, liftedBase, monadControl, mtl, network, regexCompat
, resourcet, socks, text, time, tls, tlsExtra, transformers
, transformersBase, utf8String, void, zlibConduit
}:
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.4.1.3";
sha256 = "15mpha91dfpzy6bz2577jk0866nmyj17rjwnjz3x7zh3x0i06534";
version = "1.4.1.7";
sha256 = "0b3iz03y3s30wyj5j0r8s070qwwzjbk4cs7znag5yjxqgph1h22f";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
cprngAes dataDefault failure httpTypes liftedBase monadControl mtl
network regexCompat resourcet socks text time tls tlsExtra
transformers transformersBase utf8String void zlibConduit
cprngAes dataDefault deepseq failure httpTypes liftedBase
monadControl mtl network regexCompat resourcet socks text time tls
tlsExtra transformers transformersBase utf8String void zlibConduit
];
meta = {
homepage = "http://www.yesodweb.com/book/http-conduit";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "http-types";
version = "0.6.10";
sha256 = "0py6l6hk14vrpqwrrajvsiasfksqsklk75sij4zx4xws01jwh9xd";
version = "0.6.11";
sha256 = "1waxhicqwp0nmvmpmfadpq9gdldbcx9wh6jz717ghi6y9l485vhf";
buildDepends = [ blazeBuilder caseInsensitive text ];
meta = {
homepage = "https://github.com/aristidb/http-types";

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.3.1.0";
sha256 = "0y3zfc43izvalm1lrbk286nmg4s3vgpj5v2j6j2saz3c7l2ly8z6";
version = "0.3.1.2";
sha256 = "0lqr9z2akx90l07k1qbv3y4wwwlcilj08zva4v9scbqydrwpqxip";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol

View File

@ -0,0 +1,14 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "parallel";
version = "3.2.0.3";
sha256 = "1kbdzdz9s8jq0xysqgvxx1zvzqlxgj1sk476mciwcn327kpl0fhn";
buildDepends = [ deepseq ];
meta = {
description = "Parallel programming library";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,10 +2,13 @@
cabal.mkDerivation (self: {
pname = "regex-pcre";
version = "0.94.2";
sha256 = "0p4az8z4jlrcmmyz9bjf7n90hpg6n242vq4255w2dz5v29l822wn";
version = "0.94.3";
sha256 = "0ljng60s05ssy8pi4qnpcx5c1wrn6m35d77lq0xyafmj68cg4a2r";
buildDepends = [ regexBase ];
extraLibraries = [ pcre ];
patchPhase = ''
sed -i -e '/Include-Dirs:/d' -e '/Extra-Lib-Dirs:/d' regex-pcre.cabal
'';
meta = {
homepage = "http://sourceforge.net/projects/lazy-regex";
description = "Replaces/Enhances Text.Regex";

View File

@ -0,0 +1,15 @@
{ cabal, regexBase }:
cabal.mkDerivation (self: {
pname = "regex-posix";
version = "0.95.2";
sha256 = "0gkhzhj8nvfn1ija31c7xnl6p0gadwii9ihyp219ck2arlhrj0an";
buildDepends = [ regexBase ];
meta = {
homepage = "http://sourceforge.net/projects/lazy-regex";
description = "Replaces/Enhances Text.Regex";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
version = "1.0.0.2";
sha256 = "1qygxihhfl7wzv3djxmldh82pwk8rhnk54zfvwy1pxhxb8y30wkm";
version = "1.0.0.3";
sha256 = "00x5xvjlaivl42q75cvbwbh055kgvk9i8s4y3xcmk4h7lnpfyzd6";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/shakespearean-templates";

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "svgcairo";
version = "0.12.1";
sha256 = "1nyr849ayk1fyjpxnpam1pychny609d6j2v3is84llh3gsyq99ps";
version = "0.12.1.1";
sha256 = "0fl9flsv4brvwryzxv4xpy8x3w0if4psx8nypxm2ix6l9qh3pghb";
buildDepends = [ cairo glib mtl ];
buildTools = [ gtk2hsBuildtools ];
extraLibraries = [ libc ];

View File

@ -0,0 +1,15 @@
{ cabal, deepseq }:
cabal.mkDerivation (self: {
pname = "text";
version = "0.11.2.1";
sha256 = "0ajh2xhf8khh5vi4crdjgcs7w27dga7hlwzi8ia5xjs3hzgvbjb9";
buildDepends = [ deepseq ];
meta = {
homepage = "https://github.com/bos/text";
description = "An efficient packed Unicode text type";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "vty";
version = "4.7.0.12";
sha256 = "0mmx8rhj6k8c56qhaz7ay2yf9x61h27zxs14mrkw2y4qag6d4bii";
version = "4.7.0.14";
sha256 = "0wgn2jbr7lih9znkpa09nvb4qjd0801c0r4mwwrw4pd9n9mkjqn9";
buildDepends = [
deepseq mtl parallel parsec terminfo utf8String vector
];

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.2.1";
sha256 = "0yjvd9dc0rwczj3041s55lhfn46zhymgibrawl84ssxky68syhx4";
version = "1.2.1.1";
sha256 = "1bgdvqa6c2ccxmgdsg5hjvc3mss8zgjj4xzqr5r5jdl338857xzg";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit httpTypes
liftedBase network networkConduit simpleSendfile transformers

View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "yaml";
version = "0.7.0";
sha256 = "10l5isiidmjn818zm05ac65yaidrkq0qcb1bcpwnvi0fgjr308n5";
version = "0.7.0.2";
sha256 = "0hhxvw3zzra8vkbm9914nq03wpy5x5mg6sipwajqz0hv3j5hlsf3";
buildDepends = [
aeson attoparsec conduit resourcet text transformers
unorderedContainers vector

View File

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-static";
version = "1.0.0.2";
sha256 = "12r3i4s1g9wlf5jmbvqw9qzcgw96zdlky6zisdipy40yzpg6m07v";
version = "1.0.0.3";
sha256 = "1nl7cf8yw5akldlrkamnkbypwnj7g1pjkx7nkmlc38jbx58izf5d";
buildDepends = [
base64Bytestring cereal conduit cryptoConduit cryptohash fileEmbed
httpTypes text transformers unixCompat wai waiAppStatic yesodCore

View File

@ -434,9 +434,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
blazeBuilderEnumerator = callPackage ../development/libraries/haskell/blaze-builder-enumerator {};
blazeHtml_0_4_3_4 = callPackage ../development/libraries/haskell/blaze-html/0.4.3.4.nix {};
blazeHtml_0_5_0_0 = callPackage ../development/libraries/haskell/blaze-html/0.5.0.0.nix {};
blazeHtml = self.blazeHtml_0_4_3_4;
blazeHtml = callPackage ../development/libraries/haskell/blaze-html {};
blazeMarkup = callPackage ../development/libraries/haskell/blaze-markup {};
@ -725,9 +723,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
libc = pkgs.stdenv.gcc.libc;
};
gtk2hsBuildtools_0_12_1 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.1.nix {};
gtk2hsBuildtools_0_12_3 = callPackage ../development/libraries/haskell/gtk2hs-buildtools/0.12.3.nix {};
gtk2hsBuildtools = self.gtk2hsBuildtools_0_12_1;
gtk2hsBuildtools = callPackage ../development/libraries/haskell/gtk2hs-buildtools {};
gtk2hsC2hs = self.gtk2hsBuildtools;
gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 {
@ -1074,7 +1070,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
parallel_2_2_0_1 = callPackage ../development/libraries/haskell/parallel/2.2.0.1.nix {};
parallel_3_1_0_1 = callPackage ../development/libraries/haskell/parallel/3.1.0.1.nix {};
parallel_3_2_0_2 = callPackage ../development/libraries/haskell/parallel/3.2.0.2.nix {};
parallel = self.parallel_3_2_0_2;
parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {};
parallel = self.parallel_3_2_0_3;
parseargs = callPackage ../development/libraries/haskell/parseargs {};
@ -1189,7 +1186,10 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
regexPosix_0_95_1 = callPackage ../development/libraries/haskell/regex-posix/0.95.1.nix {
regexBase = self.regexBase_0_93_2;
};
regexPosix = self.regexPosix_0_95_1;
regexPosix_0_95_2 = callPackage ../development/libraries/haskell/regex-posix/0.95.2.nix {
regexBase = self.regexBase_0_93_2;
};
regexPosix = self.regexPosix_0_95_2;
regexTDFA = callPackage ../development/libraries/haskell/regex-tdfa {};
regexTdfa = self.regexTDFA;
@ -1358,7 +1358,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
text_0_11_1_5 = callPackage ../development/libraries/haskell/text/0.11.1.5.nix {};
text_0_11_1_13 = callPackage ../development/libraries/haskell/text/0.11.1.13.nix {};
text_0_11_2_0 = callPackage ../development/libraries/haskell/text/0.11.2.0.nix {};
text = self.text_0_11_2_0;
text_0_11_2_1 = callPackage ../development/libraries/haskell/text/0.11.2.1.nix {};
text = self.text_0_11_2_1;
thespian = callPackage ../development/libraries/haskell/thespian {};