Skip to content
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

ghcjs: fix build and disable profiling by default #68009

Merged
merged 1 commit into from
Oct 26, 2019
Merged

ghcjs: fix build and disable profiling by default #68009

merged 1 commit into from
Oct 26, 2019
+1 −1

Conversation

yorickvP
Copy link
Contributor

@yorickvP yorickvP commented Sep 3, 2019

This updates ghcjs so it builds, but profiling is currently broken, ghcjs/ghcjs#759

cc @peti @basvandijk @ElvishJerricco @vaibhavsagar

@yorickvP yorickvP requested a review from basvandijk as a code owner September 3, 2019 13:44
cdepillabout
cdepillabout reviewed Sep 4, 2019
View reviewed changes
pkgs/development/haskell-modules/generic-builder.nix
@@ -25,7 +25,7 @@ in
, doBenchmark ? false
, doHoogle ? true
, editedCabalFile ? null
, enableLibraryProfiling ? true
, enableLibraryProfiling ? !(ghc.isGhcjs or false)
Copy link
Member

Choose a reason for hiding this comment

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

Could this just be !ghc.isGhcjs?

cdepillabout
cdepillabout reviewed Sep 4, 2019
View reviewed changes
pkgs/development/haskell-modules/hackage-packages.nix Outdated
@@ -105979,6 +105979,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};

"happy_1_19_9" = callPackage
Copy link
Member

Choose a reason for hiding this comment

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

This file shouldn't be updated in PRs. It is updated automatically:

#67438 (comment)

cdepillabout
cdepillabout approved these changes Sep 5, 2019
View reviewed changes
Copy link
Member

@cdepillabout cdepillabout left a comment

Choose a reason for hiding this comment

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

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.

@cdepillabout
Copy link
Member

cdepillabout commented Sep 5, 2019 •
edited
Loading

I'm not sure if we want to reduce the number of generated Haskell packages, but this also works with the older version of happy we already have. The following change still compiles:

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
peti approved these changes Sep 5, 2019
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Looks good to me.

@peti peti force-pushed the haskell-updates branch 4 times, most recently from 9c35b0f to 5c582f3 Compare September 11, 2019 08:52
@lheckemann lheckemann added this to the 19.09 milestone Sep 12, 2019
@ElvishJerricco
Copy link
Contributor

LGTM

@peti peti force-pushed the haskell-updates branch 4 times, most recently from d075238 to 742348d Compare September 19, 2019 10:33
peti
peti requested changes Sep 19, 2019
View reviewed changes
Copy link
Member

@peti peti left a comment

Choose a reason for hiding this comment

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

Don't edit hackage-packages.nix.

@peti peti force-pushed the haskell-updates branch 4 times, most recently from a9d1519 to 4f31c02 Compare September 25, 2019 13:31
@peti peti force-pushed the haskell-updates branch 3 times, most recently from ab61745 to 5d075ab Compare October 7, 2019 12:53
@peti peti force-pushed the haskell-updates branch 4 times, most recently from 407ecc3 to 33366cc Compare October 13, 2019 12:27
@peti peti force-pushed the haskell-updates branch 2 times, most recently from a564073 to 35f1e57 Compare October 24, 2019 20:01
@yorickvP yorickvP requested a review from peti October 26, 2019 08:15
@yorickvP
Copy link
Contributor Author

@peti okay, updated

@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux and removed 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 26, 2019
@peti peti merged commit 0f3c716 into NixOS:haskell-updates Oct 26, 2019
@yorickvP
Copy link
Contributor Author

@peti is it possible to get this into 19.09?

@vaibhavsagar
Copy link
Member

@yorickvP you can make a PR against the release-19.09 branch yourself.

@yorickvP yorickvP mentioned this pull request Nov 5, 2019
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cdepillabout cdepillabout

@vaibhavsagar vaibhavsagar

@basvandijk basvandijk

@peti peti

Assignees
No one assigned
Labels
6.topic: haskell 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux
Projects
None yet
Milestone
19.09
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@yorickvP @cdepillabout @ElvishJerricco @vaibhavsagar @peti @lheckemann