Merge remote-tracking branch 'origin/master' into x-updates

This commit is contained in:
Eelco Dolstra
2012-10-15 12:16:58 -04:00
40 changed files with 246 additions and 82 deletions

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "DSH";
version = "0.8.0.1";
sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s";
version = "0.8.1.0";
sha256 = "13mkpcm34jg7hqc272phiak7rg590hxb6ma3s9lwvp6izcv7vccq";
buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
meta = {
description = "Database Supported Haskell";

View File

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

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-mtl";
version = "0.3.0.2";
sha256 = "1mhk1z7hz50h8ssr4s7dzdxzn02rr0njxijdddfjjw71fln3nl5h";
version = "0.3.0.3";
sha256 = "1mmkp16c5ixknhm69a2zjrs9q0dd5ragmljnjjd6lxpakdlw64ww";
buildDepends = [ exceptionTransformers mtl transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "exception-transformers";
version = "0.3.0.2";
sha256 = "1ah3dimnc980vkr2lycpl4nsb615gxqws6mv9j90mz6g165h9khf";
version = "0.3.0.3";
sha256 = "0z3z5pppaqqbndd4fgv1czr8f9f4a8r86bwc3bcv88yf7y8cfbwz";
buildDepends = [ stm transformers ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "gloss";
version = "1.7.6.4";
sha256 = "0nyz9iicc6d96yn6yxzwz08g106qb2aadrxlw120wl01aqfw4xis";
version = "1.7.6.5";
sha256 = "0s02vbcyfqzlmjw68kp3arn3vvmldh04460gm050vbc6rqpc8dkv";
buildDepends = [ bmp GLUT OpenGL ];
meta = {
homepage = "http://gloss.ouroborus.net";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "highlighting-kate";
version = "0.5.3.2";
sha256 = "09yvqxvjzahz0y6yhsfgkx5xm39a74arv294w14sgmhay1wnlwvj";
version = "0.5.3.3";
sha256 = "08jxl2ba0kb4vj1qbdf4sas8bwbxzayzwsxnjvq358x57i5l302n";
isLibrary = true;
isExecutable = true;
buildDepends = [ blazeHtml filepath mtl parsec regexPcreBuiltin ];

View File

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

View File

@@ -4,14 +4,13 @@
cabal.mkDerivation (self: {
pname = "language-c-quote";
version = "0.4.1";
sha256 = "1graq6nfmzd2lj6fh1rwyaikfrlzn05pgd347dzrfq5ch35fgg10";
version = "0.4.2";
sha256 = "0l69kn8flx36z3cl9ckdls8w2sq8361w6abmi3gsa80l8yg3cpl4";
buildDepends = [
exceptionMtl exceptionTransformers filepath haskellSrcMeta
mainlandPretty mtl srcloc syb symbol
];
buildTools = [ alex happy ];
jailbreak = true;
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";
description = "C/CUDA/OpenCL quasiquoting library";

View File

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

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "mainland-pretty";
version = "0.2.2";
sha256 = "0kvn67g2ic46ybgyxpgpzjapwiww9848m9dv8y3xkkl7jd8anpb2";
version = "0.2.4";
sha256 = "0x481k36rz4zvj1nwvrfw1d10vbmmx8gb5f2nc8alnxcbc2y7xwq";
buildDepends = [ srcloc text ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "numbers";
version = "3000.1.0.0";
sha256 = "0iqpch8j2i2pnjq8waqb5y95jpmvbzx2r6zsvkja7sl4d578fgpn";
version = "3000.1.0.1";
sha256 = "0r2s47nfdxasnp8j7giwpxls9v48f6ld0gc2hg2p7y2ar5xfrcc4";
meta = {
homepage = "https://github.com/DanBurton/numbers";
description = "Various number types";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "repa";
version = "3.2.2.1";
sha256 = "0k8i4gm74gc19kfmg2790x1i6im58nqfblq2fq2bilh6rsj8hxh0";
version = "3.2.2.2";
sha256 = "1a7rgpy2qc42zc9si7p1zgi1m9b06dz533d2mvhizzac9k3fb5vq";
buildDepends = [ QuickCheck vector ];
meta = {
homepage = "http://repa.ouroborus.net";

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "srcloc";
version = "0.2.1";
sha256 = "03b0ra5g7mqcjjfnhm84mv4ph454j08pb9dwxrv9zfwk1kiqb2ss";
version = "0.3.0";
sha256 = "1ymk8k0r9ckk7dalz3virvvpyrf4nw8xvb23cs6ibdjjbzsphpiz";
buildDepends = [ syb ];
noHaddock = true;
meta = {

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "symbol";
version = "0.1.3";
sha256 = "1kz4kzbv6bara31pv4vc75r6wvjln6md8gjlsxx8hf50ab8vb68j";
version = "0.1.4";
sha256 = "00318syprv1ixfbr4v7xq86z10f0psxk0b8kaxvawvacm8hp61bn";
buildDepends = [ deepseq syb ];
meta = {
homepage = "http://www.eecs.harvard.edu/~mainland/";

View File

@@ -5,8 +5,8 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.3.2";
sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8";
version = "1.3.4.1";
sha256 = "09slbxbk88sjdgs3mibsvp17c85mn2r2sp67fchkmqkhf40lhcxw";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile

View File

@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.2.2";
sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7";
version = "1.1.3.1";
sha256 = "16fb0f9si5r65mw7d8j6221qjw61xgi2v60j7dm9j02ljp68i2bq";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes

View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "yesod-routes";
version = "1.1.0.1";
sha256 = "1b248ry96p1nyp21c3r9rd3awpdhpqrwj3s6d66pmjf8p0gl5vda";
version = "1.1.0.2";
sha256 = "07nrxqkpc5z32c8lk5wz9m6ql703hdhyd86pfk704frvbic02xly";
buildDepends = [ pathPieces text vector ];
meta = {
homepage = "http://www.yesodweb.com/";

View File

@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "yesod";
version = "1.1.1.2";
sha256 = "0gq4ijfjlkiqw4bp9hxs8r41vlhz33v5l9k1maqjy62d446lrgvw";
version = "1.1.2";
sha256 = "02d40crvsnhasa6jhl0k7hzxnwr9lxmbm7caf2mrvpr4sldzy1ss";
isLibrary = true;
isExecutable = true;
buildDepends = [

View File

@@ -0,0 +1,25 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libmnl-1.0.3";
src = fetchurl {
url = "http://netfilter.org/projects/libmnl/files/${name}.tar.bz2";
sha1 = "c27e25f67c6422ebf893fc3a844af8085a1c5b63";
};
meta = {
description = "minimalistic user-space library oriented to Netlink developers";
longDescription = ''
libmnl is a minimalistic user-space library oriented to Netlink developers.
There are a lot of common tasks in parsing, validating, constructing of both the Netlink
header and TLVs that are repetitive and easy to get wrong.
This library aims to provide simple helpers that allows you to re-use code and to avoid
re-inventing the wheel.
'';
homepage = http://netfilter.org/projects/libmnl/index.html;
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -0,0 +1,26 @@
{ stdenv, fetchurl, pkgconfig, libnfnetlink, libmnl }:
stdenv.mkDerivation rec {
name = "libnetfilter_conntrack-1.0.2";
src = fetchurl {
url = "http://netfilter.org/projects/libnetfilter_conntrack/files/${name}.tar.bz2";
md5 = "447114b5d61bb9a9617ead3217c3d3ff";
};
buildInputs = [ pkgconfig libnfnetlink libmnl ];
meta = {
description = "userspace library providing an API to the in-kernel connection tracking state table.";
longDescription = ''
libnetfilter_conntrack is a userspace library providing a programming interface (API) to the
in-kernel connection tracking state table. The library libnetfilter_conntrack has been
previously known as libnfnetlink_conntrack and libctnetlink. This library is currently used
by conntrack-tools among many other applications
'';
homepage = http://netfilter.org/projects/libnetfilter_conntrack/;
license = "GPLv2+";
platforms = stdenv.lib.platforms.linux;
};
}

View File

@@ -0,0 +1,27 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "libnfnetlink-1.0.1";
src = fetchurl {
url = "http://www.netfilter.org/projects/libnfnetlink/files/${name}.tar.bz2";
md5 = "98927583d2016a9fb1936fed992e2c5e";
};
meta = {
description = "low-level library for netfilter related kernel/userspace communication.";
longDescription = ''
libnfnetlink is the low-level library for netfilter related kernel/userspace communication.
It provides a generic messaging infrastructure for in-kernel netfilter subsystems
(such as nfnetlink_log, nfnetlink_queue, nfnetlink_conntrack) and their respective users
and/or management tools in userspace.
This library is not meant as a public API for application developers.
It is only used by other netfilter.org projects, like the aforementioned ones.
'';
homepage = http://www.netfilter.org/projects/libnfnetlink/index.html;
license = "GPLv2";
platforms = stdenv.lib.platforms.linux;
};
}