Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade to GHC 8.10 and lts-17 #743

Merged
merged 28 commits into from
Apr 22, 2021
Merged

Upgrade to GHC 8.10 and lts-17 #743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
fcaf153
Upgrade to GHC 8.10 and lts-17
f-f Feb 4, 2021
0d8f3fa
Fix dhall bounds
f-f Feb 4, 2021
0a70a53
Fix dhall bounds
f-f Feb 4, 2021
af18e14
Hopefully fix Windows build
f-f Feb 4, 2021
9ccf7eb
More deps shuffling
f-f Feb 4, 2021
c331929
Maybe fix windows build plan
f-f Feb 4, 2021
c28d14f
Test plan
f-f Feb 4, 2021
2049663
Something has changed with whitespace handling
f-f Feb 5, 2021
bc4dc61
Update lts to latest nightly
f-f Feb 15, 2021
a90b980
Merge branch 'master' into lts-17
f-f Feb 22, 2021
096f62c
Latest nightly
f-f Mar 17, 2021
5e77fdf
Merge branch 'master' into lts-17
f-f Mar 23, 2021
682ddca
Update to latest ubuntu
f-f Mar 23, 2021
8925f70
Merge branch 'master' into lts-17
f-f Apr 12, 2021
84f6675
Bump win32
f-f Apr 12, 2021
3ec1fe1
Fix bounds
f-f Apr 12, 2021
3a51b23
Readd cabal and stuff
f-f Apr 12, 2021
6e68125
Allow newer
f-f Apr 12, 2021
b056533
Slightly less newer
f-f Apr 12, 2021
b2b1d8a
More downgrades
f-f Apr 12, 2021
90227d8
win32-2.9
f-f Apr 12, 2021
d389f22
Try again to comment some pkgs
f-f Apr 12, 2021
c6c6281
Remove dependency on Cabal
f-f Apr 12, 2021
0fe40df
Remove package.yaml and refactor cabal file
f-f Apr 14, 2021
0c29c3c
Fix nonportable paths
f-f Apr 14, 2021
3cb9cce
Update nightly
f-f Apr 20, 2021
d405feb
Merge branch 'master' into lts-17
f-f Apr 21, 2021
147314b
Get back to mainline lts
f-f Apr 22, 2021
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
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Setup Haskell
uses: haskell/actions/setup@v1
with:
ghc-version: '8.6.5'
ghc-version: '8.10'
stack-version: 'latest'
enable-stack: true
stack-no-global: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Setup Haskell
uses: haskell/actions/setup@v1
with:
ghc-version: '8.6.5'
ghc-version: '8.10'
stack-version: 'latest'
enable-stack: true
stack-no-global: true
Expand Down
7 changes: 3 additions & 4 deletions spago.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ common defaults
KindSignatures
LambdaCase
LiberalTypeSynonyms
MonadFailDesugaring
MultiParamTypeClasses
MultiWayIf
NamedFieldPuns
Expand Down Expand Up @@ -140,7 +139,7 @@ library
, http-conduit
, http-types
, lens-family-core
, megaparsec >=7.0 && <8.0
, megaparsec
, mtl
, network-uri
, open-browser
Expand Down Expand Up @@ -206,8 +205,8 @@ test-suite spec
, directory
, extra
, hspec ==2.*
, hspec-megaparsec >=2.0 && <2.1
, megaparsec >=7.0 && <8.0
, hspec-megaparsec
, megaparsec
, process
, spago
, temporary
Expand Down
2 changes: 1 addition & 1 deletion src/Spago/RunEnv.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ getPackageSet = do

getMaybeGraph :: HasPursEnv env => BuildOptions -> Config -> [(PackageName, Package)] -> RIO env Graph
getMaybeGraph BuildOptions{ depsOnly, sourcePaths } Config{ configSourcePaths } deps = do
let partitionedGlobs@(Packages.Globs{..}) = Packages.getGlobs deps depsOnly configSourcePaths
let partitionedGlobs = Packages.getGlobs deps depsOnly configSourcePaths
globs = Packages.getGlobsSourcePaths partitionedGlobs <> sourcePaths
supportsGraph <- Purs.hasMinPursVersion "0.14.0"
if not supportsGraph
Expand Down
22 changes: 1 addition & 21 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,9 @@
resolver: lts-14.27
resolver: lts-17.9
packages:
- .
extra-deps:
- async-pool-0.9.1@sha256:4015140f896c3f1652b06a679b0ade2717d05557970c283ea2c372a71be2a6a1,1605
- base-compat-0.11.1@sha256:e49c1ce84f556621ef1142a169e4349049c516f5b3e3c3ec6830be503e7d4a93,7140
- binary-instances-1.0.0.1@sha256:e234be994da675479a3661f050d4a1d53565c9ed7786d9a68b7a29ba8b54b5a7,2659
- dhall-1.38.1
- directory-1.3.6.1@sha256:3dc9c69c8e09ec95a7a45c6d06abe0f0d2f604439c37e5f88e5a6c335b088d71,2810
- generic-lens-2.0.0.0@sha256:7409fa0ce540d0bd41acf596edd1c5d0c0ab1cd1294d514cf19c5c24e8ef2550,3866
- generic-lens-core-2.0.0.0@sha256:40b063c4a1399b3cdb19f2df1fae5a1a82f3313015c7c3e47fc23b8ef1b3e443,2913
- github-0.26@sha256:a9d4046325c3eb28cdc7bef2c3f5bb213328caeae0b7dce6f51de655f0bffaa1,7162
- haskeline-0.8.1.0@sha256:6a6158c90b929ce7aa5331ff5e9819aa32c7df8f4a7ba324b3cc055ee96b48cb,5818
- hspec-megaparsec-2.0.1@sha256:7f26ab334eaa653054766110cf259c31314d1c2ec170270e56101e344ce65ef9,2163
- http-client-0.7.2.1
- indexed-profunctors-0.1@sha256:ddf618d0d4c58319c1e735e746bc69a1021f13b6f475dc9614b80af03432e6d4,1016
- megaparsec-7.0.5@sha256:45e1f1348fab2783646fdb4d9e6097568981a740951c7356d36d794e2baba305,3902
- prettyprinter-1.7.0
- process-1.6.10.0@sha256:c0d2d8adaca7cea7ceaa60e67b61c775dc03727b83bdb1c97aa8cbeac9f5dd84,2469
- repline-0.4.0.0@sha256:3324479e497d27c40c3d4762bffc52058f9921621d20d2947dcf9a554b94cd0d,2253
- rio-0.1.18.0@sha256:067914d6ae9df1704902ecd1dd92b2c3d150216f7b924ce5aa57771a2ef3b99b,3688
- semver-range-0.2.8
- th-env-0.1.0.2@sha256:d8f1f37f42a8f1a22404d7d0579528af18f5dac7232cca6bdbd5117c115a0ad5,1370
- time-1.8.0.4@sha256:3f6eddf238b828eb4f82683acce1c3afe64784f0d20114239b738c123316c85c,5494
- unix-2.7.2.2@sha256:9e93f93cc5a065248120136e83a0a6d1ce93d6eb5ef2a2543f9593e93e164d24,3496
- Win32-2.8.5.0@sha256:50c11fce7ec29c750f199eec0bc97d42e9b8ca80abfbe068c0f474a3727b60ae,4277
- with-utf8-1.0.2.2
allow-newer: true
nix:
Expand Down