diff options
| author | Divam Narula <dfordivam@gmail.com> | 2020-08-16 10:13:57 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-16 10:13:57 +0530 |
| commit | 818d24c9db757764e03e4ec94617d6585f44ea2d (patch) | |
| tree | 3854dc5a049d1820fbc60dd324cce5e0b5d9077b /.editorconfig | |
| parent | fee55e2bb1e9f471bc8342a13ca062c710d39f41 (diff) | |
| parent | dfbda2135c3f8f7b158b7621d9745b94c8a56cf8 (diff) | |
| download | nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.gz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.bz2 nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.lz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.xz nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.tar.zst nixpkgs-818d24c9db757764e03e4ec94617d6585f44ea2d.zip | |
Merge branch 'staging' into upstream-wasm-cross-nixpkgs-4
Diffstat (limited to '.editorconfig')
| -rw-r--r-- | .editorconfig | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/.editorconfig b/.editorconfig index e61db3abee3..75c34374130 100644 --- a/.editorconfig +++ b/.editorconfig @@ -66,14 +66,24 @@ insert_final_newline = unset [nixos/modules/services/networking/ircd-hybrid/*.{conf,in}] 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/**.*] +[pkgs/build-support/dotnetenv/Wrapper/**] end_of_line = unset insert_final_newline = unset trim_trailing_whitespace = unset +[pkgs/build-support/upstream-updater/**] +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 |