aboutsummaryrefslogtreecommitdiff
path: root/cabalize
diff options
context:
space:
mode:
Diffstat (limited to 'cabalize')
-rwxr-xr-xcabalize5
1 files changed, 3 insertions, 2 deletions
diff --git a/cabalize b/cabalize
index d494dacaf..158694dc8 100755
--- a/cabalize
+++ b/cabalize
@@ -18,7 +18,7 @@ case "$ghc_version" in
6.4*)
BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC64_DEPENDS}"
;;
-6.[56]*)
+6.[5-9]*)
BUILD_DEPENDS="${BUILD_DEPENDS} ${GHC66_DEPENDS}"
;;
*)
@@ -30,7 +30,8 @@ BUILD_DEPENDS=$(echo $BUILD_DEPENDS | sed -e 's# #, #g')
# Handle 'Hs-Source-Dir' option name which was deprecated in Cabal 1.1.4.
HS_SOURCE_DIRS='Hs-Source-Dirs'
-if ghc-pkg -l | grep -q '\<[Cc]abal-[0-1]\.[0-1]\.[0-3][^,]*'; then
+cabal_version=$(ghc-pkg -l | sed -ne 's/.*\<[Cc]abal-\([^,]*\).*/\1/p')
+if printf "$cabal_version\n1.1.4" | sort | tail -n 1 | grep -q '1\.1\.4'; then
HS_SOURCE_DIRS='Hs-Source-Dir'
fi