Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 5a15cb998084
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 58ba83130c04
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on May 7, 2020

  1. i3: fix man page 

    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
    @DamienCassou
    DamienCassou committed May 7, 2020
    Copy the full SHA
    dcdbe2c View commit details
    Browse the repository at this point in the history

  2. i3-gaps: Fix man pages and simplify 

    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
    DamienCassou committed May 7, 2020
    Copy the full SHA
    3793f44 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #86294 from DamienCassou/damien/fix-i3-manpages 

    Fix man pages in i3-gaps
    @DamienCassou
    DamienCassou committed May 7, 2020
    Copy the full SHA
    58ba831 View commit details
    Browse the repository at this point in the history