summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--haskell/haskell-aeson/haskell-aeson.SlackBuild13
-rw-r--r--haskell/haskell-aeson/haskell-aeson.info14
2 files changed, 14 insertions, 13 deletions
diff --git a/haskell/haskell-aeson/haskell-aeson.SlackBuild b/haskell/haskell-aeson/haskell-aeson.SlackBuild
index 34de5afaee..f970862596 100644
--- a/haskell/haskell-aeson/haskell-aeson.SlackBuild
+++ b/haskell/haskell-aeson/haskell-aeson.SlackBuild
@@ -1,8 +1,9 @@
#!/bin/sh
-# Slackware build script for aeson
+# Slackware build script for haskell-aeson
# Copyright 2015 Mikko Värri, Finland
+# Updated 2018 David Spencer, Baildon, West Yorkshire, U.K.
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -23,7 +24,7 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=haskell-aeson
-VERSION=${VERSION:-0.9.0.1}
+VERSION=${VERSION:-1.4.1.0}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -33,7 +34,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 +45,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"
@@ -71,7 +72,7 @@ find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-o -perm 511 \) -exec chmod 755 {} \; -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
diff --git a/haskell/haskell-aeson/haskell-aeson.info b/haskell/haskell-aeson/haskell-aeson.info
index 3169a90a1d..89e7114a1b 100644
--- a/haskell/haskell-aeson/haskell-aeson.info
+++ b/haskell/haskell-aeson/haskell-aeson.info
@@ -1,10 +1,10 @@
PRGNAM="haskell-aeson"
-VERSION="0.9.0.1"
-HOMEPAGE="http://hackage.haskell.org/package/aeson"
-DOWNLOAD="http://hackage.haskell.org/package/aeson-0.9.0.1/aeson-0.9.0.1.tar.gz"
-MD5SUM="4de9b37f3b9bf98902cbad5e7639e416"
+VERSION="1.4.1.0"
+HOMEPAGE="https://hackage.haskell.org/package/aeson"
+DOWNLOAD="https://hackage.haskell.org/package/aeson-1.4.1.0/aeson-1.4.1.0.tar.gz"
+MD5SUM="8c3ad7d707d1f363a9c026707a9a95e9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
-REQUIRES="haskell-dlist haskell-attoparsec haskell-blaze-builder haskell-hashable haskell-mtl haskell-scientific haskell-syb haskell-unordered-containers haskell-vector"
-MAINTAINER="Mikko Värri"
-EMAIL="vmj@linuxbox.fi"
+REQUIRES="haskell-dlist haskell-attoparsec haskell-base-compat haskell-blaze-builder haskell-hashable haskell-scientific haskell-syb haskell-tagged haskell-th-abstraction haskell-time-locale-compat haskell-uuid-types haskell-unordered-containers haskell-vector"
+MAINTAINER="David Spencer"
+EMAIL="baildon.research@googlemail.com"