Skip to content

Commit 3aea6fb

Browse files
Update compiler to 0.15.3 (#281)
* Update PureScript to 0.15.3 * Update to latest package set and install all packages * Update versions * Update stack yaml file to match purescript's one * Account for qualify local bindings by source pos PR * Add changelog entry
1 parent bd8a769 commit 3aea6fb

File tree

7 files changed

+62
-29
lines changed

7 files changed

+62
-29
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ New features:
1111
Bugfixes:
1212

1313
Other improvements:
14+
- Update to PureScript 0.15.3 (#281 by @JordanMartinez)
15+
- Update codebase to GHC 9.2.3 (#281 by @JordanMartinez)
1416

1517
## [v2022-06-18.1](https://github.com/purescript/trypurescript/releases/tag/v2022-06-18.1)
1618

client/src/Try/SharedConfig.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ module Try.SharedConfig where
66
import Prelude
77

88
pursVersion :: String
9-
pursVersion = "v0.15.2"
9+
pursVersion = "v0.15.3"
1010

1111
pursReleaseUrl :: String
1212
pursReleaseUrl = "https://github.com/purescript/purescript/releases/tag/" <> pursVersion
1313

1414
packageSetVersion :: String
15-
packageSetVersion = "0.15.2-20220531"
15+
packageSetVersion = "0.15.2-20220621"
1616

1717
packageSetPackageJsonUrl :: String
1818
packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json"

server/Main.hs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ import qualified Language.PureScript.Errors.JSON as P
4141
import qualified Language.PureScript.Interactive as I
4242
import qualified Language.PureScript.Make as Make
4343
import qualified Language.PureScript.Make.Cache as Cache
44+
import qualified Language.PureScript.Names as N
4445
import qualified Language.PureScript.TypeChecker.TypeSearch as TS
4546
import qualified Network.Wai.Handler.Warp as Warp
4647
import System.Environment (getArgs)
@@ -192,13 +193,13 @@ getOpts port = def
192193

193194
lookupAllConstructors :: P.Environment -> P.SourceType -> [P.SourceType]
194195
lookupAllConstructors env = P.everywhereOnTypesM $ \case
195-
P.TypeConstructor ann (P.Qualified Nothing tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon
196+
P.TypeConstructor ann (P.Qualified (N.BySourcePos _) tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon
196197
other -> pure other
197198
where
198199
lookupConstructor :: P.Environment -> P.ProperName 'P.TypeName -> [P.Qualified (P.ProperName 'P.TypeName)]
199200
lookupConstructor env nm =
200201
[ q
201-
| (q@(P.Qualified (Just _) thisNm), _) <- M.toList (P.types env)
202+
| (q@(P.Qualified (N.ByModuleName _) thisNm), _) <- M.toList (P.types env)
202203
, thisNm == nm
203204
]
204205

stack.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
1-
resolver: lts-18.15
1+
resolver: nightly-2022-06-09
22
packages:
33
- "."
44

55
extra-deps:
6-
- purescript-0.15.2
6+
- purescript-0.15.3
77
- language-javascript-0.7.0.0
8-
- monoidal-containers-0.6.2.0
98
- process-1.6.13.1
10-
- Cabal-3.2.1.0
9+
# The Cabal library is not in Stackage
10+
- Cabal-3.6.3.0
11+
# Protolude is not yet in resolver snapshot
12+
- protolude-0.3.1
1113

1214
flags:
1315
aeson-pretty:

stack.yaml.lock

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,19 @@
55

66
packages:
77
- completed:
8-
hackage: purescript-0.15.2@sha256:c269f5e8ca70a49e45345d9d1e60c47c32b5bd1e87073224cefd22f5273ce164,20150
8+
hackage: purescript-0.15.3@sha256:c996f177092867d4f88327a641611535b58fd042f2d3fed16d994440587515dc,20642
99
pantry-tree:
10-
size: 148972
11-
sha256: 4526fbe5158eedb966b56626873bdc5a46fd0ab9cd8835c35d48365f5e9caa87
10+
size: 151267
11+
sha256: 20847b2aa168b38d34b562576f40df2821f55f512f2585d42cfe8e6c4cbe8695
1212
original:
13-
hackage: purescript-0.15.2
13+
hackage: purescript-0.15.3
1414
- completed:
1515
hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898
1616
pantry-tree:
1717
size: 2244
1818
sha256: b0f28d836cb3fbde203fd7318a896c3a20acd8653a905e1950ae2d9a64bccebf
1919
original:
2020
hackage: language-javascript-0.7.0.0
21-
- completed:
22-
hackage: monoidal-containers-0.6.2.0@sha256:124941d70df5e2928b4c6db605a1d0464e68c2c6b02e426db24a40194d43821d,2219
23-
pantry-tree:
24-
size: 569
25-
sha256: 07ceac751866bad09af45df7d0ae97420d659221e8a0d85407705dcda1f6e89b
26-
original:
27-
hackage: monoidal-containers-0.6.2.0
2821
- completed:
2922
hackage: process-1.6.13.1@sha256:c8bb8b7c993ff72d771381b3b56852dd154bce51880a24789c11f57b0688d353,2963
3023
pantry-tree:
@@ -33,15 +26,22 @@ packages:
3326
original:
3427
hackage: process-1.6.13.1
3528
- completed:
36-
hackage: Cabal-3.2.1.0@sha256:8743076ec022296f9771d962000c9ca3a0fe02e68c37b992c63e382a675f791d,27482
29+
hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
30+
pantry-tree:
31+
size: 19757
32+
sha256: b250a53bdb56844f047a2927833bb565b936a289abfa85dfc2a63148d776368a
33+
original:
34+
hackage: Cabal-3.6.3.0
35+
- completed:
36+
hackage: protolude-0.3.1@sha256:1cc9e5a5c26c33a43c52b554443dd9779fef13974eaa0beec7ca6d2551b400da,2647
3737
pantry-tree:
38-
size: 41224
39-
sha256: 92682a2aab8d967de341acff88525376eb9a31f53f094e0878c51c2886564f3a
38+
size: 1645
39+
sha256: 6452a6ca8d395f7d810139779bb0fd16fc1dbb00f1862630bc08ef5a100430f9
4040
original:
41-
hackage: Cabal-3.2.1.0
41+
hackage: protolude-0.3.1
4242
snapshots:
4343
- completed:
44-
size: 586286
45-
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/15.yaml
46-
sha256: 2c9cb11d7aa0656bf28672dcb2414ab21e3ba9ea83ca170c216b2c2fc7e55856
47-
original: lts-18.15
44+
size: 607265
45+
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/9.yaml
46+
sha256: 819ac07621dac5b2c320c45cb8c27f141f95114a1749b19b06d2c3606c79e839
47+
original: nightly-2022-06-09

staging/packages.dhall

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
let upstream =
2-
https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220531/packages.dhall
3-
sha256:278d3608439187e51136251ebf12fabda62d41ceb4bec9769312a08b56f853e3
2+
https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220621/packages.dhall
3+
sha256:78caab14e4d8ff3886a057f0380c2d4a2500e2ee7ab5c1d32a0f9ce5c71eedd8
44

55
in upstream

staging/spago.dhall

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
, "argonaut-generic"
1717
, "argonaut-traversals"
1818
, "argparse-basic"
19+
, "array-builder"
1920
, "arraybuffer"
2021
, "arraybuffer-builder"
2122
, "arraybuffer-types"
@@ -28,6 +29,7 @@
2829
, "barlow-lens"
2930
, "bifunctors"
3031
, "bigints"
32+
, "bolson"
3133
, "bower-json"
3234
, "call-by-name"
3335
, "canvas"
@@ -51,6 +53,7 @@
5153
, "datetime-parsing"
5254
, "debug"
5355
, "decimals"
56+
, "deku"
5457
, "dissect"
5558
, "distributive"
5659
, "dodo-printer"
@@ -59,6 +62,10 @@
5962
, "dynamic-buffer"
6063
, "effect"
6164
, "either"
65+
, "elmish"
66+
, "elmish-enzyme"
67+
, "elmish-hooks"
68+
, "elmish-html"
6269
, "email-validate"
6370
, "encoding"
6471
, "enums"
@@ -99,14 +106,19 @@
99106
, "halogen-store"
100107
, "halogen-storybook"
101108
, "halogen-subscriptions"
109+
, "halogen-svg-elems"
102110
, "halogen-vdom"
103111
, "halogen-vdom-string-renderer"
104112
, "heckin"
105113
, "heterogeneous"
106114
, "heterogeneous-extrablatt"
115+
, "homogeneous"
107116
, "http-methods"
108117
, "httpure"
109118
, "httpurple"
119+
, "httpurple-argonaut"
120+
, "httpurple-yoga-json"
121+
, "hyrule"
110122
, "identity"
111123
, "indexed-monad"
112124
, "int64"
@@ -121,11 +133,14 @@
121133
, "jwt"
122134
, "language-cst-parser"
123135
, "lazy"
136+
, "lazy-joe"
124137
, "lcg"
125138
, "leibniz"
126139
, "linalg"
127140
, "lists"
141+
, "literals"
128142
, "logging"
143+
, "logging-journald"
129144
, "machines"
130145
, "matrices"
131146
, "matryoshka"
@@ -139,13 +154,16 @@
139154
, "monad-logger"
140155
, "monad-loops"
141156
, "monad-unlift"
157+
, "monoid-extras"
142158
, "monoidal"
143159
, "morello"
144160
, "motsunabe"
161+
, "nano-id"
145162
, "naturals"
146163
, "nested-functor"
147164
, "newtype"
148165
, "node-buffer"
166+
, "node-buffer-blob"
149167
, "node-child-process"
150168
, "node-fs"
151169
, "node-fs-aff"
@@ -162,10 +180,12 @@
162180
, "npm-package-json"
163181
, "nullable"
164182
, "numbers"
183+
, "ocarina"
165184
, "open-folds"
166185
, "open-memoize"
167186
, "open-pairing"
168187
, "options"
188+
, "optparse"
169189
, "ordered-collections"
170190
, "ordered-set"
171191
, "orders"
@@ -176,8 +196,10 @@
176196
, "partial"
177197
, "pathy"
178198
, "pha"
199+
, "phaser"
179200
, "pipes"
180201
, "point-free"
202+
, "pointed-list"
181203
, "polymorphic-vectors"
182204
, "posix-types"
183205
, "precise"
@@ -203,6 +225,7 @@
203225
, "react"
204226
, "react-basic"
205227
, "react-basic-dom"
228+
, "react-basic-hooks"
206229
, "react-dom"
207230
, "read"
208231
, "record"
@@ -214,6 +237,7 @@
214237
, "result"
215238
, "return"
216239
, "ring-modules"
240+
, "rito"
217241
, "routing"
218242
, "routing-duplex"
219243
, "run"
@@ -223,6 +247,7 @@
223247
, "semirings"
224248
, "signal"
225249
, "simple-emitter"
250+
, "simple-json"
226251
, "sized-matrices"
227252
, "sized-vectors"
228253
, "slug"
@@ -241,6 +266,7 @@
241266
, "stringutils"
242267
, "substitute"
243268
, "supply"
269+
, "systemd-journald"
244270
, "tailrec"
245271
, "test-unit"
246272
, "thermite"
@@ -258,9 +284,11 @@
258284
, "typelevel-rows"
259285
, "uint"
260286
, "uncurried-transformers"
287+
, "undefined-is-not-a-problem"
261288
, "unfoldable"
262289
, "unicode"
263290
, "unlift"
291+
, "unordered-collections"
264292
, "unsafe-coerce"
265293
, "unsafe-reference"
266294
, "uri"

0 commit comments

Comments
 (0)