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

stdenv: Move devhelp books to outputDevdoc #31987

Merged
merged 5 commits into from Nov 25, 2017
Merged

Conversation

jtojnar
Copy link
Contributor

@jtojnar jtojnar commented Nov 23, 2017

Motivation for this change

For cleaner nix expressions.

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
    • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@vcunat
Copy link
Member

vcunat commented Nov 23, 2017

I'm just curious: is that some kind of successor to gtk-doc?

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 23, 2017

DevHelp is a documentation viewer. It can read content generated by gtk-doc, provided that index file is added to share/devhelp/books.

Currently testing by building libhttpseverywhere from #30352 with fixupPhase removed.

@orivej
Copy link
Contributor

orivej commented Nov 24, 2017

@jtojnar Could you show ls /run/current-system/sw/share/devhelp/books on your system?

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 24, 2017

@orivej Personally, I do not have any books installed. We need it for libhttpseverywhere (#30352) and other tools which install them.

@orivej
Copy link
Contributor

orivej commented Nov 24, 2017

OK, nix-index shows that these derivations install devhelp books, currently in out: gnome2.libglademm gnome3.vala libxmlxx libxmlxx3 vala_0_23 vala_0_26 vala_0_28 vala_0_34 vala_0_38. Please make sure that all of them define devdoc output, and update doc/multiple-output.xml.

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 24, 2017

Done, though I am unable to build it now.

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 24, 2017

Also did you omit vala_0_32 accidentally?

@orivej
Copy link
Contributor

orivej commented Nov 24, 2017

Also did you omit vala_0_32 accidentally?

I've refreshed nix-index before querying, but nix-locate did not list vala_0_32, don't know why.

@orivej
Copy link
Contributor

orivej commented Nov 24, 2017

I think that the part of doc/multiple-output.xml that mentions gtk-doc should be updated.

@jtojnar
Copy link
Contributor Author

jtojnar commented Nov 24, 2017

I updated it with the stdenv update.

@vcunat
Copy link
Member

vcunat commented Nov 25, 2017

I've refreshed nix-index before querying, but nix-locate did not list vala_0_32, don't know why.

@orivej: the directory is there on master. If you don't define an output for dev docs, they get removed by default. EDIT: could that be the reason?

@orivej
Copy link
Contributor

orivej commented Nov 25, 2017

@vcunat I don't see any reason why vala_0_32 may be absent from nix-index while vala_0_28 et al. are present (and vala_0_32 is in the binary cache). /cc @bennofs

@jtojnar jtojnar added this to Ready in GNOME Nov 25, 2017
@bennofs
Copy link
Contributor

bennofs commented Nov 25, 2017

@vcunat @orivej gnome3.vala is the same as vala_0_32, and nix-index lists the former one:

gnome3.vala.out                                       1 d /nix/store/hjcp5p1w5c5mjqsa75vypcaq398lz9n4-vala-0.32.1/share/devhelp/books

@orivej orivej merged commit 29b2984 into NixOS:staging Nov 25, 2017
GNOME automation moved this from Ready to Done Nov 25, 2017
@jtojnar jtojnar deleted the devhelp-devdoc branch November 26, 2017 20:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
GNOME
  
Done
Development

Successfully merging this pull request may close these issues.

None yet

5 participants