Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-05-10 00:48:32 +00:00
committed by GitHub
44 changed files with 518 additions and 145 deletions
+6
View File
@@ -1631,6 +1631,8 @@ in {
cvxpy = callPackage ../development/python-modules/cvxpy { };
cwcwidth = callPackage ../development/python-modules/cwcwidth { };
cx_Freeze = callPackage ../development/python-modules/cx_freeze { };
cx_oracle = callPackage ../development/python-modules/cx_oracle { };
@@ -3151,6 +3153,8 @@ in {
humanize = callPackage ../development/python-modules/humanize { };
humblewx = callPackage ../development/python-modules/humblewx { };
hupper = callPackage ../development/python-modules/hupper { };
hvac = callPackage ../development/python-modules/hvac { };
@@ -6228,6 +6232,8 @@ in {
py_stringmatching = callPackage ../development/python-modules/py_stringmatching { };
pysvg-py3 = callPackage ../development/python-modules/pysvg-py3 { };
pysvn = callPackage ../development/python-modules/pysvn {
inherit (pkgs) bash subversion apr aprutil expat neon openssl;
};