From 10a514f9ed1918a5996a85d91dc02cce9d917160 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 14 Oct 2023 21:53:51 +0000 Subject: [PATCH] chore: Update to new third_party method for haskell deps. --- .cirrus.yml | 2 +- BUILD.bazel | 19 +++++++++---------- src/Data/MessagePack.hs | 1 - src/Data/MessagePack/Get.hs | 3 +-- src/Data/MessagePack/Put.hs | 3 +-- tools/BUILD.bazel | 5 ++--- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index 98aad67..0052c58 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,5 +8,5 @@ bazel-opt_task: - /src/workspace/tools/inject-repo hs-msgpack-binary test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci //hs-msgpack-binary/... diff --git a/BUILD.bazel b/BUILD.bazel index 916c89c..1f19e88 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,13 +15,13 @@ haskell_library( visibility = ["//visibility:public"], deps = [ "//hs-msgpack-types", - hazel_library("base"), - hazel_library("binary"), - hazel_library("bytestring"), - hazel_library("data-binary-ieee754"), - hazel_library("monad-validate"), - hazel_library("text"), - hazel_library("vector"), + "//third_party/haskell:base", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", + "//third_party/haskell:data-binary-ieee754", + "//third_party/haskell:monad-validate", + "//third_party/haskell:text", + "//third_party/haskell:vector", ], ) @@ -32,7 +31,7 @@ hspec_test( deps = [ ":hs-msgpack-binary", "//hs-msgpack-testsuite", - hazel_library("base"), - hazel_library("hspec"), + "//third_party/haskell:base", + "//third_party/haskell:hspec", ], ) diff --git a/src/Data/MessagePack.hs b/src/Data/MessagePack.hs index 1e21042..896a7af 100644 --- a/src/Data/MessagePack.hs +++ b/src/Data/MessagePack.hs @@ -1,7 +1,6 @@ {-# LANGUAGE CPP #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE Trustworthy #-} {-# OPTIONS_GHC -Wno-orphans #-} -------------------------------------------------------------------- -- | diff --git a/src/Data/MessagePack/Get.hs b/src/Data/MessagePack/Get.hs index e72f323..6a0a709 100644 --- a/src/Data/MessagePack/Get.hs +++ b/src/Data/MessagePack/Get.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE LambdaCase #-} -------------------------------------------------------------------- -- | diff --git a/src/Data/MessagePack/Put.hs b/src/Data/MessagePack/Put.hs index 94c2a3d..1d5d999 100644 --- a/src/Data/MessagePack/Put.hs +++ b/src/Data/MessagePack/Put.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE LambdaCase #-} -------------------------------------------------------------------- -- | -- Module : Data.MessagePack.Put diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 2ae5fe4..acae398 100644 --- a/tools/BUILD.bazel +++ b/tools/BUILD.bazel @@ -1,4 +1,3 @@ -load("@ai_formation_hazel//tools:mangling.bzl", "hazel_library") load("@rules_haskell//haskell:defs.bzl", "haskell_binary") package(features = ["-layering_check"]) @@ -9,7 +8,7 @@ haskell_binary( deps = [ "//hs-msgpack-arbitrary", "//hs-msgpack-binary", - hazel_library("base"), + "//third_party/haskell:base", ], ) @@ -19,6 +18,6 @@ haskell_binary( deps = [ "//hs-msgpack-arbitrary", "//hs-msgpack-binary", - hazel_library("base"), + "//third_party/haskell:base", ], )