Fixes warning for ghc 8.2
parent
07e6aeec75
commit
0960d01f8d
|
@ -13,7 +13,6 @@ addons:
|
||||||
# The different configurations we want to test. You could also do things like
|
# 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.
|
# change flags or use --stack-yaml to point to a different file.
|
||||||
env:
|
env:
|
||||||
- ARGS=""
|
|
||||||
- ARGS="--resolver lts-2"
|
- ARGS="--resolver lts-2"
|
||||||
- ARGS="--resolver lts-3"
|
- ARGS="--resolver lts-3"
|
||||||
- ARGS="--resolver lts-4"
|
- ARGS="--resolver lts-4"
|
||||||
|
|
|
@ -7,7 +7,7 @@ license: MIT
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Abhinav Sarkar
|
author: Abhinav Sarkar
|
||||||
maintainer: abhinav@abhinavsarkar.net
|
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
|
category: SQL
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
-- extra-source-files:
|
-- extra-source-files:
|
||||||
|
|
|
@ -7,7 +7,7 @@ license: MIT
|
||||||
license-file: LICENSE
|
license-file: LICENSE
|
||||||
author: Abhinav Sarkar
|
author: Abhinav Sarkar
|
||||||
maintainer: abhinav@abhinavsarkar.net
|
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
|
category: SQL
|
||||||
build-type: Simple
|
build-type: Simple
|
||||||
-- extra-source-files:
|
-- extra-source-files:
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
{-# LANGUAGE NoImplicitPrelude #-}
|
{-# LANGUAGE NoImplicitPrelude #-}
|
||||||
|
{-# LANGUAGE CPP #-}
|
||||||
|
|
||||||
module Distribution.CurrentPackageDescription
|
module Distribution.CurrentPackageDescription
|
||||||
( currentPackageDescription
|
( currentPackageDescription
|
||||||
|
@ -23,7 +24,11 @@ currentPackageDescription = fmap packageDescription $ do
|
||||||
dir <- getCurrentDirectory
|
dir <- getCurrentDirectory
|
||||||
cs <- cabalFiles dir
|
cs <- cabalFiles dir
|
||||||
case cs of
|
case cs of
|
||||||
|
#if MIN_VERSION_base(4,10,0)
|
||||||
|
(c:_) -> readGenericPackageDescription silent c
|
||||||
|
#else
|
||||||
(c:_) -> readPackageDescription silent c
|
(c:_) -> readPackageDescription silent c
|
||||||
|
#endif
|
||||||
[] -> error $ "Couldn't find a cabal file in the current working directory (" ++ dir ++ ")"
|
[] -> error $ "Couldn't find a cabal file in the current working directory (" ++ dir ++ ")"
|
||||||
|
|
||||||
cabalFiles :: FilePath -> IO [FilePath]
|
cabalFiles :: FilePath -> IO [FilePath]
|
||||||
|
|
Loading…
Reference in New Issue