Squash warnings for newer GHCs

Also remove ancient stack configs
expipiplus1 · Dec 13, 2021 · c005115 · c005115
1 parent 446939c
commit c005115
Show file tree

Hide file tree

Showing 17 changed files with 6 additions and 152 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
       matrix:
         os: [ubuntu-latest]
         cabal: [latest]
-        ghc: ['8.6', '8.8', '8.10', '9.0']
+        ghc: ['8.8', '8.10', '9.0', '9.2']
       fail-fast: false
 
     steps:

diff --git a/changelog.md b/changelog.md
@@ -2,6 +2,7 @@
 
 ## WIP
 - Correct author name
+- Squash warnings for newer GHCs
 
 ## [0.12.5] - 2021-05-29
 - Tweak test suite to fix #35

diff --git a/default.nix b/default.nix
@@ -1,9 +1,4 @@
-{ nixpkgsSrc ? builtins.fetchTarball {
-  url =
-    "https://github.com/NixOS/nixpkgs/archive/540dccb2aeaffa9dc69bfdc41c55abd7ccc6baa3.tar.gz"; # nixos-unstable
-  sha256 = "1j58m811w7xxjncf36hqcjqsfj979hkfcwx9wcrm3g3zbayavapg";
-}, pkgs ? import nixpkgsSrc { }, compiler ? null, extraOverrides ? _: _: { }
-, modifier ? x: x }:
+{ nixpkgsSrc ? <nixpkgs>, pkgs ? import nixpkgsSrc { }, compiler ? null }:
 
 let
   haskellPackages = if compiler == null then
@@ -14,8 +9,5 @@ let
 in haskellPackages.developPackage {
   name = "";
   root = pkgs.nix-gitignore.gitignoreSource [ ] ./.;
-  overrides = with pkgs.haskell.lib;
-    pkgs.lib.composeExtensions (_self: _super: { }) extraOverrides;
-  inherit modifier;
+  overrides = _self: _super: { };
 }
-
diff --git a/src/Data/CReal/Internal.hs b/src/Data/CReal/Internal.hs
@@ -768,7 +768,7 @@ powerSeries q termsAtPrecision x = crMemoize
                 p' = p + d
                 p'' = p' + d
                 m = atPrecision x p''
-                xs = (%1) <$> iterate (\e -> m * e /^ p'') (bit p')
+                xs = (% 1) <$> iterate (\e -> m * e /^ p'') (bit p')
                 r = sum . take (t + 1) . fmap (round . (* fromInteger (bit d))) $ zipWith (*) q xs
             in r /^ (2 * d))
 
diff --git a/stack-7.10.2.yaml b/stack-7.10.2.yaml
diff --git a/stack-7.10.2.yaml.lock b/stack-7.10.2.yaml.lock
diff --git a/stack-7.10.3.yaml b/stack-7.10.3.yaml
diff --git a/stack-7.10.3.yaml.lock b/stack-7.10.3.yaml.lock
diff --git a/stack-8.2.2.yaml b/stack-8.2.2.yaml
diff --git a/stack-8.2.2.yaml.lock b/stack-8.2.2.yaml.lock
diff --git a/stack-8.4.4.yaml b/stack-8.4.4.yaml
diff --git a/stack-8.4.4.yaml.lock b/stack-8.4.4.yaml.lock
diff --git a/stack-8.6.5.yaml b/stack-8.6.5.yaml
diff --git a/stack-8.6.5.yaml.lock b/stack-8.6.5.yaml.lock
diff --git a/test/Test.hs b/test/Test.hs
@@ -13,7 +13,6 @@ import           Data.List             (inits)
 import           Data.Maybe            (fromJust)
 import           Data.Proxy
 import           Data.Ratio            ((%))
-import           Data.Semigroup
 import           GHC.TypeNats
 import           Numeric.Natural
 import           Test.Tasty            (TestTree, defaultMain, testGroup)

diff --git a/test/Test/QuickCheck/Classes/Extra.hs b/test/Test/QuickCheck/Classes/Extra.hs
@@ -17,7 +17,7 @@ module Test.QuickCheck.Classes.Extra
   ) where
 
 import Data.Group (invert, Group, Abelian)
-import Data.Monoid ((<>), Sum(..), Product)
+import Data.Monoid (Sum(..), Product)
 import Test.QuickCheck.Extra (Arbitrary, (<=>), (==>))
 import Test.QuickCheck.Modifiers (NonZero)
 import Test.QuickCheck.Checkers (commutes, transitive, EqProp, (=-=), BinRel)

diff --git a/test/Test/QuickCheck/Extra.hs b/test/Test/QuickCheck/Extra.hs
@@ -14,7 +14,6 @@ module Test.QuickCheck.Extra
 
 import Test.QuickCheck
 import Test.QuickCheck.Checkers (EqProp)
-import Test.QuickCheck.Modifiers (NonZero(..), Positive(..))
 import System.Random (Random)
 
 deriving instance Num a => Num (NonZero a)