Skip to content

Commit

Permalink
Merge pull request NixOS#4 from dezren39/patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
dezren39 authored Jul 4, 2024
2 parents af421cc + af8d432 commit 277c56a
Show file tree
Hide file tree
Showing 35,455 changed files with 1,770,320 additions and 963,403 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
11 changes: 11 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ end_of_line = unset
insert_final_newline = unset
trim_trailing_whitespace = unset

# We want readFile .version to return the version without a newline.
[.version]
insert_final_newline = false

# see https://nixos.org/nixpkgs/manual/#chap-conventions

# Match json/lockfiles/markdown/nix/perl/python/ruby/shell/docbook files, set indent to spaces
Expand Down Expand Up @@ -90,6 +94,9 @@ insert_final_newline = unset
indent_style = unset
trim_trailing_whitespace = unset

[pkgs/misc/documentation-highlighter/**]
insert_final_newline = unset

[pkgs/servers/dict/wordnet_structures.py]
trim_trailing_whitespace = unset

Expand All @@ -105,3 +112,7 @@ charset = unset
[lib/tests/*.plist]
indent_style = tab
insert_final_newline = unset

[pkgs/kde/generated/**]
insert_final_newline = unset
end_of_line = unset
25 changes: 25 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,28 @@ fb0e5be84331188a69b3edd31679ca6576edb75a

# nixos/*: add trivial defaultText for options with simple defaults
25124556397ba17bfd70297000270de1e6523b0a

# systemd: rewrite comments
92dfeb7b3dab820ae307c56c216d175c69ee93cd

# systemd: break too long lines of Nix code
67643f8ec84bef1482204709073e417c9f07eb87

# {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01
802a1b4d3338f24cbc4efd704616654456d75a94

# postgresql: move packages.nix to ext/default.nix
719034f6f6749d624faa28dff259309fc0e3e730

# php ecosystem: reformat with nixfmt-rfc-style
75ae7621330ff8db944ce4dff4374e182d5d151f
c759efa5e7f825913f9a69ef20f025f50f56dc4d

# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
3fe3b055adfc020e6a923c466b6bcd978a13069a

# k3s: format with nixfmt-rfc-style
6cfcd3c75428ede517bc6b15a353d704837a2830

# python3Packages: format with nixfmt
59b1aef59071cae6e87859dc65de973d2cc595c0
Loading

0 comments on commit 277c56a

Please sign in to comment.