Skip to content

glib: add man pages, make bash completion work#182054

Merged
7c6f434c merged 2 commits intoNixOS:stagingfrom
wentasah:glib-man
Aug 7, 2022
Merged

glib: add man pages, make bash completion work#182054
7c6f434c merged 2 commits intoNixOS:stagingfrom
wentasah:glib-man

Conversation

@wentasah
Copy link
Contributor

Description of changes

This contains two commits:

  1. The first adds man pages to binaries provided by the glib package.
  2. The second moves bash completion scripts to the same output as the respective binaries, which makes the completion work out of the box.

More details in commit messages.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of about 500 depending packages that are affected by this change.
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.11 Release Notes (or backporting 22.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Jul 19, 2022
@7c6f434c
Copy link
Member

@ofborg build glib

@7c6f434c
Copy link
Member

7c6f434c commented Aug 1, 2022

Hmmm, it looks like this shouldn't fail on Darwin?

@wentasah
Copy link
Contributor Author

wentasah commented Aug 1, 2022

Not sure what's going on on Darwin, so I disabled the man pages there.

@ofborg build glib

@wentasah
Copy link
Contributor Author

wentasah commented Aug 1, 2022

So now it fails only on aarch64-darwin. Is there a way to compare logs from this ofborg build and some previous successful build? I tried to find the log on hydra, but cannot find anything for aarch64-darwin.

This change adds man pages for commands provided by glib. Namely, the
$bin output now includes man pages (section 1) for:

   gapplication gdbus gio gsettings

The $dev output for:

   gdbus-codegen gio-querymodules glib-compile-resources
   glib-compile-schemas glib-genmarshal glib-gettextize glib-mkenums
   gobject-query gresource gtester-report gtester
Previously, bash completion scripts were installed in the "out"
output, which didn't contain any binaries. With this change, the
completion scripts are installed in the outputs containing the
corresponding binaries. Namely, gapplication, gdbus, gio, and
gsettings completion scripts go to $bin, and gresource to $dev. The
result is that the completions work out of the box, when the binaries
are available to the user.
@wentasah
Copy link
Contributor Author

wentasah commented Aug 1, 2022

Found the aarch64-darwin logs. I don't see any significant difference between failing and successful build. I tried to rebase on current nixos-unstable to check, whether it helps.

@ofborg build glib

@wentasah
Copy link
Contributor Author

wentasah commented Aug 1, 2022

Now it builds everywhere.

@7c6f434c 7c6f434c merged commit 6f30d45 into NixOS:staging Aug 7, 2022
@wentasah wentasah deleted the glib-man branch September 11, 2022 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 2501-5000 This PR causes many rebuilds on Darwin and should target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants