[Git][ghc/ghc][wip/backports] 4 commits: Clean up TBDs in changelog

[Ben Gamari]

Ben Gamari pushed to branch wip/backports at Glasgow Haskell Compiler / GHC


Commits:
614ac76d by Ben Gamari at 2020-08-17T15:14:35-04:00
Clean up TBDs in changelog

(cherry picked from commit 4f334120c8e9cc4aefcbf11d99f169f648af9fde)

- - - - -
1a54d708 by Ben Gamari at 2020-08-17T15:14:35-04:00
Bump bytestring submodule

- - - - -
20e19811 by Ben Gamari at 2020-08-17T15:14:35-04:00
Bump binary submodule

- - - - -
1eaa606f by Ben Gamari at 2020-08-17T15:14:35-04:00
Bump Cabal submodule

- - - - -


6 changed files:

- libraries/Cabal
- libraries/base/changelog.md
- libraries/binary
- libraries/bytestring
- libraries/template-haskell/changelog.md
- utils/ghc-cabal/ghc.mk


Changes:

=====================================
libraries/Cabal
=====================================
@@ -1 +1 @@
-Subproject commit 32dad5c1cf70d65ecb93b0ec214445cf9c9f6615
+Subproject commit 1d886476c443b227bf93eba62781a6cad5012d9e


=====================================
libraries/base/changelog.md
=====================================
@@ -30,7 +30,7 @@
 
   * Add `Ix` instances for tuples of size 6 through 15
    
-## 4.14.0.0 *TBA*
+## 4.14.0.0 *Jan 2020
   * Bundled with GHC 8.10.1
 
   * Add a `TestEquality` instance for the `Compose` newtype.
@@ -322,7 +322,7 @@
     in constant space when applied to lists. (#10830)
 
   * `mkFunTy`, `mkAppTy`, and `mkTyConApp` from `Data.Typeable` no longer exist.
-    This functionality is superseded by the interfaces provided by
+    This functionality is superceded by the interfaces provided by
     `Type.Reflection`.
 
   * `mkTyCon3` is no longer exported by `Data.Typeable`. This function is


=====================================
libraries/binary
=====================================
@@ -1 +1 @@
-Subproject commit dfaf780596328c9184758452b78288e8f405fcc1
+Subproject commit f9b1c92a2ff34cc3457fa27faf3e16b8203b4b9f


=====================================
libraries/bytestring
=====================================
@@ -1 +1 @@
-Subproject commit e6cb01e2ec0bfdd19298418c85f220925a9fa307
+Subproject commit e043aacfc4202a59ccae8b8c8cf0e1ad83a3f209


=====================================
libraries/template-haskell/changelog.md
=====================================
@@ -34,7 +34,9 @@
 
   * The argument to `TExpQ` can now be levity polymorphic.
 
-## 2.16.0.0 *TBA*
+## 2.16.0.0 *Jan 2020*
+
+  * Bundled with GHC 8.10.1
 
   * Add support for tuple sections. (#15843) The type signatures of `TupE` and
     `UnboxedTupE` have changed from `[Exp] -> Exp` to `[Maybe Exp] -> Exp`.
@@ -58,6 +60,8 @@
 
 ## 2.15.0.0 *May 2019*
 
+  * Bundled with GHC 8.8.1
+
   * In `Language.Haskell.TH.Syntax`, `DataInstD`, `NewTypeInstD`, `TySynEqn`,
     and `RuleP` now all have a `Maybe [TyVarBndr]` argument, which contains a
     list of quantified type variables if an explicit `forall` is present, and
@@ -80,6 +84,8 @@
 
 ## 2.14.0.0 *September 2018*
 
+  * Bundled with GHC 8.6.1
+
   * Introduce an `addForeignFilePath` function, as well as a corresponding
     `qAddForeignFile` class method to `Quasi`. Unlike `addForeignFile`, which
     takes the contents of the file as an argument, `addForeignFilePath` takes


=====================================
utils/ghc-cabal/ghc.mk
=====================================
@@ -37,25 +37,13 @@ ifneq "$(BINDIST)" "YES"
 $(ghc-cabal_INPLACE) : $(ghc-cabal_DIST_BINARY) | $$(dir $$@)/.
 	"$(CP)" $< $@
 
-# Minor hack, since we can't reuse the `hs-suffix-rules-srcdir` macro
-ifneq ($(wildcard libraries/Cabal/Cabal/Distribution/Fields/Lexer.x),)
-# Lexer.x exists so we have to call Alex ourselves
-CABAL_LEXER_DEP := bootstrapping/Cabal/Distribution/Fields/Lexer.hs
-
-bootstrapping/Cabal/Distribution/Fields/Lexer.hs: libraries/Cabal/Cabal/Distribution/Fields/Lexer.x
-	mkdir -p bootstrapping/Cabal/Distribution/Fields
-	$(call cmd,ALEX) $< -o $@
-else
-CABAL_LEXER_DEP := libraries/Cabal/Cabal/Distribution/Fields/Lexer.hs
-endif
-
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*/*.hs)
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*/*.hs)
-$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/Distribution/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*/*.hs)
+$(ghc-cabal_DIST_BINARY): $(wildcard libraries/Cabal/Cabal/src/Distribution/*.hs)
 
 # N.B. Compile with -O0 since this is not a performance-critical executable
 # and the Cabal takes nearly twice as long to build with -O1. See #16817.
-$(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
+$(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. bootstrapping/.
 	"$(GHC)" $(SRC_HC_OPTS) \
 	       $(addprefix -optc, $(SRC_CC_OPTS) $(CONF_CC_OPTS_STAGE0)) \
 	       $(addprefix -optl, $(SRC_LD_OPTS) $(CONF_GCC_LINKER_OPTS_STAGE0)) \
@@ -69,8 +57,7 @@ $(ghc-cabal_DIST_BINARY): $(CABAL_LEXER_DEP) utils/ghc-cabal/Main.hs $(TOUCH_DEP
 	       -DBOOTSTRAPPING \
 	       -odir  bootstrapping \
 	       -hidir bootstrapping \
-	       $(CABAL_LEXER_DEP) \
-	       -ilibraries/Cabal/Cabal \
+	       -ilibraries/Cabal/Cabal/src \
 	       -ilibraries/binary/src \
 	       -ilibraries/filepath \
 	       -ilibraries/hpc \



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca492b077bd33e069b43b6e5e6d5d4d979e05f55...1eaa606f36035a623b2b4c61f9f8b2c87a2752a2

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/ca492b077bd33e069b43b6e5e6d5d4d979e05f55...1eaa606f36035a623b2b4c61f9f8b2c87a2752a2
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200817/49ac96b5/attachment-0001.html>