Fix man pages in i3-gaps #86294
Merged
Fix man pages in i3-gaps #86294
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
DamienCassou
force-pushed
the
damien/fix-i3-manpages
branch
from
38f41fc
to
d3633f5
Compare
|
I removed one commit because @r-ryantm updated i3-gaps to 4.18.1 in the meantime. |
DamienCassou
force-pushed
the
damien/fix-i3-manpages
branch
from
d3633f5
to
39c75e2
Compare
cole-h
approved these changes
May 6, 2020
There was a problem hiding this comment.
Diff LGTM. In the nixpkgs-review shell, ls results/i3-gaps/share/man/man1 shows all files are *.1.gz, whereas before this fix, they are *.man.gz.
https://github.com/NixOS/nixpkgs/pull/86294
10 packages built:
i3 i3-gaps i3-layout-manager i3-wk-switch polybarFull python37Packages.i3ipc python37Packages.py3sta
tus python38Packages.i3ipc python38Packages.py3status raiseorlaunch
2626b49
to
97f55eb
Compare
The files with the .man extension are asciidoc versions of the man pages and should not be copied to share/man or mandb complains: mandb: warning: …/man/man1/i3.man.gz: ignoring bogus filename
The .tar.gz from the github's archive does not contain man pages, only asciidoc versions of them. Because i3-gaps uses the same build process as i3, the man pages are not generated and the asciidoc versions are put in share/man/man1. This annoys mandb: mandb: warning: …/share/man/man1/i3.man.gz: ignoring bogus filename This commit changes the downloaded file to use github's release instead. The resulting .tar.bz2 file is much closer to the one downloaded for i3 which means the build process can still be the same and we get proper man pages at the end. Because of the previous change, the I3_VERSION file is now part of the downloaded source which means Nix doesn't have to create it anymore.
DamienCassou
force-pushed
the
damien/fix-i3-manpages
branch
from
97f55eb
to
3793f44
Compare
|
Result of 10 packages built:- i3 - i3-gaps - i3-layout-manager - i3-wk-switch - polybarFull - python37Packages.i3ipc - python37Packages.py3status - python38Packages.i3ipc - python38Packages.py3status - raiseorlaunch |
|
@cole-h I changed my PR so it uses |
cole-h
approved these changes
May 7, 2020
There was a problem hiding this comment.
Diff LGTM. Thanks!
[12 built, 151 copied (587.8 MiB), 148.4 MiB DL]
https://github.com/NixOS/nixpkgs/pull/86294
10 packages built:
i3 i3-gaps i3-layout-manager i3-wk-switch polybarFull python37Packages.i3ipc python37Packages.py3status python38Packages.i3ipc python38Packages.py3status raiseorlaunch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
The files with the .man extension are asciidoc versions of the man
pages and should not be copied to share/man or mandb complains:
mandb: warning: …/man/man1/i3.man.gz: ignoring bogus filename
Things done
sandboxinnix.confon non-NixOS linux)nix-shell -p nixpkgs-review --run "nixpkgs-review wip"./result/bin/)nix path-info -Sbefore and after)/cc maintainers of i3: @modulistic @fpletz @globin
/cc maintainers of i3-gaps @fmthoma