From 6913400f5ae76cfaf6195114d5efd0aba28778df Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 12 Sep 2016 17:00:57 -0500 Subject: [PATCH 1/3] travis.yml: don't build with GHC 7.4 GHC 7.4 is more than four years old now, well outside our three-year support window. (Actually, GHC 7.6 is outside our support window too, but I don't have any pending patches which are broken with that version.) --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 45360b1810c..6b4d95e9c28 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,9 +13,6 @@ matrix: os: linux # These don't have -dyn/-prof whitelisted yet, so we have to # do the old-style installation - - env: GHCVER=7.4.2 SCRIPT=script - os: linux - sudo: required - env: GHCVER=7.6.3 SCRIPT=script os: linux sudo: required From 797d6a4a4a60c5366c3314b38797adf55bd27295 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 12 Sep 2016 17:03:19 -0500 Subject: [PATCH 2/3] Remove code specific to building with GHC 7.4 --- Cabal/Distribution/Compat/Binary.hs | 4 ---- Cabal/Distribution/Compat/Environment.hs | 7 ------- 2 files changed, 11 deletions(-) diff --git a/Cabal/Distribution/Compat/Binary.hs b/Cabal/Distribution/Compat/Binary.hs index 6238ffa09fc..b911027f2d3 100644 --- a/Cabal/Distribution/Compat/Binary.hs +++ b/Cabal/Distribution/Compat/Binary.hs @@ -17,10 +17,6 @@ module Distribution.Compat.Binary #endif ) where -#if __GLASGOW_HASKELL__ < 706 -import Prelude hiding (catch) -#endif - import Control.Exception (catch, evaluate) #if __GLASGOW_HASKELL__ >= 711 import Control.Exception (pattern ErrorCall) diff --git a/Cabal/Distribution/Compat/Environment.hs b/Cabal/Distribution/Compat/Environment.hs index 6f0b99d386e..2f0fd3c7685 100644 --- a/Cabal/Distribution/Compat/Environment.hs +++ b/Cabal/Distribution/Compat/Environment.hs @@ -51,13 +51,6 @@ getEnvironment = fmap upcaseVars System.getEnvironment getEnvironment = System.getEnvironment #endif -#if __GLASGOW_HASKELL__ < 706 --- | @lookupEnv var@ returns the value of the environment variable @var@, or --- @Nothing@ if there is no such value. -lookupEnv :: String -> IO (Maybe String) -lookupEnv name = (Just `fmap` System.getEnv name) `catchIO` const (return Nothing) -#endif /* __GLASGOW_HASKELL__ < 706 */ - -- | @setEnv name value@ sets the specified environment variable to @value@. -- -- Throws `Control.Exception.IOException` if either @name@ or @value@ is the From c9650198ea1d9c8549bff33a8692e158a1497b64 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 12 Sep 2016 20:11:52 -0500 Subject: [PATCH 3/3] Update changelog to indicate dropping support of GHC 7.4 [ci skip] --- Cabal/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cabal/changelog b/Cabal/changelog index d2ae06b4f41..f68f6db63f5 100644 --- a/Cabal/changelog +++ b/Cabal/changelog @@ -1,7 +1,7 @@ -*-change-log-*- 1.25.x.x (current development version) - * Dropped support for versions of GHC earlier than 6.12 (#3111). + * Dropped support for versions of GHC earlier than 7.6 (#3833). * Convenience/internal libraries are now supported (#269). An internal library is declared using the stanza "library 'libname'". Packages which use internal libraries can