Updated Haskell packages.

- bson: updated to version 0.2.0
 - cpu: updated to version 0.1.1
 - defaults.nix: cosmetic
 - iteratee: updated to version 0.8.9.1
 - ListLike: updated to version 3.1.5
 - mongoDB: updated to version 1.3.0
 - packages.nix: cosmetic
 - stringsearch: added version 0.3.6.3
 - system-fileio: updated to version 0.3.8
 - wai-extra: updated to version 1.2.0.5

svn path=/nixpkgs/trunk/; revision=34517
This commit is contained in:
Peter Simons 2012-06-15 08:06:11 +00:00
parent 75cd74c72c
commit da350b93a2
10 changed files with 45 additions and 31 deletions

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "ListLike"; pname = "ListLike";
version = "3.1.4"; version = "3.1.5";
sha256 = "0cpj7vqlazs2yzh0ffhlg69kdb18xyicybfw614nlqfhhrp53lj9"; sha256 = "0hxpjmj5qdyb55wda2bgd3crkg9q6dklhj2kff7qz6wkx5fdbvjs";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
meta = { meta = {

View File

@ -1,17 +1,16 @@
{ cabal, binary, compactStringFix, cryptohash, dataBinaryIeee754 { cabal, binary, cryptohash, dataBinaryIeee754, mtl, network, text
, mtl, network, time , time
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "bson"; pname = "bson";
version = "0.1.7"; version = "0.2.0";
sha256 = "1dmndq0rx22h9kxv31rxwqhwkgsvqg9qy4l0xmvpcvvl101zj4jx"; sha256 = "1m4bzbl3i9p8v78zjb4ilrpdxbxpqz5bgcpklvvkb2ipfkgqhmhx";
buildDepends = [ buildDepends = [
binary compactStringFix cryptohash dataBinaryIeee754 mtl network binary cryptohash dataBinaryIeee754 mtl network text time
time
]; ];
meta = { meta = {
homepage = "http://github.com/TonyGen/bson-haskell"; homepage = "http://github.com/selectel/bson-haskell";
description = "BSON documents are JSON-like objects with a standard binary encoding"; description = "BSON documents are JSON-like objects with a standard binary encoding";
license = "unknown"; license = "unknown";
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "cpu"; pname = "cpu";
version = "0.1.0"; version = "0.1.1";
sha256 = "020s1cv3qkhjq0gypxligg2x68izb3z82krv8y1m1k360554nqyg"; sha256 = "0ygkxx8ksa0rh63569d3g0w8pzgwg6062sd4yyi3q646zcmryhj6";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
meta = { meta = {

View File

@ -1,14 +1,16 @@
{ cabal, ListLike, MonadCatchIOTransformers, parallel, transformers { cabal, ListLike, MonadCatchIOTransformers, monadControl, parallel
, transformers, transformersBase
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "iteratee"; pname = "iteratee";
version = "0.8.8.2"; version = "0.8.9.1";
sha256 = "1d76an95y8svaja5ksx8p05fk22z62hp3gfwnd1d917qccffw6ry"; sha256 = "1yk7jvabmabf0qjcd00imbg7vx84yjf71h7x3zbv4a51ykfy5hax";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
ListLike MonadCatchIOTransformers parallel transformers ListLike MonadCatchIOTransformers monadControl parallel
transformers transformersBase
]; ];
meta = { meta = {
homepage = "http://www.tiresiaspress.us/haskell/iteratee"; homepage = "http://www.tiresiaspress.us/haskell/iteratee";

View File

@ -1,17 +1,17 @@
{ cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl { cabal, binary, bson, cryptohash, liftedBase, monadControl, mtl
, network, parsec, random, randomShuffle, transformersBase , network, parsec, random, randomShuffle, text, transformersBase
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "mongoDB"; pname = "mongoDB";
version = "1.2.0"; version = "1.3.0";
sha256 = "0rffa13p889mxbbkj2bmqy3yada3mrhngvp8pp7qvrll1acm7s13"; sha256 = "1l6r55bicjdybn8jn9rp94aamjqy5j5qs2775m05aba8svsl4kma";
buildDepends = [ buildDepends = [
binary bson cryptohash liftedBase monadControl mtl network parsec binary bson cryptohash liftedBase monadControl mtl network parsec
random randomShuffle transformersBase random randomShuffle text transformersBase
]; ];
meta = { meta = {
homepage = "http://github.com/TonyGen/mongoDB-haskell"; homepage = "http://github.com/selectel/mongodb-haskell";
description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS"; description = "Driver (client) for MongoDB, a free, scalable, fast, document DBMS";
license = "unknown"; license = "unknown";
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;

View File

@ -0,0 +1,13 @@
{ cabal }:
cabal.mkDerivation (self: {
pname = "stringsearch";
version = "0.3.6.3";
sha256 = "1f0sl1zjya8glvlscf3g5i0in0ai1knls7kg9dp82grg2k287sgz";
meta = {
homepage = "https://bitbucket.org/dafis/stringsearch";
description = "Fast searching, splitting and replacing of ByteStrings";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
};
})

View File

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "system-fileio"; pname = "system-fileio";
version = "0.3.7"; version = "0.3.8";
sha256 = "0vjjpn3fq0s2assfg3p3wpk60jsrjp1f6i0djm3abdbmc53gqyi0"; sha256 = "0zv7ngxc3qgrlfbp0vqirzcwmkmi9ql8pgqhn1ls56iqwbxbb654";
buildDepends = [ systemFilepath text time ]; buildDepends = [ systemFilepath text time ];
meta = { meta = {
homepage = "https://john-millikin.com/software/haskell-filesystem/"; homepage = "https://john-millikin.com/software/haskell-filesystem/";

View File

@ -1,16 +1,17 @@
{ cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit { cabal, ansiTerminal, blazeBuilder, blazeBuilderConduit
, caseInsensitive, conduit, dataDefault, fastLogger, httpTypes , caseInsensitive, conduit, dataDefault, fastLogger, httpTypes
, network, resourcet, text, time, transformers, wai, zlibConduit , network, resourcet, stringsearch, text, time, transformers, wai
, zlibConduit
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "wai-extra"; pname = "wai-extra";
version = "1.2.0.4"; version = "1.2.0.5";
sha256 = "10nd87bs6q1827ihwm13czflha2g8dhza443n55xpakba1sdgsaz"; sha256 = "0m9zdn6cdh2j7bwsf17225rdn7jwj7iy97khbd9g7p9rv1lpdain";
buildDepends = [ buildDepends = [
ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive ansiTerminal blazeBuilder blazeBuilderConduit caseInsensitive
conduit dataDefault fastLogger httpTypes network resourcet text conduit dataDefault fastLogger httpTypes network resourcet
time transformers wai zlibConduit stringsearch text time transformers wai zlibConduit
]; ];
meta = { meta = {
homepage = "http://github.com/yesodweb/wai"; homepage = "http://github.com/yesodweb/wai";

View File

@ -245,7 +245,6 @@
prefFun = ghc741Prefs; prefFun = ghc741Prefs;
}; };
# Stable branch snapshot.
packages_ghc742 = packages_ghc742 =
packages { ghcPath = ../development/compilers/ghc/7.4.2.nix; packages { ghcPath = ../development/compilers/ghc/7.4.2.nix;
ghcBinary = ghc6121BinaryDarwin; ghcBinary = ghc6121BinaryDarwin;
@ -255,8 +254,7 @@
# Reasonably current HEAD snapshot. Should *always* be lowPrio. # Reasonably current HEAD snapshot. Should *always* be lowPrio.
packages_ghcHEAD = packages_ghcHEAD =
packages { ghcPath = ../development/compilers/ghc/head.nix; packages { ghcPath = ../development/compilers/ghc/head.nix;
ghcBinary = # (packages_ghc704.ghcWithPackages (self : [ self.alex self.happy ])) ghcBinary = ghc704Binary;
ghc704Binary;
prefFun = ghcHEADPrefs; prefFun = ghcHEADPrefs;
}; };

View File

@ -149,7 +149,6 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
happy = self.happy_1_18_9; # 7.4.2 ok happy = self.happy_1_18_9; # 7.4.2 ok
}; };
haskellPlatformArgs_2012_2_0_0 = self : { haskellPlatformArgs_2012_2_0_0 = self : {
inherit (self) cabal ghc; inherit (self) cabal ghc;
cgi = self.cgi_3001_1_7_4; # 7.4.1 ok cgi = self.cgi_3001_1_7_4; # 7.4.1 ok
@ -1279,6 +1278,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
stringCombinators = callPackage ../development/libraries/haskell/string-combinators {}; stringCombinators = callPackage ../development/libraries/haskell/string-combinators {};
stringsearch = callPackage ../development/libraries/haskell/stringsearch {};
syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {}; syb_0_2_2 = callPackage ../development/libraries/haskell/syb/0.2.2.nix {};
syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {}; syb_0_3 = callPackage ../development/libraries/haskell/syb/0.3.nix {};
syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {}; syb_0_3_3 = callPackage ../development/libraries/haskell/syb/0.3.3.nix {};