From 6744bb14527feead90622e904b7c628a7e644a95 Mon Sep 17 00:00:00 2001 From: iphydf Date: Sat, 14 Oct 2023 21:55:47 +0000 Subject: [PATCH] chore: Update to new third_party method for haskell deps. --- .cirrus.yml | 2 +- BUILD.bazel | 59 +++++++++---------- src/Network/Tox.lhs | 1 - src/Network/Tox/Binary.hs | 5 +- src/Network/Tox/Crypto.lhs | 1 - src/Network/Tox/Crypto/Box.lhs | 1 - src/Network/Tox/Crypto/CombinedKey.lhs | 3 +- src/Network/Tox/Crypto/Key.lhs | 1 - src/Network/Tox/Crypto/KeyPair.lhs | 1 - src/Network/Tox/Crypto/Keyed.hs | 1 - src/Network/Tox/Crypto/KeyedT.hs | 1 - src/Network/Tox/Crypto/Nonce.lhs | 3 +- src/Network/Tox/DHT.lhs | 1 - src/Network/Tox/DHT/ClientList.lhs | 1 - src/Network/Tox/DHT/ClientNode.lhs | 1 - src/Network/Tox/DHT/DhtPacket.lhs | 1 - src/Network/Tox/DHT/DhtRequestPacket.lhs | 1 - src/Network/Tox/DHT/DhtState.lhs | 1 - src/Network/Tox/DHT/Distance.lhs | 5 +- src/Network/Tox/DHT/KBuckets.lhs | 1 - src/Network/Tox/DHT/NodeList.lhs | 1 - src/Network/Tox/DHT/NodesRequest.lhs | 1 - src/Network/Tox/DHT/NodesResponse.lhs | 1 - src/Network/Tox/DHT/Operation.lhs | 1 - src/Network/Tox/DHT/PendingReplies.lhs | 1 - src/Network/Tox/DHT/PingPacket.lhs | 1 - src/Network/Tox/DHT/RpcPacket.lhs | 1 - src/Network/Tox/DHT/Stamped.hs | 1 - src/Network/Tox/Encoding.hs | 5 +- src/Network/Tox/Network/MonadRandomBytes.hs | 3 +- src/Network/Tox/Network/Networked.hs | 1 - src/Network/Tox/NodeInfo.lhs | 1 - src/Network/Tox/NodeInfo/HostAddress.lhs | 1 - src/Network/Tox/NodeInfo/NodeInfo.lhs | 1 - src/Network/Tox/NodeInfo/PortNumber.lhs | 1 - src/Network/Tox/NodeInfo/SocketAddress.lhs | 1 - .../Tox/NodeInfo/TransportProtocol.lhs | 1 - src/Network/Tox/Protocol.lhs | 1 - src/Network/Tox/Protocol/Packet.lhs | 1 - src/Network/Tox/Protocol/PacketKind.lhs | 1 - src/Network/Tox/Time.hs | 3 +- src/Network/Tox/Timed.hs | 3 +- src/Network/Tox/TimedT.hs | 1 - test/Data/Result.hs | 1 - tools/BUILD.bazel | 17 +++--- web/BUILD.bazel | 21 ++++--- 46 files changed, 60 insertions(+), 103 deletions(-) diff --git a/.cirrus.yml b/.cirrus.yml index cd243b22..ca9aaea7 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -8,7 +8,7 @@ bazel-opt_task: - /src/workspace/tools/inject-repo hs-toxcore test_all_script: - cd /src/workspace && bazel test -k - --remote_http_cache=http://$CIRRUS_HTTP_CACHE_HOST + --config=ci //hs-toxcore/... android-aarch64_task: diff --git a/BUILD.bazel b/BUILD.bazel index 2a6fe02f..d9a0add7 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,24 +15,24 @@ haskell_library( visibility = ["//visibility:public"], deps = [ "//hs-msgpack-binary", - hazel_library("MonadRandom"), - hazel_library("QuickCheck"), - hazel_library("base"), - hazel_library("base16-bytestring"), - hazel_library("binary"), - hazel_library("bytestring"), - hazel_library("clock"), - hazel_library("containers"), - hazel_library("entropy"), - hazel_library("integer-gmp"), - hazel_library("iproute"), - hazel_library("lens-family"), - hazel_library("monad-validate"), - hazel_library("mtl"), - hazel_library("network"), - hazel_library("random"), - hazel_library("saltine"), - hazel_library("transformers"), + "//third_party/haskell:MonadRandom", + "//third_party/haskell:QuickCheck", + "//third_party/haskell:base", + "//third_party/haskell:base16-bytestring", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", + "//third_party/haskell:clock", + "//third_party/haskell:containers", + "//third_party/haskell:entropy", + "//third_party/haskell:integer-gmp", + "//third_party/haskell:iproute", + "//third_party/haskell:lens-family", + "//third_party/haskell:monad-validate", + "//third_party/haskell:mtl", + "//third_party/haskell:network", + "//third_party/haskell:random", + "//third_party/haskell:saltine", + "//third_party/haskell:transformers", ], ) @@ -47,16 +46,16 @@ hspec_test( ":hs-toxcore", "//hs-msgpack-binary", "//hs-msgpack-types", - hazel_library("QuickCheck"), - hazel_library("async"), - hazel_library("base"), - hazel_library("binary"), - hazel_library("bytestring"), - hazel_library("containers"), - hazel_library("hspec"), - hazel_library("monad-validate"), - hazel_library("mtl"), - hazel_library("saltine"), - hazel_library("text"), + "//third_party/haskell:QuickCheck", + "//third_party/haskell:async", + "//third_party/haskell:base", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", + "//third_party/haskell:containers", + "//third_party/haskell:hspec", + "//third_party/haskell:monad-validate", + "//third_party/haskell:mtl", + "//third_party/haskell:saltine", + "//third_party/haskell:text", ], ) diff --git a/src/Network/Tox.lhs b/src/Network/Tox.lhs index 55690689..e475b03d 100644 --- a/src/Network/Tox.lhs +++ b/src/Network/Tox.lhs @@ -1,7 +1,6 @@ \chapter{Introduction} \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox where \end{code} diff --git a/src/Network/Tox/Binary.hs b/src/Network/Tox/Binary.hs index 0c6f2ca0..19754104 100644 --- a/src/Network/Tox/Binary.hs +++ b/src/Network/Tox/Binary.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE Safe #-} +{-# LANGUAGE KindSignatures #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} module Network.Tox.Binary @@ -9,13 +9,14 @@ module Network.Tox.Binary import Data.Binary (Binary) import Data.ByteString (ByteString) +import Data.Kind (Type) import Data.Typeable (Typeable) import qualified Data.Typeable as Typeable import qualified Network.Tox.Encoding as Encoding -typeName :: Typeable a => proxy a -> String +typeName :: Typeable (a :: Type) => proxy a -> String typeName (_ :: proxy a) = show . Typeable.typeOf $ (undefined :: a) diff --git a/src/Network/Tox/Crypto.lhs b/src/Network/Tox/Crypto.lhs index 4bf87bbd..2f5a70ed 100644 --- a/src/Network/Tox/Crypto.lhs +++ b/src/Network/Tox/Crypto.lhs @@ -1,7 +1,6 @@ \chapter{Crypto} \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.Crypto where \end{code} diff --git a/src/Network/Tox/Crypto/Box.lhs b/src/Network/Tox/Crypto/Box.lhs index 8e6bc8ba..b84472eb 100644 --- a/src/Network/Tox/Crypto/Box.lhs +++ b/src/Network/Tox/Crypto/Box.lhs @@ -8,7 +8,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.Crypto.Box ( PlainText (..) , CipherText diff --git a/src/Network/Tox/Crypto/CombinedKey.lhs b/src/Network/Tox/Crypto/CombinedKey.lhs index ccb77d05..7330fdac 100644 --- a/src/Network/Tox/Crypto/CombinedKey.lhs +++ b/src/Network/Tox/Crypto/CombinedKey.lhs @@ -1,8 +1,7 @@ \subsection{Combined Key} \begin{code} -{-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE StrictData #-} module Network.Tox.Crypto.CombinedKey where import qualified Crypto.Saltine.Core.Box as Sodium (beforeNM) diff --git a/src/Network/Tox/Crypto/Key.lhs b/src/Network/Tox/Crypto/Key.lhs index ee63c963..f3644071 100644 --- a/src/Network/Tox/Crypto/Key.lhs +++ b/src/Network/Tox/Crypto/Key.lhs @@ -9,7 +9,6 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StandaloneDeriving #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.Crypto.Key where import Control.Monad ((>=>)) diff --git a/src/Network/Tox/Crypto/KeyPair.lhs b/src/Network/Tox/Crypto/KeyPair.lhs index 8c564c5b..20369642 100644 --- a/src/Network/Tox/Crypto/KeyPair.lhs +++ b/src/Network/Tox/Crypto/KeyPair.lhs @@ -17,7 +17,6 @@ standard group element and the Secret Key. See the {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.Crypto.KeyPair where import qualified Crypto.Saltine.Class as Sodium (decode, encode) diff --git a/src/Network/Tox/Crypto/Keyed.hs b/src/Network/Tox/Crypto/Keyed.hs index bb924055..e26e4756 100644 --- a/src/Network/Tox/Crypto/Keyed.hs +++ b/src/Network/Tox/Crypto/Keyed.hs @@ -1,7 +1,6 @@ {-# OPTIONS_GHC -Wno-noncanonical-monad-instances #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} {-# LANGUAGE UndecidableInstances #-} diff --git a/src/Network/Tox/Crypto/KeyedT.hs b/src/Network/Tox/Crypto/KeyedT.hs index e0153762..7d0250ee 100644 --- a/src/Network/Tox/Crypto/KeyedT.hs +++ b/src/Network/Tox/Crypto/KeyedT.hs @@ -3,7 +3,6 @@ {-# LANGUAGE LambdaCase #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} {-# LANGUAGE TupleSections #-} {-# LANGUAGE UndecidableInstances #-} module Network.Tox.Crypto.KeyedT where diff --git a/src/Network/Tox/Crypto/Nonce.lhs b/src/Network/Tox/Crypto/Nonce.lhs index 39dd825b..a0a68512 100644 --- a/src/Network/Tox/Crypto/Nonce.lhs +++ b/src/Network/Tox/Crypto/Nonce.lhs @@ -15,8 +15,7 @@ together. \begin{code} {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-} -{-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE StrictData #-} module Network.Tox.Crypto.Nonce where import qualified Crypto.Saltine.Class as Sodium (decode, encode, nudge) diff --git a/src/Network/Tox/DHT.lhs b/src/Network/Tox/DHT.lhs index ef2974f5..60b69d3d 100644 --- a/src/Network/Tox/DHT.lhs +++ b/src/Network/Tox/DHT.lhs @@ -1,7 +1,6 @@ \chapter{DHT} \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT where \end{code} diff --git a/src/Network/Tox/DHT/ClientList.lhs b/src/Network/Tox/DHT/ClientList.lhs index 08cc563d..57a1bba7 100644 --- a/src/Network/Tox/DHT/ClientList.lhs +++ b/src/Network/Tox/DHT/ClientList.lhs @@ -2,7 +2,6 @@ \begin{code} {-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.ClientList where diff --git a/src/Network/Tox/DHT/ClientNode.lhs b/src/Network/Tox/DHT/ClientNode.lhs index 192076e3..3016d1be 100644 --- a/src/Network/Tox/DHT/ClientNode.lhs +++ b/src/Network/Tox/DHT/ClientNode.lhs @@ -1,5 +1,4 @@ \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.ClientNode where diff --git a/src/Network/Tox/DHT/DhtPacket.lhs b/src/Network/Tox/DHT/DhtPacket.lhs index de6f8afc..6ac67628 100644 --- a/src/Network/Tox/DHT/DhtPacket.lhs +++ b/src/Network/Tox/DHT/DhtPacket.lhs @@ -24,7 +24,6 @@ protocol never actually sends empty messages, so in reality the minimum size is {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE NamedFieldPuns #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.DhtPacket where diff --git a/src/Network/Tox/DHT/DhtRequestPacket.lhs b/src/Network/Tox/DHT/DhtRequestPacket.lhs index fe674834..dadeefad 100644 --- a/src/Network/Tox/DHT/DhtRequestPacket.lhs +++ b/src/Network/Tox/DHT/DhtRequestPacket.lhs @@ -16,7 +16,6 @@ DHT Packet which is to be received by the addressee. \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.DhtRequestPacket where diff --git a/src/Network/Tox/DHT/DhtState.lhs b/src/Network/Tox/DHT/DhtState.lhs index d71f97c8..9bc3a9a7 100644 --- a/src/Network/Tox/DHT/DhtState.lhs +++ b/src/Network/Tox/DHT/DhtState.lhs @@ -5,7 +5,6 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.DhtState where diff --git a/src/Network/Tox/DHT/Distance.lhs b/src/Network/Tox/DHT/Distance.lhs index ba5e62f8..3d838358 100644 --- a/src/Network/Tox/DHT/Distance.lhs +++ b/src/Network/Tox/DHT/Distance.lhs @@ -2,9 +2,8 @@ \begin{code} {-# OPTIONS_GHC -Wno-noncanonical-monad-instances #-} -{-# LANGUAGE MagicHash #-} -{-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE MagicHash #-} +{-# LANGUAGE StrictData #-} module Network.Tox.DHT.Distance where import Control.Arrow (first) diff --git a/src/Network/Tox/DHT/KBuckets.lhs b/src/Network/Tox/DHT/KBuckets.lhs index 2b3b15c7..98f788c3 100644 --- a/src/Network/Tox/DHT/KBuckets.lhs +++ b/src/Network/Tox/DHT/KBuckets.lhs @@ -9,7 +9,6 @@ lifetime of a k-buckets instance. {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.DHT.KBuckets where import Data.Binary (Binary) diff --git a/src/Network/Tox/DHT/NodeList.lhs b/src/Network/Tox/DHT/NodeList.lhs index 2c578ff2..53ee29c6 100644 --- a/src/Network/Tox/DHT/NodeList.lhs +++ b/src/Network/Tox/DHT/NodeList.lhs @@ -2,7 +2,6 @@ The Close List and the Search Entries are termed the \texttt{Node Lists} of the DHT State. \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.NodeList where diff --git a/src/Network/Tox/DHT/NodesRequest.lhs b/src/Network/Tox/DHT/NodesRequest.lhs index e93a83b6..66d280a8 100644 --- a/src/Network/Tox/DHT/NodesRequest.lhs +++ b/src/Network/Tox/DHT/NodesRequest.lhs @@ -11,7 +11,6 @@ The DHT Public Key sent in the request is the one the sender is searching for. \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.NodesRequest where diff --git a/src/Network/Tox/DHT/NodesResponse.lhs b/src/Network/Tox/DHT/NodesResponse.lhs index d7586b7c..faf3af92 100644 --- a/src/Network/Tox/DHT/NodesResponse.lhs +++ b/src/Network/Tox/DHT/NodesResponse.lhs @@ -16,7 +16,6 @@ response has in their lists of known nodes. \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.NodesResponse where diff --git a/src/Network/Tox/DHT/Operation.lhs b/src/Network/Tox/DHT/Operation.lhs index 0cd38316..a9b09cd0 100644 --- a/src/Network/Tox/DHT/Operation.lhs +++ b/src/Network/Tox/DHT/Operation.lhs @@ -6,7 +6,6 @@ {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE NamedFieldPuns #-} {-# LANGUAGE RankNTypes #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.Operation where diff --git a/src/Network/Tox/DHT/PendingReplies.lhs b/src/Network/Tox/DHT/PendingReplies.lhs index 3a914e80..964c5f21 100644 --- a/src/Network/Tox/DHT/PendingReplies.lhs +++ b/src/Network/Tox/DHT/PendingReplies.lhs @@ -6,7 +6,6 @@ which was sent sufficiently recently, according to a time limit which depends on the service. \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.PendingReplies where diff --git a/src/Network/Tox/DHT/PingPacket.lhs b/src/Network/Tox/DHT/PingPacket.lhs index 7578d0a5..b5fabe40 100644 --- a/src/Network/Tox/DHT/PingPacket.lhs +++ b/src/Network/Tox/DHT/PingPacket.lhs @@ -5,7 +5,6 @@ The Ping Service is used to check if a node is responsive. \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.PingPacket where diff --git a/src/Network/Tox/DHT/RpcPacket.lhs b/src/Network/Tox/DHT/RpcPacket.lhs index d2ab4b20..53e6f287 100644 --- a/src/Network/Tox/DHT/RpcPacket.lhs +++ b/src/Network/Tox/DHT/RpcPacket.lhs @@ -3,7 +3,6 @@ {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.DHT.RpcPacket where import Data.Binary (Binary) diff --git a/src/Network/Tox/DHT/Stamped.hs b/src/Network/Tox/DHT/Stamped.hs index b2406b71..a54bea55 100644 --- a/src/Network/Tox/DHT/Stamped.hs +++ b/src/Network/Tox/DHT/Stamped.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.DHT.Stamped where diff --git a/src/Network/Tox/Encoding.hs b/src/Network/Tox/Encoding.hs index 81e0cdf7..6f24a1cb 100644 --- a/src/Network/Tox/Encoding.hs +++ b/src/Network/Tox/Encoding.hs @@ -1,6 +1,5 @@ -{-# LANGUAGE LambdaCase #-} -{-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE LambdaCase #-} +{-# LANGUAGE StrictData #-} module Network.Tox.Encoding where import Data.Binary (Binary, get, put) diff --git a/src/Network/Tox/Network/MonadRandomBytes.hs b/src/Network/Tox/Network/MonadRandomBytes.hs index 3ad2cb07..e13e16b5 100644 --- a/src/Network/Tox/Network/MonadRandomBytes.hs +++ b/src/Network/Tox/Network/MonadRandomBytes.hs @@ -1,12 +1,11 @@ {-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.Network.MonadRandomBytes where -import Control.Monad.RWS (RWST) import Control.Monad.Random (RandT, getRandoms) import Control.Monad.Reader (ReaderT) +import Control.Monad.RWS (RWST) import Control.Monad.State (StateT) import Control.Monad.Trans.Class (lift) import Control.Monad.Writer (WriterT) diff --git a/src/Network/Tox/Network/Networked.hs b/src/Network/Tox/Network/Networked.hs index 50ca4cbe..17322622 100644 --- a/src/Network/Tox/Network/Networked.hs +++ b/src/Network/Tox/Network/Networked.hs @@ -1,7 +1,6 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} -- | Abstraction layer for network functionality. -- diff --git a/src/Network/Tox/NodeInfo.lhs b/src/Network/Tox/NodeInfo.lhs index 5838f165..68be2d7d 100644 --- a/src/Network/Tox/NodeInfo.lhs +++ b/src/Network/Tox/NodeInfo.lhs @@ -1,7 +1,6 @@ \chapter{Node Info} \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.NodeInfo where \end{code} diff --git a/src/Network/Tox/NodeInfo/HostAddress.lhs b/src/Network/Tox/NodeInfo/HostAddress.lhs index e8da67c8..386827e5 100644 --- a/src/Network/Tox/NodeInfo/HostAddress.lhs +++ b/src/Network/Tox/NodeInfo/HostAddress.lhs @@ -14,7 +14,6 @@ packed byte is the protocol and the next 7 bits are the address family. {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.NodeInfo.HostAddress where import Control.Arrow ((&&&)) diff --git a/src/Network/Tox/NodeInfo/NodeInfo.lhs b/src/Network/Tox/NodeInfo/NodeInfo.lhs index 6b0ed63a..1daf5856 100644 --- a/src/Network/Tox/NodeInfo/NodeInfo.lhs +++ b/src/Network/Tox/NodeInfo/NodeInfo.lhs @@ -42,7 +42,6 @@ The reason for these numbers is that the numbers on Linux for IPv4 and IPv6 \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.NodeInfo.NodeInfo where diff --git a/src/Network/Tox/NodeInfo/PortNumber.lhs b/src/Network/Tox/NodeInfo/PortNumber.lhs index e613af07..91418c1f 100644 --- a/src/Network/Tox/NodeInfo/PortNumber.lhs +++ b/src/Network/Tox/NodeInfo/PortNumber.lhs @@ -8,7 +8,6 @@ bit unsigned integer (2 bytes). {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.NodeInfo.PortNumber where import Data.Binary (Binary) diff --git a/src/Network/Tox/NodeInfo/SocketAddress.lhs b/src/Network/Tox/NodeInfo/SocketAddress.lhs index 0243da39..e70e5dae 100644 --- a/src/Network/Tox/NodeInfo/SocketAddress.lhs +++ b/src/Network/Tox/NodeInfo/SocketAddress.lhs @@ -8,7 +8,6 @@ any internet host. {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.NodeInfo.SocketAddress where import Data.Binary (Binary, get, put) diff --git a/src/Network/Tox/NodeInfo/TransportProtocol.lhs b/src/Network/Tox/NodeInfo/TransportProtocol.lhs index 9b76690f..ceee8de8 100644 --- a/src/Network/Tox/NodeInfo/TransportProtocol.lhs +++ b/src/Network/Tox/NodeInfo/TransportProtocol.lhs @@ -15,7 +15,6 @@ The human-readable representation for UDP is \texttt{UDP} and for TCP is {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE LambdaCase #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.NodeInfo.TransportProtocol where import Data.Binary (Binary) diff --git a/src/Network/Tox/Protocol.lhs b/src/Network/Tox/Protocol.lhs index 17267908..6f86d8b8 100644 --- a/src/Network/Tox/Protocol.lhs +++ b/src/Network/Tox/Protocol.lhs @@ -1,7 +1,6 @@ \chapter{Protocol Packet} \begin{code} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.Protocol where \end{code} diff --git a/src/Network/Tox/Protocol/Packet.lhs b/src/Network/Tox/Protocol/Packet.lhs index 47bb6cf6..b24e6c80 100644 --- a/src/Network/Tox/Protocol/Packet.lhs +++ b/src/Network/Tox/Protocol/Packet.lhs @@ -1,7 +1,6 @@ \begin{code} {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.Protocol.Packet where diff --git a/src/Network/Tox/Protocol/PacketKind.lhs b/src/Network/Tox/Protocol/PacketKind.lhs index af8bdcb3..78fd9b9d 100644 --- a/src/Network/Tox/Protocol/PacketKind.lhs +++ b/src/Network/Tox/Protocol/PacketKind.lhs @@ -35,7 +35,6 @@ parentheses, e.g. \href{#ping-request-0x00}{Ping Request (0x00)}. {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE DeriveGeneric #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Network.Tox.Protocol.PacketKind where diff --git a/src/Network/Tox/Time.hs b/src/Network/Tox/Time.hs index ee0b9317..708dd3bc 100644 --- a/src/Network/Tox/Time.hs +++ b/src/Network/Tox/Time.hs @@ -1,5 +1,4 @@ -{-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} +{-# LANGUAGE StrictData #-} module Network.Tox.Time where import qualified System.Clock as Clock diff --git a/src/Network/Tox/Timed.hs b/src/Network/Tox/Timed.hs index f6d11840..2a44f8c7 100644 --- a/src/Network/Tox/Timed.hs +++ b/src/Network/Tox/Timed.hs @@ -1,13 +1,12 @@ {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE UndecidableInstances #-} module Network.Tox.Timed where -import Control.Monad.RWS (RWST) import Control.Monad.Random (RandT) import Control.Monad.Reader (ReaderT) +import Control.Monad.RWS (RWST) import Control.Monad.State (StateT) import Control.Monad.Trans (lift) import Control.Monad.Writer (WriterT) diff --git a/src/Network/Tox/TimedT.hs b/src/Network/Tox/TimedT.hs index f47f086d..d1452648 100644 --- a/src/Network/Tox/TimedT.hs +++ b/src/Network/Tox/TimedT.hs @@ -1,7 +1,6 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE StrictData #-} -{-# LANGUAGE Trustworthy #-} module Network.Tox.TimedT where diff --git a/test/Data/Result.hs b/test/Data/Result.hs index 48330631..71ac3969 100644 --- a/test/Data/Result.hs +++ b/test/Data/Result.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DeriveFoldable #-} {-# LANGUAGE DeriveFunctor #-} {-# LANGUAGE DeriveTraversable #-} -{-# LANGUAGE Safe #-} {-# LANGUAGE StrictData #-} module Data.Result ( Result (..) diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel index 0855a8a3..0cc63472 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") haskell_binary( @@ -6,10 +5,10 @@ haskell_binary( srcs = ["toxsave-convert.hs"], deps = [ "//hs-toxcore", - hazel_library("base"), - hazel_library("binary"), - hazel_library("bytestring"), - hazel_library("groom"), + "//third_party/haskell:base", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", + "//third_party/haskell:groom", ], ) @@ -20,9 +19,9 @@ haskell_binary( deps = [ "//c-toxcore", "//hs-toxcore", - hazel_library("QuickCheck"), - hazel_library("base"), - hazel_library("binary"), - hazel_library("bytestring"), + "//third_party/haskell:QuickCheck", + "//third_party/haskell:base", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", ], ) diff --git a/web/BUILD.bazel b/web/BUILD.bazel index a0063a43..57574ecd 100644 --- a/web/BUILD.bazel +++ b/web/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"]) @@ -10,15 +9,15 @@ haskell_binary( deps = [ "//hs-msgpack-binary", "//hs-toxcore", - hazel_library("QuickCheck"), - hazel_library("base"), - hazel_library("binary"), - hazel_library("bytestring"), - hazel_library("groom"), - hazel_library("servant"), - hazel_library("servant-server"), - hazel_library("wai"), - hazel_library("wai-cors"), - hazel_library("warp"), + "//third_party/haskell:QuickCheck", + "//third_party/haskell:base", + "//third_party/haskell:binary", + "//third_party/haskell:bytestring", + "//third_party/haskell:groom", + "//third_party/haskell:servant", + "//third_party/haskell:servant-server", + "//third_party/haskell:wai", + "//third_party/haskell:wai-cors", + "//third_party/haskell:warp", ], )