Merge branch 'master' into x-updates

This commit is contained in:
Peter Simons
2012-10-16 18:27:27 +02:00
13 changed files with 96 additions and 36 deletions

View File

@@ -0,0 +1,19 @@
{ cabal, cereal, libxmlSax, network, parsec, random, text
, transformers, vector, xmlTypes
}:
cabal.mkDerivation (self: {
pname = "dbus";
version = "0.10.1";
sha256 = "180923lp09pwcvxffxyq753mq7zp7dyxgaj3h13wfsrhfia0awz8";
buildDepends = [
cereal libxmlSax network parsec random text transformers vector
xmlTypes
];
meta = {
homepage = "https://john-millikin.com/software/haskell-dbus/";
description = "A client library for the D-Bus IPC system";
license = self.stdenv.lib.licenses.gpl3;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors-snap";
version = "0.5.0.0";
sha256 = "01lbd42rsryzqzra8ax22iw6c9fyv5az8q7dkdi6yyfxdq976l0x";
version = "0.5.0.1";
sha256 = "149c01vxzlwskqsncc5l26mk67icmsq2zbav2asjxpp6z8b53i3b";
buildDepends = [ digestiveFunctors filepath mtl snapCore text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "digestive-functors";
version = "0.5.0.2";
sha256 = "1phakcljl6ri2p9lfzjnn001jw0inyxa5zd7lp2k9lhq1yq0byb0";
version = "0.5.0.3";
sha256 = "176wpnwg4zpfwphl0ifb3zdm0dhw5xyd3vr81rc98s4db5y9csl0";
buildDepends = [ mtl text ];
meta = {
homepage = "http://github.com/jaspervdj/digestive-functors";

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hxt";
version = "9.3.1.0";
sha256 = "0nv7d7ffwq81671c7gyzaqx7xgrgs42svbq5xraij4jbq5406719";
version = "9.3.1.1";
sha256 = "1x0z85vx49s2b9bgjm14c2152cwr0vzf02rlxrla5dj5g565985y";
buildDepends = [
binary deepseq filepath HUnit hxtCharproperties hxtRegexXmlschema
hxtUnicode mtl network parsec

View File

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.4.2";
sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4";
version = "0.4.3";
sha256 = "13xpmj3jrqkcgilkh4p8ycxhlk5yvfsisx4c1ax7n7aafg1n7phf";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol

View File

@@ -1,11 +1,11 @@
{ cabal, alex, blazeBuilder, happy, mtl, utf8Light, utf8String }:
{ cabal, blazeBuilder, happy, mtl, utf8Light, utf8String }:
cabal.mkDerivation (self: {
pname = "language-javascript";
version = "0.5.5";
sha256 = "1p02n6rh98nvkh7g5kj18ggcnyvds8lqbgjwgzm83bnd5ayizrw7";
version = "0.5.6";
sha256 = "1a1nki2z7x0rna5jg6g0gqnipvd115k4xgagg6prrvj284ml44wd";
buildDepends = [ blazeBuilder mtl utf8Light utf8String ];
buildTools = [ alex happy ];
buildTools = [ happy ];
meta = {
homepage = "http://github.com/alanz/language-javascript";
description = "Parser for JavaScript";

View File

@@ -0,0 +1,16 @@
{ cabal, libxml2, text, xmlTypes }:
cabal.mkDerivation (self: {
pname = "libxml-sax";
version = "0.7.3";
sha256 = "1514ix5n8y1dwjdm0kmr17fdigc0ic89gzwdvfgh542sjm11100r";
buildDepends = [ text xmlTypes ];
extraLibraries = [ libxml2 ];
pkgconfigDepends = [ libxml2 ];
meta = {
homepage = "https://john-millikin.com/software/haskell-libxml/";
description = "Bindings for the libXML2 SAX interface";
license = self.stdenv.lib.licenses.mit;
platforms = self.ghc.meta.platforms;
};
})

View File

@@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "network-info";
version = "0.2.0.2";
sha256 = "132cna6dc8azpll3rm2y4wv6sdcavwjq3x9f8m4p2952vr53bw3m";
meta = {
homepage = "http://github.com/jystic/network-info";
description = "Access the local computer's basic network configuration";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})