Skip to content

Commit ed64247

Browse files
authored
build: Update nix flake (#3116)
Brings the node js version up to date with the required one And removes outdated patches
1 parent 4ee723a commit ed64247

File tree

2 files changed

+5
-48
lines changed

2 files changed

+5
-48
lines changed

flake.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,9 @@
2222
pkgs = import nixpkgs {
2323
inherit system;
2424
overlays = [
25-
# Updated neovim-node-client is pending merge:
26-
# https://github.com/NixOS/nixpkgs/pull/317333
2725
(final: prev: {
28-
nodePackages = prev.nodePackages // {
29-
neovim = prev.buildNpmPackage rec {
30-
pname = "neovim-node-client";
31-
version = "5.1.1-dev.0";
32-
src = prev.fetchFromGitHub {
33-
owner = "neovim";
34-
repo = "node-client";
35-
rev = "d99ececf115ddc8ade98467417c1bf0120b676b5";
36-
hash = "sha256-eiKyhJNz7kH2iX55lkn7NZYTj6yaSZLMZxqiqPxDIPs=";
37-
};
38-
npmDeps = prev.fetchNpmDeps {
39-
inherit src;
40-
hash = "sha256-UoMq+7evskxtZygycxLBgeUtwrET8jYKeZwMiXdBMAw=";
41-
};
42-
postInstall = ''
43-
mkdir -p $out/bin
44-
ln -s $out/lib/node_modules/neovim/node_modules/.bin/neovim-node-host $out/bin
45-
'';
46-
};
47-
};
4826
neovim = prev.neovim.override { withNodeJs = true; };
49-
# There is a recent bug that prevents cli --check invocation:
50-
# See #2613
51-
lua-language-server = prev.lua-language-server.overrideAttrs {
52-
postPatch =
53-
let
54-
patch = prev.fetchurl {
55-
url = "https://github.com/LuaLS/lua-language-server/pull/2775.patch";
56-
sha256 = "sha256-5hjuNzBHLp9kiD6O8jTL5YlvaqR8IuJPHchIZE2/p/Q=";
57-
};
58-
in
59-
''
60-
patch -p1 < ${patch}
61-
''
62-
+ prev.lua-language-server.postPatch;
63-
};
6427
})
65-
6628
];
6729
};
6830
}
@@ -90,14 +52,9 @@
9052
[
9153
pkgs.corepack
9254
pkgs.vsce
93-
pkgs.nodejs
55+
pkgs.nodejs_20
56+
pkgs.pre-commit
9457

95-
# https://github.com/NixOS/nixpkgs/pull/251418
96-
(pkgs.pre-commit.overrideAttrs (previousAttrs: {
97-
makeWrapperArgs = ''
98-
--set PYTHONPATH $PYTHONPATH
99-
'';
100-
}))
10158
python
10259
pkgs.lua-language-server # language server used by pre-commit hooks
10360

0 commit comments

Comments
 (0)