Skip to content

Drop support for GHC 7.4 #3833

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ttuegel merged 3 commits into from
Sep 13, 2016
Merged

Drop support for GHC 7.4 #3833

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6913400
travis.yml: don't build with GHC 7.4
ttuegel Sep 12, 2016
797d6a4
Remove code specific to building with GHC 7.4
ttuegel Sep 12, 2016
c965019
Update changelog to indicate dropping support of GHC 7.4
ttuegel Sep 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions Cabal/Distribution/Compat/Binary.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 0 additions & 7 deletions Cabal/Distribution/Compat/Environment.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Cabal/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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).
Copy link
Copy Markdown
Member

@23Skidoo 23Skidoo Sep 13, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#3111 was a bit different from this PR, I'd add a separate line saying "Cabal/cabal-install can no longer be compiled with GHC < 7.6" instead. Otherwise it should be possible to use 2.0 with 7.4.

Copy link
Copy Markdown
Member

@23Skidoo 23Skidoo Sep 13, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed.

* Convenience/internal libraries are now supported (#269).
An internal library is declared using the stanza "library
'libname'". Packages which use internal libraries can
Expand Down