public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'staging-next' into staging

Browse Source 
Conflicts:
	pkgs/development/python-modules/panel/default.nix
	pkgs/os-specific/linux/kernel/generic.nix
	pkgs/servers/home-assistant/default.nix
This commit is contained in:
Dmitry Kalinkin
2021-04-08 22:42:26 -04:00
parent 625ce6c7f6 c99b6f5343
commit 219590673c
127 changed files with 8479 additions and 625 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+8
View File
@@ -533,6 +533,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 { };
@@ -4221,6 +4223,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 { };
@@ -6701,6 +6705,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 { };