From 2de5a8c4d362e5ee934336de4674a0b234ef005e Mon Sep 17 00:00:00 2001 From: Filip Gralinski Date: Thu, 24 Jan 2019 21:22:02 +0100 Subject: [PATCH] Update for new geval --- Handler/Graph.hs | 3 ++- Handler/ShowChallenge.hs | 1 + gonito.cabal | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Handler/Graph.hs b/Handler/Graph.hs index 7b854b9..89a30a2 100644 --- a/Handler/Graph.hs +++ b/Handler/Graph.hs @@ -8,7 +8,8 @@ import Handler.Shared (formatParameter, formatScore, getMainTest, compareFun) import Data.Maybe import Data.List ((!!)) import Database.Persist.Sql -import GEval.Core (MetricValue, getMetricOrdering) +import GEval.Core (getMetricOrdering) +import GEval.Common (MetricValue) import qualified Data.Map as M import qualified Data.Text as T diff --git a/Handler/ShowChallenge.hs b/Handler/ShowChallenge.hs index 3ab87bd..a6241b3 100644 --- a/Handler/ShowChallenge.hs +++ b/Handler/ShowChallenge.hs @@ -27,6 +27,7 @@ import Gonito.ExtractMetadata (ExtractionOptions(..), import qualified Text.Read as TR import GEval.Core +import GEval.Common (MetricValue) import GEval.OptionsParser import GEval.ParseParams (parseParamsFromFilePath, OutputFileParsed(..)) diff --git a/gonito.cabal b/gonito.cabal index a393a70..d73ac24 100644 --- a/gonito.cabal +++ b/gonito.cabal @@ -1,5 +1,5 @@ name: gonito -version: 0.0.0 +version: 0.1.0 cabal-version: >= 1.8 build-type: Simple homepage: http://gonito.net @@ -126,7 +126,7 @@ library , filemanip , cryptohash , markdown - , geval >= 1.2.0.0 && < 1.12 + , geval >= 1.13.0.0 && < 1.14 , filepath , yesod-table , regex-tdfa