Skip to content

Commit

Permalink
Remove Portage.Tables module
Browse files Browse the repository at this point in the history
Two packages were handled specially by hackport since they had non-0
slots. Now that those packages have been switched to a 0 slot, the
code to specially handle them is no longer needed.

In the future, there shouldn't be any other packages with non-0 slots,
so the module should be removed.

Bug: gentoo-haskell/gentoo-haskell#1502
Signed-off-by: hololeap <hololeap@protonmail.com>
  • Loading branch information
hololeap committed Feb 1, 2024
1 parent fc45382 commit bb0f72d
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 43 deletions.
1 change: 0 additions & 1 deletion hackport.cabal
Expand Up @@ -870,7 +870,6 @@ library hackport-internal
Portage.Overlay
Portage.PackageId
Portage.Resolve
Portage.Tables
Portage.Use
Portage.Version
Status
Expand Down
9 changes: 4 additions & 5 deletions src/Merge/Dependencies.hs
Expand Up @@ -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
Expand Down Expand Up @@ -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
]
Expand All @@ -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
]
Expand Down
37 changes: 0 additions & 37 deletions src/Portage/Tables.hs

This file was deleted.

0 comments on commit bb0f72d

Please sign in to comment.