diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix new file mode 100644 index 000000000000..08def70ecb6e --- /dev/null +++ b/pkgs/tools/misc/fzf/default.nix @@ -0,0 +1,33 @@ +# This file was generated by go2nix. +{ stdenv, lib, ncurses, goPackages, fetchgit, fetchhg, fetchbzr, fetchsvn }: + +with goPackages; + +buildGoPackage rec { + name = "fzf-${version}"; + version = "0.12.2"; + rev = "${version}"; + + goPackagePath = "github.com/junegunn/fzf"; + + src = fetchgit { + inherit rev; + url = "https://github.com/junegunn/fzf"; + sha256 = "02qqcnijv8z3736iczbx082yizpqk02g5k746k7sdgfkgyxydppk"; + }; + + buildInputs = [ ncurses ]; + + goDeps = ./deps.json; + + patchPhase = '' + sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim + sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim + ''; + + postInstall= '' + cp $src/bin/fzf-tmux $bin/bin + mkdir -p $out/share/vim-plugins + ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name} + ''; +} diff --git a/pkgs/tools/misc/fzf/deps.json b/pkgs/tools/misc/fzf/deps.json new file mode 100644 index 000000000000..a856d2d5fa81 --- /dev/null +++ b/pkgs/tools/misc/fzf/deps.json @@ -0,0 +1,20 @@ +[ + { + "goPackagePath": "github.com/junegunn/go-runewidth", + "fetch": { + "type": "git", + "url": "https://github.com/junegunn/go-runewidth", + "rev": "63c378b851290989b19ca955468386485f118c65", + "sha256": "1z5mhfrpqdssn3603vwd95w69z28igwq96lh7b9rrdcx440i822d" + } + }, + { + "goPackagePath": "github.com/junegunn/go-shellwords", + "fetch": { + "type": "git", + "url": "https://github.com/junegunn/go-shellwords", + "rev": "35d512af75e283aae4ca1fc3d44b159ed66189a4", + "sha256": "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7" + } + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d2e5535db8f5..73a52f005250 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -801,7 +801,7 @@ in fsmark = callPackage ../tools/misc/fsmark { }; - fzf = goPackages.fzf.bin // { outputs = [ "bin" ]; }; + fzf = (callPackage ../tools/misc/fzf {}).bin; fzy = callPackage ../tools/misc/fzy { }; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 80e3d590c688..b8cde1700cb6 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -884,28 +884,6 @@ let buildInputs = [ afero ]; }; - fzf = buildFromGitHub { - rev = "0.12.0"; - owner = "junegunn"; - repo = "fzf"; - sha256 = "0lxh8nf5xc5qnmx18h0q43iy3hy818firkz4rfkr3b0b5gd3aan1"; - - buildInputs = [ - crypto ginkgo gomega junegunn.go-runewidth go-shellwords pkgs.ncurses text - ]; - - patchPhase = '' - sed -i -e "s|expand(':h:h').'/bin/fzf'|'$bin/bin/fzf'|" plugin/fzf.vim - sed -i -e "s|expand(':h:h').'/bin/fzf-tmux'|'$bin/bin/fzf-tmux'|" plugin/fzf.vim - ''; - - postInstall= '' - cp $src/bin/fzf-tmux $bin/bin - mkdir -p $out/share/vim-plugins - ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${(builtins.parseDrvName fzf.name).name} - ''; - }; - g2s = buildFromGitHub { rev = "ec76db4c1ac16400ac0e17ca9c4840e1d23da5dc"; owner = "peterbourgon"; @@ -1843,18 +1821,6 @@ let sha256 = "16y64r1v054c2ln0bi5mrqq1cmvy6d6pnxk1glb8lw2g31ksa80c"; }; - junegunn.go-runewidth = buildGoPackage rec { - rev = "travisish"; - name = "go-runewidth-${rev}"; - goPackagePath = "github.com/junegunn/go-runewidth"; - src = fetchFromGitHub { - inherit rev; - owner = "junegunn"; - repo = "go-runewidth"; - sha256 = "07d612val59sibqly5d6znfkp4h4gjd77783jxvmiq6h2fwb964k"; - }; - }; - jp = buildFromGitHub { rev = "0.1.2"; owner = "jmespath"; @@ -1877,18 +1843,6 @@ let sha256 = "1hnigpn7rjbwd1ircxkyx9hvi0xmxr32b2jdy2jzw6b3jmcnz1fs"; }; - go-shellwords = buildGoPackage rec { - rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; - name = "go-shellwords-${rev}"; - goPackagePath = "github.com/junegunn/go-shellwords"; - src = fetchFromGitHub { - inherit rev; - owner = "junegunn"; - repo = "go-shellwords"; - sha256 = "c792abe5fda48d0dfbdc32a84edb86d884a0ccbd9ed49ad48a30cda5ba028a22"; - }; - }; - go-restful = buildFromGitHub { rev = "892402ba11a2e2fd5e1295dd633481f27365f14d"; owner = "emicklei";