diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2017-01-29 13:13:17 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-29 13:13:17 +0100 |
| commit | 5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1 (patch) | |
| tree | e6872e7d9bc86bef43ba45826377dbb8f7b0ae94 /pkgs | |
| parent | 82bcfef109ecf58ac1503e4cab15ae53dd524f4b (diff) | |
| parent | a4b8a6753214e2cb927251decde4b93631ecc71b (diff) | |
| download | nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar.gz nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar.bz2 nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar.lz nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar.xz nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.tar.zst nixlib-5e7221e65b52a0ad9d3b7c03efd2e374ee109ce1.zip | |
Merge pull request #22224 from nhooyr/fzf
fzf: from 0.15.9 to 0.16.2
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/misc/fzf/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/tools/misc/fzf/deps.nix | 13 |
2 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index da5817c8850a..f0a1b63e8310 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "fzf-${version}"; - version = "0.15.9"; + version = "0.16.2"; rev = "${version}"; goPackagePath = "github.com/junegunn/fzf"; @@ -11,7 +11,7 @@ buildGoPackage rec { inherit rev; owner = "junegunn"; repo = "fzf"; - sha256 = "0r099mk9r6f52qqhx0ifb1xa8f2isqvyza80z9mcpi5zkd96174l"; + sha256 = "160474x0m3fzxi2ddy53chzhmlrx6lvialjknfxb72rm938fc845"; }; outputs = [ "bin" "out" "man" ]; @@ -33,13 +33,6 @@ buildGoPackage rec { ln -s $out/share/go/src/github.com/junegunn/fzf $out/share/vim-plugins/${name} ''; - preFixup = stdenv.lib.optionalString stdenv.isDarwin '' - # fixes cycle between $out and $bin - # otool -l shows that the binary includes an LC_RPATH to $out/lib - # it seems safe to remove that since but the directory does not exist. - install_name_tool -delete_rpath $out/lib $bin/bin/fzf - ''; - meta = with stdenv.lib; { homepage = https://github.com/junegunn/fzf; description = "A command-line fuzzy finder written in Go"; diff --git a/pkgs/tools/misc/fzf/deps.nix b/pkgs/tools/misc/fzf/deps.nix index 651c76e361fe..170761078c9e 100644 --- a/pkgs/tools/misc/fzf/deps.nix +++ b/pkgs/tools/misc/fzf/deps.nix @@ -23,8 +23,17 @@ fetch = { type = "git"; url = "https://github.com/junegunn/go-shellwords"; - rev = "35d512af75e283aae4ca1fc3d44b159ed66189a4"; - sha256 = "08la0axabk9hiba9mm4ypp6a116qhvdlxa1jvkxhv3d4zpjsp4n7"; + rev = "33bd8f1ebe16d6e5eb688cc885749a63059e9167"; + sha256 = "0xcymw0fm0ir8d9swh1bkpknnqgx5ijjsj433z4d9riy8h8ywpw8"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "854ae91cdcbf914b499b1d7641d07859f3653481"; + sha256 = "19hj2nv2awc6zhpiapv8xv2yjdwfpxhvx5wnr99if6kg0y1ybsa7"; }; } ] |