Merge pull request #158 from well-typed/edsko/cabal-warnings

Fix cabal warnings
well-typed · Jul 2, 2024 · 5018da3 · 5018da3
2 parents 0ffd1fc + 5061269
commit 5018da3
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 20 deletions.
diff --git a/cabal.project b/cabal.project
@@ -33,6 +33,7 @@ package large-records-benchmarks
 
 package large-anon
   tests: True
+  ghc-options: -dcore-lint
 
 package beam-large-records
   tests: True

diff --git a/large-anon/large-anon.cabal b/large-anon/large-anon.cabal
@@ -70,10 +70,11 @@ library
       Data.Record.Anon.Internal.Plugin.Source.Options
 
   build-depends:
-      base             >= 4.14  && < 4.19
     , aeson            >= 1.4.4 && < 2.3
+    , base             >= 4.14  && < 4.19
     , containers       >= 0.6.2 && < 0.8
     , deepseq          >= 1.4.4 && < 1.6
+    , ghc              >= 8.10  && < 9.7 
     , ghc-tcplugin-api >= 0.11  && < 0.12
     , hashable         >= 1.3   && < 1.5
     , mtl              >= 2.2.1 && < 2.4
@@ -87,9 +88,6 @@ library
 
       -- large-generics 0.2 starts using 'SmallArray' instead of 'Vector'
     , large-generics   >= 0.2   && < 0.3
-
-      -- Whatever version is bundled with ghc
-    , ghc
   hs-source-dirs:
       src
   default-language:
@@ -184,7 +182,6 @@ test-suite test-large-anon
       -Wredundant-constraints
       -Wno-unticked-promoted-constructors
       -fno-show-valid-hole-fits
-      -dcore-lint
 
   -- Not sure why, but ghc warns about record-hasfield being unused,
   -- despite it actually being required. So for now we just disable this check.

diff --git a/large-records/large-records.cabal b/large-records/large-records.cabal
@@ -44,12 +44,14 @@ library
       Data.Record.Internal.Plugin.Record
 
   build-depends:
-      base            >= 4.14   && < 4.19
-    , containers      >= 0.6.2  && < 0.8
-    , mtl             >= 2.2.1  && < 2.4
-    , primitive       >= 0.8    && < 0.10
-    , syb             >= 0.7    && < 0.8
-    , record-hasfield >= 1.0    && < 1.1
+    , base             >= 4.14   && < 4.19
+    , containers       >= 0.6.2  && < 0.8
+    , ghc              >= 8.10   && < 9.7
+    , mtl              >= 2.2.1  && < 2.4
+    , primitive        >= 0.8    && < 0.10
+    , record-hasfield  >= 1.0    && < 1.1
+    , syb              >= 0.7    && < 0.8
+    , template-haskell >= 2.16   && < 2.21
 
       -- large-generics 0.2 starts using 'SmallArray' instead of 'Vector'
     , large-generics >= 0.2 && < 0.3
@@ -59,10 +61,6 @@ library
 
       -- 0.2.16 introduces support for ghc 9.4
     , record-dot-preprocessor >= 0.2.16 && < 0.3
-
-      -- whatever versions are bundled with ghc
-    , ghc
-    , template-haskell
   hs-source-dirs:
       src
   default-language:

diff --git a/typelet/typelet.cabal b/typelet/typelet.cabal
@@ -34,12 +34,10 @@ library
         TypeLet.Plugin.NameResolution
         TypeLet.Plugin.Substitution
     build-depends:
-        base >= 4.14 && < 4.19
+      , base             >= 4.14 && < 4.19
+      , containers       >= 0.6  && < 0.7
+      , ghc              >= 8.10 && < 9.7
       , ghc-tcplugin-api >= 0.11 && < 0.12
-
-        -- whichever versions are bundled with ghc:
-      , containers
-      , ghc
     hs-source-dirs:
         src
     default-language: