Update rules_haskell #1133
Merged
Update rules_haskell #1133
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
aherrmann-da
force-pushed
the
rules_haskell-pkgdb
branch
2 times, most recently
from
f9f9bfa to
23b5a21
Compare
aherrmann-da
force-pushed
the
rules_haskell-pkgdb
branch
6 times, most recently
from
3eb7b07 to
04fbb9d
Compare
aherrmann-da
changed the title
cocreature
approved these changes
May 17, 2019
| deduped = list.dedup_on(get_lib_name, ext_libs) | ||
|
|
||
| for lib in deduped: | ||
| - # This test is a hack. When a CC library has a Haskell library |
There was a problem hiding this comment.
Not sure if the fact that we now have patches to remove hacks in rules_haskell is a good or a bad thing 😄
| @@ -1,5 +1,5 @@ | |||
| diff --git a/haskell/private/actions/compile.bzl b/haskell/private/actions/compile.bzl | |||
There was a problem hiding this comment.
We should try to upstream that patch. Just haven’t had the time so far sadly 😞
There was a problem hiding this comment.
I tried to just apply the patch on rules_haskell. Sadly it breaks plugins, haddock, and doctests.
nix/ghc.nix
Outdated
| @@ -24,7 +24,6 @@ let | |||
|
|
|||
| # We need newer versions that build with GHC 8.6 | |||
| language-c = super.callPackage ./overrides/language-c-0.8.2.nix {}; | |||
There was a problem hiding this comment.
We can probably also get rid of the language-c override if we don’t need c2hs.
There was a problem hiding this comment.
I believe we need it for grpc related stuff.
There was a problem hiding this comment.
The Nix override seems to be unused. I could only find references to the Hazel package.
This is a left-over from when the package was patched.
- rules_haskell now handles the global package db within Bazel
tweag/rules_haskell#859
- We no longer use the Nix provided c2hs. So, we drop it.
- Rename `ghcWithC2hs` to `ghcStatic` to clarify that that's where the
static linking patches are applied.
- Extend package-db patches to align Nix store paths with the new $out.
This works around a restriction in current rules_haskell, where
the paths in the package config files must have the same prefix as
the path to the package config files themselves.
- Don't exclude haskell libraries from extra-libraries entries.
aherrmann-da
force-pushed
the
rules_haskell-pkgdb
branch
from
04fbb9d to
76ec3db
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
ghcWithC2hstoghcStaticto clarify that that's where the static linking patches are applied.$out. This works around a restriction in current rules_haskell, where the paths in the package config files must have the same prefix as the path to the package config files themselves. (This is also related to why we need to pull in libffi headers separately on Unix)Pull Request Checklist
NOTE: CI is not automatically run on non-members pull-requests for security
reasons. The reviewer will have to comment with
/AzurePipelines runtotrigger the build.