Commit 3a48e6ef authored by Herbert Valerio Riedel's avatar Herbert Valerio Riedel 🕺
Browse files

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
parent 50c795c1
...@@ -48,7 +48,7 @@ Library ...@@ -48,7 +48,7 @@ Library
directory >= 1 && < 1.3, directory >= 1 && < 1.3,
process >= 1 && < 1.5, process >= 1 && < 1.5,
bytestring >= 0.9 && < 0.11, bytestring >= 0.9 && < 0.11,
binary >= 0.7 && < 0.8, binary == 0.8.*,
time < 1.6, time < 1.6,
containers >= 0.5 && < 0.6, containers >= 0.5 && < 0.6,
array >= 0.1 && < 0.6, array >= 0.1 && < 0.6,
......
Subproject commit d602f63e7daf426514e38492bfdeeb4f33bd361d Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
Subproject commit 86e4c9a6125cdddb0592a653f48c699a574ccf7b Subproject commit 8429d6b4a04970b8a0a151109a8299675ad5d190
{-# LANGUAGE CPP #-} {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-- This module deliberately defines orphan instances for now (Binary Version).
{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-name-shadowing #-}
----------------------------------------------------------------------------- -----------------------------------------------------------------------------
-- | -- |
-- Module : GHC.PackageDb -- Module : GHC.PackageDb
...@@ -381,15 +379,6 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c, ...@@ -381,15 +379,6 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
(map (\(k,v) -> (fromStringRep k, v)) instantiatedWith) (map (\(k,v) -> (fromStringRep k, v)) instantiatedWith)
exposed trusted) 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) => instance (BinaryStringRep a, BinaryStringRep b) =>
Binary (OriginalModule a b) where Binary (OriginalModule a b) where
put (OriginalModule originalPackageId originalModuleName) = do put (OriginalModule originalPackageId originalModuleName) = do
......
...@@ -39,7 +39,7 @@ Library ...@@ -39,7 +39,7 @@ Library
GHC.LanguageExtensions GHC.LanguageExtensions
build-depends: base >= 4 && < 5, build-depends: base >= 4 && < 5,
binary >= 0.7 && < 0.8, binary == 0.8.*,
bytestring >= 0.9 && < 1, bytestring >= 0.9 && < 1,
directory >= 1 && < 1.3, directory >= 1 && < 1.3,
filepath filepath
......
...@@ -38,6 +38,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b ...@@ -38,6 +38,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b
-no-user-$(GHC_PACKAGE_DB_FLAG) \ -no-user-$(GHC_PACKAGE_DB_FLAG) \
-Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \ -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
-DCABAL_VERSION=$(CABAL_VERSION) \ -DCABAL_VERSION=$(CABAL_VERSION) \
-DMIN_VERSION_binary_0_8_0 \
-DBOOTSTRAPPING \ -DBOOTSTRAPPING \
-optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \ -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \
-odir bootstrapping \ -odir bootstrapping \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment