Browse Source

Fixes warning for ghc 8.2

master
Abhinav Sarkar 5 years ago
parent
commit
0960d01f8d
  1. 1
      .travis.yml
  2. 2
      ringo-core/ringo-core.cabal
  3. 2
      ringo/ringo.cabal
  4. 5
      ringo/src/Distribution/CurrentPackageDescription.hs

1
.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"

2
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:

2
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:

5
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]

Loading…
Cancel
Save