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

Jump to bottom

gtk-doc: build with meson, etc #61598

Merged
merged 3 commits into from May 19, 2019
Merged

gtk-doc: build with meson, etc #61598

merged 3 commits into from May 19, 2019

Conversation

worldofpeace
Copy link
Contributor

Motivation for this change

Mostly wanted to fix building documentation for glib and 6f892ad fixes what I noticed but it still fails.

See: https://gist.github.com/worldofpeace/7a54fc196ff6ecbe35b11ed2106422ec

Additionally 1.30 added the experimental gtkdoc-mkhtml2 which needs anytree and lxml.
I haven't done anything to care for this because adding anytree to gtk-doc results in one of those
➰

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option 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 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)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

worldofpeace
worldofpeace commented May 16, 2019
View reviewed changes
pkgs/development/tools/documentation/gtk-doc/default.nix
src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "17h6nwhis66z4dxjrc833wvfl6pqjp81yfx3fq6x7k1qp2749xm4";
src = fetchFromGitLab {
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Some reason the meson.build aren't dist by gnome?

@ofborg ofborg bot requested a review from pSub May 16, 2019 19:23
@hedning
Copy link
Contributor

hedning commented May 18, 2019

Looks like we're hitting this: https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
There's a proposed fix: https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27

We'll alse need to target staging-next now, since the gtk-doc update have moved there.

@worldofpeace worldofpeace mentioned this pull request May 18, 2019
Merged
10 tasks
@worldofpeace worldofpeace changed the base branch from staging to staging-next May 18, 2019 18:51
@worldofpeace
gtk-doc: add missing pygments
f73ffce 
Also drop six since it was removed in the last release[0]

[0]: https://gitlab.gnome.org/GNOME/gtk-doc/blob/GTK_DOC_1_29/NEWS#L4
@worldofpeace
gtk-doc: build with meson
064ca0a
@worldofpeace
gtk-doc: fix css file permissions
0e27680 
Fixes https://gitlab.gnome.org/GNOME/gtk-doc/issues/84 which
was breaking the documentation build for glib.

The patch was based off an upstream pr [0] but
completed with the requested changes.

[0]: https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27
@worldofpeace
Copy link
Contributor Author

Looks like we're hitting this: https://gitlab.gnome.org/GNOME/gtk-doc/issues/84
There's a proposed fix: https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27

We'll alse need to target staging-next now, since the gtk-doc update have moved there.

Done that, and I've brought a variant of https://gitlab.gnome.org/GNOME/gtk-doc/merge_requests/27 in tree with different permissions.

hedning
hedning approved these changes May 18, 2019
View reviewed changes
Copy link
Contributor

@hedning hedning left a comment

Choose a reason for hiding this comment

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

Lgtm

@worldofpeace worldofpeace merged commit 8e2fe5c into NixOS:staging-next May 19, 2019
@worldofpeace worldofpeace deleted the gtk-doc/meson branch May 19, 2019 00:43
@FRidh
Copy link
Member

FRidh commented May 19, 2019

Is this related?
https://hydra.nixos.org/build/93859876

@worldofpeace
Copy link
Contributor Author

Is this related?
https://hydra.nixos.org/build/93859876

Yes, after reverting all the changes to gtk-doc this builds.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@hedning hedning hedning approved these changes

@pSub pSub Awaiting requested review from pSub

@jtojnar jtojnar Awaiting requested review from jtojnar

Assignees
No one assigned
Labels
8.has: documentation 10.rebuild-darwin: 501+ 10.rebuild-darwin: 1001-2500 10.rebuild-linux: 501+ 10.rebuild-linux: 5001+
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@worldofpeace @hedning @FRidh