From 429f89688ae073199a52371d16ebe6c624f2f84d Mon Sep 17 00:00:00 2001
From: nicoo <nicoo@mur.at>
Date: Sat, 25 May 2024 19:03:56 +0000
Subject: [PATCH] nixos/athens: Replace custom `jq`-based `runCommand` with
 `pkgs.formats`

---
 nixos/modules/services/development/athens.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/development/athens.nix b/nixos/modules/services/development/athens.nix
index ddd4699fea2a..214a262a65e2 100644
--- a/nixos/modules/services/development/athens.nix
+++ b/nixos/modules/services/development/athens.nix
@@ -140,12 +140,10 @@ let
     }
   );
 
-  configFile = pkgs.runCommandLocal "config.toml" { } ''
-    ${pkgs.buildPackages.jq}/bin/jq 'del(..|nulls)' \
-      < ${pkgs.writeText "config.json" (builtins.toJSON athensConfig)} | \
-    ${pkgs.buildPackages.remarshal}/bin/remarshal -if json -of toml \
-      > $out
-  '';
+  configFile = lib.pipe athensConfig [
+    (lib.filterAttrsRecursive (_k: v: v != null))
+    ((pkgs.formats.toml {}).generate "config.toml")
+  ];
 in
 {
   meta = {