Add taploFmt TOML format function to mkLib

examples/quick-start-workspace/flake.nix

@@ -120,6 +120,11 @@
             inherit src;
           };
 
+          my-workspace-toml-fmt = craneLib.taploFmt {
+            inherit src;
+            taploExtraArgs = "--config ./taplo.toml";
+          };
+
           # Audit dependencies
           my-workspace-audit = craneLib.cargoAudit {
             inherit src advisory-db;

examples/quick-start-workspace/taplo.toml

@@ -0,0 +1,13 @@
+# Sorts `Cargo.toml` dependencies. All other `.toml` files are formatted with the default config.
+#
+# https://taplo.tamasfe.dev/configuration/file.html#configuration-file
+
+[formatting]
+reorder_keys = false
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ["dependencies"]
+
+[rule.formatting]
+reorder_keys = true

examples/quick-start/flake.nix

@@ -91,6 +91,11 @@
             inherit src;
           };
 
+          my-crate-toml-fmt = craneLib.taploFmt {
+            inherit src;
+            taploExtraArgs = "--config ./taplo.toml";
+          };
+
           # Audit dependencies
           my-crate-audit = craneLib.cargoAudit {
             inherit src advisory-db;

examples/quick-start/taplo.toml

@@ -0,0 +1,13 @@
+# Sorts `Cargo.toml` dependencies. All other `.toml` files are formatted with the default config.
+#
+# https://taplo.tamasfe.dev/configuration/file.html#configuration-file
+
+[formatting]
+reorder_keys = false
+
+[[rule]]
+include = ["**/Cargo.toml"]
+keys = ["dependencies"]
+
+[rule.formatting]
+reorder_keys = true

lib/default.nix

@@ -119,6 +119,7 @@ let
       registryFromSparse = callPackage ./registryFromSparse.nix { };
       removeReferencesToVendoredSourcesHook = callPackage ./setupHooks/removeReferencesToVendoredSources.nix { };
       replaceCargoLockHook = callPackage ./setupHooks/replaceCargoLockHook.nix { };
+      taploFmt = callPackage ./taploFmt.nix { };
       urlForCargoPackage = callPackage ./urlForCargoPackage.nix { };
       vendorCargoDeps = callPackage ./vendorCargoDeps.nix { };
       vendorMultipleCargoDeps = callPackage ./vendorMultipleCargoDeps.nix { };

lib/taploFmt.nix

@@ -0,0 +1,24 @@
+{ taplo
+, mkCargoDerivation
+}:
+
+{ taploExtraArgs ? ""
+, ...
+}@origArgs:
+let
+  args = builtins.removeAttrs origArgs [ "taploExtraArgs" ];
+in
+mkCargoDerivation (args // {
+  cargoArtifacts = null;
+  cargoVendorDir = null;
+  pnameSuffix = "-tomlfmt";
+
+  buildPhaseCargoCommand = "taplo fmt --check ${taploExtraArgs}";
+
+  nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [ taplo ];
+
+  preInstallPhases = [ "ensureTargetDir" ] ++ (args.preInstallPhases or [ ]);
+  ensureTargetDir = ''
+    mkdir -p ''${CARGO_TARGET_DIR:-target}
+  '';
+})