Merge master into staging-next
This commit is contained in:
@@ -549,6 +549,8 @@ in {
|
||||
|
||||
asyncio-mqtt = callPackage ../development/python-modules/asyncio_mqtt { };
|
||||
|
||||
asyncio-nats-client = callPackage ../development/python-modules/asyncio-nats-client { };
|
||||
|
||||
asyncio-throttle = callPackage ../development/python-modules/asyncio-throttle { };
|
||||
|
||||
asyncpg = callPackage ../development/python-modules/asyncpg { };
|
||||
@@ -4530,6 +4532,8 @@ in {
|
||||
|
||||
nassl = callPackage ../development/python-modules/nassl { };
|
||||
|
||||
nats-python = callPackage ../development/python-modules/nats-python { };
|
||||
|
||||
natsort = callPackage ../development/python-modules/natsort { };
|
||||
|
||||
naturalsort = callPackage ../development/python-modules/naturalsort { };
|
||||
@@ -7197,6 +7201,10 @@ in {
|
||||
|
||||
recaptcha_client = callPackage ../development/python-modules/recaptcha_client { };
|
||||
|
||||
recoll = disabledIf (!isPy3k) (toPythonModule (pkgs.recoll.override {
|
||||
python3Packages = self;
|
||||
}));
|
||||
|
||||
recommonmark = callPackage ../development/python-modules/recommonmark { };
|
||||
|
||||
redbaron = callPackage ../development/python-modules/redbaron { };
|
||||
|
||||
Reference in New Issue
Block a user