Browse Source

Fixes warning for ghc 8.2

Abhinav Sarkar 3 years ago
parent
commit
0960d01f8d

+ 0
- 1
.travis.yml View File

@@ -13,7 +13,6 @@ addons:
13 13
 # The different configurations we want to test. You could also do things like
14 14
 # change flags or use --stack-yaml to point to a different file.
15 15
 env:
16
-- ARGS=""
17 16
 - ARGS="--resolver lts-2"
18 17
 - ARGS="--resolver lts-3"
19 18
 - ARGS="--resolver lts-4"

+ 1
- 1
ringo-core/ringo-core.cabal View File

@@ -7,7 +7,7 @@ license:             MIT
7 7
 license-file:        LICENSE
8 8
 author:              Abhinav Sarkar
9 9
 maintainer:          abhinav@abhinavsarkar.net
10
-copyright:           2015-2016 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar
10
+copyright:           2015-2017 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar
11 11
 category:            SQL
12 12
 build-type:          Simple
13 13
 -- extra-source-files:

+ 1
- 1
ringo/ringo.cabal View File

@@ -7,7 +7,7 @@ license:             MIT
7 7
 license-file:        LICENSE
8 8
 author:              Abhinav Sarkar
9 9
 maintainer:          abhinav@abhinavsarkar.net
10
-copyright:           2015-2016 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar
10
+copyright:           2015-2017 Quintype Inc, Nilenso Software LLP, Abhinav Sarkar
11 11
 category:            SQL
12 12
 build-type:          Simple
13 13
 -- extra-source-files:

+ 5
- 0
ringo/src/Distribution/CurrentPackageDescription.hs View File

@@ -1,4 +1,5 @@
1 1
 {-# LANGUAGE NoImplicitPrelude #-}
2
+{-# LANGUAGE CPP #-}
2 3
 
3 4
 module Distribution.CurrentPackageDescription
4 5
   ( currentPackageDescription
@@ -23,7 +24,11 @@ currentPackageDescription = fmap packageDescription $ do
23 24
   dir <- getCurrentDirectory
24 25
   cs  <- cabalFiles dir
25 26
   case cs of
27
+#if MIN_VERSION_base(4,10,0)
28
+    (c:_) -> readGenericPackageDescription silent c
29
+#else
26 30
     (c:_) -> readPackageDescription silent c
31
+#endif
27 32
     []    -> error $ "Couldn't find a cabal file in the current working directory (" ++ dir ++ ")"
28 33
 
29 34
 cabalFiles :: FilePath -> IO [FilePath]

Loading…
Cancel
Save