Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-03-05 06:17:25 +00:00
committed by GitHub
30 changed files with 659 additions and 62 deletions
+20
View File
@@ -174,6 +174,8 @@ in {
adal = callPackage ../development/python-modules/adal { };
adb-enhanced = callPackage ../development/python-modules/adb-enhanced { };
adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { };
adb-shell = callPackage ../development/python-modules/adb-shell { };
@@ -280,6 +282,8 @@ in {
aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
aiolyric = callPackage ../development/python-modules/aiolyric { };
aiomultiprocess = callPackage ../development/python-modules/aiomultiprocess { };
aiomysql = callPackage ../development/python-modules/aiomysql { };
@@ -4261,6 +4265,8 @@ in {
mt-940 = callPackage ../development/python-modules/mt-940 { };
mullvad-api = callPackage ../development/python-modules/mullvad-api { };
mulpyplexer = callPackage ../development/python-modules/mulpyplexer { };
multidict = callPackage ../development/python-modules/multidict { };
@@ -4641,6 +4647,8 @@ in {
openwrt-luci-rpc = disabledIf (!isPy3k) (callPackage ../development/python-modules/openwrt-luci-rpc { });
openwrt-ubus-rpc = callPackage ../development/python-modules/openwrt-ubus-rpc { };
opt-einsum = if isPy27 then
callPackage ../development/python-modules/opt-einsum/2.nix { }
else
@@ -5648,6 +5656,8 @@ in {
pykka = callPackage ../development/python-modules/pykka { };
pykmtronic = callPackage ../development/python-modules/pykmtronic { };
pykwalify = callPackage ../development/python-modules/pykwalify { };
pylacrosse = callPackage ../development/python-modules/pylacrosse { };
@@ -5746,6 +5756,8 @@ in {
pymitv = callPackage ../development/python-modules/pymitv { };
pymfy = callPackage ../development/python-modules/pymfy { };
pymodbus = callPackage ../development/python-modules/pymodbus { };
pymongo = callPackage ../development/python-modules/pymongo { };
@@ -5884,6 +5896,8 @@ in {
pypillowfight = callPackage ../development/python-modules/pypillowfight { };
pyplaato = callPackage ../development/python-modules/pyplaato { };
pyplatec = callPackage ../development/python-modules/pyplatec { };
pypoppler = callPackage ../development/python-modules/pypoppler { };
@@ -5974,6 +5988,8 @@ in {
pyrisco = callPackage ../development/python-modules/pyrisco { };
pyrituals = callPackage ../development/python-modules/pyrituals { };
pyRFC3339 = callPackage ../development/python-modules/pyrfc3339 { };
PyRMVtransport = callPackage ../development/python-modules/PyRMVtransport { };
@@ -6636,6 +6652,8 @@ in {
pyupdate = callPackage ../development/python-modules/pyupdate { };
pyupgrade = callPackage ../development/python-modules/pyupgrade { };
pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; };
pyutil = callPackage ../development/python-modules/pyutil { };
@@ -7972,6 +7990,8 @@ in {
tokenizers = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenizers { }));
tokenize-rt = disabledIf (!isPy3k) (toPythonModule (callPackage ../development/python-modules/tokenize-rt { }));
tokenlib = callPackage ../development/python-modules/tokenlib { };
tokenserver = callPackage ../development/python-modules/tokenserver { };