Merge branch 'master' into staging-next

Choose binwalk 2.3.1, 27 is legacy version for Python 2.
This commit is contained in:
Jan Tojnar
2021-04-25 02:50:48 +02:00
121 changed files with 987 additions and 616 deletions
+14 -2
View File
@@ -3043,6 +3043,8 @@ in {
homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { };
homeconnect = callPackage ../development/python-modules/homeconnect { };
homematicip = callPackage ../development/python-modules/homematicip { };
homepluscontrol = callPackage ../development/python-modules/homepluscontrol { };
@@ -5354,6 +5356,8 @@ in {
pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
pycocotools = callPackage ../development/python-modules/pycocotools { };
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
pycognito = callPackage ../development/python-modules/pycognito { };
@@ -6074,10 +6078,14 @@ in {
pysmappee = callPackage ../development/python-modules/pysmappee { };
pysmb = callPackage ../development/python-modules/pysmb { };
pysmart-smartx = callPackage ../development/python-modules/pysmart-smartx { };
pysmartapp = callPackage ../development/python-modules/pysmartapp { };
pysmartthings = callPackage ../development/python-modules/pysmartthings { };
pysmb = callPackage ../development/python-modules/pysmb { };
pysmbc = callPackage ../development/python-modules/pysmbc { };
pysmf = callPackage ../development/python-modules/pysmf { };
@@ -7299,6 +7307,8 @@ in {
seqdiag = callPackage ../development/python-modules/seqdiag { };
seqeval = callPackage ../development/python-modules/seqeval { };
sequoia = disabledIf isPyPy (toPythonModule (pkgs.sequoia.override {
pythonPackages = self;
pythonSupport = true;
@@ -7451,6 +7461,8 @@ in {
smdebug-rulesconfig = callPackage ../development/python-modules/smdebug-rulesconfig { };
smhi-pkg = callPackage ../development/python-modules/smhi-pkg { };
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
smmap = callPackage ../development/python-modules/smmap { };