Skip to content

haskellPackages: fix executables built for ghcjs #451527

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.

Sign up for GitHub

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
maralorn merged 1 commit into from
Oct 13, 2025
+15 −0
Merged

haskellPackages: fix executables built for ghcjs #451527

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions pkgs/development/compilers/ghc/common-hadrian.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,6 +239,10 @@
hash = "sha256-sb+AHdkGkCu8MW0xoQIpD5kEc0zYX8udAMDoC+TWc0Q=";
})
]
++ lib.optionals stdenv.targetPlatform.isGhcjs [

@sternenseemann sternenseemann Oct 13, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you make this patch unconditional in a PR to staging so that it is correctly updated/removed when updating GHC?

@alexfmpe alexfmpe Oct 13, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed

@alexfmpe alexfmpe Oct 23, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shall I do the same for the ucrt64 patch above it as upstream merged my PR?

@sternenseemann sternenseemann Oct 24, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds good!

@alexfmpe alexfmpe Oct 24, 2025

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#455401

# https://gitlab.haskell.org/ghc/ghc/-/issues/26290
./export-heap-methods.patch
]
# Prevents passing --hyperlinked-source to haddock. Note that this can
# be configured via a user defined flavour now. Unfortunately, it is
# impossible to import an existing flavour in UserSettings, so patching
Expand Down
11 changes: 11 additions & 0 deletions pkgs/development/compilers/ghc/export-heap-methods.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
diff --git a/rts/js/mem.js b/rts/js/mem.js
index 44c5c37ac4..1f150c5d55 100644
--- a/rts/js/mem.js
+++ b/rts/js/mem.js
@@ -1,5 +1,5 @@
//#OPTIONS:CPP
-//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot
+//#OPTIONS:EMCC:EXPORTED_RUNTIME_METHODS=addFunction,removeFunction,getEmptyTableSlot,HEAP8,HEAPU8

// #define GHCJS_TRACE_META 1

Loading