chore: Update to new third_party method for haskell deps.

TokTok · Nov 7, 2023 · d7d1594 · d7d1594
1 parent e2ff910
commit d7d1594
Show file tree

Hide file tree

Showing 4 changed files with 16 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-testsuite
   test_all_script:
     - cd /src/workspace && bazel test -k
-        --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST
+        --config=ci
         //hs-msgpack-testsuite/...
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,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
@@ -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
@@ -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