1
0
Fork 0
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:
nixpkgs-ci[bot] 2025-03-14 12:05:44 +00:00 committed by GitHub
commit d77c26326c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
69 changed files with 1957 additions and 1666 deletions

View file

@ -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
)