upd texts of more messages

Heterogeneous: consisting of dissimilar elements.

Heterogenous:
  1. not originating within the body;
  (ex: "You are NOT of the body!" by Dr. Leonard "Bones" McCoy)
  2. of foreign origin;
  3. heterogeneous.

Author: Anton-Latukha

src/Nix/Expr/Types.hs

@@ -264,7 +264,7 @@ instance (Serialise v, Serialise r) => Serialise (Antiquoted v r)
 
 -- | An 'NString' is a list of things that are either a plain string
 -- or an antiquoted expression. After the antiquotes have been evaluated,
--- the final string is constructed by concating all the parts.
+-- the final string is constructed by concatenating all the parts.
 data NString r
   = DoubleQuoted ![Antiquoted Text r]
   -- ^ Strings wrapped with double-quotes (") can contain literal newline

src/Nix/Pretty.hs

@@ -66,7 +66,7 @@ data NixDoc ann = NixDoc
     -- parentheses.
   , rootOp :: OperatorInfo
   , wasPath :: Bool -- This is needed so that when a path is used in a selector path
-                    -- we can add brackets appropiately
+                    -- we can add brackets appropriately
   }
 
 mkNixDoc :: Doc ann -> OperatorInfo -> NixDoc ann
@@ -83,7 +83,7 @@ pathExpr d = (simpleExpr d) { wasPath = True }
 
 -- | An expression that behaves as if its root operator had a precedence lower
 --   than all other operators. That ensures that the expression is wrapped in
---   parantheses in almost always, but it's still rendered without parentheses
+--   parentheses in almost always, but it's still rendered without parentheses
 --   in cases where parentheses are never required (such as in the LHS of a
 --   binding).
 leastPrecedence :: Doc ann -> NixDoc ann

src/Nix/Reduce.hs

@@ -186,7 +186,7 @@ reduce (NBinary_ bann op larg rarg) = do
       return $ Fix (NConstant_ ann (NInt (x + y)))
     _ -> pure $ Fix $ NBinary_ bann op lval rval
 
--- | Reduce a select on a Set by substituing the set to the selected value.
+-- | Reduce a select on a Set by substituting the set to the selected value.
 --
 -- Before applying this reduction, we need to ensure that:
 --

src/Nix/Type/Type.hs

@@ -10,8 +10,8 @@ newtype TVar = TV String
 data Type
   = TVar TVar                -- type variable
   | TCon String              -- known type
-  | TSet Bool (AttrSet Type) -- heterogenous map, bool if variadic
-  | TList [Type]             -- heterogenous list
+  | TSet Bool (AttrSet Type) -- heterogeneous map, bool if variadic
+  | TList [Type]             -- heterogeneous list
   | (:~>) Type Type          -- type -> type
   | TMany [Type]             -- variant type
   deriving (Show, Eq, Ord)

src/Nix/Value.hs

@@ -245,7 +245,7 @@ iterNValue' k f = f . fmap (\a -> k a (iterNValue' k f))
 
 -- | An 'NValueNF' is a fully evaluated value in normal form. An 'NValue f t m' is
 --   a value in head normal form, where only the "top layer" has been
---   evaluated. An action of type 'm (NValue f t m)' is a pending evualation that
+--   evaluated. An action of type 'm (NValue f t m)' is a pending evaluation that
 --   has yet to be performed. An 't' is either a pending evaluation, or
 --   a value in head normal form. A 'NThunkSet' is a set of mappings from keys
 --   to thunks.

tests/TestCommon.hs

@@ -44,7 +44,7 @@ hnixEvalText :: Options -> Text -> IO (StdValue (StandardT (StdIdT IO)))
 hnixEvalText opts src = case parseNixText src of
   Failure err ->
     error
-      $  "Parsing failed for expressien `"
+      $  "Parsing failed for expression `"
       ++ unpack src
       ++ "`.\n"
       ++ show err