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

Updating Haskell packages. 

- Agda-executable: updated to version 2.3.0.1
 - Agda: updated to version 2.3.0.1
 - gio: added version 0.12.3
 - hamlet: updated to version 0.10.9.1
 - leksah-server: updated to version 0.12.0.4
 - leksah: updated to version 0.12.0.3
 - ltk: updated to version 0.12.0.0
 - packages.nix: cosmetic change
 - pandoc: updated to version 1.9.1.2
 - polyparse: added version 1.8
 - shakespeare-css: updated to version 0.10.8
 - shakespeare-i18n: updated to version 0.0.2.1
 - shakespeare-js: updated to version 0.11.2
 - shakespeare-text: updated to version 0.11
 - shakespeare: updated to version 0.11
 - tls: updated to version 0.9.1
 - unordered-containers: updated to version 0.2.0.1
 - uuagc: updated to version 0.9.40.3
 - yesod-core: updated to version 0.10.2.2
 - yesod-form: updated to version 0.4.2.1
 - yesod: updated to version 0.10.1.4

svn path=/nixpkgs/trunk/; revision=33015
This commit is contained in:
Peter Simons 2012-03-12 14:06:18 +00:00
parent f5219b23a4
commit c86a90c4e9
22 changed files with 102 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pkgs/applications/editors/leksah/default.nix
View File

