From ecb66563cfad89d558f394fe03f7b003230aaa0f Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Sat, 7 Jul 2018 06:36:58 -0700
Subject: [PATCH] Bump base and make changelog entry
---
Cabal/Cabal.cabal | 2 +-
Cabal/ChangeLog.md | 2 ++
cabal-install/cabal-install.cabal | 2 +-
cabal-install/changelog | 2 ++
4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
index f3b60038b5..932e539d70 100644
--- a/Cabal/Cabal.cabal
+++ b/Cabal/Cabal.cabal
@@ -172,7 +172,7 @@ flag old-directory
library
build-depends:
array >= 0.4 && < 0.6,
- base >= 4.5 && < 5,
+ base >= 4.6 && < 5,
bytestring >= 0.9.2.1 && < 0.11,
containers >= 0.4.2.1 && < 0.7,
deepseq >= 1.3 && < 1.5,
diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md
index fc8e3916fb..e78f3eb307 100644
--- a/Cabal/ChangeLog.md
+++ b/Cabal/ChangeLog.md
@@ -1,4 +1,6 @@
# 2.4.0.0 (current development version)
+ * Drop support for GHC 7.4, since it is out of our support window
+ (and has been for over a year!)
* Deprecate `preSDist`, `sDistHook`, and `postSDist` in service of
`new-sdist`, since they violate key invariants of the new-build
ecosystem. Use `autogen-modules` and `build-tool-depends` instead.
diff --git a/cabal-install/cabal-install.cabal b/cabal-install/cabal-install.cabal
index 4fe600fdf7..fe34623c00 100644
--- a/cabal-install/cabal-install.cabal
+++ b/cabal-install/cabal-install.cabal
@@ -294,7 +294,7 @@ library
build-depends:
async >= 2.0 && < 3,
array >= 0.4 && < 0.6,
- base >= 4.5 && < 5,
+ base >= 4.6 && < 5,
base16-bytestring >= 0.1.1 && < 0.2,
binary >= 0.7 && < 0.9,
bytestring >= 0.10.2 && < 1,
diff --git a/cabal-install/changelog b/cabal-install/changelog
index 280a7f8257..5098fdd801 100644
--- a/cabal-install/changelog
+++ b/cabal-install/changelog
@@ -1,6 +1,8 @@
-*-change-log-*-
2.4.0.0 (current development version)
+ * Drop support for GHC 7.4, since it is out of our support window
+ (and has been for over a year!)
* 'new-update' now works outside of projects. (#5096)
* Add 'new-sdist' command (#5389). Creates stable archives based on
cabal projects in '.zip' and '.tar.gz' formats.
--
GitLab