diff options
author | Lucas Hoffmann <lucc@users.noreply.github.com> | 2021-06-07 23:27:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-07 23:27:37 +0200 |
commit | d56b1567ecc04287ea975e672dd0e3f72e913b0d (patch) | |
tree | af18a7fe5cad2d52af21432a73cfa771b24bcda3 /pkgs/tools/misc/nvimpager | |
parent | 8bf0088ce678d5fe4bf2119d1e9b4c412a8fa7fa (diff) |
nvimpager: 0.9 -> 0.10 (#126027)
* nvimpager: 0.9 -> 0.10 Patch the makefile as it assumes it is run in a git checkout and not from an extracted tarball. * fixup: add comment about new subsitute command in preBuild * fixup: Fix definition of checkPhase
Diffstat (limited to 'pkgs/tools/misc/nvimpager')
-rw-r--r-- | pkgs/tools/misc/nvimpager/default.nix | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index 61f9e7262c92b..e079891988686 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -1,36 +1,43 @@ { fetchFromGitHub , lib, stdenv , ncurses, neovim, procps -, pandoc, lua51Packages, util-linux +, scdoc, lua51Packages, util-linux }: stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.9"; + version = "0.10"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "1xy5387szfw0bp8dr7d4z33wd4xva7q219rvz8gc0vvv1vsy73va"; + sha256 = "sha256-okYnPwuxU/syxcKIMUBc25r791D6Bug2w2axH4vvmAY="; }; buildInputs = [ ncurses # for tput procps # for nvim_get_proc() which uses ps(1) ]; - nativeBuildInputs = [ pandoc ]; + nativeBuildInputs = [ scdoc ]; makeFlags = [ "PREFIX=$(out)" ]; - buildFlags = [ "nvimpager.configured" ]; + buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + # remove git command from makefile as we run from a tarball + # replace with actual timestamp of the commit + substituteInPlace makefile --replace '$(shell git log -1 --no-show-signature --pretty="%ct")' 1623019602 ''; doCheck = true; checkInputs = [ lua51Packages.busted util-linux neovim ]; - checkPhase = ''script -c "busted --lpath './?.lua' test"''; + checkPhase = '' + runHook preCheck + script -c "busted --lpath './?.lua' test" + runHook postCheck + ''; meta = with lib; { description = "Use neovim as pager"; |