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

GHC: Split docs #16167

Merged
merged 1 commit into from
Jun 14, 2016
Merged

GHC: Split docs #16167

merged 1 commit into from
Jun 14, 2016

Conversation

rasendubi
Copy link
Member

Motivation for this change

This saves ~168M per GHC installation.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • OS X
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@mention-bot
Copy link

By analyzing the blame information on this pull request, we identified @peti, @pikajude and @Ericson2314 to be potential reviewers

@rasendubi
Copy link
Member Author

cc maintainers @MarcWeber @kosmikus @peti

@joachifm joachifm added 6.topic: haskell 6.topic: closure size The final size of a derivation, including its dependencies labels Jun 12, 2016
@rasendubi
Copy link
Member Author

Is Travis failure relevant to the change?

@vcunat
Copy link
Member

vcunat commented Jun 13, 2016

Travis status isn't really important in this repo, as it has lots of false negatives (unfortunately).

@joachifm
Copy link
Contributor

It's the "No rule to make target 'install'" failure, probably spurious.

@@ -35,6 +37,7 @@ stdenv.mkDerivation rec {
"--with-gcc=${stdenv.cc}/bin/cc"
"--with-gmp-includes=${gmp.dev}/include" "--with-gmp-libraries=${gmp.out}/lib"
"--with-curses-includes=${ncurses.dev}/include" "--with-curses-libraries=${ncurses.out}/lib"
"--datadir=$doc/share/doc/ghc"
Copy link
Member

Choose a reason for hiding this comment

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

--datadir is used for nothing except for the documentation?

Copy link
Member Author

Choose a reason for hiding this comment

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

Yes.

rasen@Larry nixpkgs % ls result-doc/share/doc/ghc
html

Copy link
Member Author

Choose a reason for hiding this comment

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

According to GHC wiki, docdir defaults to $(prefix)/share/doc/ghc and can be changed with --datadir option (I find this odd, too).

@peti peti merged commit 39d657e into NixOS:master Jun 14, 2016
@rasendubi rasendubi deleted the ghc-docs branch June 14, 2016 11:50
@cstrahan
Copy link
Contributor

This might require some changes to our hoogle support.

peti added a commit that referenced this pull request Jun 20, 2016
ghcWithHoogle builds with this patch applied, but it's probably still broken in
the sense that links might point nowhere or that the generated databases and/or
documentation might be incomplete.
@peti
Copy link
Member

peti commented Jun 20, 2016

Yes, ghcWithHoogle is broken after this change. 06489a1 fixes the build, but chances are that this is not all that's required to make ghcWithHoogle succeed again.

@rasendubi, how do we mitigate this issue?

@vcunat
Copy link
Member

vcunat commented Jun 20, 2016

If the paths can't be configured easily, you could try to pass a buildEnv of both outputs to hoogle when buliding it.

@rasendubi
Copy link
Member Author

@peti I don't have any specific plans yet. Building a vm image with master to test now.

rasendubi added a commit to rasendubi/nixpkgs that referenced this pull request Jun 20, 2016
The docs were split at NixOS#16167 and broke google support. @peti fixed
build, however hoogle still didn't see packages shipped with GHC. This
patch fixes location of the libraries shipped with GHC.
@rasendubi
Copy link
Member Author

The hoogle should work fine after #16370 is merged.

@peti
Copy link
Member

peti commented Jun 20, 2016 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
6.topic: closure size The final size of a derivation, including its dependencies 6.topic: haskell
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants