Skip to content

Update compiler to 0.15.3 #281

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.

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

Merged
merged 6 commits into from
Jun 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ New features:
Bugfixes:

Other improvements:
- Update to PureScript 0.15.3 (#281 by @JordanMartinez)
- Update codebase to GHC 9.2.3 (#281 by @JordanMartinez)

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

Expand Down
4 changes: 2 additions & 2 deletions client/src/Try/SharedConfig.purs
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ module Try.SharedConfig where
import Prelude

pursVersion :: String
pursVersion = "v0.15.2"
pursVersion = "v0.15.3"

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

packageSetVersion :: String
packageSetVersion = "0.15.2-20220531"
packageSetVersion = "0.15.2-20220621"

packageSetPackageJsonUrl :: String
packageSetPackageJsonUrl = "https://github.com/purescript/package-sets/blob/psc-" <> packageSetVersion <> "/packages.json"
5 changes: 3 additions & 2 deletions server/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ import qualified Language.PureScript.Errors.JSON as P
import qualified Language.PureScript.Interactive as I
import qualified Language.PureScript.Make as Make
import qualified Language.PureScript.Make.Cache as Cache
import qualified Language.PureScript.Names as N
import qualified Language.PureScript.TypeChecker.TypeSearch as TS
import qualified Network.Wai.Handler.Warp as Warp
import System.Environment (getArgs)
Expand Down Expand Up @@ -192,13 +193,13 @@ getOpts port = def

lookupAllConstructors :: P.Environment -> P.SourceType -> [P.SourceType]
lookupAllConstructors env = P.everywhereOnTypesM $ \case
P.TypeConstructor ann (P.Qualified Nothing tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon
P.TypeConstructor ann (P.Qualified (N.BySourcePos _) tyCon) -> P.TypeConstructor ann <$> lookupConstructor env tyCon
other -> pure other
where
lookupConstructor :: P.Environment -> P.ProperName 'P.TypeName -> [P.Qualified (P.ProperName 'P.TypeName)]
lookupConstructor env nm =
[ q
| (q@(P.Qualified (Just _) thisNm), _) <- M.toList (P.types env)
| (q@(P.Qualified (N.ByModuleName _) thisNm), _) <- M.toList (P.types env)
, thisNm == nm
]

Expand Down
10 changes: 6 additions & 4 deletions stack.yaml
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
resolver: lts-18.15
resolver: nightly-2022-06-09
packages:
- "."

extra-deps:
- purescript-0.15.2
- purescript-0.15.3
- language-javascript-0.7.0.0
- monoidal-containers-0.6.2.0
- process-1.6.13.1
- Cabal-3.2.1.0
# The Cabal library is not in Stackage
- Cabal-3.6.3.0
# Protolude is not yet in resolver snapshot
- protolude-0.3.1

flags:
aeson-pretty:
Expand Down
38 changes: 19 additions & 19 deletions stack.yaml.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5,26 +5,19 @@

packages:
- completed:
hackage: purescript-0.15.2@sha256:c269f5e8ca70a49e45345d9d1e60c47c32b5bd1e87073224cefd22f5273ce164,20150
hackage: purescript-0.15.3@sha256:c996f177092867d4f88327a641611535b58fd042f2d3fed16d994440587515dc,20642
pantry-tree:
size: 148972
sha256: 4526fbe5158eedb966b56626873bdc5a46fd0ab9cd8835c35d48365f5e9caa87
size: 151267
sha256: 20847b2aa168b38d34b562576f40df2821f55f512f2585d42cfe8e6c4cbe8695
original:
hackage: purescript-0.15.2
hackage: purescript-0.15.3
- completed:
hackage: language-javascript-0.7.0.0@sha256:3eab0262b8ac5621936a4beab6a0f97d0e00a63455a8b0e3ac1547b4088dae7d,3898
pantry-tree:
size: 2244
sha256: b0f28d836cb3fbde203fd7318a896c3a20acd8653a905e1950ae2d9a64bccebf
original:
hackage: language-javascript-0.7.0.0
- completed:
hackage: monoidal-containers-0.6.2.0@sha256:124941d70df5e2928b4c6db605a1d0464e68c2c6b02e426db24a40194d43821d,2219
pantry-tree:
size: 569
sha256: 07ceac751866bad09af45df7d0ae97420d659221e8a0d85407705dcda1f6e89b
original:
hackage: monoidal-containers-0.6.2.0
- completed:
hackage: process-1.6.13.1@sha256:c8bb8b7c993ff72d771381b3b56852dd154bce51880a24789c11f57b0688d353,2963
pantry-tree:
Expand All @@ -33,15 +26,22 @@ packages:
original:
hackage: process-1.6.13.1
- completed:
hackage: Cabal-3.2.1.0@sha256:8743076ec022296f9771d962000c9ca3a0fe02e68c37b992c63e382a675f791d,27482
hackage: Cabal-3.6.3.0@sha256:ff97c442b0c679c1c9876acd15f73ac4f602b973c45bde42b43ec28265ee48f4,12459
pantry-tree:
size: 19757
sha256: b250a53bdb56844f047a2927833bb565b936a289abfa85dfc2a63148d776368a
original:
hackage: Cabal-3.6.3.0
- completed:
hackage: protolude-0.3.1@sha256:1cc9e5a5c26c33a43c52b554443dd9779fef13974eaa0beec7ca6d2551b400da,2647
pantry-tree:
size: 41224
sha256: 92682a2aab8d967de341acff88525376eb9a31f53f094e0878c51c2886564f3a
size: 1645
sha256: 6452a6ca8d395f7d810139779bb0fd16fc1dbb00f1862630bc08ef5a100430f9
original:
hackage: Cabal-3.2.1.0
hackage: protolude-0.3.1
snapshots:
- completed:
size: 586286
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/lts/18/15.yaml
sha256: 2c9cb11d7aa0656bf28672dcb2414ab21e3ba9ea83ca170c216b2c2fc7e55856
original: lts-18.15
size: 607265
url: https://raw.githubusercontent.com/commercialhaskell/stackage-snapshots/master/nightly/2022/6/9.yaml
sha256: 819ac07621dac5b2c320c45cb8c27f141f95114a1749b19b06d2c3606c79e839
original: nightly-2022-06-09
4 changes: 2 additions & 2 deletions staging/packages.dhall
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220531/packages.dhall
sha256:278d3608439187e51136251ebf12fabda62d41ceb4bec9769312a08b56f853e3
https://github.com/purescript/package-sets/releases/download/psc-0.15.2-20220621/packages.dhall
sha256:78caab14e4d8ff3886a057f0380c2d4a2500e2ee7ab5c1d32a0f9ce5c71eedd8

in upstream
28 changes: 28 additions & 0 deletions staging/spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
, "argonaut-generic"
, "argonaut-traversals"
, "argparse-basic"
, "array-builder"
, "arraybuffer"
, "arraybuffer-builder"
, "arraybuffer-types"
Expand All @@ -28,6 +29,7 @@
, "barlow-lens"
, "bifunctors"
, "bigints"
, "bolson"
, "bower-json"
, "call-by-name"
, "canvas"
Expand All @@ -51,6 +53,7 @@
, "datetime-parsing"
, "debug"
, "decimals"
, "deku"
, "dissect"
, "distributive"
, "dodo-printer"
Expand All @@ -59,6 +62,10 @@
, "dynamic-buffer"
, "effect"
, "either"
, "elmish"
, "elmish-enzyme"
, "elmish-hooks"
, "elmish-html"
, "email-validate"
, "encoding"
, "enums"
Expand Down Expand Up @@ -99,14 +106,19 @@
, "halogen-store"
, "halogen-storybook"
, "halogen-subscriptions"
, "halogen-svg-elems"
, "halogen-vdom"
, "halogen-vdom-string-renderer"
, "heckin"
, "heterogeneous"
, "heterogeneous-extrablatt"
, "homogeneous"
, "http-methods"
, "httpure"
, "httpurple"
, "httpurple-argonaut"
, "httpurple-yoga-json"
, "hyrule"
, "identity"
, "indexed-monad"
, "int64"
Expand All @@ -121,11 +133,14 @@
, "jwt"
, "language-cst-parser"
, "lazy"
, "lazy-joe"
, "lcg"
, "leibniz"
, "linalg"
, "lists"
, "literals"
, "logging"
, "logging-journald"
, "machines"
, "matrices"
, "matryoshka"
Expand All @@ -139,13 +154,16 @@
, "monad-logger"
, "monad-loops"
, "monad-unlift"
, "monoid-extras"
, "monoidal"
, "morello"
, "motsunabe"
, "nano-id"
, "naturals"
, "nested-functor"
, "newtype"
, "node-buffer"
, "node-buffer-blob"
, "node-child-process"
, "node-fs"
, "node-fs-aff"
Expand All @@ -162,10 +180,12 @@
, "npm-package-json"
, "nullable"
, "numbers"
, "ocarina"
, "open-folds"
, "open-memoize"
, "open-pairing"
, "options"
, "optparse"
, "ordered-collections"
, "ordered-set"
, "orders"
Expand All @@ -176,8 +196,10 @@
, "partial"
, "pathy"
, "pha"
, "phaser"
, "pipes"
, "point-free"
, "pointed-list"
, "polymorphic-vectors"
, "posix-types"
, "precise"
Expand All @@ -203,6 +225,7 @@
, "react"
, "react-basic"
, "react-basic-dom"
, "react-basic-hooks"
, "react-dom"
, "read"
, "record"
Expand All @@ -214,6 +237,7 @@
, "result"
, "return"
, "ring-modules"
, "rito"
, "routing"
, "routing-duplex"
, "run"
Expand All @@ -223,6 +247,7 @@
, "semirings"
, "signal"
, "simple-emitter"
, "simple-json"
, "sized-matrices"
, "sized-vectors"
, "slug"
Expand All @@ -241,6 +266,7 @@
, "stringutils"
, "substitute"
, "supply"
, "systemd-journald"
, "tailrec"
, "test-unit"
, "thermite"
Expand All @@ -258,9 +284,11 @@
, "typelevel-rows"
, "uint"
, "uncurried-transformers"
, "undefined-is-not-a-problem"
, "unfoldable"
, "unicode"
, "unlift"
, "unordered-collections"
, "unsafe-coerce"
, "unsafe-reference"
, "uri"
Expand Down