Skip to content
Browse files

-Wall cleanups

  • Loading branch information...
1 parent bd75ad0 commit 2775da027e34b1f6fe04cb0bd11d45cb3dc3b9e4 @trofi trofi committed Jan 24, 2010
Showing with 3 additions and 5 deletions.
  1. +1 −3 Cabal2Ebuild.hs
  2. +2 −2 Merge.hs
View
4 Cabal2Ebuild.hs
@@ -36,10 +36,8 @@ import qualified Distribution.Package as Cabal (PackageIdentifier(..)
import qualified Distribution.Version as Cabal (VersionRange, foldVersionRange', versionBranch, Version)
import qualified Distribution.License as Cabal (License(..))
import qualified Distribution.Text as Cabal (display)
---import qualified Distribution.Compiler as Cabal (CompilerFlavor(..))
import Data.Char (toLower,isUpper)
-import Data.Maybe ( isJust )
import Portage.Dependency
import Portage.Version
@@ -111,7 +109,7 @@ cabal2ebuild pkg = ebuildTemplate {
) (Cabal.library pkg) -- hscolour can't colour its own sources
} where
cabalPkgName = Cabal.display $ Cabal.pkgName (Cabal.package pkg)
- hasLib = isJust (Cabal.library pkg)
+ -- hasLib = isJust (Cabal.library pkg)
hasExe = (not . null) (Cabal.executables pkg)
defaultDepGHC :: Dependency
View
4 Merge.hs
@@ -194,7 +194,7 @@ merge verbosity repo serverURI args overlayPath = do
-- (FlagName "small_base", True) -- try to use small base
(FlagName "cocoa", False)
]
- (\dependency -> trace ("accepting dep(?): " ++ display dependency) True)
+ (\dep -> trace ("accepting dep(?): " ++ display dep) True)
-- (Nothing :: Maybe (Index.PackageIndex PackageIdentifier))
buildPlatform
(CompilerId GHC (Cabal.Version [6,10,4] []))
@@ -211,7 +211,7 @@ merge verbosity repo serverURI args overlayPath = do
-- calculate build tools
bt = [ pkg' -- TODO: currently ignoring version range
- | Cabal.Dependency (Cabal.PackageName pkg ) range <- buildToolsDeps pkgDesc
+ | Cabal.Dependency (Cabal.PackageName pkg ) _range <- buildToolsDeps pkgDesc
, Just pkg' <- return (lookup pkg buildToolsTable)
]

0 comments on commit 2775da0

Please sign in to comment.
Something went wrong with that request. Please try again.