Updated Haskell packages.

- HTTP: added version 4000.2.3
 - RSA: updated to version 1.2.0.0
 - RepLib: updated to version 0.5.2.1
 - conduit: updated to version 0.4.1.1
 - data-accessor: updated to version 0.2.2.2
 - deepseq-th: updated to version 0.1.0.3
 - explicit-exception: updated to version 0.1.7
 - ghc-mod: updated to version 1.10.15
 - gitit: updated to version 0.9.0.1
 - hakyll: updated to version 3.2.7.2
 - hjsmin: updated to version 0.0.16
 - http-conduit: updated to version 1.4.1
 - iteratee: updated to version 0.8.8.2
 - language-javascript: updated to version 0.5.0
 - reactive-banana: updated to version 0.5.0.1
 - repa: updated to version 3.1.1.1
 - rvar: updated to version 0.2.0.1
 - semigroups: updated to version 0.8.3
 - simple-sendfile: updated to version 0.2.3
 - storable-record: updated to version 0.0.2.5
 - unbound: updated to version 0.4.0.2
 - wxc: added version 0.90.0.2

svn path=/nixpkgs/trunk/; revision=33802
This commit is contained in:
Peter Simons 2012-04-16 12:07:58 +00:00
parent 7a4cf21350
commit d775e93f90
23 changed files with 87 additions and 56 deletions

View file

