(#1027) mk mod Prelude NoImplicitPrelude, mv mod Prelude (->Nix.)

Author: Anton-Latukha

benchmarks/Main.hs

@@ -1,5 +1,6 @@
 module Main where
 
+import           Nix.Prelude
 import           Criterion.Main
 
 import qualified ParserBench

benchmarks/ParserBench.hs

@@ -1,5 +1,6 @@
 module ParserBench (benchmarks) where
 
+import           Nix.Prelude
 import           Nix.Parser
 
 import           Criterion

hnix.cabal

@@ -341,8 +341,8 @@ flag profiling
 
 library
   exposed-modules:
-    Prelude
     Nix
+    Nix.Prelude
     Nix.Utils
     Nix.Atoms
     Nix.Builtins
@@ -398,9 +398,6 @@ library
     Paths_hnix
   hs-source-dirs:
     src
-  mixins:
-      base hiding (Prelude)
-    , relude
   ghc-options:
     -Wall
     -fprint-potential-instances
@@ -469,7 +466,8 @@ library
     , vector >= 0.12.0 && < 0.13
     , xml >= 1.3.14 && < 1.4
   default-extensions:
-      OverloadedStrings
+      NoImplicitPrelude
+    , OverloadedStrings
     , DeriveGeneric
     , DeriveDataTypeable
     , DeriveFunctor
@@ -532,11 +530,9 @@ executable hnix
     , serialise
     , template-haskell
     , time
-  mixins:
-      base hiding (Prelude)
-    , relude
   default-extensions:
-      OverloadedStrings
+      NoImplicitPrelude
+    , OverloadedStrings
     , DeriveGeneric
     , DeriveDataTypeable
     , DeriveFunctor
@@ -579,9 +575,6 @@ test-suite hnix-tests
     PrettyTests
     ReduceExprTests
     TestCommon
-  mixins:
-      base hiding (Prelude)
-    , relude
   hs-source-dirs:
     tests
   ghc-options:
@@ -615,7 +608,8 @@ test-suite hnix-tests
     , time
     , unix-compat
   default-extensions:
-      OverloadedStrings
+      NoImplicitPrelude
+    , OverloadedStrings
     , DeriveGeneric
     , DeriveDataTypeable
     , DeriveFunctor
@@ -650,9 +644,6 @@ benchmark hnix-benchmarks
     ParserBench
   hs-source-dirs:
     benchmarks
-  mixins:
-      base hiding (Prelude)
-    , relude
   ghc-options:
     -Wall
   build-depends:
@@ -668,7 +659,8 @@ benchmark hnix-benchmarks
     , template-haskell
     , time
   default-extensions:
-      OverloadedStrings
+      NoImplicitPrelude
+    , OverloadedStrings
     , DeriveGeneric
     , DeriveDataTypeable
     , DeriveFunctor

main/Main.hs

@@ -4,6 +4,7 @@
 
 module Main ( main ) where
 
+import           Nix.Prelude
 import           Relude                        as Prelude ( force )
 import           Control.Comonad                ( extract )
 import qualified Control.Exception             as Exception

main/Repl.hs

@@ -14,16 +14,16 @@ module Repl
   , main'
   ) where
 
-import           Prelude                 hiding ( state )
+import           Nix.Prelude             hiding ( state )
 import           Nix                     hiding ( exec )
 import           Nix.Scope
 import           Nix.Value.Monad                ( demand )
 
-import qualified Data.HashMap.Lazy           as M
+import qualified Data.HashMap.Lazy             as M
 import           Data.Char                      ( isSpace )
 import           Data.List                      ( dropWhileEnd )
-import qualified Data.Text                   as Text
-import qualified Data.Text.IO                as Text
+import qualified Data.Text                     as Text
+import qualified Data.Text.IO                  as Text
 import           Data.Version                   ( showVersion )
 import           Paths_hnix                     ( version )
 
@@ -33,7 +33,7 @@ import           Prettyprinter                  ( Doc
                                                 , space
                                                 )
 import qualified Prettyprinter
-import qualified Prettyprinter.Render.Text    as Prettyprinter
+import qualified Prettyprinter.Render.Text     as Prettyprinter
 
 import           System.Console.Haskeline.Completion
                                                 ( Completion(isFinished)
@@ -49,9 +49,9 @@ import           System.Console.Repline         ( Cmd
                                                 , HaskelineT
                                                 , evalRepl
                                                 )
-import qualified System.Console.Repline      as Console
-import qualified System.Exit                 as Exit
-import qualified System.IO.Error             as Error
+import qualified System.Console.Repline        as Console
+import qualified System.Exit                   as Exit
+import qualified System.IO.Error               as Error
 
 -- | Repl entry point
 main :: (MonadNix e t f m, MonadIO m, MonadMask m) =>  m ()

src/Nix.hs

@@ -1,4 +1,3 @@
-
 module Nix
   ( module Nix.Cache
   , module Nix.Exec
@@ -25,6 +24,7 @@ module Nix
   )
 where
 
+import           Nix.Prelude
 import           Relude.Unsafe                  ( (!!) )
 import           GHC.Err                        ( errorWithoutStackTrace )
 import           Data.Fix                       ( Fix )

src/Nix/Atoms.hs

@@ -1,8 +1,9 @@
-{-# language CPP            #-}
-{-# language DeriveAnyClass #-}
+{-# language CPP               #-}
+{-# language DeriveAnyClass    #-}
 
 module Nix.Atoms where
 
+import           Nix.Prelude
 import           Codec.Serialise                ( Serialise )
 
 import           Data.Data                      ( Data)

src/Nix/Builtins.hs

@@ -13,14 +13,15 @@
 
 {-# options_ghc -fno-warn-name-shadowing #-}
 
+
 -- | Code that implements Nix builtins. Lists the functions that are built into the Nix expression evaluator. Some built-ins (aka `derivation`), are always in the scope, so they can be accessed by the name. To keap the namespace clean, most built-ins are inside the `builtins` scope - a set that contains all what is a built-in.
 module Nix.Builtins
   ( withNixContext
   , builtins
   )
 where
 
-
+import           Nix.Prelude
 import           GHC.Exception                  ( ErrorCall(ErrorCall) )
 import           Control.Comonad                ( Comonad )
 import           Control.Monad                  ( foldM )

src/Nix/Cache.hs

@@ -3,6 +3,7 @@
 -- | Reading and writing Nix cache files
 module Nix.Cache where
 
+import           Nix.Prelude
 import qualified Data.ByteString.Lazy          as BSL
 import           Nix.Expr.Types.Annotated
 

src/Nix/Cited.hs

@@ -5,6 +5,7 @@
 
 module Nix.Cited where
 
+import           Nix.Prelude
 import           Control.Comonad
 import           Control.Comonad.Env
 import           Lens.Family2.TH