diff options
| author | Luflosi <luflosi@luflosi.de> | 2022-03-06 16:57:57 +0100 |
|---|---|---|
| committer | pennae <82953136+pennae@users.noreply.github.com> | 2022-03-24 20:42:07 +0000 |
| commit | ec415055baeb030c6d5cff2d265c10036a670d90 (patch) | |
| tree | 80dd98d64247dd2d69f6ed9e017fbf00583d59e9 /nixos/modules/services/network-filesystems/ipfs.nix | |
| parent | c2e8907d622c8a065dadacf782539c22e58d508a (diff) | |
| download | nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar.gz nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar.bz2 nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar.lz nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar.xz nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.tar.zst nixpkgs-ec415055baeb030c6d5cff2d265c10036a670d90.zip | |
nixos/ipfs: improve how the commandline flags are generated
Use `utils.escapeSystemdExecArgs` instead of relying on the exact way in which `toString` formats a list. In https://github.com/NixOS/nixpkgs/pull/156706#discussion_r795867283 a suggestion was made and then implemented to replace `toString` with `concatStringsSep " "`. @pennae then suggested to use `utils.escapeSystemdExecArgs` instead in https://github.com/NixOS/nixpkgs/pull/164846#issuecomment-1073001848.
Diffstat (limited to 'nixos/modules/services/network-filesystems/ipfs.nix')
| -rw-r--r-- | nixos/modules/services/network-filesystems/ipfs.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/nixos/modules/services/network-filesystems/ipfs.nix b/nixos/modules/services/network-filesystems/ipfs.nix index 655785b99d8..7e96179b3ca 100644 --- a/nixos/modules/services/network-filesystems/ipfs.nix +++ b/nixos/modules/services/network-filesystems/ipfs.nix @@ -1,16 +1,17 @@ -{ config, lib, pkgs, options, ... }: +{ config, lib, pkgs, options, utils, ... }: with lib; let cfg = config.services.ipfs; opt = options.services.ipfs; - ipfsFlags = toString ([ - (optionalString cfg.autoMount "--mount") - (optionalString cfg.enableGC "--enable-gc") - (optionalString (cfg.serviceFdlimit != null) "--manage-fdlimit=false") - (optionalString (cfg.defaultMode == "offline") "--offline") - (optionalString (cfg.defaultMode == "norouting") "--routing=none") - ] ++ cfg.extraFlags); + ipfsFlags = utils.escapeSystemdExecArgs ( + optional cfg.autoMount "--mount" ++ + optional cfg.enableGC "--enable-gc" ++ + optional (cfg.serviceFdlimit != null) "--manage-fdlimit=false" ++ + optional (cfg.defaultMode == "offline") "--offline" ++ + optional (cfg.defaultMode == "norouting") "--routing=none" ++ + cfg.extraFlags + ); profile = if cfg.localDiscovery |