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.

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

Fix the build #459

Merged
merged 1 commit into from
Jan 5, 2016
Merged

Fix the build #459

merged 1 commit into from
Jan 5, 2016

Conversation

edsko
Copy link
Contributor

@edsko edsko commented Dec 25, 2015

PR #454 broke the build; compile error:

Distribution/Server/Features/Search/SearchEngine.hs:364:7:
    Couldn't match expected type ‘(Maybe key,
                                   [(BM25F.Explanation field feature Term, key)])’
                with actual type ‘[(BM25F.Explanation field feature Term, key)]’

(both on the master branch here and on the original exact-match branch from that PR). This PR fixes the compile error, but since I am not the author of the original PR this is a bit of a guess.

The crucial part of the fix is at https://github.com/haskell/hackage-server/pull/459/files#diff-8bb91ba499325cf56b275cbaed19e47dR362 .

Pinging @mpickering .

@mpickering
Copy link
Contributor

Thanks Edsko, I just found these changes uncommitted in my local copy. Sorry for breaking this!

@edsko
Copy link
Contributor Author

edsko commented Dec 30, 2015

This fails for the standard reason (security tests). This commit will be part of #412 .

@edsko edsko closed this Dec 30, 2015
@edsko edsko mentioned this pull request Jan 1, 2016
@hvr hvr reopened this Jan 5, 2016
hvr added a commit that referenced this pull request Jan 5, 2016
@hvr hvr merged commit c14d920 into haskell:master Jan 5, 2016
@edsko edsko deleted the pr/fix-454 branch January 5, 2016 07:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants