From d234f9de0fd810c0df9f0c659e95694924a4b85d Mon Sep 17 00:00:00 2001 From: Artyom Kazak Date: Wed, 23 Jan 2019 09:58:27 +0100 Subject: [PATCH 1/2] Use network-2.7 --- stack.yaml | 2 ++ tools/bonanza/src/Bonanza/Metrics.hs | 2 ++ 2 files changed, 4 insertions(+) diff --git a/stack.yaml b/stack.yaml index ab3a9bbbd02..9dc2998ef00 100644 --- a/stack.yaml +++ b/stack.yaml @@ -149,6 +149,8 @@ extra-deps: - network-uri-static-0.1.1.0 - list-t-1.0.1 # 1.0.0.1 doesn't build - unliftio-0.2.10 # for pooled concurrency utils in UnliftIO.Async +- network-2.7.0.2 # to get nicer errors when connections fail +- HaskellNet-SSL-0.3.4.1 # first version to support network-2.7 # the following are just not on Stackage (and most of these were present in # LTS-11 but got evicted in LTS-12) diff --git a/tools/bonanza/src/Bonanza/Metrics.hs b/tools/bonanza/src/Bonanza/Metrics.hs index c33fec5cbf1..46260c0af28 100644 --- a/tools/bonanza/src/Bonanza/Metrics.hs +++ b/tools/bonanza/src/Bonanza/Metrics.hs @@ -1,6 +1,8 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} +{-# OPTIONS_GHC -Wno-deprecations #-} -- for Network.BSD + module Bonanza.Metrics ( Stats (..) , debugCollectd From 27dd50341f42170b535f04923b0f569490694090 Mon Sep 17 00:00:00 2001 From: Artyom Kazak Date: Wed, 23 Jan 2019 13:18:01 +0100 Subject: [PATCH 2/2] Fix compilation, better comments --- tools/bonanza/src/Bonanza/Metrics.hs | 4 +++- tools/bonanza/src/Bonanza/Streaming/Kibana.hs | 5 ++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/tools/bonanza/src/Bonanza/Metrics.hs b/tools/bonanza/src/Bonanza/Metrics.hs index 46260c0af28..8235b62afa4 100644 --- a/tools/bonanza/src/Bonanza/Metrics.hs +++ b/tools/bonanza/src/Bonanza/Metrics.hs @@ -1,7 +1,9 @@ {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE RecordWildCards #-} -{-# OPTIONS_GHC -Wno-deprecations #-} -- for Network.BSD +-- Network.BSD got deprecated in network-2.7; this line won't be needed once we +-- move to network-3.0 because then we can use the network-bsd package +{-# OPTIONS_GHC -Wno-deprecations #-} module Bonanza.Metrics ( Stats (..) diff --git a/tools/bonanza/src/Bonanza/Streaming/Kibana.hs b/tools/bonanza/src/Bonanza/Streaming/Kibana.hs index 751d43b3c62..c77a5eca044 100644 --- a/tools/bonanza/src/Bonanza/Streaming/Kibana.hs +++ b/tools/bonanza/src/Bonanza/Streaming/Kibana.hs @@ -6,7 +6,10 @@ {-# LANGUAGE StandaloneDeriving #-} -- necessary because of missing 'Eq ZonedTime' instance -{-# OPTIONS_GHC -fno-warn-orphans #-} +{-# OPTIONS_GHC -fno-warn-orphans #-} +-- Network.BSD got deprecated in network-2.7; this line won't be needed once we +-- move to network-3.0 because then we can use the network-bsd package +{-# OPTIONS_GHC -Wno-deprecations #-} module Bonanza.Streaming.Kibana ( KibanaEvent