Skip to content

Commit d21913c

Browse files
authored
Merge pull request #5726 from mpilgrem/updateHpack
Bump to providing `hpack-0.35.0`
2 parents c5780ad + 9d82da3 commit d21913c

File tree

4 files changed

+11
-6
lines changed

4 files changed

+11
-6
lines changed

ChangeLog.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ Behavior changes:
1313

1414
Other enhancements:
1515

16+
* Bump to `hpack-0.35.0`.
17+
1618
Bug fixes:
1719

1820
* Fix `stack clean --full`, so that the files to be deleted are not in use. See

stack-ghc-902.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ ghc-options:
2424
extra-deps:
2525
# mustache absent from lts-19.5
2626
- mustache-2.4.1@sha256:dc92ddbf90e3a64c3f2ec7785cf2937d6dcf6ffcebbc38ad9c8b33b6a70bb298,3180
27+
# lts-19.4 is limited to hpack-0.34.7
28+
- hpack-0.35.0@sha256:8cd6146fae269390f41dc7237ebd2c479074d4163806d349a41f5a7751d6cea5,4726
2729

2830
drop-packages:
2931
# See https://github.com/commercialhaskell/stack/pull/4712

stack.cabal

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cabal-version: 2.0
22

3-
-- This file has been generated from package.yaml by hpack version 0.34.6.
3+
-- This file has been generated from package.yaml by hpack version 0.35.0.
44
--
55
-- see: https://github.com/sol/hpack
66

@@ -306,6 +306,7 @@ library
306306
, yaml
307307
, zip-archive
308308
, zlib
309+
default-language: Haskell2010
309310
if os(windows)
310311
cpp-options: -DWINDOWS
311312
build-depends:
@@ -331,7 +332,6 @@ library
331332
src/unix/
332333
c-sources:
333334
src/unix/cbits/uname.c
334-
default-language: Haskell2010
335335

336336
executable stack
337337
main-is: Main.hs
@@ -430,6 +430,7 @@ executable stack
430430
, yaml
431431
, zip-archive
432432
, zlib
433+
default-language: Haskell2010
433434
if os(windows)
434435
cpp-options: -DWINDOWS
435436
build-depends:
@@ -454,7 +455,6 @@ executable stack
454455
cpp-options: -DHIDE_DEP_VERSIONS
455456
if flag(supported-build)
456457
cpp-options: -DSUPPORTED_BUILD
457-
default-language: Haskell2010
458458

459459
executable stack-integration-test
460460
main-is: IntegrationSpec.hs
@@ -553,6 +553,7 @@ executable stack-integration-test
553553
, yaml
554554
, zip-archive
555555
, zlib
556+
default-language: Haskell2010
556557
if os(windows)
557558
cpp-options: -DWINDOWS
558559
build-depends:
@@ -570,7 +571,6 @@ executable stack-integration-test
570571
buildable: False
571572
if flag(static)
572573
ld-options: -static -pthread
573-
default-language: Haskell2010
574574

575575
test-suite stack-test
576576
type: exitcode-stdio-1.0
@@ -685,6 +685,7 @@ test-suite stack-test
685685
, yaml
686686
, zip-archive
687687
, zlib
688+
default-language: Haskell2010
688689
if os(windows)
689690
cpp-options: -DWINDOWS
690691
build-depends:
@@ -698,6 +699,5 @@ test-suite stack-test
698699
cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=True
699700
else
700701
cpp-options: -DSTACK_DEVELOPER_MODE_DEFAULT=False
701-
default-language: Haskell2010
702702
build-tool-depends:
703703
hspec-discover:hspec-discover

stack.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ packages:
44
- .
55

66
extra-deps:
7-
- rio-0.1.21.0@rev:0
7+
- hpack-0.35.0@rev:0
88
- pantry-0.5.3@rev:0
9+
- rio-0.1.21.0@rev:0
910

1011

1112
docker:

0 commit comments

Comments
 (0)