Skip to content

Commit ae0d98c

Browse files
committed
Make compatibility with removed nodePackages in nixpkgs
1 parent 9c4469b commit ae0d98c

1 file changed

Lines changed: 14 additions & 7 deletions

File tree

nix/tools.nix

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{ stdenv
22
, lib
3+
, pkgs
34
, placeholder
45
, actionlint
56
, action-validator
@@ -21,6 +22,7 @@
2122
, conform
2223
, convco
2324
, crystal
25+
, cspell
2426
, cue
2527
, dart
2628
, deadnix
@@ -31,6 +33,7 @@
3133
, editorconfig-checker
3234
, elixir
3335
, elmPackages
36+
, eslint
3437
, flake-checker ? placeholder "flake-checker"
3538
, fprettify
3639
, git-annex
@@ -48,6 +51,7 @@
4851
, lua-language-server
4952
, lychee
5053
, julia-bin
54+
, markdownlint-cli
5155
, mdformat
5256
, mdl
5357
, mdsh
@@ -66,6 +70,7 @@
6670
, pkgsBuildBuild
6771
, poetry
6872
, pre-commit-hook-ensure-sops ? placeholder "pre-commit-hook-ensure-sops"
73+
, prettier
6974
, proselint
7075
, python3Packages
7176
, pyright ? nodePackages.pyright
@@ -136,6 +141,7 @@ in
136141
conform
137142
convco
138143
crystal
144+
cspell
139145
cue
140146
dart
141147
deadnix
@@ -144,6 +150,7 @@ in
144150
eclint
145151
editorconfig-checker
146152
elixir
153+
eslint
147154
flake-checker
148155
fprettify
149156
git-annex
@@ -160,6 +167,7 @@ in
160167
html-tidy
161168
keep-sorted
162169
lychee
170+
markdownlint-cli
163171
mdformat
164172
mdl
165173
mdsh
@@ -171,6 +179,7 @@ in
171179
opentofu
172180
ormolu
173181
pre-commit-hook-ensure-sops
182+
prettier
174183
poetry
175184
proselint
176185
pyright
@@ -207,12 +216,6 @@ in
207216
# TODO: these two should be statically compiled
208217
inherit (haskellPackages) fourmolu;
209218
inherit (luaPackages) luacheck;
210-
inherit (nodePackages)
211-
eslint
212-
markdownlint-cli
213-
prettier
214-
cspell
215-
;
216219
inherit (ocamlPackages) ocp-indent;
217220
inherit (python3Packages)
218221
autoflake
@@ -236,7 +239,11 @@ in
236239
phpcbf = phpPackages.php-codesniffer or phpPackages.phpcbf;
237240
phpcs = phpPackages.php-codesniffer or phpPackages.phpcs;
238241
lua-language-server = lua-language-server;
239-
purs-tidy = nodePackages.purs-tidy or (placeholder "purs-tidy");
242+
purs-tidy =
243+
if pkgs ? nodePackages && pkgs.nodePackages ? purs-tidy then
244+
pkgs.nodePackages.purs-tidy
245+
else
246+
placeholder "purs-tidy";
240247
cabal2nix-dir = callPackage ./cabal2nix-dir { };
241248
hpack-dir = callPackage ./hpack-dir { };
242249
hunspell = callPackage ./hunspell { };

0 commit comments

Comments
 (0)