Add Eq instances.

src/Oracles/Builder.hs

@@ -29,7 +29,7 @@ data Builder = Ar
              | Gcc Stage
              | Ghc Stage
              | GhcPkg Stage
-             deriving Show
+             deriving (Show, Eq)
 
 instance ShowArg Builder where
     showArg builder = toStandard <$> do

src/Package/Base.hs

@@ -4,7 +4,6 @@ module Package.Base (
     module Ways,
     module Util,
     module Oracles,
-    module Settings,
     Package (..), Settings (..), TodoItem (..),
     defaultSettings, library, customise, updateSettings,
     commonCcArgs, commonLdArgs, commonCppArgs, commonCcWarninigArgs,
@@ -21,7 +20,6 @@ import Base
 import Ways
 import Util
 import Oracles
-import Settings
 import qualified System.Directory as S
 
 data Settings = Settings
@@ -72,6 +70,9 @@ data Package = Package
          pkgTodo  :: [TodoItem] -- [(Stage1, "dist-install", defaultSettings)]
      }
 
+instance Eq Package where
+    (==) = (==) `on` pkgName
+
 updateSettings :: (Settings -> Settings) -> Package -> Package
 updateSettings update (Package name path cabal todo) =
     Package name path cabal (map updateTodo todo)