Nix.Normal: rename opaque(,->Val), indicate that it is literal

Author: Anton-Latukha

ChangeLog.md

@@ -38,6 +38,7 @@ Breaking:
 
   * `Nix.Normal`
     * add `thunkVal` literal & use it where appropriate `{deThunk, removeEffects}`
+    * rename `opaque(,->Val)`, indicate that it is a literal.
 
 
 

src/Nix/Normal.hs

@@ -140,6 +140,9 @@ normalForm_
   -> m ()
 normalForm_ t = void $ normalizeValue t
 
+opaqueVal :: Applicative f => NValue t f m
+opaqueVal = nvStr $ makeNixStringWithoutContext "<cycle>"
+
 -- | Detect cycles & stub them.
 stubCycles
   :: forall t f m
@@ -161,7 +164,8 @@ stubCycles =
     )
     Free
  where
-  Free (NValue' cyc) = opaque
+  Free (NValue' cyc) = opaqueVal
+
 thunkVal :: Applicative f => NValue t f m
 thunkVal = nvStr $ makeNixStringWithoutContext "<thunk>"
 
@@ -176,9 +180,6 @@ removeEffects =
     (\ t f -> f =<< queryM (pure thunkVal) t)
     (fmap Free . sequenceNValue' id)
 
-opaque :: Applicative f => NValue t f m
-opaque = nvStr $ makeNixStringWithoutContext "<cycle>"
-
 dethunk
   :: (MonadThunk t m (NValue t f m), MonadDataContext f m)
   => t