From 7295830f7eacfc9b01430e418feda202511fbf4e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 3 Apr 2012 18:37:58 +0000 Subject: [PATCH] Updated Haskell packages. - aeson: updated to version 0.6.0.1 - alex-meta: updated to version 0.3.0.3 - BNFC-meta: updated to version 0.3.0.1 - hakyll: updated to version 3.2.7.1 - happy-meta: updated to version 0.2.0.4 - http-enumerator: updated to version 0.7.3.2 - multiarg: updated to version 0.2.0.0 Disabled Haddock documentation for the following packages, because the input crashes Haddock: - BNFC-meta - alex-meta Re-enabled Haddock documentation for the following packages, because previously occurring errors have been fixed: - ConfigFile - HDBC-odbc - Hipmunk - instant-generics - RepLib - type-equality - xmonad - xmonad-extras - yesod-core svn path=/nixpkgs/trunk/; revision=33559 --- pkgs/applications/window-managers/xmonad/default.nix | 1 - .../window-managers/xmonad/xmonad-extras.nix | 1 - .../libraries/haskell/ConfigFile/default.nix | 1 - .../development/libraries/haskell/HDBC/HDBC-odbc.nix | 1 - .../libraries/haskell/Hipmunk/default.nix | 1 - .../development/libraries/haskell/RepLib/default.nix | 1 - pkgs/development/libraries/haskell/aeson/default.nix | 4 ++-- .../development/libraries/haskell/hakyll/default.nix | 4 ++-- .../libraries/haskell/http-enumerator/default.nix | 4 ++-- .../libraries/haskell/instant-generics/default.nix | 1 - .../libraries/haskell/multiarg/default.nix | 12 ++++-------- .../libraries/haskell/type-equality/default.nix | 1 - .../libraries/haskell/yesod-core/default.nix | 1 - pkgs/development/tools/haskell/BNFC-meta/default.nix | 5 +++-- pkgs/development/tools/haskell/alex-meta/default.nix | 5 +++-- .../development/tools/haskell/happy-meta/default.nix | 4 ++-- 16 files changed, 18 insertions(+), 29 deletions(-) diff --git a/pkgs/applications/window-managers/xmonad/default.nix b/pkgs/applications/window-managers/xmonad/default.nix index c89088e400b..a490bc8018d 100644 --- a/pkgs/applications/window-managers/xmonad/default.nix +++ b/pkgs/applications/window-managers/xmonad/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ extensibleExceptions mtl utf8String X11 ]; - noHaddock = true; meta = { homepage = "http://xmonad.org"; description = "A tiling window manager"; diff --git a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix index ce3b9fed7b7..ac0be1e70c4 100644 --- a/pkgs/applications/window-managers/xmonad/xmonad-extras.nix +++ b/pkgs/applications/window-managers/xmonad/xmonad-extras.nix @@ -10,7 +10,6 @@ cabal.mkDerivation (self: { hint HList libmpd mtl network parsec random regexPosix split X11 xmonad xmonadContrib ]; - noHaddock = true; meta = { homepage = "http://projects.haskell.org/xmonad-extras"; description = "Third party extensions for xmonad with wacky dependencies"; diff --git a/pkgs/development/libraries/haskell/ConfigFile/default.nix b/pkgs/development/libraries/haskell/ConfigFile/default.nix index 70382d1cd63..29d417562cc 100644 --- a/pkgs/development/libraries/haskell/ConfigFile/default.nix +++ b/pkgs/development/libraries/haskell/ConfigFile/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { isLibrary = true; isExecutable = true; buildDepends = [ MissingH mtl parsec ]; - noHaddock = true; meta = { homepage = "http://software.complete.org/configfile"; description = "Configuration file reading & writing"; diff --git a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix index eb1b3b3ddaa..d5dca127ca1 100644 --- a/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix +++ b/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix @@ -8,7 +8,6 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ HDBC mtl time utf8String ]; extraLibraries = [ odbc ]; - noHaddock = true; meta = { homepage = "http://software.complete.org/hdbc-odbc"; description = "ODBC driver for HDBC"; diff --git a/pkgs/development/libraries/haskell/Hipmunk/default.nix b/pkgs/development/libraries/haskell/Hipmunk/default.nix index ea2bc8cfc2c..b5fbeb126a5 100644 --- a/pkgs/development/libraries/haskell/Hipmunk/default.nix +++ b/pkgs/development/libraries/haskell/Hipmunk/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "5.2.0.7"; sha256 = "1cinxhz4qb8xcbygifx85q4zf6pmjwi90v01vqwyvwlfxmbk0j7k"; buildDepends = [ StateVar transformers ]; - noHaddock = true; meta = { homepage = "http://patch-tag.com/r/felipe/hipmunk/home"; description = "A Haskell binding for Chipmunk"; diff --git a/pkgs/development/libraries/haskell/RepLib/default.nix b/pkgs/development/libraries/haskell/RepLib/default.nix index 833e5956b2b..b070301f4e7 100644 --- a/pkgs/development/libraries/haskell/RepLib/default.nix +++ b/pkgs/development/libraries/haskell/RepLib/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.5.2"; sha256 = "1wcxvl40wlnva2x7z13pm95485lwxbpy5di1mb1din3id8dprxfr"; buildDepends = [ mtl typeEquality ]; - noHaddock = true; meta = { homepage = "http://code.google.com/p/replib/"; description = "Generic programming library with representation types"; diff --git a/pkgs/development/libraries/haskell/aeson/default.nix b/pkgs/development/libraries/haskell/aeson/default.nix index 4cb67db36f6..d3e0c360e3e 100644 --- a/pkgs/development/libraries/haskell/aeson/default.nix +++ b/pkgs/development/libraries/haskell/aeson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "aeson"; - version = "0.6.0.0"; - sha256 = "1j8g1q7xr1pgyfyrkbh2zz7fhqshj0q5qg7fczrnsbbzf5k459zw"; + version = "0.6.0.1"; + sha256 = "0hhhfq045drwfc4l3827006ybw9shwxi8mg25k9nsjx9wdhmkvy9"; buildDepends = [ attoparsec blazeBuilder deepseq dlist hashable mtl syb text time unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 1d75a0e00e0..59f219529c9 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "3.2.7.0"; - sha256 = "1jx4csfdr7icjrg9hvlw5pyi29qf3yyx0sjaw7nchz8jk43ikr2b"; + version = "3.2.7.1"; + sha256 = "07d7a8l2phb787wgqyh1rci1v9hzwxw35arg03hkal072sacif0c"; buildDepends = [ binary blazeHtml citeprocHs cryptohash filepath hamlet mtl pandoc parsec regexBase regexTdfa snapCore snapServer tagsoup time diff --git a/pkgs/development/libraries/haskell/http-enumerator/default.nix b/pkgs/development/libraries/haskell/http-enumerator/default.nix index 3346f2b3328..1104794be20 100644 --- a/pkgs/development/libraries/haskell/http-enumerator/default.nix +++ b/pkgs/development/libraries/haskell/http-enumerator/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "http-enumerator"; - version = "0.7.3.1"; - sha256 = "0a4p9340g6bx3s7mj3lbkrgw3db2kxpjncbbnnpdcwqyswi2vm75"; + version = "0.7.3.2"; + sha256 = "1djr41fc8blpmwcj3ckix0xnc0kfasbmkx82wpzrq23h54jrbdjl"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/instant-generics/default.nix b/pkgs/development/libraries/haskell/instant-generics/default.nix index 5893e0b9d05..648dfd7c315 100644 --- a/pkgs/development/libraries/haskell/instant-generics/default.nix +++ b/pkgs/development/libraries/haskell/instant-generics/default.nix @@ -5,7 +5,6 @@ cabal.mkDerivation (self: { version = "0.3.4"; sha256 = "0j3sfbw3j0izwmhvwcl8nxxvlrpfla5rngxx2yvl6w5i87wyhswi"; buildDepends = [ syb ]; - noHaddock = true; meta = { homepage = "http://www.cs.uu.nl/wiki/GenericProgramming/InstantGenerics"; description = "Generic programming library with a sum of products view"; diff --git a/pkgs/development/libraries/haskell/multiarg/default.nix b/pkgs/development/libraries/haskell/multiarg/default.nix index 446c47a41dc..0d922c4c060 100644 --- a/pkgs/development/libraries/haskell/multiarg/default.nix +++ b/pkgs/development/libraries/haskell/multiarg/default.nix @@ -1,14 +1,10 @@ -{ cabal, explicitException, QuickCheck, text, transformers -, utf8String -}: +{ cabal, explicitException, text, transformers, utf8String }: cabal.mkDerivation (self: { pname = "multiarg"; - version = "0.1.0.0"; - sha256 = "010mph49fq0rdr5dmm4pdlbmfmaaas8wffa9p1cgprs2ic1hnx3g"; - buildDepends = [ - explicitException QuickCheck text transformers utf8String - ]; + version = "0.2.0.0"; + sha256 = "1jmhlh4ngmkddrkcafx0qcmzwbmi5crkmd6p8b07cfjpaq2pc6yx"; + buildDepends = [ explicitException text transformers utf8String ]; meta = { homepage = "https://github.com/massysett/multiarg"; description = "Combinators to build command line parsers"; diff --git a/pkgs/development/libraries/haskell/type-equality/default.nix b/pkgs/development/libraries/haskell/type-equality/default.nix index f660ea6193a..66b8b1974ff 100644 --- a/pkgs/development/libraries/haskell/type-equality/default.nix +++ b/pkgs/development/libraries/haskell/type-equality/default.nix @@ -4,7 +4,6 @@ cabal.mkDerivation (self: { pname = "type-equality"; version = "0.1.0.2"; sha256 = "09m6vc5hglf3xdg0bg9lgbkgjffmbkfgcrqf5ii36l92c4dik32q"; - noHaddock = true; meta = { homepage = "http://github.com/hesselink/type-equality/"; description = "Type equality, coercion/cast and other operations"; diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 25dc59952c7..e7929b578ed 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -17,7 +17,6 @@ cabal.mkDerivation (self: { shakespeareI18n shakespeareJs text time transformers transformersBase vector wai waiExtra waiLogger yesodRoutes ]; - noHaddock = true; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; diff --git a/pkgs/development/tools/haskell/BNFC-meta/default.nix b/pkgs/development/tools/haskell/BNFC-meta/default.nix index e19a452e7ef..19fe6eec95f 100644 --- a/pkgs/development/tools/haskell/BNFC-meta/default.nix +++ b/pkgs/development/tools/haskell/BNFC-meta/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "BNFC-meta"; - version = "0.3"; - sha256 = "17vmszgq9cyayqlykjbwzvm8mim641vhpzcrdr3l6zb84hr29xgs"; + version = "0.3.0.1"; + sha256 = "1qp6aanryrmmip45wgiaf62p842lgc1yqdr8qqn3ljmszxw591ak"; buildDepends = [ alexMeta happyMeta haskellSrcMeta syb ]; + noHaddock = true; meta = { description = "Deriving Quasi-Quoters from BNF Grammars"; license = self.stdenv.lib.licenses.gpl2; diff --git a/pkgs/development/tools/haskell/alex-meta/default.nix b/pkgs/development/tools/haskell/alex-meta/default.nix index ca82ef1e580..661c9c7895b 100644 --- a/pkgs/development/tools/haskell/alex-meta/default.nix +++ b/pkgs/development/tools/haskell/alex-meta/default.nix @@ -2,9 +2,10 @@ cabal.mkDerivation (self: { pname = "alex-meta"; - version = "0.3.0.2"; - sha256 = "0kbscnax236qhr18ix9rnfl70z5rgl9zysx5mzd2vrp7h2dymigg"; + version = "0.3.0.3"; + sha256 = "08w7z2iq2s557vi9kp2x8qp1lwvh49skffbjm8kxrf2bn2il5q48"; buildDepends = [ haskellSrcMeta QuickCheck ]; + noHaddock = true; meta = { description = "Quasi-quoter for Alex lexers"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/tools/haskell/happy-meta/default.nix b/pkgs/development/tools/haskell/happy-meta/default.nix index 5ffc3edbb37..3b9a6d4c983 100644 --- a/pkgs/development/tools/haskell/happy-meta/default.nix +++ b/pkgs/development/tools/haskell/happy-meta/default.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "happy-meta"; - version = "0.2.0.3"; - sha256 = "0bvm4rbmd48vfpyjjfq476466s9hf7x3y0bgzdfkacm89xx080g9"; + version = "0.2.0.4"; + sha256 = "1s1inv2l2hwdlvypn6wpiadmi5y5mpcjawiqjb1hv0d8y43dpz54"; buildDepends = [ haskellSrcMeta mtl ]; meta = { description = "Quasi-quoter for Happy parsers";