diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-05-24 10:14:29 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-24 10:14:29 +0200 |
| commit | a64a502cd7270fd40064cd1c9b07575320f2a867 (patch) | |
| tree | f7876be84ac38f27a7ae9bf4cb73e82b19070566 | |
| parent | ffc64adcdb7a344069974fdc9a6b3014c4591fcd (diff) | |
| parent | eff2e77eee92395e7486f1f10d10569eeb9ddd51 (diff) | |
Merge pull request #313251 from lucc/nvimpager
nvimpager: 0.12.0 -> 0.13.0
| -rw-r--r-- | nixos/doc/manual/release-notes/rl-2411.section.md | 4 | ||||
| -rw-r--r-- | pkgs/tools/misc/nvimpager/default.nix | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 530ca68e0c77c..2277308d6ba2f 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -12,7 +12,9 @@ ## Backward Incompatibilities {#sec-release-24.11-incompatibilities} -- Create the first release note entry in this section! +- `nvimpager` was updated to version 0.13.0, which changes the order of user and + nvimpager settings: user commands in `-c` and `--cmd` now override the + respective default settings because they are executed later. ## Other Notable Changes {#sec-release-24.11-notable-changes} diff --git a/pkgs/tools/misc/nvimpager/default.nix b/pkgs/tools/misc/nvimpager/default.nix index fb10d0ad89c96..80900bf30ae8e 100644 --- a/pkgs/tools/misc/nvimpager/default.nix +++ b/pkgs/tools/misc/nvimpager/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "nvimpager"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lucc"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RmpPWS9gnBnR+Atw6uzBmeDSgoTOFSdKzHoJ84O+gyA="; + sha256 = "sha256-Au9rRZMZfU4qHi/ng6JO8FnMpySKDbKzr75SBPY3QiA="; }; buildInputs = [ @@ -25,18 +25,15 @@ stdenv.mkDerivation rec { buildFlags = [ "nvimpager.configured" "nvimpager.1" ]; preBuild = '' patchShebangs nvimpager - substituteInPlace nvimpager --replace ':-nvim' ':-${neovim}/bin/nvim' + substituteInPlace nvimpager --replace-fail ':-nvim' ':-${lib.getExe neovim}' ''; doCheck = true; nativeCheckInputs = [ lua51Packages.busted util-linux neovim ]; - # filter out one test that fails in the sandbox of nix - checkPhase = let - exclude-tags = if stdenv.isDarwin then "nix,mac" else "nix"; - in '' - runHook preCheck - make test BUSTED='busted --output TAP --exclude-tags=${exclude-tags}' - runHook postCheck + # filter out one test that fails in the sandbox of nix or with neovim v0.10 + # or on macOS + preCheck = '' + checkFlagsArray+=('BUSTED=busted --output TAP --exclude-tags=${"nix,v10" + lib.optionalString stdenv.isDarwin ",mac"}') ''; meta = with lib; { |