ghcjs: fix build and disable profiling by default#68009
Merged
peti merged 1 commit intoNixOS:haskell-updatesfrom Oct 26, 2019
Merged
ghcjs: fix build and disable profiling by default#68009peti merged 1 commit intoNixOS:haskell-updatesfrom
peti merged 1 commit intoNixOS:haskell-updatesfrom
Conversation
yorickvP
force-pushed
the
haskell-updates
branch
from
748b683 to
b47e8da
Compare
ofborg
bot
added
6.topic: haskell
vaibhavsagar
approved these changes
Sep 3, 2019
cdepillabout
reviewed
Sep 4, 2019
Member
There was a problem hiding this comment.
Could this just be !ghc.isGhcjs?
cdepillabout
reviewed
Sep 4, 2019
Member
There was a problem hiding this comment.
This file shouldn't be updated in PRs. It is updated automatically:
cdepillabout
approved these changes
Sep 5, 2019
Member
cdepillabout
left a comment
cdepillabout
left a comment
There was a problem hiding this comment.
Other than the two above comments, this LGTM. I tried building this locally and it looks like it built correctly. I tried compiling a small module and it appeared to work.
Member
|
I'm not sure if we want to reduce the number of generated Haskell packages, but this also works with the older version of diff --git a/pkgs/development/compilers/ghcjs-ng/default.nix b/pkgs/development/compilers/ghcjs-ng/default.nix
index 6c39263ca3d..5608fefc54b 100644
--- a/pkgs/development/compilers/ghcjs-ng/default.nix
+++ b/pkgs/development/compilers/ghcjs-ng/default.nix
@@ -24,7 +24,7 @@ let
configuredSrc = callPackage ./configured-ghcjs-src.nix {
inherit ghcjsSrc;
inherit (bootPkgs) ghc alex;
- happy = bootPkgs.happy_1_19_9;
+ happy = bootPkgs.happy_1_19_5;
};
genStage0 = callPackage ./mk-stage0.nix { inherit (passthru) configuredSrc; };
bootPkgs = bootPkgs.extend (lib.foldr lib.composeExtensions (_:_:{}) [
@@ -36,7 +36,7 @@ let
(callPackage ./common-overrides.nix {
inherit haskellLib;
inherit (bootPkgs) alex;
- happy = bootPkgs.happy_1_19_9;
+ happy = bootPkgs.happy_1_19_5;
})
ghcjsDepOverrides
]); |
peti
force-pushed
the
haskell-updates
branch
4 times, most recently
from
9c35b0f to
5c582f3
Compare
Contributor
|
LGTM |
peti
force-pushed
the
haskell-updates
branch
4 times, most recently
from
d075238 to
742348d
Compare
peti
requested changes
Sep 19, 2019
Member
peti
left a comment
peti
left a comment
There was a problem hiding this comment.
Don't edit hackage-packages.nix.
peti
force-pushed
the
haskell-updates
branch
4 times, most recently
from
a9d1519 to
4f31c02
Compare
peti
force-pushed
the
haskell-updates
branch
3 times, most recently
from
ab61745 to
5d075ab
Compare
peti
force-pushed
the
haskell-updates
branch
4 times, most recently
from
407ecc3 to
33366cc
Compare
peti
force-pushed
the
haskell-updates
branch
2 times, most recently
from
a564073 to
35f1e57
Compare
yorickvP
force-pushed
the
haskell-updates
branch
from
b47e8da to
4fd3f72
Compare
Contributor
Author
|
@peti okay, updated |
ofborg
bot
added
10.rebuild-darwin: 0
Contributor
Author
|
@peti is it possible to get this into 19.09? |
Member
|
@yorickvP you can make a PR against the |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This updates ghcjs so it builds, but profiling is currently broken, ghcjs/ghcjs#759
cc @peti @basvandijk @ElvishJerricco @vaibhavsagar