diff options
| author | Bernardo Meurer <bernardo@meurer.org> | 2023-03-16 11:10:22 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-16 11:10:22 -0300 |
| commit | 6e557333593580724cbe070ef0ab8f46f8faf49d (patch) | |
| tree | 9a74711c5858544e70c1d998d2be77a8b77e0881 /nixos/modules/services/web-apps | |
| parent | fe49120d973443e308ba531f4cfb1ce0a7e89a54 (diff) | |
| parent | d10e69c86bcd415f5c4347d3c6b981241e913465 (diff) | |
| download | nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar.gz nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar.bz2 nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar.lz nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar.xz nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.tar.zst nixpkgs-6e557333593580724cbe070ef0ab8f46f8faf49d.zip | |
Merge pull request #219747 from Stunkymonkey/deprecate-isNull
Diffstat (limited to 'nixos/modules/services/web-apps')
| -rw-r--r-- | nixos/modules/services/web-apps/dolibarr.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/web-apps/writefreely.nix | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix index a9df391128e..453229c130c 100644 --- a/nixos/modules/services/web-apps/dolibarr.nix +++ b/nixos/modules/services/web-apps/dolibarr.nix @@ -16,7 +16,7 @@ let if (any (str: k == str) secretKeys) then v else if isString v then "'${v}'" else if isBool v then boolToString v - else if isNull v then "null" + else if v == null then "null" else toString v ; in diff --git a/nixos/modules/services/web-apps/writefreely.nix b/nixos/modules/services/web-apps/writefreely.nix index dec00b46f33..a7671aa717f 100644 --- a/nixos/modules/services/web-apps/writefreely.nix +++ b/nixos/modules/services/web-apps/writefreely.nix @@ -10,12 +10,11 @@ let format = pkgs.formats.ini { mkKeyValue = key: value: let - value' = if builtins.isNull value then - "" - else if builtins.isBool value then - if value == true then "true" else "false" - else - toString value; + value' = lib.optionalString (value != null) + (if builtins.isBool value then + if value == true then "true" else "false" + else + toString value); in "${key} = ${value'}"; }; |