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.

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

ghcjs: fix build and disable profiling by default #68009

Merged
merged 1 commit into from Oct 26, 2019

Conversation

@yorickvP
Copy link
Contributor

yorickvP commented Sep 3, 2019

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

cc @peti @basvandijk @ElvishJerricco @vaibhavsagar

@@ -25,7 +25,7 @@ in
, doBenchmark ? false
, doHoogle ? true
, editedCabalFile ? null
, enableLibraryProfiling ? true
, enableLibraryProfiling ? !(ghc.isGhcjs or false)

This comment has been minimized.

Copy link
@cdepillabout

cdepillabout Sep 4, 2019

Member

Could this just be !ghc.isGhcjs?

@@ -105979,6 +105979,26 @@ self: {
hydraPlatforms = stdenv.lib.platforms.none;
}) {};

"happy_1_19_9" = callPackage

This comment has been minimized.

Copy link
@cdepillabout

cdepillabout Sep 4, 2019

Member

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

#67438 (comment)

Copy link
Member

cdepillabout left a 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.

@cdepillabout

This comment has been minimized.

Copy link
Member

cdepillabout commented Sep 5, 2019

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
Copy link
Member

peti left a comment

Looks good to me.

@peti peti force-pushed the NixOS:haskell-updates branch 4 times, most recently from 9c35b0f to 5c582f3 Sep 6, 2019
@lheckemann lheckemann added this to the 19.09 milestone Sep 12, 2019
@ElvishJerricco

This comment has been minimized.

Copy link
Contributor

ElvishJerricco commented Sep 14, 2019

LGTM

@peti peti force-pushed the NixOS:haskell-updates branch 4 times, most recently from d075238 to 742348d Sep 18, 2019
Copy link
Member

peti left a comment

Don't edit hackage-packages.nix.

@peti peti force-pushed the NixOS:haskell-updates branch 4 times, most recently from a9d1519 to 4f31c02 Sep 22, 2019
@peti peti force-pushed the NixOS:haskell-updates branch 3 times, most recently from ab61745 to 5d075ab Oct 6, 2019
@peti peti force-pushed the NixOS:haskell-updates branch 4 times, most recently from 407ecc3 to 33366cc Oct 7, 2019
@peti peti force-pushed the NixOS:haskell-updates branch 2 times, most recently from a564073 to 35f1e57 Oct 18, 2019
@yorickvP yorickvP force-pushed the yorickvP:haskell-updates branch from b47e8da to 4fd3f72 Oct 26, 2019
@yorickvP yorickvP requested a review from peti Oct 26, 2019
@yorickvP

This comment has been minimized.

Copy link
Contributor Author

yorickvP commented Oct 26, 2019

@peti okay, updated

@peti peti merged commit 0f3c716 into NixOS:haskell-updates Oct 26, 2019
12 checks passed
12 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A darwin-tested
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release-combined.nix -A tested
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@yorickvP

This comment has been minimized.

Copy link
Contributor Author

yorickvP commented Oct 26, 2019

@peti is it possible to get this into 19.09?

@vaibhavsagar

This comment has been minimized.

Copy link
Contributor

vaibhavsagar commented Oct 27, 2019

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

@yorickvP yorickvP mentioned this pull request Nov 5, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

6 participants
You can’t perform that action at this time.