chore: Update to new third_party method for haskell deps.

TokTok · Nov 7, 2023 · 10a514f · 10a514f
1 parent b4b8467
commit 10a514f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 19 deletions.
diff --git 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
@@ -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
@@ -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
@@ -1,5 +1,4 @@
-{-# LANGUAGE LambdaCase  #-}
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE LambdaCase #-}
 
 --------------------------------------------------------------------
 -- |

diff --git 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
@@ -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",
     ],
 )