@ -1,18 +1,20 @@
{ cabal, binary, binaryShared, Cabal, deepseq, filepath, glib, gtk
, gtksourceview2, hslogger, leksahServer, ltk, mtl, network, parsec
, processLeksah, regexBase, regexTdfa, strict, time, utf8String
{ cabal, binary, binaryShared, Cabal, deepseq, enumerator, filepath
, gio, glib, gtk, gtksourceview2, hslogger, leksahServer, ltk, mtl
, network, parsec, QuickCheck, regexBase, regexTdfa, strict, text
, time, transformers, utf8String
}:
cabal.mkDerivation (self: {
pname = "leksah";
version = "0.10.0.4";
sha256 = "1g12w1kl63fxzz1c2x237yrqkaja9awiqyyipkdms5iql0ini7bw";
version = "0.12.0.3";
sha256 = "1374ffwban58kabnynacl0fyzs6756kd5q1lcfya46mp26l7syrd";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary binaryShared Cabal deepseq filepath glib gtk gtksourceview2
hslogger leksahServer ltk mtl network parsec processLeksah
regexBase regexTdfa strict time utf8String
binary binaryShared Cabal deepseq enumerator filepath gio glib gtk
gtksourceview2 hslogger leksahServer ltk mtl network parsec
QuickCheck regexBase regexTdfa strict text time transformers
utf8String
];
noHaddock = true;
meta = {

4
pkgs/development/compilers/Agda-executable/default.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "Agda-executable";
version = "2.3.0";
sha256 = "1n1ak6z2vh356k9mk0zkiv6dqp9dvx97a7r21b0xnhwkmh3f8p5p";
version = "2.3.0.1";
sha256 = "156nzvpmqi7yizjr4yym2ybc0iv4nqfp84qrpdxcha682k298ib1";
isLibrary = false;
isExecutable = true;
buildDepends = [ Agda ];

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "Agda";
version = "2.3.0";
sha256 = "1p0cwf3d146z73gp49cm8fmk33hcbjsvyijbakm1871ssc5i73k0";
version = "2.3.0.1";
sha256 = "0f2kc3by2z01g8bqc446hyzx9sidx6qi0p7h5bcpjf8iryk1dh2w";
isLibrary = true;
isExecutable = true;
buildDepends = [

20
pkgs/development/libraries/haskell/gio/default.nix Normal file
View File

@ -0,0 +1,20 @@
{ cabal, glib, gtk2hsBuildtools, mtl }:
cabal.mkDerivation (self: {
pname = "gio";
version = "0.12.3";
sha256 = "0kmqldlgxwj8sh0b5k5gicc5z2n6mc9h3fmdby4wx1l4ska7rajn";
buildDepends = [ glib mtl ];
buildTools = [ gtk2hsBuildtools ];
pkgconfigDepends = [ glib ];
meta = {
homepage = "http://projects.haskell.org/gtk2hs/";
description = "Binding to the GIO";
license = self.stdenv.lib.licenses.lgpl21;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hamlet";
version = "0.10.8";
sha256 = "1vlp8vwaipz757vnd95gcdi9dkrpbgfdlsb3kgjivsj7rqbmxf7z";
version = "0.10.9.1";
sha256 = "1z2g7ymb8ihx13dkfq0k0s2fn1k6nig8h306i8p4q76wy7ybw3g0";
buildDepends = [
blazeBuilder blazeHtml failure parsec shakespeare text
];

14
pkgs/development/libraries/haskell/leksah/leksah-server.nix
View File

@ -1,16 +1,18 @@
{ cabal, binary, binaryShared, Cabal, deepseq, filepath, haddock
, hslogger, ltk, mtl, network, parsec, processLeksah, time
{ cabal, attoparsec, attoparsecEnumerator, binary, binaryShared
, Cabal, deepseq, enumerator, filepath, haddock, hslogger, ltk
, network, parsec, processLeksah, time, transformers
}:
cabal.mkDerivation (self: {
pname = "leksah-server";
version = "0.10.0.4";
sha256 = "0g523dkiaclk5ym16vzqiabh7mwksjqp0kbx17a899k5gzfwfjp6";
version = "0.12.0.4";
sha256 = "0lv6z2b79cxvcz5mldyicx87lp3a0xfmv0wjd0cjf954cdizccg2";
isLibrary = true;
isExecutable = true;
buildDepends = [
binary binaryShared Cabal deepseq filepath haddock hslogger ltk mtl
network parsec processLeksah time
attoparsec attoparsecEnumerator binary binaryShared Cabal deepseq
enumerator filepath haddock hslogger ltk network parsec
processLeksah time transformers
];
meta = {
homepage = "http://leksah.org";

8
pkgs/development/libraries/haskell/ltk/default.nix
View File

@ -1,10 +1,10 @@
{ cabal, Cabal, filepath, glib, gtk, haddock, mtl, parsec }:
{ cabal, Cabal, filepath, glib, gtk, mtl, parsec, transformers }:
cabal.mkDerivation (self: {
pname = "ltk";
version = "0.10.0.4";
sha256 = "1dp6dl8a0pfj6lx8n8a2y1j3c2z57k9pf81yr45qsp7wg53d6qhf";
buildDepends = [ Cabal filepath glib gtk haddock mtl parsec ];
version = "0.12.0.0";
sha256 = "1hlsfi77yypfnvh1alr3rflbffby9pbmc71m507davr6b09v9w9f";
buildDepends = [ Cabal filepath glib gtk mtl parsec transformers ];
meta = {
homepage = "http://www.leksah.org";
description = "Leksah tool kit";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "pandoc";
version = "1.9.1.1";
sha256 = "1npyc99f90fhbfddr6x5dlnwdc3i1pnhg4xiv12fmf1cl8xlcpyl";
version = "1.9.1.2";
sha256 = "0sjdcmf3k64y9q0x1g2y3p7km73ir7gk4xxrvvx37aqwk3v9yraj";
isLibrary = true;
isExecutable = true;
buildDepends = [

0
pkgs/development/libraries/haskell/polyparse/default.nix → pkgs/development/libraries/haskell/polyparse/1.7.nix
View File

18
pkgs/development/libraries/haskell/polyparse/1.8.nix Normal file
View File

@ -0,0 +1,18 @@
{ cabal, text }:
cabal.mkDerivation (self: {
pname = "polyparse";
version = "1.8";
sha256 = "08nr22r87q2yxxlcpvf35pkq56b4k3f1fzj3cvjnr7137k7c7ywn";
buildDepends = [ text ];
meta = {
homepage = "http://code.haskell.org/~malcolm/polyparse/";
description = "A variety of alternative parser combinator libraries";
license = "LGPL";
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-css";
version = "0.10.7.1";
sha256 = "0yi04ap2pl916ycs1wzaxrhjyx81lpmdad5in3qf1s4flfmi1h2k";
version = "0.10.8";
sha256 = "1c3a48rfrr5ifarr15zkcwg74zkqw08lhfk5fpkr5z6gxhwnbkas";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-i18n";
version = "0.0.2";
sha256 = "1hb144n3fa5qiy3skrmab0qv63fa5vf4vg4ar9hrybmwdksqa410";
version = "0.0.2.1";
sha256 = "1gaxngqihz6wi5d6hyb9mdlhgcxnr4bvmm1si919zgjndwnms8z8";
buildDepends = [ parsec shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/i18n";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-js";
version = "0.11.1";
sha256 = "1sqkfl6pwwmn72xz5qf1bh58jr95w59ry6zmy939x73g9jgpzn6x";
version = "0.11.2";
sha256 = "1ck39bgl4wswd88w42b1fx5dlsd7r31d60ssv1lk11x6s4cjihgz";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare-text";
version = "0.10.5";
sha256 = "13nhasfbza73kv3iin16iidwyz71b8d75vq0ym37zygpxb5izkvw";
version = "0.11";
sha256 = "02h8vi28kzvv44hy1ix9jc01x4jx302cp71bdj8blsjxzqyr6aq8";
buildDepends = [ shakespeare text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "shakespeare";
version = "0.10.3.1";
sha256 = "1wfw5qbgl4jl1r4gaw55mnsmn70vpzn7ykz3gbqzrf91wc6s3zj4";
version = "0.11";
sha256 = "0ksjgl2x97n5ci346vlmc2kd8plvsg6kn5cncbxkd8c6w4h28a4b";
buildDepends = [ parsec text ];
meta = {
homepage = "http://www.yesodweb.com/book/templates";

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

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "tls";
version = "0.9.0";
sha256 = "1lv4ihds9b253i79cc7fcp27s3jlh10vrbnrhbicrrmcgaqklg82";
version = "0.9.1";
sha256 = "0724xwk3mchb2hd6sq4zhrs7pyd18banr0ndxc6bhim75vci53sl";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/libraries/haskell/unordered-containers/0.2.0.0.nix → pkgs/development/libraries/haskell/unordered-containers/0.2.0.1.nix
View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "unordered-containers";
version = "0.2.0.0";
sha256 = "1fan2qrfzdg1a5xnqncy4vs5xab2v3v4v1gvk50vjfj87valxnx4";
version = "0.2.0.1";
sha256 = "16vql5s98w9gfzjngzq0a18d173l67jcrib18fh0bxdibmg9hzql";
buildDepends = [ deepseq hashable ];
meta = {
description = "Efficient hashing-based container types";

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

@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "0.10.2.1";
sha256 = "00cw31k6fkffryiqji33x56hqxivwg2c3rgaqmplph9zjpndvgb2";
version = "0.10.2.2";
sha256 = "1aghra5pmmykl9fvsb18mbpawvwqwv3iwls33m166b0czzdwlrlv";
buildDepends = [
aeson blazeBuilder blazeHtml caseInsensitive cereal clientsession
conduit cookie failure fastLogger hamlet httpTypes liftedBase

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

@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "yesod-form";
version = "0.4.2";
sha256 = "0vl938ngf8lbpylra9wmywgcdffi9prhbz45d6cl1hra9hlsavj6";
version = "0.4.2.1";
sha256 = "0zpmyqxbknz8pdib1gdf410jv4xndn4pphdigagqxl5m5c2hi1v2";
buildDepends = [
blazeBuilder blazeHtml dataDefault emailValidate hamlet network
persistent shakespeareCss shakespeareJs text time transformers wai

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

@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "0.10.1.3";
sha256 = "01r9b88gsj7f1mn56nm5dyzj2s46l9pg9p7fjwkf0l8zdfmrbflw";
version = "0.10.1.4";
sha256 = "0glyl1q5szwk1r2l2amq7w42kjl5wda33bvz64rvav1hngkpvii0";
isLibrary = true;
isExecutable = true;
buildDepends = [

4
pkgs/development/tools/haskell/uuagc/default.nix
View File

@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "uuagc";
version = "0.9.40.2";
sha256 = "1qc5sqm2lqysm5rplzc229rfw5750w4z8b7cgxaid7jjv4csrbf8";
version = "0.9.40.3";
sha256 = "053p7cbis843zn0qg8imc77xnfj4kna8wwfanxbj8kcapcqvwihl";
isLibrary = true;
isExecutable = true;
buildDepends = [

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

@ -713,6 +713,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {};
gio = callPackage ../development/libraries/haskell/gio {};
gitit = callPackage ../development/libraries/haskell/gitit {};
glade = callPackage ../development/libraries/haskell/glade {
@ -765,6 +767,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
graphviz = callPackage ../development/libraries/haskell/graphviz {
fgl = self.fgl_5_4_2_4;
polyparse = self.polyparse_1_7;
};
hakyll = callPackage ../development/libraries/haskell/hakyll {};
@ -796,7 +799,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haskellSrc_1_0_1_5 = callPackage ../development/libraries/haskell/haskell-src/1.0.1.5.nix {};
haskellSrc = self.haskellSrc_1_0_1_5;
haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts/default.nix {};
haskellSrcExts = callPackage ../development/libraries/haskell/haskell-src-exts {};
haskellSrcMeta = callPackage ../development/libraries/haskell/haskell-src-meta {};
@ -1098,7 +1101,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
persistentTemplate = callPackage ../development/libraries/haskell/persistent-template {};
polyparse = callPackage ../development/libraries/haskell/polyparse/default.nix {};
polyparse_1_7 = callPackage ../development/libraries/haskell/polyparse/1.7.nix {};
polyparse_1_8 = callPackage ../development/libraries/haskell/polyparse/1.8.nix {};
polyparse = self.polyparse_1_8;
poolConduit = callPackage ../development/libraries/haskell/pool-conduit {};
@ -1383,8 +1388,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
unixCompat = callPackage ../development/libraries/haskell/unix-compat {};
unorderedContainers_0_1_4_6 = callPackage ../development/libraries/haskell/unordered-containers/0.1.4.6.nix {};
unorderedContainers_0_2_0_0 = callPackage ../development/libraries/haskell/unordered-containers/0.2.0.0.nix {};
unorderedContainers = self.unorderedContainers_0_2_0_0;
unorderedContainers_0_2_0_1 = callPackage ../development/libraries/haskell/unordered-containers/0.2.0.1.nix {};
unorderedContainers = self.unorderedContainers_0_2_0_1;
url = callPackage ../development/libraries/haskell/url {};
@ -1604,7 +1609,9 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
tar = self.tar_0_3_2_0;
};
leksah = callPackage ../applications/editors/leksah {};
leksah = callPackage ../applications/editors/leksah {
QuickCheck = self.QuickCheck2;
};
mathblog = callPackage ../applications/misc/mathblog {};