Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 0ad1b80a3b15
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9c04b1c3da77
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Jul 10, 2019

  1. fzf: 0.17.5 -> 0.18.0

    @xrelkd
    xrelkd committed Jul 10, 2019
    Copy the full SHA
    4dcd65a View commit details

Commits on Jul 11, 2019

  1. Merge pull request #64590 from xrelkd/update/fzf 

    fzf: 0.17.5 -> 0.18.0
    @etu
    etu authored Jul 11, 2019
    Copy the full SHA
    9c04b1c View commit details
Showing with 26 additions and 109 deletions.
  1. +26 −25 pkgs/tools/misc/fzf/default.nix
  2. +0 −84 pkgs/tools/misc/fzf/deps.nix
51 changes: 26 additions & 25 deletions pkgs/tools/misc/fzf/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,27 +1,24 @@
{ stdenv, ncurses, buildGoPackage, fetchFromGitHub, writeText, runtimeShell }:
{ lib, buildGoModule, fetchFromGitHub, writeText, runtimeShell, ncurses, }:

buildGoPackage rec {
name = "fzf-${version}";
version = "0.17.5";
rev = "${version}";

goPackagePath = "github.com/junegunn/fzf";
buildGoModule rec {
pname = "fzf";
version = "0.18.0";

src = fetchFromGitHub {
inherit rev;
owner = "junegunn";
repo = "fzf";
sha256 = "04kalm25sn5k24nrdmbkafp4zvxpm2l3rxchvccl0kz0j3szh62z";
repo = pname;
rev = version;
sha256 = "0pwpr4fpw56yzzkcabzzgbgwraaxmp7xzzmap7w1xsrkbj7dl2xl";
};

outputs = [ "bin" "out" "man" ];
modSha256 = "0xc4166d74ix5nzjphrq4rgw7qpskz05ymzl77i2qh2nhbdb53p0";

outputs = [ "out" "man" ];

fishHook = writeText "load-fzf-keybindings.fish" "fzf_key_bindings";

buildInputs = [ ncurses ];

goDeps = ./deps.nix;

patchPhase = ''
sed -i -e "s|expand('<sfile>:h:h')|'$bin'|" plugin/fzf.vim
@@ -33,30 +30,34 @@ buildGoPackage rec {
'';

preInstall = ''
mkdir -p $bin/share/fish/vendor_functions.d $bin/share/fish/vendor_conf.d
cp $src/shell/key-bindings.fish $bin/share/fish/vendor_functions.d/fzf_key_bindings.fish
cp ${fishHook} $bin/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
mkdir -p $out/share/fish/{vendor_functions.d,vendor_conf.d}
cp $src/shell/key-bindings.fish $out/share/fish/vendor_functions.d/fzf_key_bindings.fish
cp ${fishHook} $out/share/fish/vendor_conf.d/load-fzf-key-bindings.fish
'';

postInstall = ''
cp $src/bin/fzf-tmux $bin/bin
name="${pname}-${version}"
cp $src/bin/fzf-tmux $out/bin
mkdir -p $man/share/man
cp -r $src/man/man1 $man/share/man
mkdir -p $out/share/vim-plugins/${name}
cp -r $src/plugin $out/share/vim-plugins/${name}
cp -R $src/shell $bin/share/fzf
cat <<SCRIPT > $bin/bin/fzf-share
mkdir -p $out/share/vim-plugins/$name
cp -r $src/plugin $out/share/vim-plugins/$name
cp -R $src/shell $out/share/fzf
cat <<SCRIPT > $out/bin/fzf-share
#!${runtimeShell}
# Run this script to find the fzf shared folder where all the shell
# integration scripts are living.
echo $bin/share/fzf
echo $out/share/fzf
SCRIPT
chmod +x $bin/bin/fzf-share
chmod +x $out/bin/fzf-share
'';

meta = with stdenv.lib; {
homepage = https://github.com/junegunn/fzf;
meta = with lib; {
homepage = "https://github.com/junegunn/fzf";
description = "A command-line fuzzy finder written in Go";
license = licenses.mit;
platforms = platforms.unix;
84 changes: 0 additions & 84 deletions pkgs/tools/misc/fzf/deps.nix
View file

This file was deleted.