LGTM, thanks.
On Mon, Sep 30, 2013 at 1:23 PM, Klaus Aehlig <[email protected]> wrote: > hslogger is a mandatory Haskell dependency form 2.9 onwards. Hence > update the INSTALL instructions accordingly. > > Signed-off-by: Klaus Aehlig <[email protected]> > --- > INSTALL | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > diff --git a/INSTALL b/INSTALL > index 411cae4..fa9ca65 100644 > --- a/INSTALL > +++ b/INSTALL > @@ -146,12 +146,15 @@ deploy Ganeti on production machines). More > specifically: > - `deepseq <http://hackage.haskell.org/package/deepseq>`_ > - `curl <http://hackage.haskell.org/package/curl>`_, tested with > versions 1.3.4 and above > +- `hslogger <http://software.complete.org/hslogger>`_, version 1.1 and > + above (note that Debian Squeeze only has version 1.0.9) > > Some of these are also available as package in Debian/Ubuntu:: > > $ apt-get install ghc libghc-json-dev libghc-network-dev \ > libghc-parallel-dev libghc-deepseq-dev \ > - libghc-utf8-string-dev libghc-curl-dev > + libghc-utf8-string-dev libghc-curl-dev \ > + libghc-hslogger-dev > > Or in older versions of these distributions (using GHC 6.x):: > > @@ -173,7 +176,7 @@ the Haskell platform. You can also install ``cabal`` > manually:: > Then install the additional libraries (only the ones not available in your > distribution packages) via ``cabal``:: > > - $ cabal install json network parallel utf8-string curl > + $ cabal install json network parallel utf8-string curl hslogger > > Haskell optional features > ~~~~~~~~~~~~~~~~~~~~~~~~~ > @@ -183,8 +186,6 @@ a few more Haskell libraries enabled: the > ``ganeti-confd`` and > ``ganeti-luxid`` daemon (``--enable-confd``) and the monitoring daemon > (``--enable-mond``). The list of extra dependencies for these is: > > -- `hslogger <http://software.complete.org/hslogger>`_, version 1.1 and > - above (note that Debian Squeeze only has version 1.0.9) > - `Crypto <http://hackage.haskell.org/package/Crypto>`_, tested with > version 4.2.4 > - `text <http://hackage.haskell.org/package/text>`_ > @@ -202,7 +203,7 @@ a few more Haskell libraries enabled: the > ``ganeti-confd`` and > These libraries are available in Debian Wheezy (but not in Squeeze), so > you > can use either apt:: > > - $ apt-get install libghc-hslogger-dev libghc-crypto-dev libghc-text-dev > \ > + $ apt-get install libghc-crypto-dev libghc-text-dev \ > libghc-hinotify-dev libghc-regex-pcre-dev \ > libghc-attoparsec-dev libghc-vector-dev \ > libghc-snap-server-dev > @@ -210,7 +211,7 @@ can use either apt:: > or ``cabal``, after installing a required non-Haskell dependency:: > > $ apt-get install libpcre3-dev libcurl4-openssl-dev > - $ cabal install hslogger Crypto text hinotify==0.3.2 regex-pcre \ > + $ cabal install Crypto text hinotify==0.3.2 regex-pcre \ > attoparsec vector snap-server > > to install them. > -- > 1.8.4 > > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
