From 3c310896fa12f4958afa87002c204faaf4042f42 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Thu, 21 May 2020 11:32:59 -0400 Subject: base: Bump to 4.15.0.0 --- compiler/ghc.cabal.in | 2 +- libraries/array | 2 +- libraries/base/base.cabal | 2 +- libraries/deepseq | 2 +- libraries/directory | 2 +- libraries/filepath | 2 +- libraries/ghc-boot-th/ghc-boot-th.cabal.in | 2 +- libraries/ghc-boot/ghc-boot.cabal.in | 2 +- libraries/ghc-compact/ghc-compact.cabal | 2 +- libraries/ghci/ghci.cabal.in | 2 +- libraries/haskeline | 2 +- libraries/hpc | 2 +- libraries/parsec | 2 +- libraries/process | 2 +- libraries/stm | 2 +- libraries/template-haskell/template-haskell.cabal.in | 2 +- libraries/terminfo | 2 +- libraries/unix | 2 +- testsuite/tests/dependent/should_compile/T14729.stderr | 4 ++-- testsuite/tests/dependent/should_compile/T15743.stderr | 4 ++-- testsuite/tests/dependent/should_compile/T15743e.stderr | 4 ++-- testsuite/tests/indexed-types/should_compile/T15711.stderr | 4 ++-- testsuite/tests/indexed-types/should_compile/T15852.stderr | 4 ++-- testsuite/tests/polykinds/T15592.stderr | 4 ++-- testsuite/tests/polykinds/T15592b.stderr | 4 ++-- testsuite/tests/printer/T18052a.stderr | 2 +- testsuite/tests/typecheck/should_compile/T12763.stderr | 4 ++-- .../tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr | 4 ++-- utils/haddock | 2 +- utils/hsc2hs | 2 +- 30 files changed, 39 insertions(+), 39 deletions(-) diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index 3b9bb8f6e3..40c4c609d6 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -67,7 +67,7 @@ Library Default-Language: Haskell2010 Exposed: False - Build-Depends: base >= 4.11 && < 4.15, + Build-Depends: base >= 4.11 && < 4.16, deepseq >= 1.4 && < 1.5, directory >= 1 && < 1.4, process >= 1 && < 1.7, diff --git a/libraries/array b/libraries/array index f73f681e52..ab535173d7 160000 --- a/libraries/array +++ b/libraries/array @@ -1 +1 @@ -Subproject commit f73f681e52546b1e35cb9e8a62fe49c33f259d98 +Subproject commit ab535173d7885ebfc2005d8da2765f0f52c923ce diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index 919571c00c..e35a575ccb 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.14.0.0 +version: 4.15.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/deepseq b/libraries/deepseq index da0eda33f5..13c1c84415 160000 --- a/libraries/deepseq +++ b/libraries/deepseq @@ -1 +1 @@ -Subproject commit da0eda33f540786b6823c6f542ab59cf9d1b71d9 +Subproject commit 13c1c84415da727ab56e9fa33aca5046b6683848 diff --git a/libraries/directory b/libraries/directory index 36bd192125..3d9ca6edc0 160000 --- a/libraries/directory +++ b/libraries/directory @@ -1 +1 @@ -Subproject commit 36bd1921258b759724a95ce56c5e880edf0972a2 +Subproject commit 3d9ca6edc0703860829ab3210db78bb4c4ff72b9 diff --git a/libraries/filepath b/libraries/filepath index 023eedaeb1..9088df9f97 160000 --- a/libraries/filepath +++ b/libraries/filepath @@ -1 +1 @@ -Subproject commit 023eedaeb142d47b7b5a41fe4cc4150da0bd0042 +Subproject commit 9088df9f97914664c9360857347d65c32dd6c892 diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index 66c561ffff..cfbe696c43 100644 --- a/libraries/ghc-boot-th/ghc-boot-th.cabal.in +++ b/libraries/ghc-boot-th/ghc-boot-th.cabal.in @@ -36,4 +36,4 @@ Library GHC.ForeignSrcLang.Type GHC.Lexeme - build-depends: base >= 4.7 && < 4.15 + build-depends: base >= 4.7 && < 4.16 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index 6866f65011..bf68363827 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -55,7 +55,7 @@ Library -- GHC.Version -- GHC.Platform.Host - build-depends: base >= 4.7 && < 4.15, + build-depends: base >= 4.7 && < 4.16, binary == 0.8.*, bytestring == 0.10.*, containers >= 0.5 && < 0.7, diff --git a/libraries/ghc-compact/ghc-compact.cabal b/libraries/ghc-compact/ghc-compact.cabal index 56532c24e7..e5544e8c14 100644 --- a/libraries/ghc-compact/ghc-compact.cabal +++ b/libraries/ghc-compact/ghc-compact.cabal @@ -37,7 +37,7 @@ library CPP build-depends: ghc-prim >= 0.5.3 && < 0.7, - base >= 4.9.0 && < 4.15, + base >= 4.9.0 && < 4.16, bytestring >= 0.10.6.0 ghc-options: -Wall diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 11d144c5b3..c160c8c0e3 100644 --- a/libraries/ghci/ghci.cabal.in +++ b/libraries/ghci/ghci.cabal.in @@ -72,7 +72,7 @@ library Build-Depends: array == 0.5.*, - base >= 4.8 && < 4.15, + base >= 4.8 && < 4.16, binary == 0.8.*, bytestring == 0.10.*, containers >= 0.5 && < 0.7, diff --git a/libraries/haskeline b/libraries/haskeline index 3d3e7c18a4..d3885e4bc1 160000 --- a/libraries/haskeline +++ b/libraries/haskeline @@ -1 +1 @@ -Subproject commit 3d3e7c18a44fa904f004e5eac0e666e396f1b3f4 +Subproject commit d3885e4bc1dfe6b06829871361bf9330414fc9e2 diff --git a/libraries/hpc b/libraries/hpc index f73c482db3..772de3f7b4 160000 --- a/libraries/hpc +++ b/libraries/hpc @@ -1 +1 @@ -Subproject commit f73c482db30a40cfa12074de51335b70a0974931 +Subproject commit 772de3f7b43e31178f042ba77c071594845363e3 diff --git a/libraries/parsec b/libraries/parsec index ce416997e1..190492494f 160000 --- a/libraries/parsec +++ b/libraries/parsec @@ -1 +1 @@ -Subproject commit ce416997e15438ca616667995660e123ef7e219d +Subproject commit 190492494fe92e8dd42165190b7ac112be1f7389 diff --git a/libraries/process b/libraries/process index 1afc36ecd3..8f4ecebb65 160000 --- a/libraries/process +++ b/libraries/process @@ -1 +1 @@ -Subproject commit 1afc36ecd38c069251a836e1c1c8b3a3043ddc01 +Subproject commit 8f4ecebb6578a179a6c04074cb06600683e2e50c diff --git a/libraries/stm b/libraries/stm index faf9904137..444f672416 160000 --- a/libraries/stm +++ b/libraries/stm @@ -1 +1 @@ -Subproject commit faf9904137044e35a589c7c1579e1bfa03789c84 +Subproject commit 444f672416a354c3cfde9d94ec237a36be46ef59 diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index 10f64895bc..fc89bf69c6 100644 --- a/libraries/template-haskell/template-haskell.cabal.in +++ b/libraries/template-haskell/template-haskell.cabal.in @@ -55,7 +55,7 @@ Library Language.Haskell.TH.Lib.Map build-depends: - base >= 4.11 && < 4.15, + base >= 4.11 && < 4.16, ghc-boot-th == @ProjectVersionMunged@, ghc-prim, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo index 27e694688d..3ebb36f4a2 160000 --- a/libraries/terminfo +++ b/libraries/terminfo @@ -1 +1 @@ -Subproject commit 27e694688d2d6eee69959a8b6a128c584c84aa72 +Subproject commit 3ebb36f4a2c42b74ec4e35efccc2be34c198a830 diff --git a/libraries/unix b/libraries/unix index 1a993b89c5..ea13d99058 160000 --- a/libraries/unix +++ b/libraries/unix @@ -1 +1 @@ -Subproject commit 1a993b89c570e03ba74f196f5d065a0ebe624010 +Subproject commit ea13d990580273a883368793dfbb826cab5a22d4 diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr index 74f04b591f..4c31287941 100644 --- a/testsuite/tests/dependent/should_compile/T14729.stderr +++ b/testsuite/tests/dependent/should_compile/T14729.stderr @@ -11,5 +11,5 @@ COERCION AXIOMS FAMILY INSTANCES type instance F Int = Bool -- Defined at T14729.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr index 1212fc12dc..acdb531ba8 100644 --- a/testsuite/tests/dependent/should_compile/T15743.stderr +++ b/testsuite/tests/dependent/should_compile/T15743.stderr @@ -3,5 +3,5 @@ TYPE CONSTRUCTORS forall {k1} k2 (k3 :: k2). Proxy k3 -> k1 -> k2 -> * roles nominal nominal nominal phantom phantom phantom Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr index 048cbe57ab..524b4831ef 100644 --- a/testsuite/tests/dependent/should_compile/T15743e.stderr +++ b/testsuite/tests/dependent/should_compile/T15743e.stderr @@ -52,5 +52,5 @@ DATA CONSTRUCTORS (d :: Proxy k5) (e :: Proxy k7). f c -> T k8 a b f c d e Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr index 565246800f..98cff51f12 100644 --- a/testsuite/tests/indexed-types/should_compile/T15711.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15711.stderr @@ -3,5 +3,5 @@ TYPE CONSTRUCTORS associated type family F{2} :: forall a. Maybe a -> * roles nominal nominal Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr index 73a072fe00..5ee0ade4d0 100644 --- a/testsuite/tests/indexed-types/should_compile/T15852.stderr +++ b/testsuite/tests/indexed-types/should_compile/T15852.stderr @@ -9,5 +9,5 @@ FAMILY INSTANCES data instance forall {k1} {k2} {j :: k1} {c :: k2}. DF (Proxy c) -- Defined at T15852.hs:10:15 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr index 68010a184a..966635442d 100644 --- a/testsuite/tests/polykinds/T15592.stderr +++ b/testsuite/tests/polykinds/T15592.stderr @@ -5,5 +5,5 @@ DATA CONSTRUCTORS MkT :: forall {k} k1 (f :: k1 -> k -> *) (a :: k1) (b :: k). f a b -> T f a b -> T f a b Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr index 48d6163f18..9abb1964d1 100644 --- a/testsuite/tests/polykinds/T15592b.stderr +++ b/testsuite/tests/polykinds/T15592b.stderr @@ -4,5 +4,5 @@ TYPE CONSTRUCTORS forall k (f :: k -> *) (a :: k). f a -> * roles nominal nominal nominal nominal Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/printer/T18052a.stderr b/testsuite/tests/printer/T18052a.stderr index 1ac260a73b..99aa8b033f 100644 --- a/testsuite/tests/printer/T18052a.stderr +++ b/testsuite/tests/printer/T18052a.stderr @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS PATTERN SYNONYMS (:||:) :: forall {a} {b}. a -> b -> (a, b) Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, integer-gmp-1.0.3.0] ==================== Tidy Core ==================== diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index 24f44e2772..efc3528342 100644 --- a/testsuite/tests/typecheck/should_compile/T12763.stderr +++ b/testsuite/tests/typecheck/should_compile/T12763.stderr @@ -8,5 +8,5 @@ COERCION AXIOMS CLASS INSTANCES instance C Int -- Defined at T12763.hs:9:10 Dependent modules: [] -Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, - integer-gmp-1.0.2.0] +Dependent packages: [base-4.15.0.0, ghc-prim-0.6.1, + integer-gmp-1.0.3.0] diff --git a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr index 8ea32fcde6..6007ab4d0b 100644 --- a/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr +++ b/testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr @@ -9,10 +9,10 @@ subsumption_sort_hole_fits.hs:2:5: warning: [-Wtyped-holes (in -Wdefault)] Valid hole fits include lines :: String -> [String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 - (and originally defined in ‘base-4.14.0.0:Data.OldList’)) + (and originally defined in ‘base-4.15.0.0:Data.OldList’)) words :: String -> [String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 - (and originally defined in ‘base-4.14.0.0:Data.OldList’)) + (and originally defined in ‘base-4.15.0.0:Data.OldList’)) read :: forall a. Read a => String -> a with read @[String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 diff --git a/utils/haddock b/utils/haddock index a1cc87c864..e37911553b 160000 --- a/utils/haddock +++ b/utils/haddock @@ -1 +1 @@ -Subproject commit a1cc87c864242377833ab383f1df72583ab4a01d +Subproject commit e37911553bfe6804d3903f750261f758569b4a26 diff --git a/utils/hsc2hs b/utils/hsc2hs index 24100ea521..e792dd8e55 160000 --- a/utils/hsc2hs +++ b/utils/hsc2hs @@ -1 +1 @@ -Subproject commit 24100ea521596922d3edc8370b3d9f7b845ae4cf +Subproject commit e792dd8e5589d42a4d416f78df8efb70995f95e3 -- cgit v1.2.1