Skip to content

Commit e961238

Browse files
committed
Include patched hackage-security for #3073
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.
1 parent c2e24e8 commit e961238

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

ChangeLog.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ Bug fixes:
3434
we were forgetting to record the result, which meant that all tests
3535
always ran even if they had already passed before. See
3636
[#3770](https://github.com/commercialhaskell/stack/pull/3770).
37+
* Includes a patched version of `hackage-security` which fixes both
38+
some issues around asynchronous exception handling, and moves from
39+
directory locking to file locking, making the update mechanism
40+
resilient against SIGKILL and machine failure. See
41+
[hackage-security #187](https://github.com/haskell/hackage-security/issues/187)
42+
and [#3073](https://github.com/commercialhaskell/stack/issues/3073).
3743

3844
## v1.6.3
3945

stack-nightly.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,6 @@ nix:
77
- http-client-tls-0.3.4
88
extra-deps:
99
- hpack-0.26.0
10+
- archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
11+
subdirs:
12+
- hackage-security

stack.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,6 @@ extra-deps:
3030
- ansi-terminal-0.7.1.1
3131
- ansi-wl-pprint-0.6.8.1
3232
- smallcheck-1.1.3
33+
- archive: https://github.com/haskell/hackage-security/archive/3297b0f3f4285cb30321baaa7b54e3d22e1f6bd7.tar.gz
34+
subdirs:
35+
- hackage-security

0 commit comments

Comments
 (0)