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

Updated haskell packages. 

- HDBC-postgresql updated to version 2.3.2.1
 - HsOpenSSL updated to version 0.10.1.3
 - hledger-web updated to version 0.17.1
 - persistent updated to version 0.8.0.2
 - xml-conduit updated to version 0.5.3.1
 - haddock: added version 2.10.0

svn path=/nixpkgs/trunk/; revision=32799
This commit is contained in:
Peter Simons 2012-03-05 11:58:21 +00:00
parent edb8aaed92
commit 05d92999a0
7 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/haskell/HDBC/HDBC-postgresql.nix
View File

@ -1,15 +1,17 @@
{ cabal, HDBC, mtl, parsec, postgresql, time, utf8String }: { cabal, convertible, HDBC, mtl, parsec, postgresql, time
, utf8String
}:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "HDBC-postgresql"; pname = "HDBC-postgresql";
version = "2.3.2.0"; version = "2.3.2.1";
sha256 = "0fwza9h2ghl70x44c4snfybnnfsj1mwlf5a1x12ddl1fbj6fx6gs"; sha256 = "1ji10w4d91dp3ci7pn1jd8nb3wasszwlsy1lfbb4mqnr15c9vnpb";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ HDBC mtl parsec time utf8String ]; buildDepends = [ convertible HDBC mtl parsec time utf8String ];
extraLibraries = [ postgresql ]; extraLibraries = [ postgresql ];
meta = { meta = {
homepage = "http://software.complete.org/hdbc-postgresql"; homepage = "http://github.com/hdbc/hdbc-postgresql";
description = "PostgreSQL driver for HDBC"; description = "PostgreSQL driver for HDBC";
license = self.stdenv.lib.licenses.bsd3; license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms; platforms = self.ghc.meta.platforms;

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

@ -2,8 +2,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "HsOpenSSL"; pname = "HsOpenSSL";
version = "0.10.1.2"; version = "0.10.1.3";
sha256 = "0najn3749s6jxqavpxw7q58jzsvli06sxjgkvs3lidasv6jhwmxh"; sha256 = "0r6gns729nfaxlig0sxlal5cx4ipyjk62zrmwn5i1i7lighp10y0";
buildDepends = [ network time ]; buildDepends = [ network time ];
extraLibraries = [ openssl ]; extraLibraries = [ openssl ];
meta = { meta = {

18
pkgs/development/libraries/haskell/hledger-web/default.nix
View File

@ -1,23 +1,23 @@
{ cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs { cabal, aeson, blazeHtml, cabalFileTh, clientsession, cmdargs
, dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet , dataObject, dataObjectYaml, failure, fileEmbed, filepath, hamlet
, hledger, hledgerLib, HUnit, ioStorage, parsec, regexpr, safe , hledger, hledgerLib, httpEnumerator, HUnit, ioStorage, parsec
, shakespeareCss, shakespeareJs, shakespeareText, text, time , regexpr, safe, shakespeareCss, shakespeareJs, shakespeareText
, transformers, wai, waiExtra, warp, yesod, yesodCore, yesodForm , text, time, tlsExtra, transformers, wai, waiExtra, warp, yesod
, yesodJson, yesodStatic , yesodCore, yesodForm, yesodJson, yesodStatic
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "hledger-web"; pname = "hledger-web";
version = "0.17"; version = "0.17.1";
sha256 = "1b5k76p27pvxc91gns3aimy3zcy6m366nnpwzbm214v6ka82imfi"; sha256 = "0cix0k2skbrcbjhj876cx4mizjvkqnr91s092a3lg4rv40dhgwa9";
isLibrary = true; isLibrary = true;
isExecutable = true; isExecutable = true;
buildDepends = [ buildDepends = [
aeson blazeHtml cabalFileTh clientsession cmdargs dataObject aeson blazeHtml cabalFileTh clientsession cmdargs dataObject
dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib dataObjectYaml failure fileEmbed filepath hamlet hledger hledgerLib
HUnit ioStorage parsec regexpr safe shakespeareCss shakespeareJs httpEnumerator HUnit ioStorage parsec regexpr safe shakespeareCss
shakespeareText text time transformers wai waiExtra warp yesod shakespeareJs shakespeareText text time tlsExtra transformers wai
yesodCore yesodForm yesodJson yesodStatic waiExtra warp yesod yesodCore yesodForm yesodJson yesodStatic
]; ];
meta = { meta = {
homepage = "http://hledger.org"; homepage = "http://hledger.org";

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

@ -6,8 +6,8 @@
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "persistent"; pname = "persistent";
version = "0.8.0.1"; version = "0.8.0.2";
sha256 = "1lsmsx0zxa3h83z29r6h3r94czg7c8apid9mah48f8hxlfynbqhi"; sha256 = "10v11fnx7dhj2gg09k3ji054iywbpazs789vhfxn56wfg6rz59wb";
buildDepends = [ buildDepends = [
aeson attoparsec base64Bytestring blazeHtml conduit liftedBase aeson attoparsec base64Bytestring blazeHtml conduit liftedBase
monadControl mtl pathPieces poolConduit text time transformers monadControl mtl pathPieces poolConduit text time transformers

10
pkgs/development/libraries/haskell/xml-conduit/default.nix
View File

@ -1,16 +1,16 @@
{ cabal, attoparsec, attoparsecConduit, blazeBuilder { cabal, attoparsec, attoparsecConduit, blazeBuilder
, blazeBuilderConduit, conduit, dataDefault, failure , blazeBuilderConduit, conduit, dataDefault, failure, monadControl
, systemFilepath, text, transformers, xmlTypes , systemFilepath, text, transformers, xmlTypes
}: }:
cabal.mkDerivation (self: { cabal.mkDerivation (self: {
pname = "xml-conduit"; pname = "xml-conduit";
version = "0.5.3"; version = "0.5.3.1";
sha256 = "09jphn19g6v9z1b75iyqcdyn75n7inbhib8g9fgfzwd7q8rdd3yc"; sha256 = "124c88x3ww1414c7s3wx7z1kqy37m9mwihiwyamgz25lg502n8gb";
buildDepends = [ buildDepends = [
attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit attoparsec attoparsecConduit blazeBuilder blazeBuilderConduit
conduit dataDefault failure systemFilepath text transformers conduit dataDefault failure monadControl systemFilepath text
xmlTypes transformers xmlTypes
]; ];
meta = { meta = {
homepage = "http://github.com/snoyberg/xml"; homepage = "http://github.com/snoyberg/xml";

21
pkgs/development/tools/documentation/haddock/2.10.0.nix Normal file
View File

@ -0,0 +1,21 @@
{ cabal, alex, Cabal, filepath, ghcPaths, happy, xhtml }:
cabal.mkDerivation (self: {
pname = "haddock";
version = "2.10.0";
sha256 = "045lmmna5nwj07si81vxms5xkkmqvjsiif20nny5mvlabshxn1yi";
isLibrary = true;
isExecutable = true;
buildDepends = [ Cabal filepath ghcPaths xhtml ];
buildTools = [ alex happy ];
meta = {
homepage = "http://www.haskell.org/haddock/";
description = "A documentation-generation tool for Haskell libraries";
license = self.stdenv.lib.licenses.bsd3;
platforms = self.ghc.meta.platforms;
maintainers = [
self.stdenv.lib.maintainers.andres
self.stdenv.lib.maintainers.simons
];
};
})

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

@ -160,7 +160,7 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
cabalInstall = self.cabalInstall_0_10_2; # 7.4.1 fails cabalInstall = self.cabalInstall_0_10_2; # 7.4.1 fails
alex = self.alex_3_0_1; # 7.4.1 ok alex = self.alex_3_0_1; # 7.4.1 ok
happy = self.happy_1_18_9; # 7.4.1 ok happy = self.happy_1_18_9; # 7.4.1 ok
haddock = self.haddock_2_9_2; # 7.4.1 fails haddock = self.haddock_2_10_0; # 7.4.1 ok
}; };
haskellPlatformDefaults_future = haskellPlatformDefaults_future =
@ -1563,7 +1563,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y);
haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {}; haddock_2_7_2 = callPackage ../development/tools/documentation/haddock/2.7.2.nix {};
haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {}; haddock_2_9_2 = callPackage ../development/tools/documentation/haddock/2.9.2.nix {};
haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {}; haddock_2_9_4 = callPackage ../development/tools/documentation/haddock/2.9.4.nix {};
haddock = self.haddock_2_9_4; haddock_2_10_0 = callPackage ../development/tools/documentation/haddock/2.10.0.nix {};
haddock = self.haddock_2_10_0;
happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {}; happy_1_18_4 = callPackage ../development/tools/parsing/happy/1.18.4.nix {};
happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {}; happy_1_18_5 = callPackage ../development/tools/parsing/happy/1.18.5.nix {};