Merge "doc: sort change-authors.yml" into main

2 files changed, 77 insertions, 65 deletions

diff --git a/doc/manual/change-authors.yml b/doc/manual/change-authors.yml
index 6f0008eea..98a135397 100644
--- a/doc/manual/change-authors.yml
+++ b/doc/manual/change-authors.yml
@@ -3,109 +3,109 @@
 #
 # It's used for crediting people accurately in release notes. The release notes
 # script will link to forgejo, then to GitHub if forgejo is not present.
-horrors:
-  display_name: eldritch horrors
-  forgejo: pennae
-  github: pennae
-
-Qyriad:
-  forgejo: Qyriad
-  github: Qyriad
+9999years:
+  display_name: wiggles
+  forgejo: rbt
+  github: 9999years
 
-jade:
-  forgejo: jade
-  github: lf-
+Artturin:
+  github: Artturin
 
-iFreilicht:
-  github: iFreilicht
+DavHau:
+  github: DavHau
 
-ma27:
-  forgejo: ma27
-  github: ma27
+Kha:
+  github: Kha
 
 Lunaphied:
   forgejo: Lunaphied
   github: Lunaphied
 
-9999years:
-  display_name: wiggles
-  github: 9999years
-  forgejo: rbt
-
-matthewbauer:
-  github: matthewbauer
-
-raito:
-  display_name: Raito Bezarius
-  github: RaitoBezarius
-  forgejo: raito
-
-winter:
-  github: winterqt
-  forgejo: winter
+Qyriad:
+  forgejo: Qyriad
+  github: Qyriad
 
-Kha:
-  github: Kha
+SharzyL:
+  github: SharzyL
 
-Artturin:
-  github: Artturin
+alois31:
+  forgejo: alois31
+  github: alois31
 
-thufschmitt:
-  display_name: Théophane Hufschmitt
-  github: thufschmitt
+artemist:
+  display_name: Artemis Tosini
+  forgejo: artemist
 
 edolstra:
   display_name: Eelco Dolstra
   github: edolstra
 
-roberth:
-  display_name: Robert Hensing
-  github: roberth
-
 ericson:
   display_name: John Ericson
   github: ericson2314
 
-tomberek:
-  display_name: Tom Bereknyei
-  github: tomberek
+horrors:
+  display_name: eldritch horrors
+  forgejo: pennae
+  github: pennae
 
-valentin:
-  display_name: Valentin Gagarin
-  github: fricklerhandwerk
+iFreilicht:
+  github: iFreilicht
+
+jade:
+  forgejo: jade
+  github: lf-
 
 lovesegfault:
   github: lovesegfault
 
-yshui:
-  github: yshui
+ma27:
+  forgejo: ma27
+  github: ma27
 
-ncfavier:
-  github: ncfavier
+matthewbauer:
+  github: matthewbauer
 
 midnightveil:
   display_name: julia
   forgejo: midnightveil
   github: midnightveil
 
+ncfavier:
+  github: ncfavier
+
 puck:
   display_name: puck
   forgejo: puck
   github: puckipedia
 
-alois31:
-  forgejo: alois31
-  github: alois31
+r-vdp:
+  github: r-vdp
 
-DavHau:
-  github: DavHau
+raito:
+  display_name: Raito Bezarius
+  forgejo: raito
+  github: RaitoBezarius
 
-SharzyL:
-  github: SharzyL
+roberth:
+  display_name: Robert Hensing
+  github: roberth
 
-r-vdp:
-  github: r-vdp
+thufschmitt:
+  display_name: Théophane Hufschmitt
+  github: thufschmitt
 
-artemist:
-  display_name: Artemis Tosini
-  forgejo: artemist
+tomberek:
+  display_name: Tom Bereknyei
+  github: tomberek
+
+valentin:
+  display_name: Valentin Gagarin
+  github: fricklerhandwerk
+
+winter:
+  forgejo: winter
+  github: winterqt
+
+yshui:
+  github: yshui
diff --git a/misc/pre-commit.nix b/misc/pre-commit.nix
index ea39bc21d..ed2b152a3 100644
--- a/misc/pre-commit.nix
+++ b/misc/pre-commit.nix
@@ -66,6 +66,18 @@ pre-commit-run {
         ${lib.getExe pkgs.build-release-notes} --change-authors doc/manual/change-authors.yml doc/manual/rl-next doc/manual/rl-next-dev
       '';
     };
+    change-authors-sorted = {
+      enable = true;
+      package = pkgs.yq;
+      files = ''^doc/manual/change-authors\.yml'';
+      entry = "${pkgs.writeShellScript "change-authors-sorted" ''
+        set -euo pipefail
+        shopt -s inherit_errexit
+
+        echo "changes necessary to sort $1:"
+        diff -U3 <(${lib.getExe pkgs.yq} -y . "$1") <(${lib.getExe pkgs.yq} -Sy . "$1")
+      ''}";
+    };
     check-headers = {
       enable = true;
       package = pkgs.check-headers;