From 4c1fb8659ab4c9cc6df115714726b1a88415727c Mon Sep 17 00:00:00 2001 From: Tom Oostveen Date: Thu, 11 Jun 2026 11:09:04 +0200 Subject: [PATCH 1/2] neovim-unwrapped: 0.12.2 -> 0.12.3 Diff: https://github.com/neovim/neovim/compare/v0.12.2...v0.12.3 Changelog: https://github.com/neovim/neovim/releases/tag/v0.12.3 --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index ae0c858bf89f..504df37cc5cc 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.12.2"; + version = "0.12.3"; __structuredAttrs = true; @@ -114,7 +114,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-V+jZiNv0SvG/GOOUPzmBkOQGrnrN3UW2BY2n9NxP2Eg="; + hash = "sha256-JjDU3GZf+wvsMyDjIfu1btTUBkOlpp6E1HFLqBLR9po="; }; strictDeps = true; @@ -124,11 +124,6 @@ stdenv.mkDerivation ( # necessary so that nix can handle `UpdateRemotePlugins` for the plugins # it installs. See https://github.com/neovim/neovim/issues/9413. ./system_rplugin_manifest.patch - (fetchpatch { - name = "CVE-2026-11487.patch"; - url = "https://github.com/neovim/neovim/commit/f83e0dcaf8cf18de94828341b0a1a61a86c75baf.patch"; - hash = "sha256-iWnq0ezbKYJqjvevVlcTJBvUc17ZvrhsanhtuKrh8zM="; - }) ]; inherit lua; From f6e55319cfe373d534ba139d4badf81e9d2f46b1 Mon Sep 17 00:00:00 2001 From: Tom Oostveen Date: Thu, 11 Jun 2026 17:59:51 +0200 Subject: [PATCH 2/2] vimPlugins.orgmode: fix build https://github.com/NixOS/nixpkgs/pull/530655#issuecomment-4679441976 --- pkgs/by-name/ne/neovim-unwrapped/package.nix | 1 - pkgs/development/lua-modules/overrides.nix | 5 +++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index 504df37cc5cc..bcc15e19bcc7 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, gettext, libuv, diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index 2dfdf5fd83d0..313f222eaa72 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -1003,6 +1003,11 @@ in # remove failing tests rm tests/plenary/colors/colors_spec.lua # colors depend on neovim version usually rm tests/plenary/capture/capture_spec.lua # because clipboard not available + # trailing whitespace inconsistencies + rm tests/plenary/api/api_spec.lua + rm tests/plenary/babel/tangle_spec.lua + rm tests/plenary/capture/datetree_spec.lua + rm tests/plenary/init_spec.lua # UI tests depend on the neovim version rm -r tests/plenary/ui/*