Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-05-14 09:25:25 +02:00
197 changed files with 2754 additions and 1663 deletions
+15
View File
@@ -2935,6 +2935,8 @@ in {
hglib = callPackage ../development/python-modules/hglib {};
huey = callPackage ../development/python-modules/huey { };
humanize = callPackage ../development/python-modules/humanize { };
humanfriendly = callPackage ../development/python-modules/humanfriendly { };
@@ -3235,6 +3237,9 @@ in {
priority = callPackage ../development/python-modules/priority { };
privacyidea = callPackage ../development/python-modules/privacyidea { };
privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { };
prov = callPackage ../development/python-modules/prov { };
pudb = callPackage ../development/python-modules/pudb { };
@@ -3755,6 +3760,8 @@ in {
flask_testing = callPackage ../development/python-modules/flask-testing { };
flask-versioned = callPackage ../development/python-modules/flask-versioned { };
flask_wtf = callPackage ../development/python-modules/flask-wtf { };
wtforms = callPackage ../development/python-modules/wtforms { };
@@ -4076,6 +4083,8 @@ in {
uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };
unrpa = callPackage ../development/python-modules/unrpa { };
lsi = callPackage ../development/python-modules/lsi { };
hkdf = callPackage ../development/python-modules/hkdf { };
@@ -5241,6 +5250,8 @@ in {
pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { };
pyrad = callPackage ../development/python-modules/pyrad { };
pyrr = callPackage ../development/python-modules/pyrr { };
pysha3 = callPackage ../development/python-modules/pysha3 { };
@@ -5851,6 +5862,8 @@ in {
sqlalchemy-utils = callPackage ../development/python-modules/sqlalchemy-utils { };
sqlsoup = callPackage ../development/python-modules/sqlsoup { };
staticjinja = callPackage ../development/python-modules/staticjinja { };
statsmodels = callPackage ../development/python-modules/statsmodels { };
@@ -6263,6 +6276,8 @@ in {
smartdc = callPackage ../development/python-modules/smartdc { };
smpplib = callPackage ../development/python-modules/smpplib { };
socksipy-branch = callPackage ../development/python-modules/socksipy-branch { };
sockjs-tornado = callPackage ../development/python-modules/sockjs-tornado { };