Merge pull request #3394 from input-output-hk/bump-report-server

report-server:  bump to latest master

Author: deepfire

infra/Pos/Infra/Reporting/Http.hs

@@ -1,5 +1,3 @@
-{-# LANGUAGE AllowAmbiguousTypes #-}
-
 module Pos.Infra.Reporting.Http
        ( sendReport
        , sendReportNodeImpl
@@ -13,11 +11,13 @@ import           Control.Exception.Safe (catchAny, try)
 import           Data.Aeson (encode)
 import qualified Data.List.NonEmpty as NE
 import           Data.Time.Clock (getCurrentTime)
+import           Data.Version (showVersion)
 import           Formatting (sformat, shown, string, (%))
 import           Network.HTTP.Client (httpLbs, newManager, parseUrlThrow)
 import qualified Network.HTTP.Client.MultipartFormData as Form
 import           Network.HTTP.Client.TLS (tlsManagerSettings)
-import           Pos.ReportServer.Report (ReportInfo (..), ReportType (..))
+import           Pos.ReportServer.Report (BackendVersion (..), ReportInfo (..), ReportType (..),
+                                          Version (..))
 import           System.FilePath (takeFileName)
 import           System.Info (arch, os)
 
@@ -26,7 +26,7 @@ import           Pos.Crypto (ProtocolMagic (..))
 import           Pos.Infra.Reporting.Exceptions (ReportingError (..))
 import           Pos.Infra.Reporting.MemState ()
 import           Pos.Util.CompileInfo (CompileTimeInfo)
-import           Pos.Util.Trace (Trace, Severity (..), traceWith)
+import           Pos.Util.Trace (Severity (..), Trace, traceWith)
 import           Pos.Util.Util ((<//>))
 
 
@@ -69,7 +69,7 @@ sendReport pm compileInfo mLogFile reportType appName reportServerUri = do
         -- We are using version of 'cardano-sl-infra' here. We agreed
         -- that the version of 'cardano-sl' and it subpackages should
         -- be same.
-        , rVersion = version
+        , rVersion = BackendVersion . Version . fromString . showVersion $ version
         , rBuild = pretty compileInfo
         , rOS = toText (os <> "-" <> arch)
         , rMagic = getProtocolMagic pm

pkgs/default.nix

@@ -14539,12 +14539,12 @@ license = stdenv.lib.licenses.mit;
 mkDerivation {
 
 pname = "cardano-report-server";
-version = "0.4.10";
+version = "0.5.10";
 src = fetchgit {
 
 url = "https://github.com/input-output-hk/cardano-report-server.git";
-sha256 = "0chhbnrl68aqjfhkqvq53v572zsg52mj8pjxl3n7nnbc006cqs49";
-rev = "81eea7361a75923f9402fcb7840fb36722dbf88e";
+sha256 = "02n86wbfr3z2xqrc8g8naj0dc5j4644y0l295qzdqlfynmz6a82z";
+rev = "9b96874d0f234554a5779d98762cc0a6773a532a";
 
 };
 isLibrary = true;

stack.yaml

@@ -73,7 +73,7 @@ packages:
   extra-dep: true
 - location:
     git: https://github.com/input-output-hk/cardano-report-server.git
-    commit: 81eea7361a75923f9402fcb7840fb36722dbf88e # master 0.4.10
+    commit: 9b96874d0f234554a5779d98762cc0a6773a532a
   extra-dep: true
 # These three are needed for cardano-sl-networking
 - location: