Skip to content

Commit

Permalink
Update for PureScript 0.15 (#16)
Browse files Browse the repository at this point in the history
* Update for PureScript 0.15

* Update ci.yml

* Update shell.nix
  • Loading branch information
thomashoneyman authored May 2, 2022
1 parent 79e2800 commit 7dbf39d
Show file tree
Hide file tree
Showing 8 changed files with 46 additions and 12 deletions.
5 changes: 4 additions & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,14 @@ jobs:

steps:
- uses: actions/checkout@v2

- uses: purescript-contrib/setup-purescript@main
with:
purs-tidy: "latest"

- name: Install esbuild
run: npm install --global [email protected]

- name: Build source
run: npm run build

Expand Down
2 changes: 1 addition & 1 deletion example/basic-hooks/Basic/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ main :: Effect Unit
main = launchAff_ do
body <- HA.awaitBody
root <- runStoreT BS.initialStore BS.reduce Counter.component
runUI root unit body
void $ runUI root unit body
2 changes: 1 addition & 1 deletion example/basic-no-action/NoAction/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ main :: Effect Unit
main = launchAff_ do
body <- HA.awaitBody
root <- runStoreT NAS.initialStore (#) Counter.component
runUI root unit body
void $ runUI root unit body
2 changes: 1 addition & 1 deletion example/basic/Basic/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ main :: Effect Unit
main = launchAff_ do
body <- HA.awaitBody
root <- runStoreT BS.initialStore BS.reduce Counter.component
runUI root unit body
void $ runUI root unit body
2 changes: 1 addition & 1 deletion example/redux-todo/ReduxTodo/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ main :: Effect Unit
main = launchAff_ do
body <- HA.awaitBody
root <- runStoreT Store.initialStore Store.reduce app
runUI root unit body
void $ runUI root unit body
36 changes: 34 additions & 2 deletions packages.dhall
Original file line number Diff line number Diff line change
@@ -1,5 +1,37 @@
let upstream =
https://github.com/purescript/package-sets/releases/download/psc-0.14.7-20220303/packages.dhall
sha256:d7cbc15ea16768e4a4f99baa58a54559dd2648c6c1362de2469d9e41c23b28c3
https://github.com/purescript/package-sets/releases/download/psc-0.15.0-20220502/packages.dhall
sha256:38d347aeba9fe6359c208abe87a5cecf1ffb14294f11ad19664ae35c59b6e29a

in upstream
with
halogen-hooks =
{ repo = "https://github.com/thomashoneyman/purescript-halogen-hooks"
, version = "v0.6.0"
, dependencies =
[ "aff"
, "arrays"
, "bifunctors"
, "effect"
, "exceptions"
, "foldable-traversable"
, "foreign-object"
, "free"
, "freeap"
, "halogen"
, "halogen-subscriptions"
, "maybe"
, "newtype"
, "ordered-collections"
, "parallel"
, "partial"
, "prelude"
, "refs"
, "tailrec"
, "transformers"
, "tuples"
, "unsafe-coerce"
, "unsafe-reference"
, "web-dom"
, "web-html"
]
}
7 changes: 4 additions & 3 deletions shell.nix
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
let
pkgs = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/21.05.tar.gz";
url = "https://github.com/NixOS/nixpkgs/archive/21.11.tar.gz";
}) {};

# To update to a newer version of easy-purescript-nix, run:
Expand All @@ -10,8 +10,8 @@ let
pursPkgs = import (pkgs.fetchFromGitHub {
owner = "justinwoo";
repo = "easy-purescript-nix";
rev = "aa72388ca0fb72ed64467f59a121db1f104897db";
sha256 = "1j37v3ncnakhq7p4l2vqdn4li8bgwcc8cd2hk2fblxhnlglikgx2";
rev = "0ad5775c1e80cdd952527db2da969982e39ff592";
sha256 = "0x53ads5v8zqsk4r1mfpzf5913byifdpv5shnvxpgw634ifyj1kg";
}) { inherit pkgs; };

in pkgs.stdenv.mkDerivation {
Expand All @@ -24,5 +24,6 @@ in pkgs.stdenv.mkDerivation {
pursPkgs.purescript-language-server

pkgs.nodejs-16_x
pkgs.esbuild
];
}
2 changes: 0 additions & 2 deletions spago.dhall
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
[ "aff"
, "distributive"
, "effect"
, "foldable-traversable"
, "fork"
, "halogen"
, "halogen-hooks"
Expand All @@ -14,7 +13,6 @@
, "tailrec"
, "transformers"
, "tuples"
, "unsafe-coerce"
, "unsafe-reference"
]
, packages = ./packages.dhall
Expand Down

0 comments on commit 7dbf39d

Please sign in to comment.