diff options
| author | Yegor Timoshenko <yegortimoshenko@riseup.net> | 2018-06-18 20:47:55 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-06-18 20:47:55 +0300 |
| commit | 5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9 (patch) | |
| tree | 0adc7cce3b0e75c2cede8ee66ca122ebdb3a61f2 /nixos/modules/services | |
| parent | e0e505de429f0d69bf1d923cb35638f5c2ae179e (diff) | |
| parent | 170223fe642bba1b36181d2120ba0095c70de6eb (diff) | |
| download | nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar.gz nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar.bz2 nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar.lz nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar.xz nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.tar.zst nixlib-5e5bdfa6ad23259d68ac6571ccd51406dfdbf5d9.zip | |
Merge pull request #41098 from mkaito/oauth2_proxy
oauth2_proxy: Handle attributes being derivations
Diffstat (limited to 'nixos/modules/services')
| -rw-r--r-- | nixos/modules/services/security/oauth2_proxy.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/services/security/oauth2_proxy.nix b/nixos/modules/services/security/oauth2_proxy.nix index 433d97c2a7d7..96d78630e6d1 100644 --- a/nixos/modules/services/security/oauth2_proxy.nix +++ b/nixos/modules/services/security/oauth2_proxy.nix @@ -72,6 +72,7 @@ let mapConfig = key: attr: if (!isNull attr && attr != []) then ( + if isDerivation attr then mapConfig key (toString attr) else if (builtins.typeOf attr) == "set" then concatStringsSep " " (mapAttrsToList (name: value: mapConfig (key + "-" + name) value) attr) else if (builtins.typeOf attr) == "list" then concatMapStringsSep " " (mapConfig key) attr else |