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

Merge branch 'master' into x-updates.

Browse Source
This commit is contained in:
Peter Simons
2012-10-12 15:24:24 +02:00
parent 0bb86f86b1 b1169e5509
commit f77a2f460a
60 changed files with 1263 additions and 234 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/haskell/DSH/default.nix
View File

@@ -1,15 +1,10 @@
{ cabal, convertible, csv, FerryCore, HaXml, HDBC, json, mtl
, Pathfinder, syb, text, xhtml
}:
{ cabal, csv, FerryCore, HaXml, HDBC, mtl, Pathfinder, text }:
cabal.mkDerivation (self: {
pname = "DSH";
version = "0.7.8.2";
sha256 = "1rs42c05q4s46a1a03srzdq0aijwalhilzifc8ryq4qwjgh7vkwz";
buildDepends = [
convertible csv FerryCore HaXml HDBC json mtl Pathfinder syb text
xhtml
];
version = "0.8.0.1";
sha256 = "08bwn7jpnkzvyj2dlpk6zx97iwsjb085vbnc8hwvxnhf9y8wl96s";
buildDepends = [ csv FerryCore HaXml HDBC mtl Pathfinder text ];
meta = {
description = "Database Supported Haskell";
license = self.stdenv.lib.licenses.bsd3;

5
pkgs/development/libraries/haskell/conduit/default.nix
View File

@@ -4,13 +4,12 @@
cabal.mkDerivation (self: {
pname = "conduit";
version = "0.5.2.5";
sha256 = "1savaq8n29cry75jl8rfk35q24s5bvm57j1zhnp3dcvj2i6w9k3y";
version = "0.5.2.6";
sha256 = "0zmls6gl02mdwapdggw340s7pn5fjsvaky40m31ph3n28qr71kww";
buildDepends = [
liftedBase monadControl resourcet text transformers
transformersBase void
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Streaming data processing library";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "criterion";
version = "0.6.1.1";
sha256 = "1w5yqcgnx2ij3hmvmz5g4ynj6n8wa3yyk1kfbbwxyh9j5kc2xwiw";
version = "0.6.2.0";
sha256 = "1xd90qb026niq2sn7ks8bn92ifb6255saic68bzg6kzj7ydwwdmx";
buildDepends = [
aeson deepseq filepath hastache mtl mwcRandom parsec statistics
time transformers vector vectorAlgorithms

4
pkgs/development/libraries/haskell/data-memocombinators/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "data-memocombinators";
version = "0.4.3";
sha256 = "0mzvjgccm23y7mfaz9iwdy64amf69d7i8yq9fc9mjx1nyzxdrgsc";
version = "0.4.4";
sha256 = "06x79rgxi6cxrpzjzzsjk7yj7i0ajmcgns0n12lxakz9vxbqxyn2";
buildDepends = [ dataInttrie ];
meta = {
homepage = "http://github.com/luqui/data-memocombinators";

4
pkgs/development/libraries/haskell/ghc-mtl/default.nix
View File

@@ -2,8 +2,8 @@
cabal.mkDerivation (self: {
pname = "ghc-mtl";
version = "1.0.1.1";
sha256 = "04lm1g27xwwph02k3d8b51nbhi2sw8jx7arqczcqc3rygak10fpn";
version = "1.0.1.2";
sha256 = "06m8ynqlbvvs37w211ikldwvlvg4ry27x9l7idnwa1m8w2jkbkva";
buildDepends = [ MonadCatchIOMtl mtl ];
meta = {
homepage = "http://darcsden.com/jcpetruzza/ghc-mtl";

10
pkgs/development/libraries/haskell/heist/default.nix
View File

@@ -1,16 +1,16 @@
{ cabal, aeson, attoparsec, blazeBuilder, blazeHtml, directoryTree
, filepath, MonadCatchIOTransformers, mtl, random, text, time
, transformers, unorderedContainers, vector, xmlhtml
, unorderedContainers, vector, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "heist";
version = "0.8.1.1";
sha256 = "0ad56izskafpc1dx2nq0a8w71ayppwx8dc7kdaw1by972kh3nflh";
version = "0.8.2";
sha256 = "0zamggvfq9054vxznbnfq1fihk110ih8q0dza1rmsjb1h2s88rkj";
buildDepends = [
aeson attoparsec blazeBuilder blazeHtml directoryTree filepath
MonadCatchIOTransformers mtl random text time transformers
unorderedContainers vector xmlhtml
MonadCatchIOTransformers mtl random text time unorderedContainers
vector xmlhtml
];
meta = {
homepage = "http://snapframework.com/";

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

@@ -4,8 +4,8 @@
cabal.mkDerivation (self: {
pname = "hint";
version = "0.3.3.4";
sha256 = "0pmvhlj9m0s1wvw8ppx1wx879lwzg38bcvhy1ma1d4wnrpq3bhiy";
version = "0.3.3.5";
sha256 = "09pd4b105c2ikf4ap96fz8091qra7hypq3k3ik0kay3bb532hmlq";
buildDepends = [
extensibleExceptions filepath ghcMtl ghcPaths haskellSrc
MonadCatchIOMtl mtl random utf8String

5
pkgs/development/libraries/haskell/http-conduit/default.nix
View File

@@ -8,8 +8,8 @@
cabal.mkDerivation (self: {
pname = "http-conduit";
version = "1.6.1.1";
sha256 = "00xixsp1n37mb2in20lsxf460cyjbsp8dj2avys6hyrdn14ki130";
version = "1.6.1.2";
sha256 = "02dh7gh9pk5dj6dl28hn3vqvf9280b57bqas4w7zsgnhjivxy20x";
buildDepends = [
asn1Data attoparsec attoparsecConduit base64Bytestring blazeBuilder
blazeBuilderConduit caseInsensitive certificate conduit cookie
@@ -17,7 +17,6 @@ cabal.mkDerivation (self: {
monadControl mtl network regexCompat resourcet socks text time tls
tlsExtra transformers transformersBase utf8String void zlibConduit
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/http-conduit";
description = "HTTP client package with conduit interface and HTTPS support";

5
pkgs/development/libraries/haskell/network-conduit/default.nix
View File

@@ -3,12 +3,11 @@
cabal.mkDerivation (self: {
pname = "network-conduit";
version = "0.6.0";
sha256 = "0y296v8b6xrxs9jw6az6flz9nsqgk60cnpc954pmp6mi5q8mbv7i";
version = "0.6.1.1";
sha256 = "00x5ks1qcq5smmd2g4bm23lb3ngdxmdlz822qkkj9l9c27lkn67n";
buildDepends = [
conduit liftedBase monadControl network transformers
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Stream socket data using conduits";

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

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

5
pkgs/development/libraries/haskell/persistent/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "persistent";
version = "1.0.1.2";
sha256 = "0gw635mhbn6w8aswiw9j41rdpi7rhnnhay2qgvlc8103s0g5lp9j";
version = "1.0.1.3";
sha256 = "156iv1iv807wm39sr98z0f10sbw4q0ac3lafgai0mq3ph5xysi80";
buildDepends = [
aeson attoparsec base64Bytestring blazeHtml blazeMarkup conduit
liftedBase monadControl monadLogger pathPieces poolConduit
@@ -15,7 +15,6 @@ cabal.mkDerivation (self: {
unorderedContainers vector
];
extraLibraries = [ sqlite ];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/book/persistent";
description = "Type-safe, multi-backend data serialization";

14
pkgs/development/libraries/haskell/primitive/0.5.0.1.nix Normal file
View File

@@ -0,0 +1,14 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "primitive";
version = "0.5.0.1";
sha256 = "04s33xqxz68ddppig5pjf7ki1y5y62xzzzmg3b5pkcxp0r6rsv2j";
meta = {
homepage = "http://code.haskell.org/primitive";
description = "Primitive memory-related operations";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

5
pkgs/development/libraries/haskell/resourcet/default.nix
View File

@@ -4,12 +4,11 @@
cabal.mkDerivation (self: {
pname = "resourcet";
version = "0.4.0.1";
sha256 = "0idyb2xvjk9cbz9gy1gr6sw1mz6v9d8fgk0kw778n6k3h488dw9x";
version = "0.4.0.2";
sha256 = "0w4hm29dig6m4jm6y9zmyfnhwii7b88hqjqlvl6xmk5zxp1q7hc2";
buildDepends = [
liftedBase monadControl mtl transformers transformersBase
];
jailbreak = true;
meta = {
homepage = "http://github.com/snoyberg/conduit";
description = "Deterministic allocation and freeing of scarce resources";

12
pkgs/development/libraries/haskell/snap/core.nix
View File

@@ -1,19 +1,19 @@
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, bytestringMmap, caseInsensitive, deepseq
, enumerator, filepath, HUnit, MonadCatchIOTransformers, mtl
, random, regexPosix, text, time, transformers, unixCompat
, unorderedContainers, vector, zlibEnum
, random, regexPosix, text, time, unixCompat, unorderedContainers
, vector, zlibEnum
}:
cabal.mkDerivation (self: {
pname = "snap-core";
version = "0.9.2.1";
sha256 = "18i0hfzc37q12nyp7g4sc87s4xcqz1crjwpnhh4y5fw66glzmq3q";
version = "0.9.2.2";
sha256 = "0svahih2piaj87xfysgjvqqh11gmwz9icrh2g819h68kzh10imlf";
buildDepends = [
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
bytestringMmap caseInsensitive deepseq enumerator filepath HUnit
MonadCatchIOTransformers mtl random regexPosix text time
transformers unixCompat unorderedContainers vector zlibEnum
MonadCatchIOTransformers mtl random regexPosix text time unixCompat
unorderedContainers vector zlibEnum
];
meta = {
homepage = "http://snapframework.com/";

20
pkgs/development/libraries/haskell/snap/server.nix
View File

@@ -1,20 +1,18 @@
{ cabal, attoparsec, attoparsecEnumerator, binary, blazeBuilder
, blazeBuilderEnumerator, caseInsensitive, directoryTree
, enumerator, filepath, MonadCatchIOTransformers, mtl, network
, snapCore, text, time, transformers, unixCompat
{ cabal, attoparsec, attoparsecEnumerator, blazeBuilder
, blazeBuilderEnumerator, caseInsensitive, enumerator
, MonadCatchIOTransformers, mtl, network, snapCore, text, time
, unixCompat
}:
cabal.mkDerivation (self: {
pname = "snap-server";
version = "0.9.2.3";
sha256 = "0wl7clzwrd34d32sikd6vkj3pla9yni26mmdsnrjw1s3lq412yqd";
version = "0.9.2.4";
sha256 = "1kwmrlk9dr033h6q05afnr916wnw5wlxrr87z1myv0a6nzqmdhzl";
buildDepends = [
attoparsec attoparsecEnumerator binary blazeBuilder
blazeBuilderEnumerator caseInsensitive directoryTree enumerator
filepath MonadCatchIOTransformers mtl network snapCore text time
transformers unixCompat
attoparsec attoparsecEnumerator blazeBuilder blazeBuilderEnumerator
caseInsensitive enumerator MonadCatchIOTransformers mtl network
snapCore text time unixCompat
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "A fast, iteratee-based, epoll-enabled web server for the Snap Framework";

11
pkgs/development/libraries/haskell/snap/snap.nix
View File

@@ -2,14 +2,14 @@
, dataLens, dataLensTemplate, directoryTree, filepath, hashable
, heist, logict, MonadCatchIOTransformers, mtl, mwcRandom
, pwstoreFast, snapCore, snapServer, stm, syb, text, time
, transformers, unorderedContainers, utf8String, vector
, vectorAlgorithms, xmlhtml
, transformers, unorderedContainers, vector, vectorAlgorithms
, xmlhtml
}:
cabal.mkDerivation (self: {
pname = "snap";
version = "0.9.2.1";
sha256 = "0gxnkr6icx2g16w3ab54cqy4x15xj6y9cs6qv8dg0xamm7kyyfhl";
version = "0.9.2.2";
sha256 = "1ql9c8b9arcd8zwlwsiipl4diah87sp339ljc5bc7yls1g4d9zsw";
isLibrary = true;
isExecutable = true;
buildDepends = [
@@ -17,9 +17,8 @@ cabal.mkDerivation (self: {
dataLensTemplate directoryTree filepath hashable heist logict
MonadCatchIOTransformers mtl mwcRandom pwstoreFast snapCore
snapServer stm syb text time transformers unorderedContainers
utf8String vector vectorAlgorithms xmlhtml
vector vectorAlgorithms xmlhtml
];
jailbreak = true;
meta = {
homepage = "http://snapframework.com/";
description = "Top-level package for the Snap Web Framework";

15
pkgs/development/libraries/haskell/vector/0.10.0.1.nix Normal file
View File

@@ -0,0 +1,15 @@
{ cabal, deepseq, primitive }:
cabal.mkDerivation (self: {
pname = "vector";
version = "0.10.0.1";
sha256 = "1bq8am8qnpnsla315i21f1kikikalyz9ps1izxgpr9q1ic2lbsgc";
buildDepends = [ deepseq primitive ];
meta = {
homepage = "http://code.haskell.org/vector";
description = "Efficient Arrays";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [ self.stdenv.lib.maintainers.andres ];
};
})

4
pkgs/development/libraries/haskell/wai-extra/default.nix
View File

@@ -6,8 +6,8 @@
cabal.mkDerivation (self: {
pname = "wai-extra";
version = "1.3.0.2";
sha256 = "0w69wjfbzgg523n0rcs700qx0gsdhvlr0qjvqg1hppvi188llpwl";
version = "1.3.0.3";
sha256 = "0nfk24mwzf2v35vlvvhzb7a6ldr6pvw37m3ws3b3cv2m80jdd7kr";
buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault dateCache fastLogger httpTypes network

5
pkgs/development/libraries/haskell/warp/default.nix
View File

@@ -5,14 +5,13 @@
cabal.mkDerivation (self: {
pname = "warp";
version = "1.3.3.1";
sha256 = "0nz5n574lgaii6i9ncc6dkzw2aw6g7hwjjq7v8njly2vpwygxn7s";
version = "1.3.3.2";
sha256 = "1w2i5nf3qh7p0xfrrp6x34rw3sxa48v703w1vlsikhyjdqs2crq8";
buildDepends = [
blazeBuilder blazeBuilderConduit caseInsensitive conduit hashable
httpTypes liftedBase network networkConduit simpleSendfile
transformers unixCompat void wai
];
patchPhase = "sed -i -e 's|, lifted-base.*|, lifted-base|' warp.cabal";
meta = {
homepage = "http://github.com/yesodweb/wai";
description = "A fast, light-weight web server for WAI applications";

5
pkgs/development/libraries/haskell/yesod-auth/default.nix
View File

@@ -7,8 +7,8 @@
cabal.mkDerivation (self: {
pname = "yesod-auth";
version = "1.1.1.1";
sha256 = "1ryq3jxcgb55ijjmcv0j234n9nay2ianifb59gz9akyv0sc3zcl9";
version = "1.1.1.2";
sha256 = "1agyazzkgwmp63vwx84bzalf9lwg14k5jshj6n97g1iagsiaxqa0";
buildDepends = [
aeson authenticate blazeHtml blazeMarkup hamlet httpConduit
liftedBase mimeMail persistent persistentTemplate pureMD5
@@ -16,7 +16,6 @@ cabal.mkDerivation (self: {
unorderedContainers wai yesodCore yesodForm yesodJson
yesodPersistent
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Authentication for Yesod";

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

@@ -9,8 +9,8 @@
cabal.mkDerivation (self: {
pname = "yesod-core";
version = "1.1.2.1";
sha256 = "195r19xsd3fvsirz62mkfxqgw5zi4lx700ly08h1i0kvmfnfx1g8";
version = "1.1.2.2";
sha256 = "13852r6s7p9b4zvg4pi9qfmgv8g21m0gqlw7bky05jy5a9c8v3a7";
buildDepends = [
aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal
clientsession conduit cookie failure fastLogger hamlet httpTypes
@@ -19,7 +19,6 @@ cabal.mkDerivation (self: {
text time transformers transformersBase vector wai waiExtra
yesodRoutes
];
jailbreak = true;
meta = {
homepage = "http://www.yesodweb.com/";
description = "Creation of type-safe, RESTful web applications";

21
pkgs/development/libraries/phat/default.nix
View File

@@ -1,21 +0,0 @@
{ stdenv, fetchurl, gtk, libgnomecanvas, pkgconfig }:
stdenv.mkDerivation rec {
name = "phat-${version}";
version = "0.4.1";
src = fetchurl {
url = "http://download.berlios.de/phat/${name}.tar.gz";
sha256 = "1icncp2d8hbarzz8mmflkw13blg7blgwfic8q2wll7s6n01ii2av";
};
buildInputs = [ gtk libgnomecanvas pkgconfig ];
meta = with stdenv.lib; {
description = "GTK+ widgets geared toward pro-audio apps";
homepage = http://phat.berlios.de;
license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = [ maintainers.goibhniu ];
};
}