This commit is contained in:
Robert Hensing 2019-09-27 12:39:07 +02:00
parent 81887ba633
commit 44df36673c
3 changed files with 5 additions and 5 deletions

View file

@ -146,7 +146,7 @@ runEvalAndDC cmd dopts opts = do
runCat :: CommonOptions -> IO ()
runCat co = do
v <- Arion.Nix.evaluate EvaluationArgs
v <- Arion.Nix.evaluateComposition EvaluationArgs
{ evalUid = 0 -- TODO
, evalModules = files co
, evalPkgs = pkgs co

View file

@ -33,8 +33,8 @@ data EvaluationArgs = EvaluationArgs
, evalUserArgs :: [Text]
}
evaluate :: EvaluationArgs -> IO Value
evaluate ea = do
evaluateComposition :: EvaluationArgs -> IO Value
evaluateComposition ea = do
evalComposition <- getDataFileName "nix/eval-composition.nix"
let commandArgs =
[ "--eval"

View file

@ -18,8 +18,8 @@ import qualified Data.Aeson.Encode.Pretty
import Data.Char (isSpace)
spec :: Spec
spec = describe "evaluate" $ it "matches an example" $ do
x <- Arion.Nix.evaluate EvaluationArgs
spec = describe "evaluateComposition" $ it "matches an example" $ do
x <- Arion.Nix.evaluateComposition EvaluationArgs
{ evalUid = 123
, evalModules = NEL.fromList
["src/haskell/testdata/Arion/NixSpec/arion-compose.nix"]