From 0960d01f8d7499ec6b645f46ba395fb0de2118ed Mon Sep 17 00:00:00 2001 From: Abhinav Sarkar Date: Thu, 16 Nov 2017 21:04:32 +0530 Subject: [PATCH] Fixes warning for ghc 8.2 --- .travis.yml | 1 - ringo-core/ringo-core.cabal | 2 +- ringo/ringo.cabal | 2 +- ringo/src/Distribution/CurrentPackageDescription.hs | 5 +++++ 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 508f9ec..5c5ee6d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ addons: # The different configurations we want to test. You could also do things like # change flags or use --stack-yaml to point to a different file. env: -- ARGS="" - ARGS="--resolver lts-2" - ARGS="--resolver lts-3" - ARGS="--resolver lts-4" diff --git a/ringo-core/ringo-core.cabal b/ringo-core/ringo-core.cabal index 5970f2f..241d1b4 100644 --- a/ringo-core/ringo-core.cabal +++ b/ringo-core/ringo-core.cabal @@ -7,7 +7,7 @@ license: MIT license-file: LICENSE author: Abhinav Sarkar maintainer: abhinav@abhinavsarkar.net -copyright: 2015-2016 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar +copyright: 2015-2017 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar category: SQL build-type: Simple -- extra-source-files: diff --git a/ringo/ringo.cabal b/ringo/ringo.cabal index ad66ff5..c6e384a 100644 --- a/ringo/ringo.cabal +++ b/ringo/ringo.cabal @@ -7,7 +7,7 @@ license: MIT license-file: LICENSE author: Abhinav Sarkar maintainer: abhinav@abhinavsarkar.net -copyright: 2015-2016 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar +copyright: 2015-2017 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar category: SQL build-type: Simple -- extra-source-files: diff --git a/ringo/src/Distribution/CurrentPackageDescription.hs b/ringo/src/Distribution/CurrentPackageDescription.hs index be17f0b..e415dfa 100644 --- a/ringo/src/Distribution/CurrentPackageDescription.hs +++ b/ringo/src/Distribution/CurrentPackageDescription.hs @@ -1,4 +1,5 @@ {-# LANGUAGE NoImplicitPrelude #-} +{-# LANGUAGE CPP #-} module Distribution.CurrentPackageDescription ( currentPackageDescription @@ -23,7 +24,11 @@ currentPackageDescription = fmap packageDescription $ do dir <- getCurrentDirectory cs <- cabalFiles dir case cs of +#if MIN_VERSION_base(4,10,0) + (c:_) -> readGenericPackageDescription silent c +#else (c:_) -> readPackageDescription silent c +#endif [] -> error $ "Couldn't find a cabal file in the current working directory (" ++ dir ++ ")" cabalFiles :: FilePath -> IO [FilePath]