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.

Sign up for GitHub

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

Jump to bottom

alacritty: add terminfo and man #43814

Merged
merged 1 commit into from
Jul 29, 2018
Merged

alacritty: add terminfo and man #43814

merged 1 commit into from
Jul 29, 2018

Conversation

bricewge
Copy link
Contributor

Motivation for this change
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 nox --run "nox-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)
  • Fits CONTRIBUTING.md.

@GrahamcOfBorg GrahamcOfBorg added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jul 19, 2018
infinisil
infinisil requested changes Jul 24, 2018
View reviewed changes
Copy link
Member

@infinisil infinisil left a comment

Choose a reason for hiding this comment

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

Merge conflicts need to be fixed

pkgs/applications/misc/alacritty/default.nix Outdated
gzip -c alacritty.man > "$out/share/man/man1/alacritty.1.gz"

install -dm 755 "$terminfo/usr/share/terminfo/a/"
tic -x -o "$terminfo/usr/share/terminfo" alacritty.info
Copy link
Member

Choose a reason for hiding this comment

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

Should be just $terminfo/share/terminfo

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here you go.

@GrahamcOfBorg GrahamcOfBorg added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 25, 2018
@infinisil
Copy link
Member

Merge conflicts still need to be fixed, just rebasing on master should do it

@bricewge
alacritty: add terminfo and man
1af7a83 
Signed-off-by: Brice Waegeneire <brice.wge@gmail.com>
@GrahamcOfBorg GrahamcOfBorg removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 25, 2018
@infinisil
Copy link
Member

Thanks!

@infinisil infinisil merged commit c735294 into NixOS:master Jul 29, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@infinisil infinisil infinisil approved these changes

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bricewge @infinisil @GrahamcOfBorg