Merge pull request #165259 from Luflosi/ipfs-recursiveUpdate

nixos/ipfs: use lib.recursiveUpdate instead of // operator
2022-04-05 19:16:39 +02:00
parent 1b5e91c39b 38f1576ba9
commit 39e0bd705b
1 changed files with 9 additions and 5 deletions
@@ -267,11 +267,15 @@ in
      '' + ''
        ipfs --offline config show \
          | ${pkgs.jq}/bin/jq '. * $extraConfig' --argjson extraConfig ${
-              escapeShellArg (builtins.toJSON ({
-                Addresses.API = cfg.apiAddress;
-                Addresses.Gateway = cfg.gatewayAddress;
-                Addresses.Swarm = cfg.swarmAddress;
-              } // cfg.extraConfig))
+              escapeShellArg (builtins.toJSON (
+                recursiveUpdate
+                  {
+                    Addresses.API = cfg.apiAddress;
+                    Addresses.Gateway = cfg.gatewayAddress;
+                    Addresses.Swarm = cfg.swarmAddress;
+                  }
+                  cfg.extraConfig
+              ))
            } \
          | ipfs --offline config replace -
      '';