-
-
Notifications
You must be signed in to change notification settings - Fork 14.6k
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
fzf: 0.47.0 -> 0.49.0 #298692
fzf: 0.47.0 -> 0.49.0 #298692
Conversation
Please split the 236-char commit message line into a subject (<=50 chars) + blank line + body (wrapped to <= 72 chars). |
@@ -77,7 +77,7 @@ In addition to numerous new and updated packages, this release has the following | |||
|
|||
- [frigate](https://frigate.video), an open source NVR built around real-time AI object detection. Available as [services.frigate](#opt-services.frigate.enable). | |||
|
|||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.fuzzyCompletion). | |||
- [fzf](https://github.com/junegunn/fzf), a command line fuzzyfinder. Available as [programs.fzf](#opt-programs.fzf.enable). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if that's ok but the manual seems to build against the current state not the state it was made so I get a build-error of the changelog if the old option is still referenced with #opt here. Alternative would be to remove the link "#opt" and leave it as text.
Thanks for the feedback, all done 🙏🏻 |
Result of 1 package blacklisted:
50 packages built:
|
Update derivation to not install old shell-completions Update module to load completion for bash, fish (new) and zsh (or oh-my-zsh plugin) with changed way through fzf-binary Added change to release note as it is backwards-incompatible.
Fixed issue where |
Would you mind updating it to fzf 0.49.0? |
The fzf-share helper was added to help to find the shell scripts [1], but since fzf≥0.48.0 the it's no longer needed because fzf has its shell integration scripts embedded. [1] NixOS#27709
Since fzf 0.43.0, the history command only uses Perl if it's installed otherwise uses Awk [1]. [1] junegunn/fzf@9f7684f
`fzf-share` was removed
@@ -30,7 +30,7 @@ in | |||
''; | |||
|
|||
programs.fish.interactiveShellInit = '' | |||
eval "$(${getExe pkgs.fzf} --fish)" | |||
${getExe pkgs.fzf} --fish | source |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should we do this for the others as well?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think it's just the fish
setup that is different
Thanks for updating, I guess we need another round of review now before we can merge 🙏🏻 |
I'm going ahead and merge this, because another Thank you for working on this! |
The shell scripts are just embedded (https://github.com/junegunn/fzf/blob/master/main.go#L15-L28) using go's inbuilt embed feature. For completion I don't think there is any way to disable them completely https://github.com/junegunn/fzf/blob/master/shell/completion.bash |
Didn't check that as it wasn't an issue for me and I stated it in the MR that it comes with this compromise. I would prefer if both are enabled to still use the official integration which also have the advantage if they don't just print them in the future e.g. use substitution/placeholders the official integration will keep working. |
We can just add an option for that junegunn/fzf#3722 :) |
I've changed #303213 according to upstream feedback and half of the changes done here are being reverted because there is no reason for them and upstream recommend to load the shell files individually, if you want more control, so it seems like there is no urge to switch to the new format which makes removing options unjustified. Please take a look at that PR asap. |
…xOS#298692 Also drop with lib
nixos/fzf: bring back keybindings and completion option removed in #298692
Description of changes
Superseeds #295978
Home-Manager module will need also an update (just as note here)
Things done
nix.conf
? (See Nix manual)sandbox = relaxed
sandbox = true
nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD"
. Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/
)Add a 👍 reaction to pull requests you find important.