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

fix ghc-paths-nix-ghcjs.patch #73170

Merged
merged 1 commit into from Nov 11, 2019
Merged

fix ghc-paths-nix-ghcjs.patch #73170

merged 1 commit into from Nov 11, 2019

Conversation

@MarcFontaine
Copy link
Contributor

MarcFontaine commented Nov 10, 2019

Motivation for this change

This patch is used in pkgs/development/haskell-modules/configuration-ghcjs.nix
to fix the ghc-path package for use with ghcjs.
The ghc-paths package has been updated in a way that the existing patch can no longer
be applied.
This PR fixes the patch-file.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @obadz

This patch is used in pkgs/development/haskell-modules/configuration-ghcjs.nix
to fix the ghc-path package for use with ghcjs.
The ghc-paths package has been updated in a way that the existing patch can no longer
be applied.
@MarcFontaine MarcFontaine force-pushed the MarcFontaine:mafo/ghcjs branch from 4e945e4 to 8142cad Nov 10, 2019
@ofborg ofborg bot added the 6.topic: haskell label Nov 10, 2019
@MarcFontaine MarcFontaine marked this pull request as ready for review Nov 10, 2019
@cdepillabout

This comment has been minimized.

Copy link
Member

cdepillabout commented Nov 10, 2019

@MarcFontaine thanks for this PR.

I'm not super familiar with the ghcjs infrastructure in nixpkgs. How do you recommend I test this?

Is doing something like nix-build -A haskell.packages.ghcjs.ghc-paths sufficient? I just did this on my machine, and I've confirmed that with the current master, ghc-paths can't build because the patch doesn't apply, but with this PR, it does build.

@GrahamcOfBorg build haskell.packages.ghcjs.ghc-paths

@MarcFontaine

This comment has been minimized.

Copy link
Contributor Author

MarcFontaine commented Nov 11, 2019

@cdepillabout thanks for looking at the PR.
Yes, nix-build -A haskell.packages.ghcjs.ghc-paths was exactly my test for this patch.
(should have added it to the description..)

I'm not very familiar the ghcjs either. I was trying to build a small ghcjs demo app which broke at the ghc-paths library and with this PR I got the build running past that point and build another thirty or so packages (before failing at something else, where I gave up).
This is the relevant PR that broke the patch and which this PR is based on:
simonmar/ghc-paths@6497ecc

@cdepillabout

This comment has been minimized.

Copy link
Member

cdepillabout commented Nov 11, 2019

Okay, this looks good to me, and it appears to have fixed something that was previously broken.

I'll go ahead and merge it.

Thanks!

@cdepillabout cdepillabout merged commit 2df923e into NixOS:master Nov 11, 2019
14 checks passed
14 checks passed
haskell.packages.ghcjs.ghc-paths on aarch64-linux Timed out, unknown build status
Details
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
haskell.packages.ghcjs.ghc-paths on x86_64-linux Success
Details
@MarcFontaine MarcFontaine deleted the MarcFontaine:mafo/ghcjs branch Nov 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
2 participants
You can’t perform that action at this time.