From adf5cab75ee4a05bc4f424d180679d71a8dad3f8 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 14 Oct 2023 21:54:52 +0000 Subject: [PATCH] chore: Update to new third_party method for haskell deps. --- BUILD.bazel | 27 +++++++++++++-------------- src/Test/MessagePack/BytePacker.hs | 3 +-- src/Test/MessagePack/Spec.hs | 3 +-- 3 files changed, 15 insertions(+), 18 deletions(-) diff --git a/BUILD.bazel b/BUILD.bazel index f9af915..4eb4e0f 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") @@ -16,17 +15,17 @@ haskell_library( deps = [ "//hs-msgpack-arbitrary", "//hs-msgpack-types", - hazel_library("QuickCheck"), - hazel_library("base"), - hazel_library("bytestring"), - hazel_library("containers"), - 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: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", ], ) @@ -35,7 +34,7 @@ hspec_test( size = "small", deps = [ ":hs-msgpack-testsuite", - hazel_library("base"), - hazel_library("hspec"), + "//third_party/haskell:base", + "//third_party/haskell:hspec", ], ) diff --git a/src/Test/MessagePack/BytePacker.hs b/src/Test/MessagePack/BytePacker.hs index d1d3c37..a7b7968 100644 --- a/src/Test/MessagePack/BytePacker.hs +++ b/src/Test/MessagePack/BytePacker.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE CPP #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE CPP #-} module Test.MessagePack.BytePacker ( BytePacker (..) , unpackEither, unpack diff --git a/src/Test/MessagePack/Spec.hs b/src/Test/MessagePack/Spec.hs index a8b20e7..d245bdc 100644 --- a/src/Test/MessagePack/Spec.hs +++ b/src/Test/MessagePack/Spec.hs @@ -1,8 +1,7 @@ -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -Wno-orphans #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Test.MessagePack.Spec where import Test.Hspec