Skip to content

Angerman/build ghcjs #382

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

Jump to bottom
Merged
merged 25 commits into from
Feb 9, 2020
Merged

Angerman/build ghcjs #382

merged 25 commits into from
Feb 9, 2020

Conversation

angerman
Copy link
Collaborator

This will likely need to be split into a few PRs.

It does address #365 though.

@angerman angerman mentioned this pull request Dec 24, 2019
Draft
@angerman angerman force-pushed the angerman/build-ghcjs branch from a99a094 to 6c68f7d Compare January 9, 2020 04:06
@angerman angerman marked this pull request as ready for review January 14, 2020 06:48
hamishmack and others added 15 commits January 15, 2020 17:46
@hamishmack
Fix plan-sha256 for ghcjs
74fd708
@hamishmack
Add ghcjs-dumparchive
1e41578
@hamishmack
Add ghcjsProject like cabalProject' but for ghcjs (#414)
0cf46c2 
* Add ghcjsProject like cabalProject' but for ghcjs

* Add more comments about ghcjsProject

* Add back bootInputs to ghcjs derivation
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/build-ghcjs
bd814a2
@hamishmack
Relocatable ghcjs binaries
a25cbc2
@hamishmack
Bump ghcjs ref
aad91ba
@hamishmack
Use ${pkgroot} to make relocatable package DBs
d0919a1
@hamishmack
Include only libraries with for the GHC target
411b7c9
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/build-ghcjs
dc56363
@cleverca22
always run git-ls-files on the host arch
ae19a42
@hamishmack
Do not build custom setup if buildType == "Simple"
7b261be
@hamishmack
Merge remote-tracking branch 'origin/use-host-arch' into angerman/bui…
dbc8dea 
…ld-ghcjs
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/build-ghcjs
81e7bf3
@hamishmack
Merge master into angerman/build-ghcjs
ee14569 
# Conflicts:
#	builder/make-config-files.nix
#	lib/call-cabal-project-to-nix.nix
#	overlays/bootstrap.nix
@hamishmack
Merge remote-tracking branch 'origin/master' into angerman/build-ghcjs
de24155
disassembler pushed a commit to IntersectMBO/cardano-prelude that referenced this pull request Feb 5, 2020
@erikd @disassembler
Switch to haskell.nix cabalProject
d9052fc 
* temporarily removes from failing CI jobs
* adds required attribute with tests and lib for linux/darwin
* windows support will work with a haskell.nix bump when input-output-hk/haskell.nix#382 is on master
@hamishmack
Move remove position independence from ghcjs
d64c969 
We will put it in a separate derivation and PR
@hamishmack
Revert "Merge remote-tracking branch 'origin/use-host-arch' into ange…
76dd2ed 
…rman/build-ghcjs"

This reverts commit dbc8dea, reversing
changes made to 7b261be.

# Conflicts:
#	lib/call-cabal-project-to-nix.nix
angerman
angerman commented Feb 9, 2020
View reviewed changes
Copy link
Collaborator Author

@angerman angerman left a comment

Choose a reason for hiding this comment

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

I think we should comment:

 package.identifier.name == "distributive"

and revert the ghcjs-source change. That was only due to the double linking iirc.

@hamishmack
Remove logging
68bdf0b
@hamishmack
Put ghcjs back to version without nub dupes
dafac8d 
We think the issues we had with duplicate code might have been caused
by the TH caching.
@angerman angerman merged commit f5b150c into master Feb 9, 2020
@angerman angerman deleted the angerman/build-ghcjs branch February 9, 2020 12:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@angerman @hamishmack @cleverca22