Skip to content

Commit

Permalink
Merge branch 'master' into cinny-desktop-darwin-closure-size
Browse files Browse the repository at this point in the history
  • Loading branch information
@ofalvai
ofalvai authored Oct 31, 2024
2 parents 8f96213 + ff01e15 commit 563595e
Show file tree
Hide file tree
Showing 14,878 changed files with 564,535 additions and 336,492 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
32 changes: 32 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ d1c1a0c656ccd8bd3b25d3c4287f2d075faf3cf3
# fix indentation in meteor default.nix
a37a6de881ec4c6708e6b88fd16256bbc7f26bbd

# pkgs/stdenv/make-derivation: Reindent
b4cc2a2479a7ab0f6440b2e1319221920ef72699

# treewide: automatically md-convert option descriptions
2e751c0772b9d48ff6923569adfa661b030ab6a2

Expand Down Expand Up @@ -160,9 +163,21 @@ ad815aebfbfe1415ff6436521d545029c803c3fb
# nixos/nvidia: apply nixfmt-rfc-style (#313440)
fbdcdde04a7caa007e825a8b822c75fab9adb2d6

# treewide: reformat files which need reformatting after (#341407)
e0464e47880a69896f0fb1810f00e0de469f770a

# step-cli: format package.nix with nixfmt (#331629)
fc7a83f8b62e90de5679e993d4d49ca014ea013d

# ndn-cxx: format with nixfmt-rfc-style
160b2b769c3b8a6d1ae9947afa77520fa2887db7

# ndn-tools: format with nixfmt-rfc-style
4882ef721ce3d7bb3b5e48ff80125255db515013

# nfd: format with nixfmt-rfc-style
548c2377fa81e2abfc192fbf4f521e601251c468

# darwin.stdenv: format with nixfmt-rfc-style (#333962)
93c10ac9e561c6594d3baaeaff2341907390d9b8

Expand All @@ -171,3 +186,20 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9

# nixos/kanidm: inherit lib, nixfmt
8f18393d380079904d072007fb19dc64baef0a3a

# fetchurl: nixfmt-rfc-style
ce21e97a1f20dee15da85c084f9d1148d84f853b

# percona: apply nixfmt
8d14fa2886fec877690c6d28cfcdba4503dbbcea

# nixos/virtualisation: format image-related files
# Original formatting commit that was reverted
04fadac429ca7d6b92025188652376c230205730
# Revert commit
4cec81a9959ce612b653860dcca53101a36f328a
# Final commit that does the formatting
88b285c01d84de82c0b2b052fd28eaf6709c2d26

# sqlc: format with nixfmt
2bdec131b2bb2c8563f4556d741d34ccb77409e2
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,5 @@ nixos/doc/default.nix linguist-documentation=false

nixos/modules/module-list.nix merge=union
# pkgs/top-level/all-packages.nix merge=union

ci/OWNERS linguist-language=CODEOWNERS
Loading

0 comments on commit 563595e

Please sign in to comment.