Skip to content

kitty: 0.23.1 -> 0.24.1#153999

Merged
teto merged 4 commits intoNixOS:masterfrom
Luflosi:update/kitty
Jan 16, 2022
Merged

kitty: 0.23.1 -> 0.24.1#153999
teto merged 4 commits intoNixOS:masterfrom
Luflosi:update/kitty

Conversation

@Luflosi
Copy link
Contributor

@Luflosi Luflosi commented Jan 8, 2022

Motivation for this change

https://github.com/kovidgoyal/kitty/releases/tag/v0.23.1
A new dependency is needed.
Closes #153928.
https://sw.kovidgoyal.net/kitty/build/#notes-for-linux-macos-packagers recommends to split kitty into three packages with kitty-shell-integration being the one that includes some files useful for the shell integration. We already use kitty.terminfo in Nixpkgs instead of kitty-terminfo but we can't use kitty.shell-integration instead of kitty-shell-integration because shell-integration is not a valid shell variable name. I named it kitty.shell_integration instead. This package can then be used by a future kitty nixos module that still needs to be created. Without this commit, kitty would modify the user's ~/.bashrc when using bash.
I also included the commit from #137512 so that kitty will finally compile on Macs with Apple silicon.

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 22.05 Release Notes (or backporting 21.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

Luflosi and others added 4 commits January 8, 2022 13:44
https://sw.kovidgoyal.net/kitty/build/#notes-for-linux-macos-packagers recommends to split kitty into three packages with kitty-shell-integration being the one that includes some files useful for the shell integration. We already use kitty.terminfo in Nixpkgs instead of kitty-terminfo but we can't use kitty.shell-integration instead of kitty-shell-integration because shell-integration is not a valid shell variable name. I named it kitty.shell_integration instead. This package can then be used by a future kitty nixos module that still needs to be created. Without this commit, kitty would modify the user's ~/.bashrc when using bash.
@ofborg ofborg bot requested review from rvolosatovs and tex January 8, 2022 13:07
@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Jan 8, 2022
@Luflosi
Copy link
Contributor Author

Luflosi commented Jan 13, 2022

/marvin opt-in
/status needs_reviewer

@marvin-mk2 marvin-mk2 bot added the marvin label Jan 13, 2022
@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 13, 2022

Hi! I'm an experimental bot. My goal is to guide this PR through its stages, hopefully ending with a merge. You can read up on the usage here.

@teto
Copy link
Member

teto commented Jan 13, 2022

I haven't tested the many features shown in the video (some quite cool I had no idea existed) but PR looks ok.

@marvin-mk2
Copy link

marvin-mk2 bot commented Jan 16, 2022

Reminder: Please review!

This Pull Request is awaiting review. If you are the assigned reviewer, please have a look. Try to find another reviewer if necessary. If you can't, please say so. If the status is not accurate, please change it. If nothing happens, this PR will be should be put back in the needs_reviewer queue in one day.


Note: This feature is currently broken. The bot will not actually change the status. If you see this message multiple times, please request a status change manually.

@teto teto merged commit 64d73fa into NixOS:master Jan 16, 2022
@Luflosi Luflosi deleted the update/kitty branch January 16, 2022 22:25
@teto
Copy link
Member

teto commented Jan 27, 2022

If you guys are curious about zsh shell integration (something I've wanted for a long time), add this to your .zshrc :

if [[ -n $KITTY_INSTALLATION_DIR ]]; then
  export KITTY_SHELL_INTEGRATION="enabled"
  autoload -Uz -- "$KITTY_INSTALLATION_DIR"/shell-integration/zsh/kitty-integration
  kitty-integration
  unfunction kitty-integration
fi

ctrl+shift+g opens last block in pager: magical ! Thanks for packaging this new version

@Luflosi
Copy link
Contributor Author

Luflosi commented Jan 27, 2022

I think I'll try to create a NixOS module at some point, so one just needs to set something like programs.kitty.shell-integration.enable = true and then everything works.

@teto
Copy link
Member

teto commented Jan 28, 2022

I could review it, had a similar idea in mind but for home-manager.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

kitty: 0.23.1 -> 0.24.1

3 participants