Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Upgrade stack LTS snapshot to 21.9 (GHC 9.4.6). #66

Merged
merged 2 commits into from
Sep 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ haskell_library(
name = "hs-msgpack-types",
srcs = glob(["src/**/*.*hs"]),
src_strip_prefix = "src",
version = "0.3.2",
version = "0.3.3",
visibility = ["//visibility:public"],
deps = [
hazel_library("base"),
Expand Down
83 changes: 40 additions & 43 deletions msgpack-types.cabal
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
name: msgpack-types
version: 0.3.2
synopsis: A Haskell implementation of MessagePack.
homepage: http://msgpack.org/
license: BSD3
license-file: LICENSE
author: Hideyuki Tanaka
maintainer: Iphigenia Df <iphydf@gmail.com>
copyright: Copyright (c) 2009-2016, Hideyuki Tanaka
category: Data
stability: Experimental
cabal-version: >= 1.10
build-type: Simple
name: msgpack-types
version: 0.3.3
synopsis: A Haskell implementation of MessagePack.
homepage: http://msgpack.org/
license: BSD3
license-file: LICENSE
author: Hideyuki Tanaka
maintainer: Iphigenia Df <iphydf@gmail.com>
copyright: Copyright (c) 2009-2016, Hideyuki Tanaka
category: Data
stability: Experimental
cabal-version: >=1.10
build-type: Simple
description:
A Haskell implementation of MessagePack <http://msgpack.org/>
.
Expand All @@ -19,27 +19,26 @@ description:
bugfixes and is actively being developed.

source-repository head
type: git
location: https://github.com/TokTok/hs-msgpack-types.git
type: git
location: https://github.com/TokTok/hs-msgpack-types.git

library
default-language: Haskell2010
hs-source-dirs:
src
ghc-options:
-Wall
-fno-warn-unused-imports
hs-source-dirs: src
ghc-options: -Wall -Wno-unused-imports
exposed-modules:
Data.MessagePack.Tags
Data.MessagePack.Types
Data.MessagePack.Tags
Data.MessagePack.Types

other-modules:
Data.MessagePack.Types.Assoc
Data.MessagePack.Types.Class
Data.MessagePack.Types.DecodeError
Data.MessagePack.Types.Generic
Data.MessagePack.Types.Object
Data.MessagePack.Types.Assoc
Data.MessagePack.Types.Class
Data.MessagePack.Types.DecodeError
Data.MessagePack.Types.Generic
Data.MessagePack.Types.Object

build-depends:
base < 5
base <5
, bytestring
, containers
, deepseq
Expand All @@ -51,23 +50,20 @@ library
, vector

test-suite testsuite
type: exitcode-stdio-1.0
default-language: Haskell2010
hs-source-dirs: test
main-is: testsuite.hs
type: exitcode-stdio-1.0
default-language: Haskell2010
hs-source-dirs: test
main-is: testsuite.hs
other-modules:
Data.MessagePack.TagsSpec
Data.MessagePack.Types.AssocSpec
Data.MessagePack.Types.ClassSpec
Test.QuickCheck.Instances.MessagePack
ghc-options:
-Wall
-fno-warn-unused-imports
build-tool-depends:
hspec-discover:hspec-discover
Data.MessagePack.TagsSpec
Data.MessagePack.Types.AssocSpec
Data.MessagePack.Types.ClassSpec
Test.QuickCheck.Instances.MessagePack

ghc-options: -Wall -Wno-unused-imports
build-tool-depends: hspec-discover:hspec-discover
build-depends:
base < 5
, QuickCheck
base <5
, bytestring
, containers
, deepseq
Expand All @@ -76,6 +72,7 @@ test-suite testsuite
, hspec
, monad-validate
, msgpack-types
, QuickCheck
, quickcheck-instances
, text
, unordered-containers
Expand Down
3 changes: 2 additions & 1 deletion src/Data/MessagePack/Types/Generic.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import Control.Monad.Trans.State.Strict (StateT, evalStateT, get,
put)
import Control.Monad.Validate (MonadValidate, refute)
import Data.Bits (shiftR)
import Data.Kind (Type)
import Data.Word (Word64)
import GHC.Generics

Expand Down Expand Up @@ -156,7 +157,7 @@ instance GMessagePack a => GSumPack (C1 c a) where
class SumSize f where
sumSize :: Tagged f Word64

newtype Tagged (s :: * -> *) b = Tagged { unTagged :: b }
newtype Tagged (s :: Type -> Type) b = Tagged { unTagged :: b }

instance (SumSize a, SumSize b) => SumSize (a :+: b) where
sumSize = Tagged $ unTagged (sumSize :: Tagged a Word64) + unTagged
Expand Down
4 changes: 2 additions & 2 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
packages: [.]
resolver: lts-18.18
resolver: lts-21.9
extra-deps:
- monad-validate-1.2.0.0@sha256:9850f408431098b28806dd464b6825a88a0b56c84f380d7fe0454c1df9d6f881,3505
- monad-validate-1.3.0.0
3 changes: 2 additions & 1 deletion test/Data/MessagePack/Types/ClassSpec.hs
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{-# OPTIONS_GHC -fconstraint-solver-iterations=10 #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE LambdaCase #-}
Expand All @@ -14,8 +15,8 @@ import Control.Monad.Validate (MonadValidate (..),
runValidate)
import qualified Data.ByteString as BS
import qualified Data.ByteString.Lazy as LBS
import qualified Data.HashMap.Strict as HashMap
import Data.Hashable (Hashable)
import qualified Data.HashMap.Strict as HashMap
import Data.Int (Int16, Int32, Int64,
Int8)
import qualified Data.IntMap.Strict as IntMap
Expand Down