Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-09 18:23:01 +00:00
committed by GitHub
27 changed files with 178 additions and 136 deletions
+3 -1
View File
@@ -5181,7 +5181,9 @@ in {
prison = callPackage ../development/python-modules/prison { };
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
privacyidea = callPackage ../development/python-modules/privacyidea { };
pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { };
proboscis = callPackage ../development/python-modules/proboscis { };