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

dehydrated: move to pname syntax, handle docs/manpage. #68266

Merged
merged 1 commit into from Sep 12, 2019

Conversation

pstn
Copy link
Contributor

@pstn pstn commented Sep 7, 2019

Motivation for this change

Does not change the actual functionality of the package, but moves the docs to the output and also puts the man page that has been added by upstream since the original creation of this package.

Also added two minor tweaks: moved makeWrapper into nativeBuildInputs where it belongs and moved the package to the new pname syntax.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • 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 nix-review --run "nix-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.
Notify maintainers

cc


installPhase = ''
mkdir -p "$out/share/man/man1"
gzip < docs/man/dehydrated.1 > "$out/share/man/man1/dehydrated.1.gz"
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you use installManPage like

Suggested change
gzip < docs/man/dehydrated.1 > "$out/share/man/man1/dehydrated.1.gz"
installManPage docs/man/dehydrated.1

comes from installShellFiles

Copy link
Contributor

Choose a reason for hiding this comment

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

not sure if the mkdir will be unseeded with this, but it's worth checking.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

mkdir doesn't seem to be needed with installManPage. Thanks for the hint!

@worldofpeace worldofpeace merged commit 2a10e8f into NixOS:master Sep 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants