diff options
31 files changed, 22 insertions, 25 deletions
diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in index a33edcd2ea..58b840b6ad 100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in @@ -59,7 +59,7 @@ Library Default-Language: Haskell2010 Exposed: False - Build-Depends: base >= 4.11 && < 4.14, + Build-Depends: base >= 4.11 && < 4.15, deepseq >= 1.4 && < 1.5, directory >= 1 && < 1.4, process >= 1 && < 1.7, diff --git a/libraries/array b/libraries/array -Subproject 7f79bb4c781235e243ed6ee3155e6fbb424360b +Subproject f73f681e52546b1e35cb9e8a62fe49c33f259d9 diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal index b978e3fdbf..919571c00c 100644 --- a/libraries/base/base.cabal +++ b/libraries/base/base.cabal @@ -1,6 +1,6 @@ cabal-version: 3.0 name: base -version: 4.13.0.0 +version: 4.14.0.0 -- NOTE: Don't forget to update ./changelog.md license: BSD-3-Clause diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index b6c07d9400..c42d5eb795 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -4,7 +4,7 @@ * Add `IsList` instance for `ZipList`. ## 4.14.0.0 *TBA* - * Bundled with GHC *TBA* + * Bundled with GHC 8.10.1 * Add a `TestEquality` instance for the `Compose` newtype. diff --git a/libraries/deepseq b/libraries/deepseq -Subproject a2d507af21a8f538b7c2fa129f0ce7ab6a7667d +Subproject da0eda33f540786b6823c6f542ab59cf9d1b71d diff --git a/libraries/directory b/libraries/directory -Subproject 59883e953d488492487dcda266901080347bbf1 +Subproject 90847972dd689a8bdfa21bb76e9aaa933e00968 diff --git a/libraries/exceptions b/libraries/exceptions -Subproject a2efbf722de51abe4ad9b3234cbe6d89a799dcd +Subproject 42b1360668c36eab573449941d5362867a95789 diff --git a/libraries/filepath b/libraries/filepath -Subproject 39035d6433fff2356cf65747649666ed9b6e83e +Subproject 023eedaeb142d47b7b5a41fe4cc4150da0bd004 diff --git a/libraries/ghc-boot-th/ghc-boot-th.cabal.in b/libraries/ghc-boot-th/ghc-boot-th.cabal.in index 495968edbe..66c561ffff 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.14 + build-depends: base >= 4.7 && < 4.15 diff --git a/libraries/ghc-boot/ghc-boot.cabal.in b/libraries/ghc-boot/ghc-boot.cabal.in index f986810b6b..d837fc9875 100644 --- a/libraries/ghc-boot/ghc-boot.cabal.in +++ b/libraries/ghc-boot/ghc-boot.cabal.in @@ -54,7 +54,7 @@ Library -- GHC.Version -- GHC.Platform.Host - build-depends: base >= 4.7 && < 4.14, + build-depends: base >= 4.7 && < 4.15, 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 87c3b8dc6e..56532c24e7 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.14, + base >= 4.9.0 && < 4.15, bytestring >= 0.10.6.0 ghc-options: -Wall diff --git a/libraries/ghci/ghci.cabal.in b/libraries/ghci/ghci.cabal.in index 849e2a147a..62f8ec43a5 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.14, + base >= 4.8 && < 4.15, binary == 0.8.*, bytestring == 0.10.*, containers >= 0.5 && < 0.7, diff --git a/libraries/hpc b/libraries/hpc -Subproject 35aabd9abcf576643d0d509f94ddeda47a89842 +Subproject 4206323affaa6cc625a6f400c3da7cdd9c30946 diff --git a/libraries/parsec b/libraries/parsec -Subproject 60dfb0cb6a711f141e5d8728af37de894e33795 +Subproject ee741870f028e036ab15ae6e2183f09b31e51ae diff --git a/libraries/process b/libraries/process -Subproject ad6a6eeabed63447c135dad95ce5851b66b8629 +Subproject 7bd4a4e1ce603b73bc18c0c9f2c12b1756dce6c diff --git a/libraries/stm b/libraries/stm -Subproject f9979c926ca539362b5a2412359750e8b498e53 +Subproject bee98e4c333eccaa96c973589812a0b3b73e5a9 diff --git a/libraries/template-haskell/template-haskell.cabal.in b/libraries/template-haskell/template-haskell.cabal.in index ebedcda650..6374681906 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.14, + base >= 4.11 && < 4.15, ghc-boot-th == @ProjectVersionMunged@, ghc-prim, pretty == 1.1.* diff --git a/libraries/terminfo b/libraries/terminfo -Subproject 6065302a4f75649f14397833766e82c8182935b +Subproject 27e694688d2d6eee69959a8b6a128c584c84aa7 diff --git a/libraries/unix b/libraries/unix -Subproject 94cca26b4b0ef33f98c626926d4f0e92f3aa744 +Subproject 2fe6d8b7ab1e4137876705eb58b7909bb1107a0 diff --git a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal index b9752674bd..69f47e8e54 100644 --- a/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal +++ b/testsuite/tests/backpack/cabal/T16219/backpack-issue.cabal @@ -1,6 +1,3 @@ --- Initial backpack-issue.cabal generated by cabal init. For further --- documentation, see http://haskell.org/cabal/users-guide/ - name: backpack-issue version: 0.1.0.0 -- synopsis: @@ -18,19 +15,19 @@ cabal-version: >=2 library library-a signatures: A.Sig exposed-modules: B - build-depends: base == 4.13.* + build-depends: base hs-source-dirs: library-a default-language: Haskell2010 library library-a-impl exposed-modules: A - build-depends: base == 4.13.* + build-depends: base hs-source-dirs: library-a-impl default-language: Haskell2010 library library-b exposed-modules: C - build-depends: base == 4.13.* + build-depends: base , library-a hs-source-dirs: library-b default-language: Haskell2010 @@ -40,7 +37,7 @@ library mixins: library-a requires (A.Sig as A) , library-b requires (A.Sig as A) reexported-modules: A, B, C - build-depends: base == 4.13.* + build-depends: base , library-a , library-a-impl , library-b diff --git a/testsuite/tests/dependent/should_compile/T14729.stderr b/testsuite/tests/dependent/should_compile/T14729.stderr index f09d88312c..53f3862f87 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/dependent/should_compile/T15743.stderr b/testsuite/tests/dependent/should_compile/T15743.stderr index be0bc523f5..1212fc12dc 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/dependent/should_compile/T15743e.stderr b/testsuite/tests/dependent/should_compile/T15743e.stderr index 2bc8de1954..048cbe57ab 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15711.stderr b/testsuite/tests/indexed-types/should_compile/T15711.stderr index fc41818184..565246800f 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/indexed-types/should_compile/T15852.stderr b/testsuite/tests/indexed-types/should_compile/T15852.stderr index d1d352dfbc..f4f2107240 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/polykinds/T15592.stderr b/testsuite/tests/polykinds/T15592.stderr index 1a773e0120..68010a184a 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/polykinds/T15592b.stderr b/testsuite/tests/polykinds/T15592b.stderr index 8a203f77e7..48d6163f18 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.0] diff --git a/testsuite/tests/typecheck/should_compile/T12763.stderr b/testsuite/tests/typecheck/should_compile/T12763.stderr index b4247454f9..24f44e2772 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.13.0.0, ghc-prim-0.6.1, +Dependent packages: [base-4.14.0.0, ghc-prim-0.6.1, integer-gmp-1.0.2.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 0d15bc4d1d..eb4b02f34e 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.13.0.0:Data.OldList’)) + (and originally defined in ‘base-4.14.0.0:Data.OldList’)) words :: String -> [String] (imported from ‘Prelude’ at subsumption_sort_hole_fits.hs:1:1 - (and originally defined in ‘base-4.13.0.0:Data.OldList’)) + (and originally defined in ‘base-4.14.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 -Subproject e3c045f9265e39c1a77aa003bf35785e1871a9d +Subproject 9d5b3266ff071a2cdc58466e939aabd537a6950 diff --git a/utils/hsc2hs b/utils/hsc2hs -Subproject 17ba2dce8fcd83590ddb679351f6226d45a5b9c +Subproject 748cdd6ad6f93063149ff416c9bf76dee1e6c41 |