diff options
author | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2021-01-15 10:30:44 +0000 |
commit | e0794be8a0d11e90461e5a9c85012a36b93ec976 (patch) | |
tree | efd9cbc55ea3322867bf601c4d536758a3dd5fcc /nixpkgs/.editorconfig | |
parent | 3538874082ded7647b1ccec0343c7c1e882cfef3 (diff) | |
parent | 1a57d96edd156958b12782e8c8b6a374142a7248 (diff) | |
download | nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.gz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.bz2 nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.lz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.xz nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.tar.zst nixlib-e0794be8a0d11e90461e5a9c85012a36b93ec976.zip |
Merge commit '1a57d96edd156958b12782e8c8b6a374142a7248'
Diffstat (limited to 'nixpkgs/.editorconfig')
-rw-r--r-- | nixpkgs/.editorconfig | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/nixpkgs/.editorconfig b/nixpkgs/.editorconfig index 129ef84df806..6625cbf69810 100644 --- a/nixpkgs/.editorconfig +++ b/nixpkgs/.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 @@ -63,7 +65,7 @@ trim_trailing_whitespace = unset [gemset.nix] insert_final_newline = unset -[node-{composition,packages}.nix] +[node-{composition,packages,packages-generated}.nix] insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] @@ -72,37 +74,34 @@ trim_trailing_whitespace = unset [nixos/tests/systemd-networkd-vrf.nix] trim_trailing_whitespace = unset -[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json] -indent_size = unset - [pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset +indent_style = unset insert_final_newline = unset trim_trailing_whitespace = unset [pkgs/build-support/upstream-updater/**] +indent_style = unset trim_trailing_whitespace = unset [pkgs/development/compilers/elm/registry.dat] end_of_line = unset insert_final_newline = unset -[pkgs/development/lisp-modules/quicklisp-to-nix.nix] -indent_size = unset - [pkgs/development/haskell-modules/hackage-packages.nix] indent_style = unset -indent_size = unset 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/development/{perl-modules,ocaml-modules,tools/ocaml}/**] +indent_style = unset + [pkgs/servers/dict/wordnet_structures.py] -indent_size = unset trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] @@ -114,6 +113,3 @@ trim_trailing_whitespace = unset [pkgs/top-level/emscripten-packages.nix] trim_trailing_whitespace = unset - -[pkgs/top-level/perl-packages.nix] -indent_size = unset |