LGTM, thanks On Tue, Nov 18, 2014 at 7:09 PM, 'Niklas Hambuechen' via ganeti-devel < [email protected]> wrote:
> happy is introduced as dependency of haskell-src-exts, which is a > dependency of hlint. > > Signed-off-by: Niklas Hambuechen <[email protected]> > --- > roles/buildslave/scripts/postinstall | 31 +++++++++++++++++++++++++------ > 1 file changed, 25 insertions(+), 6 deletions(-) > > diff --git a/roles/buildslave/scripts/postinstall > b/roles/buildslave/scripts/postinstall > index c4f9c6f..19071ed 100755 > --- a/roles/buildslave/scripts/postinstall > +++ b/roles/buildslave/scripts/postinstall > @@ -52,7 +52,7 @@ case "$1" in > libghc6-zlib-dev \ > libpcre3 libpcre3-dev \ > cabal-install \ > - hscolour hlint pandoc \ > + happy hscolour pandoc \ > python-sphinx python-epydoc graphviz \ > openssl python-openssl \ > python-pyparsing python-simplejson \ > @@ -78,7 +78,8 @@ case "$1" in > cabal install --global \ > base64-bytestring \ > lens-3.10.2 \ > - 'lifted-base>=0.1.2' > + 'lifted-base>=0.1.2' \ > + 'hlint>=1.9.12' > > ;; > buildslave.jessie*) > @@ -107,7 +108,7 @@ case "$1" in > libghc-zlib-dev \ > libpcre3 libpcre3-dev \ > cabal-install \ > - hscolour hlint pandoc \ > + happy hscolour pandoc \ > python-sphinx python-epydoc graphviz \ > openssl python-openssl \ > python-pyparsing python-simplejson \ > @@ -121,6 +122,14 @@ case "$1" in > shelltestrunner \ > pylint > > + # Update cabal, unless we have done so in the last 3 days > + if [ ! -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar -o > -n "$(find $HOME/.cabal -path $HOME/.cabal/packages/ > hackage.haskell.org/00-index.tar -mtime +2)" ]; then > + cabal update > + fi > + > + cabal install --global \ > + 'hlint>=1.9.12' > + > ;; > buildslave.ubuntu1304*) > apt-get update > @@ -146,7 +155,7 @@ case "$1" in > libghc-psqueue-{dev,prof} \ > libpcre3 libpcre3-dev \ > libghc-zlib-dev libghc-base64-bytestring-dev \ > - hscolour hlint pandoc \ > + happy hscolour pandoc \ > python-sphinx python-epydoc graphviz \ > openssl python-openssl \ > python-pyparsing python-simplejson \ > @@ -167,6 +176,15 @@ case "$1" in > logilab-astng==0.23.0 \ > pylint==0.25.0 \ > pep8==1.2 > + > + # Update cabal, unless we have done so in the last 3 days > + if [ ! -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar -o > -n "$(find $HOME/.cabal -path $HOME/.cabal/packages/ > hackage.haskell.org/00-index.tar -mtime +2)" ]; then > + cabal update > + fi > + > + cabal install --global \ > + 'hlint>=1.9.12' > + > ;; > buildslave.fedora*) > yum install -q -y \ > @@ -181,7 +199,7 @@ case "$1" in > ghc-regex-pcre-devel ghc-hinotify-devel \ > ghc-vector-devel \ > graphviz \ > - hlint \ > + happy \ > libcurl libcurl-devel \ > pandoc \ > pyOpenSSL \ > @@ -223,7 +241,8 @@ case "$1" in > cabal install --global \ > base64-bytestring zlib \ > lens-3.10.2 \ > - lifted-base==0.2.1.1 > + lifted-base==0.2.1.1 \ > + 'hlint>=1.9.12' > ;; > *) > echo "Unknown role '$1'" 1>&2 > -- > 2.1.0.rc2.206.gedb03e5 > > Hrvoje Ribicic Ganeti Engineering 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 Steuernummer: 48/725/00206 Umsatzsteueridentifikationsnummer: DE813741370
