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

Commit 29f97c9

Browse files
committed
Use TH-enabled build, remove custom miso
1 parent 35a70b4 commit 29f97c9

File tree

4 files changed

+26
-23
lines changed

4 files changed

+26
-23
lines changed

.github/workflows/build.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,15 @@ jobs:
4040
~/.ghc-wasm/add_to_github_path.sh
4141
popd
4242
43+
- name: cabal
44+
run: |
45+
ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-prereleases-0.0.8.yaml
46+
ghcup install cabal --set 3.15.0.0.2024.10.3
47+
4348
- name: wasm32-wasi-ghc
4449
run: |
4550
ghcup config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/develop/ghcup-cross-0.0.8.yaml
46-
ghcup install ghc --set wasm32-wasi-9.10.1 -- $CONFIGURE_ARGS
51+
ghcup install ghc --set wasm32-wasi-9.10.1.20241021 -- $CONFIGURE_ARGS
4752
4853
- uses: dw-labs-org/dart-sass-gha@v1
4954

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,8 @@ The GHC wasm backend supports the
55
feature, allowing Haskell wasm apps to interop with JavaScript
66
seamlessly in the browser. This repo contains a few examples to
77
demonstrate this ability, all of which based on the
8-
[`miso`](https://haskell-miso.org) frontend framework, using an
9-
unofficial [port](https://github.com/amesgen/miso/tree/remove-th) as
10-
well as an experimental
8+
[`miso`](https://haskell-miso.org) frontend framework as well as
9+
an experimental
1110
[`jsaddle-wasm`](https://github.com/amesgen/jsaddle-wasm) library
1211
under the hood.
1312

@@ -44,7 +43,8 @@ You can set up the toolchain by either:
4443
[`ghc-wasm-meta`](https://gitlab.haskell.org/ghc/ghc-wasm-meta#getting-started-without-nix)
4544
directly to set up ghc head or ghc 9.10
4645
- Using [`ghcup`](https://www.haskell.org/ghcup/guide/#cross-support)
47-
to set up ghc 9.10
46+
to set up ghc 9.10 (9.10.1.20241021 or later, with TemplateHaskell support)
47+
and cabal >=3.15.
4848

4949
Also install [Sass](https://sass-lang.com/install/).
5050

cabal.project

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,22 @@
11
packages: . hs2048
22

3-
index-state: 2024-09-29T15:37:55Z
3+
index-state: 2024-10-26T13:27:42Z
44

55
if arch(wasm32)
6+
-- Required for TemplateHaskell. When using wasm32-wasi-cabal from
7+
-- ghc-wasm-meta, this is superseded by the global cabal.config.
8+
shared: True
9+
10+
-- https://github.com/haskellari/time-compat/issues/37
11+
-- Older versions of time don't build on WASM.
12+
constraints: time installed
13+
allow-newer: time
14+
615
-- https://github.com/haskellari/splitmix/pull/73
716
source-repository-package
817
type: git
918
location: https://github.com/amesgen/splitmix
1019
tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75
1120

12-
-- remove TemplateHaskell
13-
source-repository-package
14-
type: git
15-
location: https://github.com/amesgen/miso
16-
tag: 27dd5fc80be9d0a3b80a9ecc81ee3401bc610e01
17-
18-
source-repository-package
19-
type: git
20-
location: https://github.com/amesgen/jsaddle-wasm
21-
tag: be129c788f8ca1ea2e9cc1515397c1a46d02bb41
22-
2321
package aeson
2422
flags: -ordered-keymap

flake.lock

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)