Merge pull request #53 from haskellari/OneTuple-0.4

Support OneTuple-0.4

Author: phadej

.github/workflows/haskell-ci.yml

@@ -32,6 +32,11 @@ jobs:
     strategy:
       matrix:
         include:
+          - compiler: ghc-9.6.0.20230210
+            compilerKind: ghc
+            compilerVersion: 9.6.0.20230210
+            setup-method: ghcup
+            allow-failure: true
           - compiler: ghc-9.4.4
             compilerKind: ghc
             compilerVersion: 9.4.4
@@ -149,7 +154,7 @@ jobs:
           echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"
           echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"
           echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"
-          echo "HEADHACKAGE=false" >> "$GITHUB_ENV"
+          if [ $((HCNUMVER >= 90600)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi
           echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"
           echo "GHCJSARITH=0" >> "$GITHUB_ENV"
         env:
@@ -178,6 +183,18 @@ jobs:
           repository hackage.haskell.org
             url: http://hackage.haskell.org/
           EOF
+          if $HEADHACKAGE; then
+          cat >> $CABAL_CONFIG <<EOF
+          repository head.hackage.ghc.haskell.org
+             url: https://ghc.gitlab.haskell.org/head.hackage/
+             secure: True
+             root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d
+                        26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329
+                        f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89
+             key-threshold: 3
+          active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override
+          EOF
+          fi
           cat >> $CABAL_CONFIG <<EOF
           program-default-options
             ghc-options: $GHCJOBS +RTS -M3G -RTS
@@ -229,6 +246,9 @@ jobs:
           if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo "    ghc-options: -Werror=missing-methods" >> cabal.project ; fi
           cat >> cabal.project <<EOF
           EOF
+          if $HEADHACKAGE; then
+          echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project
+          fi
           $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(binary-orphans)$/; }' >> cabal.project.local
           cat cabal.project
           cat cabal.project.local

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 1.0.4.1
+
+- Support OneTuple-0.4
+
 # 1.0.4
 
 - Depend on `data-byte-array` to provide `Data.Array.Byte` instance

binary-orphans.cabal

@@ -1,6 +1,6 @@
 cabal-version:      1.12
 name:               binary-orphans
-version:            1.0.4
+version:            1.0.4.1
 synopsis:           Compatibility package for binary; provides instances
 category:           Data, Binary, Parsing, Compatibility
 description:
@@ -28,6 +28,7 @@ tested-with:
    || ==9.0.2
    || ==9.2.7
    || ==9.4.4
+   || ==9.6.1
 
 extra-source-files: CHANGELOG.md
 
@@ -55,7 +56,7 @@ library
     build-depends: semigroups >=0.18.5 && <0.20.1
 
   if !impl(ghc >=9.2)
-    build-depends: OneTuple >=0.3 && <0.4
+    build-depends: OneTuple >=0.3 && <0.5
 
   if impl(ghc >=8.0 && <9.4)
     build-depends: data-array-byte >=0.1.0.1 && <0.2
@@ -70,7 +71,7 @@ test-suite binary-orphans-test
       base
     , binary
     , binary-orphans
-    , OneTuple              >=0.3      && <0.4
+    , OneTuple              >=0.3      && <0.5
     , QuickCheck            >=2.13.1   && <2.15
     , quickcheck-instances  >=0.3.28   && <0.4
     , tagged                >=0.8.6    && <0.8.7

src/Data/Binary/Orphans.hs

@@ -31,10 +31,18 @@ import           Data.Void             (Void, absurd)
 import           GHC.Fingerprint       (Fingerprint (..))
 import           Numeric.Natural       (Natural)
 
-#if MIN_VERSION_base(4,16,0)
-import Data.Tuple (Solo (..))
+#if MIN_VERSION_base(4,18,0)
+import Data.Tuple (Solo (MkSolo))
+#elif MIN_VERSION_base(4,16,0)
+import Data.Tuple (Solo (Solo))
+#define MkSolo Solo
 #else
-import Data.Tuple.Solo (Solo (..))
+#if MIN_VERSION_OneTuple(0,4,0)
+import Data.Tuple.Solo (Solo (MkSolo))
+#else
+import Data.Tuple.Solo (Solo (Solo))
+#define MkSolo Solo
+#endif
 #endif
 
 #if MIN_VERSION_base(4,9,0)
@@ -348,8 +356,8 @@ instance Binary a => Binary (Identity a) where
 
 -- | @since 1.0.2
 instance Binary a => Binary (Solo a) where
-  put (Solo x) = put x
-  get = fmap Solo get
+  put (MkSolo x) = put x
+  get = fmap MkSolo get
 
 #if MIN_VERSION_base(4,9,0)
 -- | @since 1.0.3