Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not -package transitive dependencies. #85

Merged
merged 1 commit into from
Jan 7, 2018
Merged

Do not -package transitive dependencies. #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion haskell/actions.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,7 +503,7 @@ def gather_dependency_information(ctx):
new_external_libraries = new_external_libraries.union(pkg.external_libraries)
hpi = HaskellPackageInfo(
name = hpi.name,
names = hpi.names + pkg.names,
names = hpi.names + [pkg.name],
confs = hpi.confs + pkg.confs,
caches = hpi.caches + pkg.caches,
static_libraries = hpi.static_libraries + pkg.static_libraries,
Expand Down
5 changes: 5 additions & 0 deletions haskell/haskell.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,11 @@ def _haskell_library_impl(ctx):
dep_info = gather_dependency_information(ctx)
return [HaskellPackageInfo(
name = dep_info.name,
# TODO this is somewhat useless now, we shouldn't be abusing
# HaskellPackageInfo to carry information only relevant during
# build just to throw it away later as upstream doesn't need this.
# Technically Haddock rule relies on this but it should gather its
# own info.
names = depset(transitive = [dep_info.names, depset([get_pkg_id(ctx)])]),
confs = depset(transitive = [dep_info.confs, depset([conf_file])]),
caches = depset(transitive = [dep_info.caches, depset([cache_file])]),
Expand Down