Skip to content

Commit

Permalink
Bump base version to 4.8.2.0
Browse files Browse the repository at this point in the history
This is needed because GHC 7.10.2 requires a minor version bump to base-4.8.1.0

Several test outputs needed base-4.8.1.0 replaced by base-4.8.2.0
  • Loading branch information
hvr committed Apr 25, 2015
1 parent bbabb71 commit c4e8097
Show file tree
Hide file tree
Showing 69 changed files with 80 additions and 76 deletions.
2 changes: 1 addition & 1 deletion libraries/base/base.cabal
@@ -1,5 +1,5 @@
name: base
version: 4.8.1.0
version: 4.8.2.0
-- NOTE: Don't forget to update ./changelog.md
license: BSD3
license-file: LICENSE
Expand Down
6 changes: 5 additions & 1 deletion libraries/base/changelog.md
@@ -1,6 +1,6 @@
# Changelog for [`base` package](http://hackage.haskell.org/package/base)

## 4.8.1.0 *TBA*
## 4.8.2.0 *TBA*

* Bundled with GHC 7.12.1

Expand Down Expand Up @@ -35,6 +35,10 @@

* `Data.Version.Version` now has a `Generic` instance

## 4.8.1.0 *TBA*

* Bundled with GHC 7.10.2

## 4.8.0.0 *Mar 2015*

* Bundled with GHC 7.10.1
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/cabal/cabal06/q/q-1.0.conf
Expand Up @@ -13,7 +13,7 @@ trusted: False
import-dirs: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/lib/x86_64-linux-ghc-7.9.20140719/q-1.0
library-dirs: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/lib/x86_64-linux-ghc-7.9.20140719/q-1.0
hs-libraries: HSd54a904d84001e92dbb7d30e2bede8ce
depends: base-4.8.1.0-inplace
depends: base-4.8.2.0-inplace
p-1.0-168289aa0216a183a2729001bb18e7a8
haddock-interfaces: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/share/doc/x86_64-linux-ghc-7.9.20140719/q-1.0/html/q.haddock
haddock-html: /5playpen/t-edyang/ghc-backpack/testsuite/tests/cabal/cabal06/inst-d/share/doc/x86_64-linux-ghc-7.9.20140719/q-1.0/html
2 changes: 1 addition & 1 deletion testsuite/tests/ghci/scripts/ghci008.stdout
Expand Up @@ -31,4 +31,4 @@ class (RealFrac a, Floating a) => RealFloat a where
instance RealFloat Float -- Defined in ‘GHC.Float’
instance RealFloat Double -- Defined in ‘GHC.Float’
isPrefixOf :: Eq a => [a] -> [a] -> Bool
-- Defined in ‘base-4.8.1.0:Data.OldList’
-- Defined in ‘base-4.8.2.0:Data.OldList’
2 changes: 1 addition & 1 deletion testsuite/tests/indexed-types/should_compile/T3017.stderr
Expand Up @@ -16,5 +16,5 @@ INSTANCES
FAMILY INSTANCES
type Elem (ListColl a)
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/ADT.stderr
Expand Up @@ -5,5 +5,5 @@ TYPE CONSTRUCTORS
Promotable
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/Either.stderr
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.3.1.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.3.1.0,
integer-gmp-0.5.1.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/Every.stderr
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -7,5 +7,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -227,5 +227,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.3.1.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.3.1.0,
integer-gmp-0.5.1.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/Forall1.stderr
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -14,5 +14,5 @@ INSTANCES
-- Defined at Meltdown.hs:11:10
instance Monad (NukeMonad a b) -- Defined at Meltdown.hs:15:10
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/PatBind.stderr
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.3.1.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.3.1.0,
integer-gmp-0.5.1.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -5,5 +5,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -8,5 +8,5 @@ TYPE CONSTRUCTORS
Promotable
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
2 changes: 1 addition & 1 deletion testsuite/tests/partial-sigs/should_compile/Uncurry.stderr
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -3,5 +3,5 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]
Expand Up @@ -4,7 +4,7 @@ TYPE SIGNATURES
TYPE CONSTRUCTORS
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]

WarningWildcardInstantiations.hs:5:14: Warning:
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/rename/should_fail/rnfail040.stderr
Expand Up @@ -3,7 +3,7 @@ rnfail040.hs:7:12:
Conflicting exports for ‘nub’:
‘module M’ exports ‘M.nub’
imported from ‘Data.List’ at rnfail040.hs:10:2-22
(and originally defined in ‘base-4.8.1.0:Data.OldList’)
(and originally defined in ‘base-4.8.2.0:Data.OldList’)
‘module M’ exports ‘T.nub’
imported from ‘Rnfail040_A’ at rnfail040.hs:11:2-24
(and originally defined at Rnfail040_A.hs:2:3-5)
2 changes: 1 addition & 1 deletion testsuite/tests/roles/should_compile/Roles1.stderr
Expand Up @@ -17,7 +17,7 @@ TYPE CONSTRUCTORS
data T7 (a :: k) b = K7 b
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]

==================== Typechecker ====================
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/roles/should_compile/Roles14.stderr
Expand Up @@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
COERCION AXIOMS
axiom Roles12.NTCo:C2 :: C2 a = a -> a
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]

==================== Typechecker ====================
Expand Down
2 changes: 1 addition & 1 deletion testsuite/tests/roles/should_compile/Roles2.stderr
Expand Up @@ -5,7 +5,7 @@ TYPE CONSTRUCTORS
data T2 a = K2 (FunPtr a)
COERCION AXIOMS
Dependent modules: []
Dependent packages: [base-4.8.1.0, ghc-prim-0.4.0.0,
Dependent packages: [base-4.8.2.0, ghc-prim-0.4.0.0,
integer-gmp-1.0.0.0]

==================== Typechecker ====================
Expand Down

0 comments on commit c4e8097

Please sign in to comment.