[Git][ghc/ghc][wip/bump-base] base: Bump to 4.15.0.0

Ben Gamari gitlab at gitlab.haskell.org
Wed May 27 12:30:11 UTC 2020



Ben Gamari pushed to branch wip/bump-base at Glasgow Haskell Compiler / GHC


Commits:
c1a8577c by Ben Gamari at 2020-05-27T12:29:21+00:00
base: Bump to 4.15.0.0

- - - - -


30 changed files:

- compiler/ghc.cabal.in
- libraries/array
- libraries/base/base.cabal
- libraries/deepseq
- libraries/directory
- libraries/filepath
- libraries/ghc-boot-th/ghc-boot-th.cabal.in
- libraries/ghc-boot/ghc-boot.cabal.in
- libraries/ghc-compact/ghc-compact.cabal
- libraries/ghci/ghci.cabal.in
- libraries/haskeline
- libraries/hpc
- libraries/parsec
- libraries/process
- libraries/stm
- libraries/template-haskell/template-haskell.cabal.in
- libraries/terminfo
- libraries/unix
- testsuite/tests/dependent/should_compile/T14729.stderr
- testsuite/tests/dependent/should_compile/T15743.stderr
- testsuite/tests/dependent/should_compile/T15743e.stderr
- testsuite/tests/indexed-types/should_compile/T15711.stderr
- testsuite/tests/indexed-types/should_compile/T15852.stderr
- testsuite/tests/polykinds/T15592.stderr
- testsuite/tests/polykinds/T15592b.stderr
- testsuite/tests/printer/T18052a.stderr
- testsuite/tests/typecheck/should_compile/T12763.stderr
- testsuite/tests/typecheck/should_compile/subsumption_sort_hole_fits.stderr
- utils/haddock
- utils/hsc2hs


Changes:

=====================================
compiler/ghc.cabal.in
=====================================
@@ -59,7 +59,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,


=====================================
libraries/array
=====================================
@@ -1 +1 @@
-Subproject commit f73f681e52546b1e35cb9e8a62fe49c33f259d98
+Subproject commit ab535173d7885ebfc2005d8da2765f0f52c923ce


=====================================
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


=====================================
libraries/deepseq
=====================================
@@ -1 +1 @@
-Subproject commit da0eda33f540786b6823c6f542ab59cf9d1b71d9
+Subproject commit 13c1c84415da727ab56e9fa33aca5046b6683848


=====================================
libraries/directory
=====================================
@@ -1 +1 @@
-Subproject commit 36bd1921258b759724a95ce56c5e880edf0972a2
+Subproject commit 0dcb228388a6e306c11f419c7c5575eaa6af40b3


=====================================
libraries/filepath
=====================================
@@ -1 +1 @@
-Subproject commit 023eedaeb142d47b7b5a41fe4cc4150da0bd0042
+Subproject commit 7cb3dc285cd595a7b6cf0b74a58b6583fb67772e


=====================================
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


=====================================
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,


=====================================
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
 


=====================================
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,


=====================================
libraries/haskeline
=====================================
@@ -1 +1 @@
-Subproject commit 463fc49d17bfab846cceba48bccc02ef285e6cba
+Subproject commit 0382e3acdb8433e1d9c33ca5947784e78134f838


=====================================
libraries/hpc
=====================================
@@ -1 +1 @@
-Subproject commit f73c482db30a40cfa12074de51335b70a0974931
+Subproject commit 43bb9061a748aee6a95a9f1db33a2b1e5f770634


=====================================
libraries/parsec
=====================================
@@ -1 +1 @@
-Subproject commit ce416997e15438ca616667995660e123ef7e219d
+Subproject commit 190492494fe92e8dd42165190b7ac112be1f7389


=====================================
libraries/process
=====================================
@@ -1 +1 @@
-Subproject commit 1afc36ecd38c069251a836e1c1c8b3a3043ddc01
+Subproject commit 8f4ecebb6578a179a6c04074cb06600683e2e50c


=====================================
libraries/stm
=====================================
@@ -1 +1 @@
-Subproject commit faf9904137044e35a589c7c1579e1bfa03789c84
+Subproject commit 444f672416a354c3cfde9d94ec237a36be46ef59


=====================================
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.*


=====================================
libraries/terminfo
=====================================
@@ -1 +1 @@
-Subproject commit 27e694688d2d6eee69959a8b6a128c584c84aa72
+Subproject commit 3ebb36f4a2c42b74ec4e35efccc2be34c198a830


=====================================
libraries/unix
=====================================
@@ -1 +1 @@
-Subproject commit 1a993b89c570e03ba74f196f5d065a0ebe624010
+Subproject commit ea13d990580273a883368793dfbb826cab5a22d4


=====================================
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]


=====================================
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]


=====================================
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]


=====================================
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]


=====================================
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]


=====================================
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]


=====================================
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]


=====================================
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 ====================


=====================================
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]


=====================================
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


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit 8f340aef12df5f5df02d49ab5c6c5d7cccfa398b
+Subproject commit be2dfbd166f6bb0790ad94f0b4b9a90f02849d84


=====================================
utils/hsc2hs
=====================================
@@ -1 +1 @@
-Subproject commit 24100ea521596922d3edc8370b3d9f7b845ae4cf
+Subproject commit e792dd8e5589d42a4d416f78df8efb70995f95e3



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c1a8577c1f18bfedc6a67197c80fd206286d1f87

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/c1a8577c1f18bfedc6a67197c80fd206286d1f87
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/20200527/493a0575/attachment-0001.html>


More information about the ghc-commits mailing list