Skip to content

Commit a808f82

Browse files
authored
Merge branch 'master' into docs/improve-go-builder
2 parents 9a6d7cc + 5629952 commit a808f82

File tree

34,397 files changed

+1746597
-1060139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

34,397 files changed

+1746597
-1060139
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,10 @@ indent_size = 4
4444
indent_size = 2
4545
indent_style = space
4646

47+
# Match package.json, which are generally pulled from upstream and accept them as they are
48+
[package.json]
49+
indent_style = unset
50+
4751
# Disable file types or individual files
4852
# some of these files may be auto-generated and/or require significant changes
4953

.git-blame-ignore-revs

Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,3 +102,87 @@ fb0e5be84331188a69b3edd31679ca6576edb75a
102102

103103
# systemd: break too long lines of Nix code
104104
67643f8ec84bef1482204709073e417c9f07eb87
105+
106+
# {pkgs/development/cuda-modules,pkgs/test/cuda,pkgs/top-level/cuda-packages.nix}: reformat all CUDA files with nixfmt-rfc-style 2023-03-01
107+
802a1b4d3338f24cbc4efd704616654456d75a94
108+
109+
# postgresql: move packages.nix to ext/default.nix
110+
719034f6f6749d624faa28dff259309fc0e3e730
111+
112+
# php ecosystem: reformat with nixfmt-rfc-style
113+
75ae7621330ff8db944ce4dff4374e182d5d151f
114+
c759efa5e7f825913f9a69ef20f025f50f56dc4d
115+
116+
# pkgs/os-specific/bsd: Reformat with nixfmt-rfc-style 2024-03-01
117+
3fe3b055adfc020e6a923c466b6bcd978a13069a
118+
119+
# k3s: format with nixfmt-rfc-style
120+
6cfcd3c75428ede517bc6b15a353d704837a2830
121+
122+
# python3Packages: format with nixfmt
123+
59b1aef59071cae6e87859dc65de973d2cc595c0
124+
125+
# treewide description changes (#317959)
126+
bf995e3641950f4183c1dd9010349263dfa0123b
127+
755b915a158c9d588f08e9b08da9f7f3422070cc
128+
f8c4a98e8e138e21353a2c33b90db3359f539b37
129+
130+
# vscode-extensions.*: format with nixfmt (RFC 166)
131+
7bf9febfa6271012b1ef86647a3a06f06875fdcf
132+
133+
# remove uses of mdDoc (#303841)
134+
1a24330f792c8625746d07d842290e6fd95ae6f9
135+
acd0e3898feb321cb9a71a0fd376f1157d0f4553
136+
1b28414d2886c57343864326dbb745a634d3e37d
137+
6afb255d976f85f3359e4929abd6f5149c323a02
138+
139+
# azure-cli: move to by-name, nixfmt #325950
140+
96cd538b68bd1d0a0a37979356d669abbba32ebc
141+
142+
# poptracker: format with nixfmt-rfc-style (#326697)
143+
ff5c8f6cc3d1f2e017e86d50965c14b71f00567b
144+
145+
# mangal: format with nixfmt-rfc-style #328284
146+
3bb5e993cac3a6e1c3056d2bc9bf43eb2c7a5951
147+
148+
# pico-sdk: switch to finalAttrs (#329438)
149+
8946018b0391ae594d167f1e58497b18de068968
150+
151+
# ollama: format with nixfmt-rfc-style (#329353)
152+
bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
153+
154+
# nixos/ollama: format with nixfmt-rfc-style (#329561)
155+
246d1ee533810ac1946d863bbd9de9b525818d56
156+
157+
# steam: cleanup (#216972)
158+
ad815aebfbfe1415ff6436521d545029c803c3fb
159+
160+
# nixos/nvidia: apply nixfmt-rfc-style (#313440)
161+
fbdcdde04a7caa007e825a8b822c75fab9adb2d6
162+
163+
# treewide: reformat files which need reformatting after (#341407)
164+
e0464e47880a69896f0fb1810f00e0de469f770a
165+
166+
# step-cli: format package.nix with nixfmt (#331629)
167+
fc7a83f8b62e90de5679e993d4d49ca014ea013d
168+
169+
# ndn-cxx: format with nixfmt-rfc-style
170+
160b2b769c3b8a6d1ae9947afa77520fa2887db7
171+
172+
# ndn-tools: format with nixfmt-rfc-style
173+
4882ef721ce3d7bb3b5e48ff80125255db515013
174+
175+
# nfd: format with nixfmt-rfc-style
176+
548c2377fa81e2abfc192fbf4f521e601251c468
177+
178+
# darwin.stdenv: format with nixfmt-rfc-style (#333962)
179+
93c10ac9e561c6594d3baaeaff2341907390d9b8
180+
181+
# nrr: format with nixfmt-rfc-style (#334578)
182+
cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
183+
184+
# nixos/kanidm: inherit lib, nixfmt
185+
8f18393d380079904d072007fb19dc64baef0a3a
186+
187+
# fetchurl: nixfmt-rfc-style
188+
ce21e97a1f20dee15da85c084f9d1148d84f853b

.gitattributes

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false
1616

1717
nixos/modules/module-list.nix merge=union
1818
# pkgs/top-level/all-packages.nix merge=union
19+
20+
ci/OWNERS linguist-language=CODEOWNERS

0 commit comments

Comments
 (0)