Update binary submodule to binary-0.8 snapshot

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

4 files changed, 2 insertions, 13 deletions

diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject d602f63e7daf426514e38492bfdeeb4f33bd361
+Subproject 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbd
diff --git a/libraries/binary b/libraries/binary
-Subproject 86e4c9a6125cdddb0592a653f48c699a574ccf7
+Subproject 8429d6b4a04970b8a0a151109a8299675ad5d19
diff --git a/libraries/ghc-boot/GHC/PackageDb.hs b/libraries/ghc-boot/GHC/PackageDb.hs
index fcb24d8a46..2be20b2405 100644
--- a/libraries/ghc-boot/GHC/PackageDb.hs
+++ b/libraries/ghc-boot/GHC/PackageDb.hs
@@ -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
diff --git a/libraries/ghc-boot/ghc-boot.cabal b/libraries/ghc-boot/ghc-boot.cabal
index 7f0f14fc8c..883bbaf795 100644
--- a/libraries/ghc-boot/ghc-boot.cabal
+++ b/libraries/ghc-boot/ghc-boot.cabal
@@ -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