Merge branch 'staging' into luiabee-statics

.editorconfig

@@ -43,32 +43,65 @@ indent_style = space
 # Disable file types or individual files
 # some of these files may be auto-generated and/or require significant changes
 
+[*.{c,h}]
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
+[*.{asc,key,ovpn}]
+insert_final_newline = unset
+end_of_line = unset
+trim_trailing_whitespace = unset
+
 [*.lock]
 indent_size = unset
 
-[gemset.nix]
+# Although Markdown/CommonMark allows using two trailing spaces to denote
+# a hard line break, we do not use that feature in nixpkgs since
+# it forces the surrounding paragraph to become a <literallayout> which
+# does not wrap reasonably.
+# Instead of a hard line break, start a new paragraph by inserting a blank line.
+[*.md]
+trim_trailing_whitespace = true
+
+# binaries
+[*.nib]
+end_of_line = unset
 insert_final_newline = unset
+trim_trailing_whitespace = unset
+charset = unset
 
-[pkgs/applications/editors/emacs-modes/recipes-archive-melpa.json]
-indent_size = unset
+[eggs.nix]
+trim_trailing_whitespace = unset
 
-[pkgs/development/lisp-modules/quicklisp-to-nix.nix]
-indent_size = unset
+[nixos/modules/services/networking/ircd-hybrid/*.{conf,in}]
+trim_trailing_whitespace = unset
+
+[pkgs/build-support/dotnetenv/Wrapper/**]
+end_of_line = unset
+indent_style = unset
+insert_final_newline = unset
+trim_trailing_whitespace = unset
+
+[pkgs/development/compilers/elm/registry.dat]
+end_of_line = unset
+insert_final_newline = 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]
+[pkgs/servers/dict/wordnet_structures.py]
+trim_trailing_whitespace = unset
+
+[pkgs/tools/misc/timidity/timidity.cfg]
 trim_trailing_whitespace = unset
 
-[pkgs/development/node-packages/node-packages.nix]
+[pkgs/tools/virtualization/ovftool/*.ova]
+end_of_line = unset
 insert_final_newline = unset
-
-[pkgs/servers/dict/wordnet_structures.py]
-indent_size = unset
 trim_trailing_whitespace = unset
+charset = unset
 
-[pkgs/top-level/perl-packages.nix]
-indent_size = unset
+[lib/tests/*.plist]
+indent_style = tab
+insert_final_newline = unset

.git-blame-ignore-revs

@@ -0,0 +1,41 @@
+# This file contains a list of commits that are not likely what you
+# are looking for in a blame, such as mass reformatting or renaming.
+# You can set this file as a default ignore file for blame by running
+# the following command.
+#
+# $ git config blame.ignoreRevsFile .git-blame-ignore-revs
+#
+# To temporarily not use this file add
+# --ignore-revs-file=""
+# to your blame command.
+#
+# The ignoreRevsFile can't be set globally due to blame failing if the file isn't present.
+# To not have to set the option in every repository it is needed in,
+# save the following script in your path with the name "git-bblame"
+# now you can run
+# $ git bblame $FILE
+# to use the .git-blame-ignore-revs file if it is present.
+#
+# #!/usr/bin/env bash
+# repo_root=$(git rev-parse --show-toplevel)
+# if [[ -e $repo_root/.git-blame-ignore-revs ]]; then
+#     git blame --ignore-revs-file="$repo_root/.git-blame-ignore-revs" $@
+# else
+#     git blame $@
+# fi
+
+
+# nixos/modules/rename: Sort alphabetically
+1f71224fe86605ef4cd23ed327b3da7882dad382
+
+# manual: fix typos
+feddd5e7f8c6f8167b48a077fa2a5394dc008999
+
+# nixos: fix module paths in rename.nix
+d08ede042b74b8199dc748323768227b88efcf7c
+
+# fix indentation in mk-python-derivation.nix
+d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
+
+# fix indentation in meteor default.nix
+a37a6de881ec4c6708e6b88fd16256bbc7f26bbd

.gitattributes

@@ -1,4 +1,6 @@
 **/deps.nix linguist-generated
+**/deps.json linguist-generated
+**/deps.toml lingust-generated
 **/node-packages.nix linguist-generated
 
 pkgs/applications/editors/emacs-modes/*-generated.nix linguist-generated