diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index b774cfb59440..d9310de861cd 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -4645,19 +4645,20 @@ final: prev: { nui-nvim, nvim-nio, pathlib-nvim, - plenary-nvim, + tree-sitter-norg, + tree-sitter-norg-meta, }: buildLuarocksPackage { pname = "neorg"; - version = "9.4.0-1"; + version = "9.6.4-1"; knownRockspec = (fetchurl { - url = "mirror://luarocks/neorg-9.4.0-1.rockspec"; - sha256 = "0gm91iv0a5lpch6n92cnrcbpn525gxl735cgqwlldbrdfjwxv4y2"; + url = "mirror://luarocks/neorg-9.6.4-1.rockspec"; + sha256 = "11k7qwr7430wk3j5kf7isn3d9i4y0drmq6d0dwdx62s4cy9c3pvm"; }).outPath; src = fetchzip { - url = "https://github.com/nvim-neorg/neorg/archive/d4e6b3665504baa88685c9d2e79446d336dc0594.zip"; - sha256 = "0gjyn9csw3rngnjxq6hyh7zl20ks6ibqvb5kggmkr9qhi3a8kiaj"; + url = "https://github.com/nvim-neorg/neorg/archive/1f14d72aad7165eac307a2a2f6be0fb97a04b3c2.zip"; + sha256 = "0l7hc1w4j00csv8i6dgbdhx0jcf0017b7hhs8gcldvsyka50xkx5"; }; disabled = luaOlder "5.1"; @@ -4666,7 +4667,8 @@ final: prev: { nui-nvim nvim-nio pathlib-nvim - plenary-nvim + tree-sitter-norg + tree-sitter-norg-meta ]; meta = { diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index c824bd55686b..c3983d8fe62a 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -889,9 +889,7 @@ in postConfigure = '' substituteInPlace ''${rockspecFilename} \ --replace-fail "'nvim-nio ~> 1.7'," "'nvim-nio >= 1.7'," \ - --replace-fail "'plenary.nvim == 0.1.4'," "'plenary.nvim'," \ - --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim'," \ - --replace-fail ", 'nvim-treesitter-legacy-api == 0.9.2'" "" + --replace-fail "'nui.nvim == 0.3.0'," "'nui.nvim'," ''; };