diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
| commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
| tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/.editorconfig | |
| parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
| parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
| download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip | |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/.editorconfig')
| -rw-r--r-- | nixpkgs/.editorconfig | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/nixpkgs/.editorconfig b/nixpkgs/.editorconfig index 3c7962ab4d8b..ebb66b07945c 100644 --- a/nixpkgs/.editorconfig +++ b/nixpkgs/.editorconfig @@ -55,10 +55,20 @@ trim_trailing_whitespace = unset [*.lock] indent_size = unset -# trailing whitespace is an actual syntax element of classic Markdown/ -# CommonMark to enforce a line break +# 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 [eggs.nix] trim_trailing_whitespace = unset @@ -85,3 +95,13 @@ trim_trailing_whitespace = unset [pkgs/tools/misc/timidity/timidity.cfg] trim_trailing_whitespace = unset + +[pkgs/tools/virtualization/ovftool/*.ova] +end_of_line = unset +insert_final_newline = unset +trim_trailing_whitespace = unset +charset = unset + +[lib/tests/*.plist] +indent_style = tab +insert_final_newline = unset |