Skip to content

Commit

Permalink
Use WASM GHC 9.8
Browse files Browse the repository at this point in the history
  • Loading branch information
amesgen authored and mrkkrp committed Sep 4, 2023
1 parent 62e2cf1 commit bab66ce
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 24 deletions.
23 changes: 11 additions & 12 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
};

# for Ormolu Live
ghc-wasm-meta.url = "gitlab:amesgen/ghc-wasm-meta/bump?host=gitlab.haskell.org";
ghc-wasm-meta.url = "gitlab:ghc/ghc-wasm-meta?host=gitlab.haskell.org";
npmlock2nix = { url = "github:nix-community/npmlock2nix"; flake = false; };
ps-tools = {
follows = "purs-nix/ps-tools";
Expand Down
13 changes: 3 additions & 10 deletions ormolu-live/cabal.project
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
packages: . ..

index-state:
, hackage.haskell.org 2023-07-31T13:43:03Z
, head.hackage 2023-07-21T04:26:25Z
index-state: 2023-09-01T14:51:04Z
allow-newer: all
constraints: text >=2.0 && <2.0.2

package ormolu
-- The WASM backend does not support TH.
Expand All @@ -11,10 +11,3 @@ package ormolu
package ghc-lib-parser
-- The WASM backend does not support the threaded RTS.
flags: -threaded-rts

-- Some fixes to compile with GHC 9.9 (master)
source-repository-package
type: git
location: https://github.com/amesgen/stuff
tag: 0cbade491127ed2e5190629d906a982169d81824
subdir: ghc-lib-parser-9.6.2.20230523-wasm
2 changes: 1 addition & 1 deletion ormolu-live/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ let
ghcAPIVersion =
defaultGHC.dev.hsPkgs.ghc-lib-parser.components.library.version;
};
ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.default ];
ghcWasmDeps = [ inputs.ghc-wasm-meta.packages.${system}.all_9_8 ];
in
{
package = npmlock2nix.build (common-npmlock2nix // {
Expand Down

0 comments on commit bab66ce

Please sign in to comment.