summaryrefslogtreecommitdiff
path: root/haskell/haskell-cabal-install
diff options
context:
space:
mode:
Diffstat (limited to 'haskell/haskell-cabal-install')
-rw-r--r--haskell/haskell-cabal-install/haskell-cabal-install.SlackBuild16
-rw-r--r--haskell/haskell-cabal-install/haskell-cabal-install.info10
2 files changed, 14 insertions, 12 deletions
diff --git a/haskell/haskell-cabal-install/haskell-cabal-install.SlackBuild b/haskell/haskell-cabal-install/haskell-cabal-install.SlackBuild
index 4d5d972b3b..e330d7e8a5 100644
--- a/haskell/haskell-cabal-install/haskell-cabal-install.SlackBuild
+++ b/haskell/haskell-cabal-install/haskell-cabal-install.SlackBuild
@@ -23,7 +23,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-cabal-install
-VERSION=${VERSION:-1.22.9.0}
+VERSION=${VERSION:-2.2.0.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +33,7 @@ GHC_VERSION=$(ghc --numeric-version)
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -44,8 +44,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -90,13 +90,15 @@ runghc Setup copy --destdir=$PKG
find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+mv $PKG/usr/share/man $PKG/usr/man
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
+
mkdir -p $PKG/usr/share/bash-completion/completions
cp -a bash-completion/cabal $PKG/usr/share/bash-completion/completions/
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
- changelog LICENSE README.md \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a changelog LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
mkdir -p $PKG/install
diff --git a/haskell/haskell-cabal-install/haskell-cabal-install.info b/haskell/haskell-cabal-install/haskell-cabal-install.info
index 7f9464b8ed..cd20eb59ff 100644
--- a/haskell/haskell-cabal-install/haskell-cabal-install.info
+++ b/haskell/haskell-cabal-install/haskell-cabal-install.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-cabal-install"
-VERSION="1.22.9.0"
-HOMEPAGE="http://hackage.haskell.org/package/cabal-install"
-DOWNLOAD="http://hackage.haskell.org/package/cabal-install-1.22.9.0/cabal-install-1.22.9.0.tar.gz"
-MD5SUM="460995d67a9dc65f04bd2a68eaccf6a5"
+VERSION="2.2.0.0"
+HOMEPAGE="https://hackage.haskell.org/package/cabal-install"
+DOWNLOAD="https://hackage.haskell.org/package/cabal-install-2.2.0.0/cabal-install-2.2.0.0.tar.gz"
+MD5SUM="f182cf03249d3a5944db012492d26d16"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-async haskell-base16-bytestring haskell-hashable haskell-HTTP haskell-network-uri haskell-random haskell-tar haskell-zlib"
+REQUIRES="haskell-async haskell-base16-bytestring haskell-cryptohash-sha256 haskell-echo haskell-edit-distance haskell-hackage-security haskell-hashable haskell-HTTP haskell-network-uri haskell-random haskell-resolv haskell-tar haskell-zlib"
MAINTAINER="David Spencer"
EMAIL="baildon.research@googlemail.com"