diff --git a/.cirrus.yml b/.cirrus.yml index 0e3d4de..3f6bf56 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,5 +8,5 @@ bazel-opt_task: - /src/workspace/tools/inject-repo hs-msgpack-types test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci //hs-msgpack-types/... diff --git a/BUILD.bazel b/BUILD.bazel index 6931f0d..aec99bb 100644 --- a/BUILD.bazel +++ b/BUILD.bazel @@ -1,4 +1,3 @@ -load("@ai_formation_hazel//tools:mangling.bzl", "hazel_library") load("@rules_haskell//haskell:defs.bzl", "haskell_library") load("//third_party/haskell/hspec-discover:build_defs.bzl", "hspec_test") load("//tools/project:build_defs.bzl", "project") @@ -12,16 +11,16 @@ haskell_library( version = "0.3.3", visibility = ["//visibility:public"], deps = [ - hazel_library("base"), - hazel_library("bytestring"), - hazel_library("containers"), - hazel_library("deepseq"), - hazel_library("hashable"), - hazel_library("monad-validate"), - hazel_library("text"), - hazel_library("transformers"), - hazel_library("unordered-containers"), - hazel_library("vector"), + "//third_party/haskell:base", + "//third_party/haskell:bytestring", + "//third_party/haskell:containers", + "//third_party/haskell:deepseq", + "//third_party/haskell:hashable", + "//third_party/haskell:monad-validate", + "//third_party/haskell:text", + "//third_party/haskell:transformers", + "//third_party/haskell:unordered-containers", + "//third_party/haskell:vector", ], ) @@ -31,18 +30,18 @@ hspec_test( compiler_flags = ["-Wno-unused-imports"], deps = [ ":hs-msgpack-types", - hazel_library("QuickCheck"), - hazel_library("base"), - hazel_library("bytestring"), - hazel_library("containers"), - hazel_library("deepseq"), - hazel_library("generic-arbitrary"), - hazel_library("hashable"), - hazel_library("hspec"), - hazel_library("monad-validate"), - hazel_library("quickcheck-instances"), - hazel_library("text"), - hazel_library("unordered-containers"), - hazel_library("vector"), + "//third_party/haskell:QuickCheck", + "//third_party/haskell:base", + "//third_party/haskell:bytestring", + "//third_party/haskell:containers", + "//third_party/haskell:deepseq", + "//third_party/haskell:generic-arbitrary", + "//third_party/haskell:hashable", + "//third_party/haskell:hspec", + "//third_party/haskell:monad-validate", + "//third_party/haskell:quickcheck-instances", + "//third_party/haskell:text", + "//third_party/haskell:unordered-containers", + "//third_party/haskell:vector", ], ) diff --git a/src/Data/MessagePack/Types.hs b/src/Data/MessagePack/Types.hs index 4075abf..fae4294 100644 --- a/src/Data/MessagePack/Types.hs +++ b/src/Data/MessagePack/Types.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE Trustworthy #-} module Data.MessagePack.Types ( Assoc (..) , Object (..) diff --git a/src/Data/MessagePack/Types/Assoc.hs b/src/Data/MessagePack/Types/Assoc.hs index 53b203c..019c87c 100644 --- a/src/Data/MessagePack/Types/Assoc.hs +++ b/src/Data/MessagePack/Types/Assoc.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} -------------------------------------------------------------------- -- | diff --git a/src/Data/MessagePack/Types/Class.hs b/src/Data/MessagePack/Types/Class.hs index e107ed3..2382736 100644 --- a/src/Data/MessagePack/Types/Class.hs +++ b/src/Data/MessagePack/Types/Class.hs @@ -6,7 +6,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} {-# LANGUAGE ViewPatterns #-} -------------------------------------------------------------------- diff --git a/src/Data/MessagePack/Types/DecodeError.hs b/src/Data/MessagePack/Types/DecodeError.hs index f7aa0e3..d98a739 100644 --- a/src/Data/MessagePack/Types/DecodeError.hs +++ b/src/Data/MessagePack/Types/DecodeError.hs @@ -1,6 +1,5 @@ {-# OPTIONS_GHC -Wno-orphans #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE Trustworthy #-} module Data.MessagePack.Types.DecodeError ( DecodeError , decodeError diff --git a/src/Data/MessagePack/Types/Generic.hs b/src/Data/MessagePack/Types/Generic.hs index acb3da3..e12f71b 100644 --- a/src/Data/MessagePack/Types/Generic.hs +++ b/src/Data/MessagePack/Types/Generic.hs @@ -8,7 +8,6 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} {-# LANGUAGE TypeOperators #-} {-# LANGUAGE UndecidableInstances #-} module Data.MessagePack.Types.Generic () where diff --git a/src/Data/MessagePack/Types/Object.hs b/src/Data/MessagePack/Types/Object.hs index 9f3cf6d..6a1d8ee 100644 --- a/src/Data/MessagePack/Types/Object.hs +++ b/src/Data/MessagePack/Types/Object.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Data.MessagePack.Types.Object ( Object (..) ) where