diff --git a/hackport.cabal b/hackport.cabal index ff598213..b91eb1cd 100644 --- a/hackport.cabal +++ b/hackport.cabal @@ -870,7 +870,6 @@ library hackport-internal Portage.Overlay Portage.PackageId Portage.Resolve - Portage.Tables Portage.Use Portage.Version Status diff --git a/src/Merge/Dependencies.hs b/src/Merge/Dependencies.hs index b9fdd3f0..4c7407f5 100644 --- a/src/Merge/Dependencies.hs +++ b/src/Merge/Dependencies.hs @@ -43,7 +43,6 @@ import qualified Portage.Dependency.Normalize as PN import qualified Portage.Overlay as Portage import qualified Portage.PackageId as Portage import qualified Portage.Use as Portage -import qualified Portage.Tables as Portage import qualified Cabal2Ebuild as C2E import qualified Portage.GHCCore as GHCCore @@ -156,8 +155,8 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg ], dep_e = S.singleton "${RDEPEND}", rdep = Portage.DependAllOf - [ Portage.set_build_slot ghc_dep - , Portage.set_build_slot $ add_profile $ raw_haskell_deps + [ ghc_dep + , add_profile $ raw_haskell_deps , extra_libs , Portage.DependAllOf pkg_config_libs ] @@ -172,8 +171,8 @@ resolveDependencies overlay pkg compiler_info ghc_package_names merged_cabal_pkg ], dep_e = S.singleton "${RDEPEND}", rdep = Portage.DependAllOf - [ Portage.set_build_slot ghc_dep - , Portage.set_build_slot $ raw_haskell_deps + [ ghc_dep + , raw_haskell_deps , extra_libs , Portage.DependAllOf pkg_config_libs ] diff --git a/src/Portage/Tables.hs b/src/Portage/Tables.hs deleted file mode 100644 index fc06a351..00000000 --- a/src/Portage/Tables.hs +++ /dev/null @@ -1,37 +0,0 @@ -{-| -Module : Portage.Tables -License : GPL-3+ -Maintainer : haskell@gentoo.org - -Tables of Portage-specific conversions. --} -module Portage.Tables - ( set_build_slot - ) where - -import Portage.Dependency.Builder -import Portage.Dependency.Types -import Portage.PackageId - -import Data.Monoid - --- | Set the @SLOT@ for a given 'Dependency'. -set_build_slot :: Dependency -> Dependency -set_build_slot = - overAtom $ \a@(Atom pn dr (DAttr _ u)) -> - case mconcat $ map (First . matches a) slottedPkgs of - First (Just s) -> Atom pn dr (DAttr s u) - First Nothing -> Atom pn dr (DAttr AnyBuildTimeSlot u) - where - matches (Atom pn _ _) (nm,s) - | pn == nm = Just s - | otherwise = Nothing - --- | List of 'PackageName's with their corresponding default 'SlotDepend's. --- --- For example, dependency @QuickCheck@ has its @SLOT@ always set to @2@. -slottedPkgs :: [(PackageName, SlotDepend)] -slottedPkgs = - [ (mkPackageName "dev-haskell" "quickcheck", GivenSlot "2=") - , (mkPackageName "dev-haskell" "hdbc", GivenSlot "2=") - ]