diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 7d48b61793ca..1551eebb3c64 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, silver-searcher, tree, man, stdenv, +{ fetchFromGitHub, ag, tree, man, stdenv, pandocSupport ? true, pandoc ? null , ... }: @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "06999nps46dxrjakvpin1d2zvfpjil69hb3bxagq29icalag3y2z"; + sha256 = "1kq8hmq4lgvkk717nhmdryr90g61xm0jm7y8dzya8jsxsn531gm8"; }; installPhase = let @@ -23,15 +23,16 @@ stdenv.mkDerivation rec { else "#pandoc_cmd=pandoc"; in '' - mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions} + mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/bin/ag" \ + --replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ --replace "tree_cmd=tree" "tree_cmd=${tree}/bin/tree" \ --replace "man_cmd=man" "man_cmd=${man}/bin/man" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 - mv completion/memo.bash $out/share/bash-completion/completions/memo.sh + mv completion/bash/memo.sh $out/share/bash-completion/completions/memo.sh + mv completion/zsh/_memo $out/share/zsh/site-functions/_memo ''; meta = {