Skip to content

Commit

Permalink
Include patched hackage-security for #3073
Browse files Browse the repository at this point in the history
NOTE: This is included via an extra-dep, which would constitute the
first time Stack would include a patched version of an upstream library.
This is due to the fact that
haskell/hackage-security#203 is likely not going
to be merged, despite fixing issues affecting Stack. This leaves us with
(AFAICT) 4 choices at the Stack level:

1. Continue using the officially released upstream version of
   hackage-security, bugs and all
2. Fork hackage-security on Hackage, and depend on the fork
3. Inline the code from hackage-security into Stack itself, and drop the
   explicit dependency on hackage-security
4. Include hackage-security via an `extra-dep` pointing at a Git commit.
   Our official builds will use the patched version of hackage-security,
   and anyone building from Hackage will end up with the unpatched version

This PR represents approach (4). If and when the PR is merged and
released to Hackage, this becomes a non-issue. But generally speaking,
we should have a policy in Stack for handling these kinds of upstream
issues cases.
  • Loading branch information
snoyberg committed Feb 16, 2018
1 parent c2e24e8 commit e961238
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 0 deletions.
6 changes: 6 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ Bug fixes:
we were forgetting to record the result, which meant that all tests
always ran even if they had already passed before. See
[#3770](https://github.com/commercialhaskell/stack/pull/3770).
* Includes a patched version of `hackage-security` which fixes both
some issues around asynchronous exception handling, and moves from
directory locking to file locking, making the update mechanism
resilient against SIGKILL and machine failure. See
[hackage-security #187](https://github.com/haskell/hackage-security/issues/187)
and [#3073](https://github.com/commercialhaskell/stack/issues/3073).

## v1.6.3

Expand Down
3 changes: 3 additions & 0 deletions stack-nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,6 @@ nix:
- http-client-tls-0.3.4
extra-deps:
- hpack-0.26.0
- archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
subdirs:
- hackage-security
3 changes: 3 additions & 0 deletions stack.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,6 @@ extra-deps:
- ansi-terminal-0.7.1.1
- ansi-wl-pprint-0.6.8.1
- smallcheck-1.1.3
- archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
subdirs:
- hackage-security

0 comments on commit e961238

Please sign in to comment.