summaryrefslogtreecommitdiffstats
path: root/.editorconfig
diff options
context:
space:
mode:
authorJan Tojnar <jtojnar@gmail.com>2020-10-11 00:27:42 +0200
committerJan Tojnar <jtojnar@gmail.com>2020-10-11 00:27:42 +0200
commit1882368e8a3225f75f83efebc925ddc01b16d7d5 (patch)
tree937c001d58a8c2458808d1d7221e1e08b7cd6238 /.editorconfig
parentdb3b1c12cbb136da533ae37e7c5e83b7dec504ee (diff)
parentaabcf2d8f52c68ad37d72bf80d90608831450af5 (diff)
Merge branch 'staging-next' into staging
Diffstat (limited to '.editorconfig')
-rw-r--r--.editorconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig
index 129ef84df806..66a23a205773 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -56,6 +56,8 @@ indent_size = unset
[deps.nix]
insert_final_newline = unset
+[pkgs/tools/networking/dd-agent/*-deps.nix]
+insert_final_newline = unset
[eggs.nix]
trim_trailing_whitespace = unset
@@ -65,6 +67,8 @@ insert_final_newline = unset
[node-{composition,packages}.nix]
insert_final_newline = unset
+[node-packages-generated.nix]
+insert_final_newline = unset
[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
trim_trailing_whitespace = unset
@@ -98,7 +102,7 @@ trim_trailing_whitespace = unset
[pkgs/development/mobile/androidenv/generated/{addons,packages}.nix]
trim_trailing_whitespace = unset
-[pkgs/development/node-packages/node-packages.nix]
+[pkgs/development/node-packages/composition.nix]
insert_final_newline = unset
[pkgs/servers/dict/wordnet_structures.py]