Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-09 00:39:09 +00:00
committed by GitHub
65 changed files with 2594 additions and 1218 deletions
+14 -8
View File
@@ -2403,6 +2403,8 @@ in {
flask_script = callPackage ../development/python-modules/flask-script { };
flask-seasurf = callPackage ../development/python-modules/flask-seasurf { };
flask-silk = callPackage ../development/python-modules/flask-silk { };
flask-socketio = callPackage ../development/python-modules/flask-socketio { };
@@ -2411,6 +2413,8 @@ in {
flask_sqlalchemy = callPackage ../development/python-modules/flask-sqlalchemy { };
flask-sslify = callPackage ../development/python-modules/flask-sslify { };
flask-swagger = callPackage ../development/python-modules/flask-swagger { };
flask-swagger-ui = callPackage ../development/python-modules/flask-swagger-ui { };
@@ -2672,8 +2676,6 @@ in {
gmpy = callPackage ../development/python-modules/gmpy { };
gmusicapi = callPackage ../development/python-modules/gmusicapi { };
gntp = callPackage ../development/python-modules/gntp { };
gnureadline = callPackage ../development/python-modules/gnureadline { };
@@ -2797,12 +2799,6 @@ in {
googlemaps = callPackage ../development/python-modules/googlemaps { };
google-music = callPackage ../development/python-modules/google-music { };
google-music-proto = callPackage ../development/python-modules/google-music-proto { };
google-music-utils = callPackage ../development/python-modules/google-music-utils { };
google-pasta = callPackage ../development/python-modules/google-pasta { };
google-resumable-media = callPackage ../development/python-modules/google-resumable-media { };
@@ -3845,6 +3841,8 @@ in {
lightparam = callPackage ../development/python-modules/lightparam { };
lima = callPackage ../development/python-modules/lima { };
limitlessled = callPackage ../development/python-modules/limitlessled { };
limits = callPackage ../development/python-modules/limits { };
@@ -6261,6 +6259,8 @@ in {
pytest-check = callPackage ../development/python-modules/pytest-check { };
pytest-cid = callPackage ../development/python-modules/pytest-cid { };
pytest-click = callPackage ../development/python-modules/pytest-click { };
pytest-cov = self.pytestcov; # self 2021-01-04
@@ -6418,6 +6418,8 @@ in {
python-awair = callPackage ../development/python-modules/python-awair { };
python3-saml = callPackage ../development/python-modules/python3-saml { };
python-axolotl = callPackage ../development/python-modules/python-axolotl { };
python-axolotl-curve25519 = callPackage ../development/python-modules/python-axolotl-curve25519 { };
@@ -8663,6 +8665,10 @@ in {
xmlschema = callPackage ../development/python-modules/xmlschema { };
xmlsec = callPackage ../development/python-modules/xmlsec {
inherit (pkgs) libxslt libxml2 libtool pkg-config xmlsec;
};
xmltodict = callPackage ../development/python-modules/xmltodict { };
xmodem = callPackage ../development/python-modules/xmodem { };