Unverified Commit ab353578 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

cabal-install: Remove support for building with GHC < 7.10.

GHC 7.8.4 was released in Dec 2014, so this is in accordance with our
support policy. NB: doesn't affect lib:Cabal.

Fixes #4856.
parent 3f20e1fa
......@@ -34,10 +34,10 @@ matrix:
- env: GHCVER=7.4.2 SCRIPT=script CABAL_LIB_ONLY=YES TEST_OTHER_VERSIONS=YES
os: linux
sudo: required
- env: GHCVER=7.6.3 SCRIPT=script
- env: GHCVER=7.6.3 SCRIPT=script CABAL_LIB_ONLY=YES TEST_OTHER_VERSIONS=YES
os: linux
sudo: required
- env: GHCVER=7.8.4 SCRIPT=script USE_GOLD=YES
- env: GHCVER=7.8.4 SCRIPT=script CABAL_LIB_ONLY=YES TEST_OTHER_VERSIONS=YES USE_GOLD=YES
os: linux
sudo: required
# Ugh, we'd like to drop 'sudo: required' and use the
......@@ -70,7 +70,7 @@ matrix:
# We axed GHC 7.6 and earlier because it's not worth the trouble to
# make older GHC work with clang's cpp. See
# https://ghc.haskell.org/trac/ghc/ticket/8493
- env: GHCVER=7.8.4 SCRIPT=script
- env: GHCVER=7.8.4 SCRIPT=script CABAL_LIB_ONLY=YES TEST_OTHER_VERSIONS=YES
os: osx
# Keep this synced with travis/upload.sh
osx_image: xcode6.4 # We need 10.10
......
......@@ -452,9 +452,7 @@ runProcess' cmd args mb_cwd mb_env mb_stdin mb_stdout mb_stderr _delegate = do
, Process.std_in = mbToStd mb_stdin
, Process.std_out = mbToStd mb_stdout
, Process.std_err = mbToStd mb_stderr
#if MIN_VERSION_process(1,2,0)
, Process.delegate_ctlc = _delegate
#endif
}
return ph
where
......
......@@ -212,21 +212,8 @@ PARSEC_VER="3.1.9"; PARSEC_VER_REGEXP="[3]\.[01]\."
# >= 3.0 && < 3.2
DEEPSEQ_VER="1.4.2.0"; DEEPSEQ_VER_REGEXP="1\.[1-9]\."
# >= 1.1 && < 2
case "$GHC_VER" in
7.4*|7.6*)
# GHC 7.4 or 7.6
BINARY_VER="0.8.2.1"
BINARY_VER_REGEXP="[0]\.[78]\.[0-2]\." # >= 0.7 && < 0.8.3
;;
*)
# GHC >= 7.8
BINARY_VER="0.8.3.0"
BINARY_VER_REGEXP="[0]\.[78]\." # >= 0.7 && < 0.9
;;
esac
BINARY_VER="0.8.3.0"; BINARY_VER_REGEXP="[0]\.[78]\."
# >= 0.7 && < 0.9
TEXT_VER="1.2.2.2"; TEXT_VER_REGEXP="((1\.[012]\.)|(0\.([2-9]|(1[0-1]))\.))"
# >= 0.2 && < 1.3
NETWORK_VER="2.6.3.2"; NETWORK_VER_REGEXP="2\.[0-6]\."
......@@ -251,10 +238,6 @@ STM_VER="2.4.4.1"; STM_VER_REGEXP="2\."
# == 2.*
ASYNC_VER="2.1.1.1"; ASYNC_VER_REGEXP="2\."
# 2.*
OLD_TIME_VER="1.1.0.3"; OLD_TIME_VER_REGEXP="1\.[01]\.?"
# >=1.0.0.0 && <1.2
OLD_LOCALE_VER="1.0.0.7"; OLD_LOCALE_VER_REGEXP="1\.0\.?"
# >=1.0.0.0 && <1.1
BASE16_BYTESTRING_VER="0.1.1.6"; BASE16_BYTESTRING_VER_REGEXP="0\.1"
# 0.1.*
BASE64_BYTESTRING_VER="1.0.0.1"; BASE64_BYTESTRING_VER_REGEXP="1\."
......@@ -480,8 +463,6 @@ info_pkg "mtl" ${MTL_VER} ${MTL_VER_REGEXP}
info_pkg "text" ${TEXT_VER} ${TEXT_VER_REGEXP}
info_pkg "parsec" ${PARSEC_VER} ${PARSEC_VER_REGEXP}
info_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP}
info_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_VER_REGEXP}
info_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_VER_REGEXP}
info_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
info_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
info_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
......@@ -521,8 +502,6 @@ do_pkg "network" ${NETWORK_VER} ${NETWORK_VER_REGEXP}
# We conditionally install network-uri, depending on the network version.
do_network_uri_pkg
do_pkg "old-locale" ${OLD_LOCALE_VER} ${OLD_LOCALE_VER_REGEXP}
do_pkg "old-time" ${OLD_TIME_VER} ${OLD_TIME_VER_REGEXP}
do_pkg "HTTP" ${HTTP_VER} ${HTTP_VER_REGEXP}
do_pkg "zlib" ${ZLIB_VER} ${ZLIB_VER_REGEXP}
do_pkg "random" ${RANDOM_VER} ${RANDOM_VER_REGEXP}
......
......@@ -93,14 +93,6 @@ source-repository head
location: https://github.com/haskell/cabal/
subdir: cabal-install
Flag old-bytestring
description: Use bytestring < 0.10.2 and bytestring-builder
default: False
Flag old-directory
description: Use directory < 1.2 and old-time
default: False
Flag network-uri
description: Get Network.URI from the network-uri package
default: True
......@@ -303,12 +295,13 @@ library
array >= 0.4 && < 0.6,
base >= 4.5 && < 5,
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.5 && < 0.9,
bytestring >= 0.9 && < 1,
binary >= 0.7 && < 0.9,
bytestring >= 0.10.2 && < 1,
Cabal >= 2.1 && < 2.2,
containers >= 0.4 && < 0.6,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.2.0 && < 1.4,
echo >= 0.1.3 && < 0.2,
edit-distance >= 0.2.2 && < 0.3,
filepath >= 1.3 && < 1.5,
......@@ -316,6 +309,7 @@ library
HTTP >= 4000.1.5 && < 4000.4,
mtl >= 2.0 && < 3,
pretty >= 1.1 && < 1.2,
process >= 1.1.0.2 && < 1.7,
random >= 1 && < 1.2,
stm >= 2.0 && < 3,
tar >= 0.5.0.3 && < 0.6,
......@@ -323,18 +317,6 @@ library
zlib >= 0.5.3 && < 0.7,
hackage-security >= 0.5.2.2 && < 0.6
if flag(old-bytestring)
build-depends: bytestring < 0.10.2, bytestring-builder >= 0.10 && < 1
else
build-depends: bytestring >= 0.10.2
if flag(old-directory)
build-depends: directory >= 1.1 && < 1.2, old-time >= 1 && < 1.2,
process >= 1.0.1.1 && < 1.1.0.2
else
build-depends: directory >= 1.2 && < 1.4,
process >= 1.1.0.2 && < 1.7
-- NOTE: you MUST include the network dependency even when network-uri
-- is pulled in, otherwise the constraint solver doesn't have enough
-- information
......@@ -349,10 +331,6 @@ library
else
build-depends: resolv >= 0.1.1 && < 0.2
-- Needed for GHC.Generics before GHC 7.6
if impl(ghc < 7.6)
build-depends: ghc-prim >= 0.2 && < 0.3
if os(windows)
build-depends: Win32 >= 2 && < 3
else
......@@ -400,12 +378,13 @@ executable cabal
array >= 0.4 && < 0.6,
base >= 4.5 && < 5,
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.5 && < 0.9,
bytestring >= 0.9 && < 1,
binary >= 0.7 && < 0.9,
bytestring >= 0.10.2 && < 1,
Cabal >= 2.1 && < 2.2,
containers >= 0.4 && < 0.6,
cryptohash-sha256 >= 0.11 && < 0.12,
deepseq >= 1.3 && < 1.5,
directory >= 1.2.2.0 && < 1.4,
echo >= 0.1.3 && < 0.2,
edit-distance >= 0.2.2 && < 0.3,
filepath >= 1.3 && < 1.5,
......@@ -413,6 +392,7 @@ executable cabal
HTTP >= 4000.1.5 && < 4000.4,
mtl >= 2.0 && < 3,
pretty >= 1.1 && < 1.2,
process >= 1.2 && < 1.7,
random >= 1 && < 1.2,
stm >= 2.0 && < 3,
tar >= 0.5.0.3 && < 0.6,
......@@ -565,18 +545,6 @@ executable cabal
Distribution.Solver.Types.SourcePackage
Distribution.Solver.Types.Variable
if flag(old-bytestring)
build-depends: bytestring < 0.10.2, bytestring-builder >= 0.10 && < 1
else
build-depends: bytestring >= 0.10.2
if flag(old-directory)
build-depends: directory >= 1.1 && < 1.2, old-time >= 1 && < 1.2,
process >= 1.0.1.1 && < 1.1.0.2
else
build-depends: directory >= 1.2 && < 1.4,
process >= 1.1.0.2 && < 1.7
-- NOTE: you MUST include the network dependency even when network-uri
-- is pulled in, otherwise the constraint solver doesn't have enough
-- information
......@@ -591,10 +559,6 @@ executable cabal
else
build-depends: resolv >= 0.1.1 && < 0.2
-- Needed for GHC.Generics before GHC 7.6
if impl(ghc < 7.6)
build-depends: ghc-prim >= 0.2 && < 0.3
if os(windows)
build-depends: Win32 >= 2 && < 3
else
......@@ -669,8 +633,7 @@ executable cabal
time,
zlib
if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
ghc-options: -threaded
-- On AIX, some legacy BSD operations such as flock(2) are provided by libbsd.a
if os(aix)
......@@ -730,8 +693,7 @@ Test-Suite unit-tests
tagged,
QuickCheck >= 2.8.2
if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
ghc-options: -threaded
if !flag(lib)
buildable: False
......@@ -760,8 +722,7 @@ Test-Suite memory-usage-tests
tasty >= 0.12,
tasty-hunit >= 0.10
if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
ghc-options: -threaded
if !flag(lib)
buildable: False
......@@ -790,8 +751,7 @@ Test-Suite solver-quickcheck
QuickCheck >= 2.8.2,
pretty-show >= 1.6.15
if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
ghc-options: -threaded
if !flag(lib)
buildable: False
......@@ -822,12 +782,11 @@ test-suite integration-tests2
if !flag(lib)
buildable: False
if !(arch(arm) && impl(ghc < 7.6))
ghc-options: -threaded
ghc-options: -threaded
default-language: Haskell2010
custom-setup
setup-depends: Cabal >= 2.1,
base,
process >= 1.1.0.1 && < 1.7,
filepath >= 1.3 && < 1.5
filepath >= 1.3 && < 1.5
......@@ -45,6 +45,7 @@
unncecessarily if the main install command fails (#1375).
* Added support for '--enable-tests' and '--enable-benchmarks' to
'cabal fetch' (#4948).
* Removed support for building cabal-install with GHC < 7.10.
2.0.0.1 Mikhail Glushenkov <mikhail.glushenkov@gmail.com> December 2017
* Support for GHC's numeric -g debug levels (#4673).
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment