diff --git a/flake.lock b/flake.lock index c71e255..0b88fa2 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1782610331, - "narHash": "sha256-au6HDH8xl1WcVlMppPfAcF6FbZsGGnS/enWsb+qSpV0=", + "lastModified": 1783675123, + "narHash": "sha256-G98CTxkMT9bNvMbsyjrC1/1v92P5qfYHapSy+Z7ZR0k=", "owner": "neovim", "repo": "neovim", - "rev": "a5aa62e37b82214a1d4d1e0a54d193b155fb340c", + "rev": "e684a3dd181d7b8fcb6b56dc3450debe933705f2", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1782175435, - "narHash": "sha256-EMzXKmnOtBQ2MnvpiNOm7E+kOMvdPrIKaeg52Tip2Uk=", + "lastModified": 1783279667, + "narHash": "sha256-/NAkDSsve+GNM0Bt6tleJdCGfsTlK89nPjkVOzZMo0s=", "owner": "nixos", "repo": "nixpkgs", - "rev": "89570f24e97e614aa34aa9ab1c927b6578a43775", + "rev": "f205b5574fd0cb7da5b702a2da51507b7f4fdd1b", "type": "github" }, "original": { diff --git a/pkgs/neovim/package.nix b/pkgs/neovim/package.nix index fad6d3e..dae2480 100644 --- a/pkgs/neovim/package.nix +++ b/pkgs/neovim/package.nix @@ -56,14 +56,6 @@ 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 25a49f2..f7d2e12 100644 --- a/pkgs/neovim/tree-sitter-bundled.nix +++ b/pkgs/neovim/tree-sitter-bundled.nix @@ -8,7 +8,7 @@ ... }: let - cargoHash = "sha256-PaSMjcukkLqYNJFyK0OV44Vq9KpyaSJcODhFeSHCitE="; + cargoHash = "sha256-2jEduknhqxuOnlFWja83QNUSs4mX3rhNjLjxppozm+0="; in tree-sitter.overrideAttrs (oa: { src = dependencies.treesitter;