ghoscht/arion
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename

Browse source
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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/haskell/exe/Main.hs
View file

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

4
src/haskell/lib/Arion/Nix.hs
View file

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

4
src/haskell/test/Arion/NixSpec.hs
View file

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