Update binary submodule to binary-0.8 snapshot
authorHerbert Valerio Riedel <hvr@gnu.org>
Wed, 16 Dec 2015 10:37:20 +0000 (11:37 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Wed, 16 Dec 2015 10:38:47 +0000 (11:38 +0100)
This requires tweaking version constraints to allow this new major version
of `binary`.

Starting with binary-0.8, `Binary Version` is de-orphaned into `binary`.
This requires some minor adaptations to remove/hide orphan instances.

/cc @kolmodin

Differential Revision: https://phabricator.haskell.org/D1635

compiler/ghc.cabal.in
libraries/Cabal
libraries/binary
libraries/ghc-boot/GHC/PackageDb.hs
libraries/ghc-boot/ghc-boot.cabal
utils/ghc-cabal/ghc.mk

index f053f79..8dc4e23 100644 (file)
@@ -48,7 +48,7 @@ Library
                    directory  >= 1   && < 1.3,
                    process    >= 1   && < 1.5,
                    bytestring >= 0.9 && < 0.11,
-                   binary     >= 0.7 && < 0.8,
+                   binary     == 0.8.*,
                    time                 < 1.6,
                    containers >= 0.5 && < 0.6,
                    array      >= 0.1 && < 0.6,
index d602f63..35f50ba 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d602f63e7daf426514e38492bfdeeb4f33bd361d
+Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
index 86e4c9a..8429d6b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 86e4c9a6125cdddb0592a653f48c699a574ccf7b
+Subproject commit 8429d6b4a04970b8a0a151109a8299675ad5d190
index fcb24d8..2be20b2 100644 (file)
@@ -1,6 +1,4 @@
-{-# LANGUAGE CPP #-}
--- This module deliberately defines orphan instances for now (Binary Version).
-{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  GHC.PackageDb
@@ -381,15 +379,6 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
               (map (\(k,v) -> (fromStringRep k, v)) instantiatedWith)
               exposed trusted)
 
-instance Binary Version where
-  put (Version a b) = do
-    put a
-    put b
-  get = do
-    a <- get
-    b <- get
-    return (Version a b)
-
 instance (BinaryStringRep a, BinaryStringRep b) =>
          Binary (OriginalModule a b) where
   put (OriginalModule originalPackageId originalModuleName) = do
index 7f0f14f..883bbaf 100644 (file)
@@ -39,7 +39,7 @@ Library
             GHC.LanguageExtensions
 
     build-depends: base       >= 4   && < 5,
-                   binary     >= 0.7 && < 0.8,
+                   binary     == 0.8.*,
                    bytestring >= 0.9 && < 1,
                    directory  >= 1   && < 1.3,
                    filepath
index 3ac864f..49a2ba3 100644 (file)
@@ -38,6 +38,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b
               -no-user-$(GHC_PACKAGE_DB_FLAG) \
               -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
               -DCABAL_VERSION=$(CABAL_VERSION) \
+              -DMIN_VERSION_binary_0_8_0 \
               -DBOOTSTRAPPING \
               -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \
               -odir  bootstrapping \