picnoir
/
hnix
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Silence redundant import warnings for Control.Monad.Fail (#633) 

Also address mysterious redundant import warnings in the testsuite

This allows us to enable `buildStrictly=true` for GHC 8.8.

Fixes #613.
This commit is contained in:
Simon Jakobi 2020-06-19 02:21:06 +02:00 committed by GitHub
parent 0fa311301c
commit f0532b86f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.travis.yml
View File

@ -101,6 +101,7 @@ jobs:
- name: GHC 8.8.3, macOS
env:
- GHCVERSION=ghc883
- buildStrictly=true
os: osx
- name: GHC 8.10.1, Linux, SDist, Optimize, Benchmark, Haddock, Shell Completions
env:

2
src/Nix/Fresh.hs
View File

@ -16,7 +16,9 @@ import Control.Applicative
import Control.Monad.Base
import Control.Monad.Catch
import Control.Monad.Except
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail
#endif
import Control.Monad.Reader
import Control.Monad.Ref
import Control.Monad.ST

3
src/Nix/Fresh/Basic.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE MultiParamTypeClasses #-}
{-# LANGUAGE ScopedTypeVariables #-}
@ -8,7 +9,9 @@
module Nix.Fresh.Basic where
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail )
#endif
import Control.Monad.Reader
import Nix.Effects
import Nix.Render

3
src/Nix/Reduce.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE AllowAmbiguousTypes #-}
{-# LANGUAGE ApplicativeDo #-}
{-# LANGUAGE ConstraintKinds #-}
@ -35,7 +36,9 @@ import Control.Applicative
import Control.Arrow ( second )
import Control.Monad
import Control.Monad.Catch
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail
#endif
import Control.Monad.Fix
import Control.Monad.IO.Class
import Control.Monad.Reader

3
src/Nix/Render.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE DefaultSignatures #-}
{-# LANGUAGE FlexibleContexts #-}
@ -12,7 +13,9 @@ module Nix.Render where
import Prelude hiding ( readFile )
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail )
#endif
import Control.Monad.Trans
import Data.ByteString ( ByteString )
import qualified Data.ByteString as BS

2
src/Nix/Standard.hs
View File

@ -22,7 +22,9 @@ import Control.Applicative
import Control.Comonad ( Comonad )
import Control.Comonad.Env ( ComonadEnv )
import Control.Monad.Catch hiding ( catchJust )
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail ( MonadFail )
#endif
import Control.Monad.Free
import Control.Monad.Reader
import Control.Monad.Ref

3
src/Nix/Type/Infer.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE AllowAmbiguousTypes #-}
{-# LANGUAGE ConstraintKinds #-}
{-# LANGUAGE ExistentialQuantification #-}
@ -30,7 +31,9 @@ import Control.Applicative
import Control.Arrow
import Control.Monad.Catch
import Control.Monad.Except
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail
#endif
import Control.Monad.Logic
import Control.Monad.Reader
import Control.Monad.Ref

3
src/Nix/Utils/Fix1.hs
View File

@ -1,3 +1,4 @@
{-# LANGUAGE CPP #-}
{-# LANGUAGE FlexibleInstances #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE MultiParamTypeClasses #-}
@ -11,7 +12,9 @@ module Nix.Utils.Fix1 where
import Control.Applicative
import Control.Monad
#if !MIN_VERSION_base(4,13,0)
import Control.Monad.Fail
#endif
import Control.Monad.Fix
import Control.Monad.IO.Class
import Control.Monad.Catch

5
tests/PrettyParseTests.hs
View File

@ -29,10 +29,7 @@ import Nix.Parser
import Nix.Pretty
import Test.Tasty
import Test.Tasty.Hedgehog
import Text.Megaparsec ( Pos
, SourcePos
, mkPos
)
import Text.Megaparsec ( Pos )
import qualified Text.Show.Pretty as PS
asciiString :: MonadGen m => m String