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

Merge master into staging-next

Browse Source
This commit is contained in:
github-actions[bot]
2021-03-25 00:17:22 +00:00
committed by GitHub
parent 8e2d0e45c0 d9a1de3d60
commit eb499aa20e
53 changed files with 363 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+4 -1
View File
@@ -322,6 +322,8 @@ in {
aioshelly = callPackage ../development/python-modules/aioshelly { };
aiosmb = callPackage ../development/python-modules/aiosmb { };
aiosmtpd = callPackage ../development/python-modules/aiosmtpd { };
aiosqlite = callPackage ../development/python-modules/aiosqlite { };
@@ -3976,7 +3978,6 @@ in {
llfuse = callPackage ../development/python-modules/llfuse {
inherit (pkgs) fuse;
inherit (pkgs.darwin.apple_sdk.frameworks) DiskArbitration;
};
llvmlite = callPackage ../development/python-modules/llvmlite {
@@ -7776,6 +7777,8 @@ in {
softlayer = callPackage ../development/python-modules/softlayer { };
solaredge = callPackage ../development/python-modules/solaredge { };
solax = callPackage ../development/python-modules/solax { };
solo-python = disabledIf (!pythonAtLeast "3.6") (callPackage ../development/python-modules/solo-python { });