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

dbus: build manpages from xml #99018

Merged
merged 1 commit into from Oct 1, 2020
Merged

dbus: build manpages from xml #99018

merged 1 commit into from Oct 1, 2020

Conversation

solson
Copy link
Member

@solson solson commented Sep 28, 2020 •
edited

Motivation for this change

I noticed that manual pages like dbus-send(1) and dbus-monitor(1) were missing from my system.

The docbook_xml_dtd_44 and docbook_xsl bits are necessary to prevent xmlto from trying to use the network during build. I copied from other nix packages that have the same issue. (Edit: Did it a cleaner way.)

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 nixpkgs-review --run "nixpkgs-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.

I don't think my machine is powerful enough to run the nixpkgs-review for this change, given the sheer number of packages that depend on dbus. I confirmed the manpages were generated correctly and that simple binaries like dbus-send, dbus-monitor, and dbus-uuidgen work (I'm not sure how to use or test the others).

jtojnar
jtojnar reviewed Sep 28, 2020
View reviewed changes
Copy link
Contributor

@jtojnar jtojnar left a comment

Choose a reason for hiding this comment

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

LGTM after a squash.

@jtojnar
Copy link
Contributor

jtojnar commented Sep 28, 2020

Also this should target staging branch as it causes a mass rebuild.

@solson solson changed the base branch from master to staging September 28, 2020 23:33
@solson
Copy link
Member Author

solson commented Sep 28, 2020 •
edited

I have squashed and rebased onto staging. I have no idea why GitHub did that mass review request.

Edit: My best guess is that after I force pushed, but before I changed the base branch in GitHub, this PR included a whole bunch of unrelated commits for a few seconds. Sorry for the unnecessary pings.

@solson
dbus: build manpages from xml
aba3abc 
The `docbook_xml_dtd_44` and `docbook-xsl-nons` bits are necessary to
prevent `xmlto` from trying to use the network during the build.
@solson solson removed the request for review from jonringer September 28, 2020 23:43
@jonringer
Copy link
Contributor

jonringer commented Sep 29, 2020 •
edited

I don't think my machine is powerful enough to run the nixpkgs-review for this change, given the sheer number of packages that depend on dbus. I confirmed the manpages were generated correctly and that simple binaries like dbus-send, dbus-monitor, and dbus-uuidgen work (I'm not sure how to use or test the others).

This is what staging-next is for. I would just ensure that the package you're affecting has the intended changes in it.

@alyssais alyssais merged commit 7214023 into NixOS:staging Oct 1, 2020
@solson solson deleted the dbus-manpages branch October 1, 2020 21:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jtojnar jtojnar jtojnar approved these changes

@jonringer jonringer jonringer approved these changes

@worldofpeace worldofpeace Awaiting requested review from worldofpeace

Assignees
No one assigned
Labels
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
4 participants
@solson @jtojnar @jonringer @alyssais