From 26210f556af7e598eb10f14ebe4445a724e85c56 Mon Sep 17 00:00:00 2001 From: Uli Baum Date: Wed, 1 Aug 2018 10:42:09 +0200 Subject: [PATCH] memo: don't use ag alias using the alias `ag` for `silver-searcher` broke the nixpkgs tarball with an error in eval-release.nix, see discussion in #44273. --- pkgs/applications/misc/memo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 1551eebb3c6..072ea7e42dc 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,4 @@ -{ fetchFromGitHub, ag, tree, man, stdenv, +{ fetchFromGitHub, silver-searcher, tree, man, stdenv, pandocSupport ? true, pandoc ? null , ... }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { in '' mkdir -p $out/{bin,share/man/man1,share/bash-completion/completions,share/zsh/site-functions} substituteInPlace memo \ - --replace "ack_cmd=ack" "ack_cmd=${ag}/bin/ag" \ + --replace "ack_cmd=ack" "ack_cmd=${silver-searcher}/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}"