mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-07-04 23:02:38 +03:00
Merge master into staging-next
This commit is contained in:
commit
d77c26326c
69 changed files with 1957 additions and 1666 deletions
|
@ -790,12 +790,12 @@ in
|
|||
++ concatLists (
|
||||
flip mapAttrsToList (filterPresent cfg.provision.systems.oauth2) (
|
||||
oauth2: oauth2Cfg:
|
||||
(optionals (cfg.provision.extraJsonFile == null) (
|
||||
(optional (cfg.provision.extraJsonFile == null) (
|
||||
assertGroupsKnown "services.kanidm.provision.systems.oauth2.${oauth2}.scopeMaps" (
|
||||
attrNames oauth2Cfg.scopeMaps
|
||||
)
|
||||
))
|
||||
++ (optionals (cfg.provision.extraJsonFile == null) (
|
||||
++ (optional (cfg.provision.extraJsonFile == null) (
|
||||
assertGroupsKnown "services.kanidm.provision.systems.oauth2.${oauth2}.supplementaryScopeMaps" (
|
||||
attrNames oauth2Cfg.supplementaryScopeMaps
|
||||
)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue