diff options
| author | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
|---|---|---|
| committer | Pascal Wittmann <mail@pascal-wittmann.de> | 2018-08-11 09:36:34 +0200 |
| commit | a34579e01ef2aca4b33381a5c189746a1b52e2f0 (patch) | |
| tree | 70410891f5c55611a2d17d2d723f270ad022c391 /pkgs/applications/misc/memo/default.nix | |
| parent | af8cd3c74e80ff532b17568039ecc4f143992813 (diff) | |
| parent | 40dea2488fec71f6224944c1b9dae280c2fcc2dc (diff) | |
| download | nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.gz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.bz2 nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.lz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.xz nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.tar.zst nixlib-a34579e01ef2aca4b33381a5c189746a1b52e2f0.zip | |
Merge branch 'master' into add-missing-licenses
Conflicts: pkgs/tools/networking/network-manager/fortisslvpn.nix
Diffstat (limited to 'pkgs/applications/misc/memo/default.nix')
| -rw-r--r-- | pkgs/applications/misc/memo/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/applications/misc/memo/default.nix b/pkgs/applications/misc/memo/default.nix index 072ea7e42dc5..c112cf0c928f 100644 --- a/pkgs/applications/misc/memo/default.nix +++ b/pkgs/applications/misc/memo/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub, silver-searcher, tree, man, stdenv, + git, pandocSupport ? true, pandoc ? null , ... }: @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { name = "memo-${version}"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "memo"; rev = "${version}"; - sha256 = "1kq8hmq4lgvkk717nhmdryr90g61xm0jm7y8dzya8jsxsn531gm8"; + sha256 = "1cvjs36f6vxzfz5d63yhyw8j7gdw5hn6cfzccf7ag08lamjhfhbr"; }; installPhase = let @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { --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 "git_cmd=git" "git_cmd=${git}/bin/git" \ --replace "pandoc_cmd=pandoc" "${pandocReplacement}" mv memo $out/bin/ mv doc/memo.1 $out/share/man/man1/memo.1 |