Sync Flaky template

This also causes us to upgrade to Nixpkgs 24.05.

.config/mustache.yaml

@@ -5,5 +5,4 @@ project:
   name: "elisp-reader"
   repo: "sellout/elisp-reader.el"
   summary: "A custom Lisp reader written in Elisp"
-  version: "0.1.0"
 type: { name: "emacs-lisp" }

.config/project/default.nix

@@ -1,4 +1,10 @@
-{config, flaky, lib, ...}: {
+{
+  config,
+  flaky,
+  lib,
+  supportedSystems,
+  ...
+}: {
   project = {
     name = "elisp-reader";
     summary = "A custom Lisp reader written in Elisp";
@@ -51,25 +57,25 @@
   ## CI
   services.garnix = {
     enable = true;
-    builds.exclude = [
-      # TODO: Remove once garnix-io/garnix#285 is fixed.
-      "homeConfigurations.x86_64-darwin-${config.project.name}-example"
-    ];
+    ## TODO: Remove once garnix-io/garnix#285 is fixed.
+    builds.exclude = ["homeConfigurations.x86_64-darwin-example"];
   };
   ## FIXME: Shouldn’t need `mkForce` here (or to duplicate the base contexts).
   ##        Need to improve module merging.
   services.github.settings.branches.main.protection.required_status_checks.contexts =
     lib.mkForce
-      (lib.concatMap flaky.lib.garnixChecks [
-        (sys: "check elisp-doctor [${sys}]")
-        (sys: "check elisp-lint [${sys}]")
-        (sys: "homeConfig ${sys}-${config.project.name}-example")
-        (sys: "package default [${sys}]")
-        (sys: "package emacs-${config.project.name} [${sys}]")
-        ## FIXME: These are duplicated from the base config
-        (sys: "check formatter [${sys}]")
-        (sys: "devShell default [${sys}]")
-      ]);
+    (flaky.lib.forGarnixSystems supportedSystems (sys: [
+      "check elisp-doctor [${sys}]"
+      "check elisp-lint [${sys}]"
+      "homeConfig ${sys}-example"
+      "package default [${sys}]"
+      "package emacs-${config.project.name} [${sys}]"
+      ## FIXME: These are duplicated from the base config
+      "check formatter [${sys}]"
+      "check project-manager-files [${sys}]"
+      "check vale [${sys}]"
+      "devShell default [${sys}]"
+    ]));
 
   ## publishing
   services.flakehub.enable = true;

elisp-reader.el

@@ -483,26 +483,26 @@ Returns nil if ELT isn’t in LST."
   "Replace occurrences  of CELL in ORIG with ORIG."
   (cl-labels
       ((subst-in (thing)
-                 (cond
-                  ((eq thing cell)
-                   orig)
-                  ((consp thing)
-                   (subst-in-list thing)
-                   thing)
-                  ((stringp thing)
-                   thing)
-                  ((arrayp thing)
-                   (subst-in-array thing)
-                   thing)
-                  (t
-                   thing)))
+         (cond
+          ((eq thing cell)
+           orig)
+          ((consp thing)
+           (subst-in-list thing)
+           thing)
+          ((stringp thing)
+           thing)
+          ((arrayp thing)
+           (subst-in-array thing)
+           thing)
+          (t
+           thing)))
        (subst-in-list (lst)
-                      (rplaca lst (subst-in (car lst)))
-                      (rplacd lst (subst-in (cdr lst))))
+         (rplaca lst (subst-in (car lst)))
+         (rplacd lst (subst-in (cdr lst))))
        (subst-in-array (array)
-                       (cl-loop for el across array
-                                for i upfrom 0
-                                do (aset array i (subst-in el)))))
+         (cl-loop for el across array
+                  for i upfrom 0
+                  do (aset array i (subst-in el)))))
     (subst-in orig)))
 
 (defconst er-*all-digits* '( ?0 ?1 ?2 ?3 ?4 ?5 ?6 ?7 ?8 ?9