Unverified Commit 4be063c1 authored by figsoda's avatar figsoda Committed by GitHub
Browse files

Merge pull request #212481 from qowoz/fzf 

fzf: 0.36.0 -> 0.37.0
parents e673e907 8643480e

pkgs/tools/misc/fzf/default.nix

+2 −14
Original line number Diff line number Diff line
@@ -2,8 +2,6 @@ 
, lib

, buildGoModule

, fetchFromGitHub

, fetchpatch

, writeText

, writeShellScriptBin

, runtimeShell

, installShellFiles
@@ -26,13 +24,13 @@ let 
in

buildGoModule rec {

  pname = "fzf";

  version = "0.36.0";

  version = "0.37.0";



  src = fetchFromGitHub {

    owner = "junegunn";

    repo = pname;

    rev = version;

    hash = "sha256-1PKu8l4Mx17CpePUE0JEnLPNsUdJ0KvW6Lx6VZM27kI=";

    hash = "sha256-m+tKNz7tUWkm/Vg9DhcfZyaBgZh+Mcf0mRfc5/SW2Os=";

  };



  vendorHash = "sha256-MsMwBBualAwJzCrv/WNBJakv6LcKZYsDUqkNmivUMOQ=";
@@ -47,16 +45,6 @@ buildGoModule rec { 
    "-s" "-w" "-X main.version=${version} -X main.revision=${src.rev}"

  ];



  patches = [

    # fix for test failure on 32-bit platforms

    # can be removed in the next release of fzf

    # https://github.com/junegunn/fzf/issues/3127

    (fetchpatch {

      url = "https://github.com/junegunn/fzf/commit/aa7361337d3f78ae1e32283ba395446025323abb.patch";

      hash = "sha256-ZmBdJa7eq9f58f2pL7QrtDSApkQJQBH/Em12J5xk3Q4=";

    })

  ];



  # The vim plugin expects a relative path to the binary; patch it to abspath.

  postPatch = ''

    sed -i -e "s|expand('<sfile>:h:h')|'$out'|" plugin/fzf.vim