Merge commit '467ce5a9f45aaf96110b41eb863a56866e1c2c3c'

1 files changed, 55 insertions, 9 deletions

diff --git a/nixpkgs/.editorconfig b/nixpkgs/.editorconfig
index f272739f240a..a4a872ed5c85 100644
--- a/nixpkgs/.editorconfig
+++ b/nixpkgs/.editorconfig
@@ -1,5 +1,5 @@
 # EditorConfig configuration for nixpkgs
-# http://EditorConfig.org
+# https://EditorConfig.org
 
 # Top-most EditorConfig file
 root = true
@@ -11,18 +11,64 @@ insert_final_newline = true
 trim_trailing_whitespace = true
 charset = utf-8
 
+# Ignore diffs/patches
+[*.{diff,patch}]
+end_of_line = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
 # see https://nixos.org/nixpkgs/manual/#chap-conventions
 
-# Match nix/ruby/docbook files, set indent to spaces with width of two
-[*.{nix,rb,xml}]
+# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
+[*.{json,lock,md,nix,pl,pm,py,rb,sh,xml}]
 indent_style = space
+
+# Match docbook files, set indent width of one
+[*.xml]
+indent_size = 1
+
+# Match json/lockfiles/markdown/nix/ruby files, set indent width of two
+[*.{json,lock,md,nix,rb}]
 indent_size = 2
 
-# Match shell/python/perl scripts, set indent to spaces with width of four
-[*.{sh,py,pl}]
-indent_style = space
+# Match perl/python/shell scripts, set indent width of four
+[*.{pl,pm,py,sh}]
 indent_size = 4
 
-# Match diffs, avoid to trim trailing whitespace
-[*.{diff,patch}]
-trim_trailing_whitespace = false
+# Match gemfiles, set indent to spaces with width of two
+[Gemfile]
+indent_size = 2
+indent_style = space
+
+# Disable file types or individual files
+# some of these files may be auto-generated and/or require significant changes
+
+[*.lock]
+indent_size = unset
+
+[gemset.nix]
+insert_final_newline = unset
+
+[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json]
+indent_size = 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]
+insert_final_newline = unset
+
+[pkgs/servers/dict/wordnet_structures.py]
+indent_size = unset
+trim_trailing_whitespace = unset
+
+[pkgs/top-level/perl-packages.nix]
+indent_size = unset