From b6d21d70695553dc12fc51a1cef10040e8fe1464 Mon Sep 17 00:00:00 2001 From: robin Date: Sat, 6 Jun 2026 13:20:42 +0200 Subject: [PATCH] flake.lock: update inputs --- flake.lock | 12 ++++++------ pkgs/neovim/package.nix | 8 ++++++++ pkgs/neovim/tree-sitter-bundled.nix | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 1f342a6..b0c0676 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1779374284, - "narHash": "sha256-9zMdgcLVEp5HK7CiGPHALYHTaXoi3fHJ7MDT+05M5h8=", + "lastModified": 1781212614, + "narHash": "sha256-ZJXg/EUJvbrMx8Qprs/Sg9EYsbXJc49NxVmHdzJn1s0=", "owner": "neovim", "repo": "neovim", - "rev": "7662001c482d63e1119aafcebc0e13d1201a2805", + "rev": "3ed78daf83aa88003f52234e6b493c9718b2d987", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", + "lastModified": 1781173989, + "narHash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", + "rev": "8c91a71d13451abc40eb9dae8910f972f979852f", "type": "github" }, "original": { diff --git a/pkgs/neovim/package.nix b/pkgs/neovim/package.nix index 674eea7..39725e2 100644 --- a/pkgs/neovim/package.nix +++ b/pkgs/neovim/package.nix @@ -54,6 +54,14 @@ in version = "${neovim-src.shortRev or "dirty"}"; inherit src; + # https://github.com/nix-community/neovim-nightly-overlay/commit/2a8dddeeea5e6b98159a90c73deb65351b1748f9 + # Workaround: nixpkgs applies CVE-2026-11487.patch, but the fix is already + # part of nightly (neovim/neovim@f83e0dca), so it fails as already applied. + # Remove once nixpkgs drops the patch (NixOS/nixpkgs#530655). + patches = builtins.filter (patch: !lib.hasInfix "CVE-2026-11487" (toString patch)) ( + oa.patches or [ ] + ); + preConfigure = '' ${oa.preConfigure} substituteInPlace cmake.config/versiondef.h.in \ diff --git a/pkgs/neovim/tree-sitter-bundled.nix b/pkgs/neovim/tree-sitter-bundled.nix index 5967fd4..4b091fd 100644 --- a/pkgs/neovim/tree-sitter-bundled.nix +++ b/pkgs/neovim/tree-sitter-bundled.nix @@ -7,7 +7,7 @@ dependencies, }: let - cargoHash = "sha256-F8aOid3rGQuRHb35ioAmsYoubu+820/XrVxs8Wlrp0c="; + cargoHash = "sha256-PaSMjcukkLqYNJFyK0OV44Vq9KpyaSJcODhFeSHCitE="; in tree-sitter.overrideAttrs (oa: { src = dependencies.treesitter; -- 2.51.2