diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix
index 8220bca249fb..7ad40c8c62c2 100644
--- a/lib/systems/doubles.nix
+++ b/lib/systems/doubles.nix
@@ -6,43 +6,51 @@ let
   inherit (lib.attrsets) matchAttrs;
 
   all = [
-    "aarch64-linux"
-    "armv5tel-linux" "armv6l-linux" "armv7a-linux" "armv7l-linux"
-
-    "mipsel-linux"
-
-    "i686-cygwin" "i686-freebsd" "i686-linux" "i686-netbsd" "i686-openbsd"
-
-    "x86_64-cygwin" "x86_64-freebsd" "x86_64-linux"
-    "x86_64-netbsd" "x86_64-openbsd" "x86_64-solaris"
+    # Cygwin
+    "i686-cygwin" "x86_64-cygwin"
 
+    # Darwin
     "x86_64-darwin" "i686-darwin" "aarch64-darwin" "armv7a-darwin"
 
-    "x86_64-windows" "i686-windows"
+    # FreeBSD
+    "i686-freebsd" "x86_64-freebsd"
 
-    "wasm64-wasi" "wasm32-wasi"
+    # Genode
+    "aarch64-genode" "i686-genode" "x86_64-genode"
 
-    "x86_64-redox"
-
-    "powerpc64-linux"
-    "powerpc64le-linux"
-
-    "riscv32-linux" "riscv64-linux"
-
-    "arm-none" "armv6l-none" "aarch64-none"
-    "avr-none"
-    "i686-none" "x86_64-none"
-    "powerpc-none"
-    "msp430-none"
-    "riscv64-none" "riscv32-none"
-    "vc4-none"
-    "or1k-none"
-
-    "mmix-mmixware"
+    # illumos
+    "x86_64-solaris"
 
+    # JS
     "js-ghcjs"
 
-    "aarch64-genode" "i686-genode" "x86_64-genode"
+    # Linux
+    "aarch64-linux" "armv5tel-linux" "armv6l-linux" "armv7a-linux"
+    "armv7l-linux" "i686-linux" "mipsel-linux" "powerpc64-linux"
+    "powerpc64le-linux" "riscv32-linux" "riscv64-linux" "x86_64-linux"
+
+    # MMIXware
+    "mmix-mmixware"
+
+    # NetBSD
+    "i686-netbsd" "x86_64-netbsd"
+
+    # none
+    "aarch64-none" "arm-none" "armv6l-none" "avr-none" "i686-none" "msp430-none"
+    "or1k-none" "powerpc-none" "riscv32-none" "riscv64-none" "vc4-none"
+    "x86_64-none"
+
+    # OpenBSD
+    "i686-openbsd" "x86_64-openbsd"
+
+    # Redox
+    "x86_64-redox"
+
+    # WASI
+    "wasm64-wasi" "wasm32-wasi"
+
+    # Windows
+    "x86_64-windows" "i686-windows"
   ];
 
   allParsed = map parse.mkSystemFromString all;