Author: simons
Date: Tue Apr 3 18:37:58 2012
New Revision: 33559
URL: https://nixos.org/websvn/nix/?rev=33559&sc=1
Log:
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
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/ConfigFile/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/RepLib/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/instant-generics/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/multiarg/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/type-equality/default.nix
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix
nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix
nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
Modified: nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -7,7 +7,6 @@
isLibrary = true;
isExecutable = true;
buildDepends = [ extensibleExceptions mtl utf8String X11 ];
- noHaddock = true;
meta = {
homepage = "http://xmonad.org";
description = "A tiling window manager";
Modified:
nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/applications/window-managers/xmonad/xmonad-extras.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -10,7 +10,6 @@
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";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/ConfigFile/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/ConfigFile/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/ConfigFile/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -7,7 +7,6 @@
isLibrary = true;
isExecutable = true;
buildDepends = [ MissingH mtl parsec ];
- noHaddock = true;
meta = {
homepage = "http://software.complete.org/configfile";
description = "Configuration file reading & writing";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/HDBC/HDBC-odbc.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -8,7 +8,6 @@
isExecutable = true;
buildDepends = [ HDBC mtl time utf8String ];
extraLibraries = [ odbc ];
- noHaddock = true;
meta = {
homepage = "http://software.complete.org/hdbc-odbc";
description = "ODBC driver for HDBC";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/Hipmunk/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -5,7 +5,6 @@
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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/RepLib/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/RepLib/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/RepLib/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -5,7 +5,6 @@
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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/aeson/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -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
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/hakyll/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -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
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/http-enumerator/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -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 = [
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/instant-generics/default.nix
==============================================================================
---
nixpkgs/trunk/pkgs/development/libraries/haskell/instant-generics/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++
nixpkgs/trunk/pkgs/development/libraries/haskell/instant-generics/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -5,7 +5,6 @@
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";
Modified: nixpkgs/trunk/pkgs/development/libraries/haskell/multiarg/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/multiarg/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/multiarg/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -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";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/type-equality/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/type-equality/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/type-equality/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -4,7 +4,6 @@
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";
Modified:
nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Tue Apr 3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/libraries/haskell/yesod-core/default.nix
Tue Apr 3 18:37:58 2012 (r33559)
@@ -17,7 +17,6 @@
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";
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/BNFC-meta/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -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;
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/alex-meta/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -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;
Modified: nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix Tue Apr
3 18:00:51 2012 (r33558)
+++ nixpkgs/trunk/pkgs/development/tools/haskell/happy-meta/default.nix Tue Apr
3 18:37:58 2012 (r33559)
@@ -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";
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits