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

Merge branch 'master' into upd-defaultNix-04

Browse source
This commit is contained in:
Anton Latukha 2020-06-03 04:57:17 +03:00 committed by GitHub
parent 8538d3a763 d1ff97dd1e
commit 0bcb7133de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 15 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
main/Repl.hs
View file

@ -38,7 +38,6 @@ import Data.List ( isPrefixOf
, foldl'
)
import qualified Data.Map as Map
import Data.Monoid
import Data.Text ( unpack
, pack
)

4
src/Nix/Builtins.hs
View file

@ -59,9 +59,7 @@ import qualified Data.Text.Lazy as LazyText
import qualified Data.Text.Lazy.Builder as Builder
import Data.These ( fromThese )
import qualified Data.Time.Clock.POSIX as Time
import Data.Traversable ( for
, mapM
)
import Data.Traversable ( for )
import qualified Data.Vector as V
import Nix.Atoms
import Nix.Convert

1
src/Nix/Exec.hs
View file

@ -33,7 +33,6 @@ import Control.Monad
import Control.Monad.Catch hiding ( catchJust )
import Control.Monad.Fix
import Control.Monad.Reader
import Control.Monad.Trans.Reader ( ReaderT(..) )
import Data.Fix
import qualified Data.HashMap.Lazy as M
import Data.List

1
src/Nix/Expr/Strings.hs
View file

@ -8,7 +8,6 @@ import Data.List ( intercalate
, dropWhileEnd
, inits
)
import Data.Monoid ( (<>) )
import Data.Text ( Text )
import qualified Data.Text as T
import Data.Tuple ( swap )

2
src/Nix/Parser.hs
View file

@ -58,7 +58,6 @@ import Data.Char ( isAlpha
, isSpace
)
import Data.Data ( Data(..) )
import Data.Foldable ( concat )
import Data.Functor
import Data.Functor.Identity
import Data.HashSet ( HashSet )
@ -66,7 +65,6 @@ import qualified Data.HashSet as HashSet
import Data.List.NonEmpty ( NonEmpty(..) )
import qualified Data.List.NonEmpty as NE
import qualified Data.Map as Map
import Data.Text ( Text )
import Data.Text hiding ( map
, foldr1
, concat

3
src/Nix/Reduce.hs
View file

@ -40,9 +40,6 @@ import Control.Monad.Fix
import Control.Monad.IO.Class
import Control.Monad.Reader
import Control.Monad.State.Strict
import Control.Monad.Trans.Reader ( ReaderT(..) )
import Control.Monad.Trans.State.Strict
( StateT(..) )
import Data.Fix
-- import Data.Foldable
import Data.HashMap.Lazy ( HashMap )

1
src/Nix/Type/Infer.hs
View file

@ -40,7 +40,6 @@ import Data.Fix ( cata )
import Data.Foldable
import qualified Data.HashMap.Lazy as M
import Data.List ( delete
, find
, nub
, intersect
, (\\)

4
src/Nix/Utils.hs
View file

@ -25,9 +25,7 @@ import Data.Hashable
import Data.HashMap.Lazy ( HashMap )
import qualified Data.HashMap.Lazy as M
import Data.List ( sortOn )
import Data.Monoid ( Endo
, (<>)
)
import Data.Monoid ( Endo )
import Data.Text ( Text )
import qualified Data.Text as Text
import qualified Data.Vector as V

23
src/Nix/Value.hs
View file

@ -30,20 +30,23 @@
module Nix.Value where
import Control.Comonad
import Control.Exception
import Control.Monad
import Control.Monad.Free
import Control.Monad.Trans.Class
import Control.Comonad ( Comonad, extract )
import Control.Exception ( Exception )
import Control.Monad ( (<=<) )
import Control.Monad.Free ( Free(..)
, hoistFree, iter, iterM )
import Control.Monad.Trans.Class ( MonadTrans, lift )
import qualified Data.Aeson as A
import Data.Functor.Classes
import Data.Functor.Classes ( Show1
, liftShowsPrec
, showsUnaryWith )
import Data.HashMap.Lazy ( HashMap )
import Data.Text ( Text )
import Data.Typeable ( Typeable )
import GHC.Generics
import Lens.Family2
import Lens.Family2.Stock
import Lens.Family2.TH
import GHC.Generics ( Generic )
import Lens.Family2.Stock ( _1 )
import Lens.Family2.TH ( makeTraversals
, makeLenses )
import Nix.Atoms
import Nix.Expr.Types
import Nix.Expr.Types.Annotated