@ -0,0 +1,15 @@
{ cabal, mtl, network, parsec }:
cabal.mkDerivation (self: {
pname = "HTTP";
version = "4000.2.3";
sha256 = "1z7s5rkyljwdl95cwqbqg64i207wjwxgpksrdmvcv82k39srzx80";
buildDepends = [ mtl network parsec ];
meta = {
homepage = "https://github.com/haskell/HTTP";
description = "A library for client-side HTTP";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -1,12 +1,12 @@
{ cabal, binary, pureMD5, random, SHA }:
{ cabal, binary, cryptoApi, monadcryptorandom, pureMD5, SHA }:
cabal.mkDerivation (self: {
pname = "RSA";
version = "1.0.6.3";
sha256 = "0lk3nsh6nvacv1xzrg2pxxhd5gglmy40dkb8a47c9r9px0q6yjpj";
version = "1.2.0.0";
sha256 = "0x4wa0yq4k43ccdakqcmy0mxvdlvrkfg6kc1j2hv7hh8b4vjisms";
isLibrary = true;
isExecutable = true;
buildDepends = [ binary pureMD5 random SHA ];
buildDepends = [ binary cryptoApi monadcryptorandom pureMD5 SHA ];
meta = {
description = "Implementation of RSA, using the padding schemes of PKCS#1 v2.1.";
license = self.stdenv.lib.licenses.bsd3;

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "RepLib";
version = "0.5.2";
sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr";
version = "0.5.2.1";
sha256 = "133zpiszfdb8s4hqd1xpgsiac98v04dclk3hivzxcg0h77m7qpcc";
buildDepends = [ mtl typeEquality ];
meta = {
homepage = "http://code.google.com/p/replib/";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.4.0.1";
sha256 = "1n4a42ayww55hvvsnis6gdfwfciwxpzz0wxa0b3ybvmyr0jsidiq";
version = "0.4.1.1";
sha256 = "1y5bccjd3r1kakwiq0nlp3dk2jwrdsm3f8dncnfsmnlk093ajyxa";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-accessor";
version = "0.2.2.1";
sha256 = "1zb7z9fnlnxxlvjd655vadfscanzq9msvjv21cjmdric0ja24hxb";
version = "0.2.2.2";
sha256 = "1q9hx2bkp7dknr9ygx39lj93i846x8g9j7lkhkjijvsicih28yyi";
buildDepends = [ transformers ];
meta = {
homepage = "http://www.haskell.org/haskellwiki/Record_access";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "deepseq-th";
version = "0.1.0.2";
sha256 = "0f2hrp2rjb3iailnxh47wl1imgq6jqr9qj31vi7k8lgp5pwa90mc";
version = "0.1.0.3";
sha256 = "1xx88i55iskyxrpxbdg0srb64y5siqs1b8qj7bh3i1893qs9sha2";
buildDepends = [ deepseq ];
meta = {
description = "Template Haskell based deriver for optimised NFData instances";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "explicit-exception";
version = "0.1.6";
sha256 = "0pgdbaav952bwcmbfwg0fgvc15k57rlnw131bs3pnp8rqdbxfv39";
version = "0.1.7";
sha256 = "0pqh97fxs55554bd16dknggkr0yayqj1dz0sddp9b2svjy2q4vrm";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers ];

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mod";
version = "1.10.12";
sha256 = "1r06phm9fjrzwga63065lzdd7dn24sqn3g4fkyh8s30n531672rg";
version = "1.10.15";
sha256 = "1ywsv8nxd5040k3v5r9kf4zb0myicnjg6yckxmp6xnvf5glylylm";
isLibrary = false;
isExecutable = true;
buildDepends = [

View file

@ -1,5 +1,5 @@
{ cabal, blazeHtml, cgi, ConfigFile, feed, filepath, filestore
, ghcPaths, happstackServer, happstackUtil, highlightingKate
{ cabal, base64Bytestring, blazeHtml, cgi, ConfigFile, feed
, filepath, filestore, ghcPaths, happstackServer, highlightingKate
, hslogger, HStringTemplate, HTTP, json, mtl, network, pandoc
, pandocTypes, parsec, random, recaptcha, safe, SHA, syb, tagsoup
, text, time, url, utf8String, xhtml, xml, xssSanitize, zlib
@ -7,16 +7,16 @@
cabal.mkDerivation (self: {
pname = "gitit";
version = "0.9";
sha256 = "00kjfmczj5m3b8r8djdpad8d27s44z7pf76yyc0sdja1f3bd4mlp";
version = "0.9.0.1";
sha256 = "1k1z6qvp72c61yhrfma3340wf4ysjkb80f8lqapaqsyhp96qjl3m";
isLibrary = true;
isExecutable = true;
buildDepends = [
blazeHtml cgi ConfigFile feed filepath filestore ghcPaths
happstackServer happstackUtil highlightingKate hslogger
HStringTemplate HTTP json mtl network pandoc pandocTypes parsec
random recaptcha safe SHA syb tagsoup text time url utf8String
xhtml xml xssSanitize zlib
base64Bytestring blazeHtml cgi ConfigFile feed filepath filestore
ghcPaths happstackServer highlightingKate hslogger HStringTemplate
HTTP json mtl network pandoc pandocTypes parsec random recaptcha
safe SHA syb tagsoup text time url utf8String xhtml xml xssSanitize
zlib
];
meta = {
homepage = "http://gitit.net";

View file

@ -5,15 +5,12 @@
cabal.mkDerivation (self: {
pname = "hakyll";
version = "3.2.7.1";
sha256 = "07d7a8l2phb787wgqyh1rci1v9hzwxw35arg03hkal072sacif0c";
version = "3.2.7.2";
sha256 = "1l37w3q2jhcxjkq3h0nh8hl21vscgvsj6jkkd2hni62kfzfrgqhw";
buildDepends = [
binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc
parsec regexBase regexTdfa snapCore snapServer tagsoup time
];
patchPhase = ''
sed -i 's|hamlet >= 0.10.3 && < 0.11|hamlet|' hakyll.cabal
'';
meta = {
homepage = "http://jaspervdj.be/hakyll";
description = "A static website compiler library";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "hjsmin";
version = "0.0.15";
sha256 = "1bik3bvaz4zjhyx8nyghhs61l14zm71hndfhj4k0xvkw3h6hlj9k";
version = "0.0.16";
sha256 = "0svpmhrzhra3yhc1bzwga9d13k4kd8vw6va1q9866pkw385j5jr4";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeBuilder languageJavascript text ];

View file

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.4.0.2";
sha256 = "1zhsz9zqa4h5f18yalihcqa5p4ji50b8cw7h88i9s46q3fwcrbhh";
version = "1.4.1";
sha256 = "1jv5nk2h17hf2fp1r6ych9grnlx2hsclxgn10d5f1vx21xbd0hkl";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie

View file

@ -3,8 +3,8 @@
cabal.mkDerivation (self: {
pname = "iteratee";
version = "0.8.8.1";
sha256 = "1d6b83j3k2idpa9xcii8h9wa6mvxngp7rymb4xy6w8lvrmi7rmwz";
version = "0.8.8.2";
sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry";
isLibrary = true;
isExecutable = true;
buildDepends = [

View file

@ -1,12 +1,12 @@
{ cabal, happy, mtl, utf8Light }:
{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
cabal.mkDerivation (self: {
pname = "language-javascript";
version = "0.4.10";
sha256 = "1bk5xrhj5cpacz2bcfjz28sldizdadg05daalppxq8vs830sdx5h";
version = "0.5.0";
sha256 = "0fx087z8sa360bsbd22g7jsnzz0dzvm6pfr59d4vamfwc0zg2yg9";
isLibrary = true;
isExecutable = true;
buildDepends = [ mtl utf8Light ];
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ happy ];
meta = {
homepage = "http://github.com/alanz/language-javascript";

View file

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "reactive-banana";
version = "0.5.0.0";
sha256 = "1dabyzdkc8imm397cj7i18r3784233a45jlli3y6ch8zg2kl1iri";
version = "0.5.0.1";
sha256 = "04mr1pb0q1ks29q3mzy3apk5ki1sbzlslavbldfnrrq3g2s90366";
buildDepends = [
fclabels hashable QuickCheck transformers unorderedContainers vault
];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.1.0.1";
sha256 = "0dcx2n7bqw8rrr1aaxnrbmjv0c89lvxl6fgccrw0qci5rzwccnp2";
version = "3.1.1.1";
sha256 = "0r78xd8caqpjvf1wxlv9mp13n5as8k98j76sni6wyrj2i55sx7ls";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "rvar";
version = "0.2";
sha256 = "1in2qn1clv9b7ijyllhjflh9zdkna31hpyclhlkfnsc6899z3y1f";
version = "0.2.0.1";
sha256 = "17wgd4gc1hn04dck168nkyzn9jyipgbysxsznyzy2z36vafqqqbm";
buildDepends = [ MonadPrompt mtl randomSource transformers ];
meta = {
homepage = "https://github.com/mokus0/random-fu";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "semigroups";
version = "0.8.2";
sha256 = "1vxavkpg68qfs5arhi76liafds1jd8prircnp66ykhkj40z5aix0";
version = "0.8.3";
sha256 = "179m5vvhf8rf01fnq8b2lg7v8i70yx6yq975jiazghm0qnsm32ji";
meta = {
homepage = "http://github.com/ekmett/semigroups/";
description = "Haskell 98 semigroups";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "simple-sendfile";
version = "0.2.2";
sha256 = "0id3d6ynl2xz4w0vcxm3wyj1kxjnchcl3h0xa4prh3s0giap8yax";
version = "0.2.3";
sha256 = "1i3jx90kwq504fdl2qbhz25psjvq9ldvwgx5cij82ajjqi61pfrv";
buildDepends = [ network ];
meta = {
description = "Cross platform library for the sendfile system call";

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "storable-record";
version = "0.0.2.4";
sha256 = "5ed2680dcfc4c3d4fe605d23e797b847fe047b7acd3f4acfd82155c93e72b280";
version = "0.0.2.5";
sha256 = "078vwwcr47d3dmzkhxr7ggjkq9d5rnxv4z8p049kdnmzfbcmisn3";
isLibrary = true;
isExecutable = true;
buildDepends = [ transformers utilityHt ];

View file

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unbound";
version = "0.4.0.1";
sha256 = "0zb029wji85b643iqf4cnkd9d68accrjxnk8422xs82zik2kn6zf";
version = "0.4.0.2";
sha256 = "0vwbqrjrahg7ifsqgmq18ddmmczjxnsdz5w3kfgb4jpv1glwlxrh";
buildDepends = [ mtl RepLib transformers ];
meta = {
homepage = "http://code.google.com/p/replib/";

View file

@ -0,0 +1,16 @@
{ cabal, libX11, mesa, wxdirect, wxGTK }:
cabal.mkDerivation (self: {
pname = "wxc";
version = "0.90.0.2";
sha256 = "1vqs9517qacm04d2bxpbpcdgfmlhpblm6af45nmcdikvlfa1v0jp";
buildDepends = [ wxdirect ];
extraLibraries = [ libX11 mesa wxGTK ];
meta = {
homepage = "http://haskell.org/haskellwiki/WxHaskell";
description = "wxHaskell C++ wrapper";
license = "unknown";
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

View file

@ -152,7 +152,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
syb = self.syb_0_3_6; # 7.4.1 ok
xhtml = self.xhtml_3000_2_0_5; # 7.4.1 ok
zlib = self.zlib_0_5_3_3; # 7.4.1 ok
HTTP = self.HTTP_4000_2_2; # 7.4.1 ok
HTTP = self.HTTP_4000_2_3; # 7.4.1 ok
text = self.text_0_11_2_0; # 7.4.1 ok
transformers = self.transformers_0_2_2_0; # 7.4.1 ok
mtl = self.mtl_2_0_1_0; # 7.4.1 ok
@ -810,7 +810,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
HTTP_4000_1_2 = callPackage ../development/libraries/haskell/HTTP/4000.1.2.nix {};
HTTP_4000_2_1 = callPackage ../development/libraries/haskell/HTTP/4000.2.1.nix {};
HTTP_4000_2_2 = callPackage ../development/libraries/haskell/HTTP/4000.2.2.nix {};
HTTP = self.HTTP_4000_2_2;
HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {};
HTTP = self.HTTP_4000_2_3;
hackageDb = callPackage ../development/libraries/haskell/hackage-db {};
@ -1462,6 +1463,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
wx = callPackage ../development/libraries/haskell/wxHaskell/wx.nix {};
wxc = callPackage ../development/libraries/haskell/wxHaskell/wxc.nix {};
wxcore = callPackage ../development/libraries/haskell/wxHaskell/wxcore.nix {
wxGTK = pkgs.wxGTK28;
};