Merge pull request #107602 (fix maintainers-list)

aszlig · aszlig · commit 117ea111df0d · 2020-12-26T01:04:39.000+01:00
The commit in question just fixes a swapped entry in maintainers-list.nix and given the email reply from @cab404 (which is also the affected maintainer record) of "ooof, LGTM", I'd consider the pull request as accepted.
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
@@ -1370,12 +1370,12 @@
     keys = [
       # compare with https://keybase.io/cab404
       {
-        longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
-        fingerprint = "rsa3072/0xCBDECF658C38079E";
+        fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";
+        longkeyid = "rsa3072/0xCBDECF658C38079E";
       }
       {
-        longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
-        fingerprint = "ed25519/0xB7EFFC271D55DB8A";
+        fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";
+        longkeyid = "ed25519/0xB7EFFC271D55DB8A";
       }
     ];
   };

Original file line number	Diff line number	Diff line change
`@@ -1370,12 +1370,12 @@`
`1370`	`1370`	`keys = [`
`1371`	`1371`	`# compare with https://keybase.io/cab404`
`1372`	`1372`	`{`
`1373`		`- longkeyid = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";`
`1374`		`- fingerprint = "rsa3072/0xCBDECF658C38079E";`
	`1373`	`+ fingerprint = "1BB96810926F4E715DEF567E6BA7C26C3FDF7BB3";`
	`1374`	`+ longkeyid = "rsa3072/0xCBDECF658C38079E";`
`1375`	`1375`	`}`
`1376`	`1376`	`{`
`1377`		`- longkeyid = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";`
`1378`		`- fingerprint = "ed25519/0xB7EFFC271D55DB8A";`
	`1377`	`+ fingerprint = "1EBC648C64D6045463013B3EB7EFFC271D55DB8A";`
	`1378`	`+ longkeyid = "ed25519/0xB7EFFC271D55DB8A";`
`1379`	`1379`	`}`
`1380`	`1380`	`];`
`1381`	`1381`	`};`