--force was a needless duplicate of --strict
This commit is contained in:
parent
e9006ff98b
commit
b186e44174
|
@ -144,7 +144,7 @@ main = do
|
|||
. A.encodingToLazyByteString
|
||||
. toEncodingSorted
|
||||
<=< fromNix
|
||||
| normalize opts =
|
||||
| strict opts =
|
||||
liftIO . print . prettyNValueNF <=< normalForm
|
||||
| values opts =
|
||||
liftIO . print <=< prettyNValueProv
|
||||
|
|
|
@ -103,7 +103,7 @@ exec update source = do
|
|||
go expr = do
|
||||
val <- evalExprLoc expr
|
||||
opts :: Nix.Options <- asks (view hasLens)
|
||||
if | normalize opts ->
|
||||
if | strict opts ->
|
||||
liftIO . print . prettyNValueNF =<< normalForm val
|
||||
| values opts ->
|
||||
liftIO . print =<< prettyNValueProv val
|
||||
|
|
|
@ -16,7 +16,6 @@ data Options = Options
|
|||
, finder :: Bool
|
||||
, findFile :: Maybe FilePath
|
||||
, strict :: Bool
|
||||
, normalize :: Bool
|
||||
, evaluate :: Bool
|
||||
, json :: Bool
|
||||
, xml :: Bool
|
||||
|
@ -50,7 +49,6 @@ defaultOptions current = Options
|
|||
, finder = False
|
||||
, findFile = Nothing
|
||||
, strict = False
|
||||
, normalize = False
|
||||
, evaluate = False
|
||||
, json = False
|
||||
, xml = False
|
||||
|
|
|
@ -69,9 +69,6 @@ nixOptions current = Options
|
|||
<*> switch
|
||||
( long "strict"
|
||||
<> help "When used with --eval, recursively evaluate list elements and attributes")
|
||||
<*> switch
|
||||
( long "force"
|
||||
<> help "Whether to force the results of evaluation to normal form")
|
||||
<*> switch
|
||||
( long "eval"
|
||||
<> help "Whether to evaluate, or just pretty-print")
|
||||
|
|
Loading…
Reference in a new issue