From 44df36673c713d8cd8cd24d0a33a2f711e0566ab Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Fri, 27 Sep 2019 12:39:07 +0200
Subject: [PATCH] Rename

---
 src/haskell/exe/Main.hs           | 2 +-
 src/haskell/lib/Arion/Nix.hs      | 4 ++--
 src/haskell/test/Arion/NixSpec.hs | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/haskell/exe/Main.hs b/src/haskell/exe/Main.hs
index cc30bac..c625bc3 100644
--- a/src/haskell/exe/Main.hs
+++ b/src/haskell/exe/Main.hs
@@ -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
diff --git a/src/haskell/lib/Arion/Nix.hs b/src/haskell/lib/Arion/Nix.hs
index d955484..609f38f 100644
--- a/src/haskell/lib/Arion/Nix.hs
+++ b/src/haskell/lib/Arion/Nix.hs
@@ -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"
diff --git a/src/haskell/test/Arion/NixSpec.hs b/src/haskell/test/Arion/NixSpec.hs
index 6b2308e..3d07cb4 100644
--- a/src/haskell/test/Arion/NixSpec.hs
+++ b/src/haskell/test/Arion/NixSpec.hs
@@ -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"]