Skip to content

Commit

Permalink
Fix build of proto-lens-0.3.* on lts-12.
Browse files Browse the repository at this point in the history
Also update `stack.yaml` to `lts-12.6` rather than a nightly.

The proto-lens-protoc-0.3.1.1 release had an upper bound
on `temporary` that was too restrictive.  Increase it,
and bump the version to `0.3.1.2`.
  • Loading branch information
judah committed Aug 24, 2018
1 parent ec79d10 commit 3cbb18c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ matrix:
addons: {apt: {packages: [libgmp-dev]}}
- env: BUILD=stack STACK='stack --resolver=lts-9.6'
addons: {apt: {packages: [libgmp-dev]}}
- env: BUILD=stack STACK=stack # Use the resolver in stack.yaml
- env: BUILD=stack STACK=stack --resolver=11.22'
addons: {apt: {packages: [libgmp-dev]}}
- env: BUILD=stack STACK='stack --resolver=nightly-2018-05-04'
- env: BUILD=stack STACK='stack' # Use the resolver in stack.yaml
addons: {apt: {packages: [libgmp-dev]}}

before_install:
Expand Down
3 changes: 3 additions & 0 deletions proto-lens-protoc/Changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# Changelog for `proto-lens-protoc`

## v0.3.1.2
- Bump the upper bound to `temporary-1.3`.

## v0.3.1.1
- Fix management of generated files between Cabal components (#171).
- Bump the lower bound on `base` to indicate we require `ghc>=8.0`.
Expand Down
2 changes: 1 addition & 1 deletion proto-lens-protoc/package.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ library:
- lens-labels == 0.2.*
- pretty == 1.1.*
- process >= 1.2 && < 1.7
- temporary == 1.2.*
- temporary >= 1.2 && < 1.4
exposed-modules:
- Data.ProtoLens.Compiler.Combinators
- Data.ProtoLens.Compiler.Definitions
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-11.7
resolver: lts-12.7
packages:
- discrimination-ieee754
- lens-labels
Expand Down

0 comments on commit 3cbb18c

Please sign in to comment.