Skip to content
This repository was archived by the owner on Oct 7, 2020. It is now read-only.

Bump resolvers #1019

Merged
alanz merged 1 commit into from
Dec 31, 2018
Merged

Bump resolvers #1019

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,15 @@
/test/testdata/HaReMoveDef.refactored.hs
/test/testdata/HaReRename.hs.keep
/test/testdata/HaReRename.refactored.hs
/test/testdata/gototest/stack.yaml
/test/testdata/stack.yaml
/test/testdata/addPackageTest/**/stack.yaml
/test/testdata/addPackageTest/**/stack.yaml
/test/testdata/addPackageTest/hpack/*.cabal
/test/testdata/redundantImportTest/stack.yaml
/test/testdata/badProjects/cabal/stack.yaml
/test/testdata/completion/stack.yaml
/test/testdata/definition/stack.yaml
/test/testdata/gototest/stack.yaml
/test/testdata/redundantImportTest/stack.yaml
/test/testdata/stack.yaml
/test/testdata/wErrorTest/stack.yaml
TAGS
cabal-dev/
Expand Down
5 changes: 3 additions & 2 deletions stack-8.4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-12.20 # LTS 12.15 is first to support GHC 8.4.4
resolver: lts-12.26 # LTS 12.15 is first to support GHC 8.4.4
Copy link
Contributor

@samuelpilz samuelpilz Dec 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

minor note: some old lts is referenced here in comment, other files only reference the ghc version in the comment

Copy link
Collaborator Author

@alanz alanz Dec 31, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For the nightly it changes GHC version at certain points. For the the lts, the minor version may change at certain points.

So we add comments to mark these transitions, and the "last" type comments are the most important, as they tell me not to bother trying to update the resolver again. Although I do re-do the specified deps in the stack files to see if any have advanced.

packages:
- .
- hie-plugin-api
Expand All @@ -20,7 +20,8 @@ extra-deps:
- haskell-lsp-types-0.8.0.1
- hsimport-0.8.6
- lsp-test-0.5.0.2
- pretty-show-1.8.2
- optparse-simple-0.1.0
- pretty-show-1.9.5
- syz-0.2.0.0
- temporary-1.2.1.1

Expand Down
18 changes: 1 addition & 17 deletions stack-8.6.1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,11 @@ extra-deps:
- cabal-install-2.4.0.0
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
- cryptohash-sha256-0.11.101.0
- czipwith-1.0.1.1
- data-tree-print-0.1.0.2
- ed25519-0.0.5.0
- ekg-core-0.1.1.4
- ekg-core-0.1.1.6
- ekg-json-0.1.0.6
- ekg-wai-0.1.0.3
- hackage-security-0.5.3.0
- haddock-api-2.21.0
- haskell-lsp-0.8.0.1
- haskell-lsp-types-0.8.0.1
Expand All @@ -38,24 +35,11 @@ extra-deps:
- yaml-0.8.32



flags:
haskell-ide-engine:
pedantic: true
hie-plugin-api:
pedantic: true
# ekg-core:
# allow-newer: true
# ekg-json:
# allow-newer: true
# ekg-wai:
# allow-newer: true
# base:
# allow-newer: true
# process:
# allow-newer: true

allow-newer: true

nix:
packages: [ icu libcxx zlib ]
Expand Down
19 changes: 1 addition & 18 deletions stack-8.6.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2018-11-30 # GHC 8.6.2
resolver: nightly-2018-12-17 # Last GHC 8.6.2
packages:
- .
- hie-plugin-api
Expand All @@ -10,7 +10,6 @@ extra-deps:
- ./submodules/ghc-mod
- ./submodules/ghc-mod/core

- apply-refact-0.6.0.0
- butcher-1.3.2.1
- cabal-plan-0.4.0.0
- constrained-dynamic-0.1.0.0
Expand All @@ -21,31 +20,15 @@ extra-deps:
- lsp-test-0.5.0.2
- monad-memo-0.4.1
- multistate-0.8.0.1
- resolv-0.1.1.2
- syz-0.2.0.0
- temporary-1.2.1.1
- yaml-0.8.32




flags:
haskell-ide-engine:
pedantic: true
hie-plugin-api:
pedantic: true
# ekg-core:
# allow-newer: true
# ekg-json:
# allow-newer: true
# ekg-wai:
# allow-newer: true
# base:
# allow-newer: true
# process:
# allow-newer: true

# allow-newer: true

nix:
packages: [ icu libcxx zlib ]
Expand Down
4 changes: 0 additions & 4 deletions stack-8.6.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ extra-deps:
- ekg-wai-0.1.0.3
- haddock-api-2.21.0
- hsimport-0.8.6
# # - lsp-test-0.5.0.2
- monad-memo-0.4.1
- multistate-0.8.0.1
# # - resolv-0.1.1.2
- syz-0.2.0.0
- temporary-1.2.1.1
- yaml-0.8.32




flags:
haskell-ide-engine:
pedantic: true
Expand Down
3 changes: 1 addition & 2 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2018-12-27 # GHC 8.6.3
resolver: nightly-2018-12-31 # GHC 8.6.3
packages:
- .
- hie-plugin-api
Expand All @@ -24,7 +24,6 @@ extra-deps:
- temporary-1.2.1.1
- yaml-0.8.32


flags:
haskell-ide-engine:
pedantic: true
Expand Down
2 changes: 1 addition & 1 deletion submodules/brittany
Open in desktop
Submodule brittany updated 7 files
+6 −6 .travis.yml
+7 −5 brittany.cabal
+0 −1 doc-svg-gen/doc-svg-gen.cabal
+14 −0 src-literatetests/10-tests.blt
+0 −2 src/Language/Haskell/Brittany/Internal/BackendUtils.hs
+1 −1 src/Language/Haskell/Brittany/Internal/Layouters/Expr.hs
+4 −0 src/Language/Haskell/Brittany/Internal/Transformations/Floating.hs
7 changes: 0 additions & 7 deletions test/testdata/badProjects/cabal/stack.yaml
View file
Open in desktop

This file was deleted.