Ormolu Live: update ghc-wasm-meta

tweag · Jan 17, 2025 · cf9a8b2 · cf9a8b2
1 parent 2d333eb
commit cf9a8b2
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/ormolu-live/build.sh b/ormolu-live/build.sh
@@ -28,19 +28,19 @@ else
         "$ORMOLU_WASM" -o "$WDIR/ormolu-init.wasm"
     ORMOLU_WASM_FINAL="$WDIR/ormolu-opt.wasm"
     wasm-opt "$WDIR/ormolu-init.wasm" -o "$ORMOLU_WASM_FINAL" -Oz
-    wasm-strip "$ORMOLU_WASM_FINAL"
+    wasm-tools strip "$ORMOLU_WASM_FINAL" -o "$ORMOLU_WASM_FINAL"
 fi
 
 rm -rf dist
 mkdir -p dist
 cp "$ORMOLU_WASM_FINAL" dist/ormolu-live.wasm
 
-wasmedge --dir /:. "$(wasm32-wasi-cabal list-bin exe:pregen)" \
+wasmtime --dir .::/ "$(wasm32-wasi-cabal list-bin exe:pregen)" \
          www/jsaddle.js dist/index.html
 
 esbuild_args=(--platform=browser --format=esm)
 [[ $dev_mode == false ]] && esbuild_args+=(--minify)
-esbuild www/{index,worker}.js --outdir=dist --bundle "${esbuild_args[@]}"
+esbuild www/{index,worker}.js --external:node:timers --outdir=dist --bundle "${esbuild_args[@]}"
 esbuild www/jsaddle.js --outdir=dist "${esbuild_args[@]}"
 
 cp node_modules/bulma/css/bulma.min.css dist/
diff --git a/ormolu-live/cabal.project b/ormolu-live/cabal.project
@@ -3,10 +3,6 @@ packages: . ..
 index-state: 2025-01-16T23:07:37Z
 
 if arch(wasm32)
-  -- Older versions of time don't build on WASM.
-  constraints: time installed
-  allow-newer: time
-
   package ghc-lib-parser
     -- The WASM backend does not support the threaded RTS.
     flags: -threaded-rts
@@ -15,4 +11,4 @@ if arch(wasm32)
   source-repository-package
     type: git
     location: https://github.com/amesgen/splitmix
-    tag: 5f5b766d97dc735ac228215d240a3bb90bc2ff75
+    tag: cea9e31bdd849eb0c17611bb99e33d590e126164
diff --git a/ormolu-live/default.nix b/ormolu-live/default.nix
@@ -2,6 +2,7 @@
 
 let
   pkgs = inputs.ghc-wasm-meta.inputs.nixpkgs.legacyPackages.${system};
+  inherit (pkgs) lib;
 in
 {
   shell = pkgs.mkShell {
@@ -11,5 +12,13 @@ in
       pkgs.npm-check-updates
       pkgs.miniserve
     ];
+
+    # Otherwise there are `happy` errors in GHA CI.
+    shellHook = ''
+      export LANG="en_US.UTF-8"
+    '' + lib.optionalString
+      (pkgs.glibcLocales != null && pkgs.stdenv.hostPlatform.libc == "glibc") ''
+      export LOCALE_ARCHIVE="${pkgs.glibcLocales}/lib/locale/locale-archive"
+    '';
   };
 }