squash: some minor cleanups
Merge branch 'x-updates' into vlada/introspection

Conflicts (easy):
	pkgs/development/libraries/gobject-introspection/default.nix
	pkgs/development/libraries/pango/default.nix