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

nixos/fzf: bring back keybindings and completion option removed in #298692 #303213

Merged
merged 3 commits into from
Apr 11, 2024

Conversation

SuperSandro2000
Copy link
Member

@SuperSandro2000 SuperSandro2000 commented Apr 10, 2024

Description of changes

According to upstream feedback in junegunn/fzf#3722, half of the changes done in #298692 are being revert.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • 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/)
  • 24.05 Release Notes (or backporting 23.05 and 23.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
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@SuperSandro2000 SuperSandro2000 marked this pull request as ready for review April 10, 2024 21:06
@SuperSandro2000 SuperSandro2000 mentioned this pull request Apr 10, 2024
13 tasks
@SuperSandro2000 SuperSandro2000 changed the title nixos/fzf: bring back keybindings and completion option removed in #2… nixos/fzf: bring back keybindings and completion option removed in #298692 Apr 10, 2024
@ofborg ofborg bot requested review from zowoq, Br1ght0ne and Ma27 April 10, 2024 22:07
@marsam
Copy link
Contributor

marsam commented Apr 11, 2024

I think we could also revert 1035a9efdfe4 and optionally de5b2ef

@SuperSandro2000
Copy link
Member Author

SuperSandro2000 commented Apr 11, 2024

Added that. I didn't do a revert commit for the first one as that would have multiple merge conflicts.

Copy link
Contributor

@marsam marsam left a comment

Choose a reason for hiding this comment

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

LGTM. Thank you!

@SuperSandro2000
Copy link
Member Author

Removed a line I left in from the first draft.

Also I could finally test this e2e as yesterday nixos-rebuild wanted to build electron for me.

@Ma27 Ma27 mentioned this pull request Apr 11, 2024
@SebTM
Copy link
Contributor

SebTM commented Apr 11, 2024

Result of nixpkgs-review pr 303213 run on x86_64-linux 1

2 packages blacklisted:
  • nixos-install-tools
  • tests.nixos-functions.nixos-test
51 packages built:
  • adl
  • ani-cli
  • arsenal
  • arsenal.dist
  • catcli
  • catcli.dist
  • clerk
  • dra-cla
  • felix-fm
  • fishPlugins.fzf-fish
  • fontpreview
  • fzf
  • fzf-git-sh
  • fzf-zsh
  • fzf.man
  • gh-f
  • gh-notify
  • kakounePlugins.fzf-kak
  • kns
  • license-cli
  • lunarvim
  • mov-cli
  • mov-cli.dist
  • navi
  • python311Packages.pyfzf
  • python311Packages.pyfzf.dist
  • python312Packages.pyfzf
  • python312Packages.pyfzf.dist
  • ripgrep-all
  • spacevim
  • sway-launcher-desktop
  • sysz
  • tmuxPlugins.extrakto
  • tmuxPlugins.fuzzback
  • tmuxPlugins.session-wizard
  • tmuxPlugins.t-smart-tmux-session-manager
  • tmuxPlugins.tmux-fzf
  • unipicker
  • vimPlugins.fzf-hoogle-vim
  • vimPlugins.fzf-lua
  • vimPlugins.fzf-vim
  • vimPlugins.fzfWrapper
  • vimPlugins.telescope-zoxide
  • vimPlugins.vim-fzf-coauthorship
  • vimPlugins.vim-zettel
  • vimPlugins.zoxide-vim
  • xmloscopy
  • yazi
  • ytfzf
  • zoxide
  • zsh-forgit

@SebTM
Copy link
Contributor

SebTM commented Apr 11, 2024

Build and tested it locally - LGTM so going ahead and merge it 🙏🏻

@SebTM SebTM merged commit 8978af6 into NixOS:master Apr 11, 2024
24 checks passed
@SuperSandro2000 SuperSandro2000 deleted the fzf-followup branch April 12, 2024 07:09
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.

4 participants