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

Merge branch 'master' into staging-next

Browse Source 
(a trivial conflict in transmission)
This commit is contained in:
Vladimír Čunát
2021-05-09 09:31:55 +02:00
parent 9f024e4c92 90c2fb1f2f
commit 5663b2b2d3
201 changed files with 2565 additions and 1560 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+21
View File
@@ -311,6 +311,8 @@ in {
aionotion = callPackage ../development/python-modules/aionotion { };
aiopg = callPackage ../development/python-modules/aiopg { };
aioprocessing = callPackage ../development/python-modules/aioprocessing { };
aiopulse = callPackage ../development/python-modules/aiopulse { };
@@ -385,6 +387,8 @@ in {
amqplib = callPackage ../development/python-modules/amqplib { };
amqtt = callPackage ../development/python-modules/amqtt { };
android-backup = callPackage ../development/python-modules/android-backup { };
androidtv = callPackage ../development/python-modules/androidtv { };
@@ -931,6 +935,8 @@ in {
backports_weakref = callPackage ../development/python-modules/backports_weakref { };
backports-zoneinfo = callPackage ../development/python-modules/backports-zoneinfo { };
bacpypes = callPackage ../development/python-modules/bacpypes { };
banal = callPackage ../development/python-modules/banal { };
@@ -2344,6 +2350,7 @@ in {
fenics = callPackage ../development/libraries/science/math/fenics {
pytest = self.pytest_4;
hdf5 = pkgs.hdf5_1_10;
};
ffmpeg-python = callPackage ../development/python-modules/ffmpeg-python { };
@@ -3181,6 +3188,10 @@ in {
hyppo = callPackage ../development/python-modules/hyppo { };
i2c-tools = callPackage ../development/python-modules/i2c-tools {
inherit (pkgs) i2c-tools;
};
i3ipc = callPackage ../development/python-modules/i3ipc { };
i3-py = callPackage ../development/python-modules/i3-py { };
@@ -3888,6 +3899,8 @@ in {
line_profiler = callPackage ../development/python-modules/line_profiler { };
linkify-it-py = callPackage ../development/python-modules/linkify-it-py { };
linode-api = callPackage ../development/python-modules/linode-api { };
linode = callPackage ../development/python-modules/linode { };
@@ -4108,6 +4121,8 @@ in {
md2gemini = callPackage ../development/python-modules/md2gemini { };
mdit-py-plugins = callPackage ../development/python-modules/mdit-py-plugins { };
MDP = callPackage ../development/python-modules/mdp { };
measurement = callPackage ../development/python-modules/measurement { };
@@ -5642,6 +5657,8 @@ in {
pyi2cflash = callPackage ../development/python-modules/pyi2cflash { };
pyialarm = callPackage ../development/python-modules/pyialarm { };
pyicloud = callPackage ../development/python-modules/pyicloud { };
PyICU = callPackage ../development/python-modules/pyicu { };
@@ -6397,6 +6414,8 @@ in {
pytest-random-order = callPackage ../development/python-modules/pytest-random-order { };
pytest-regressions = callPackage ../development/python-modules/pytest-regressions { };
pytest-relaxed = callPackage ../development/python-modules/pytest-relaxed { };
pytest-remotedata = callPackage ../development/python-modules/pytest-remotedata { };
@@ -8316,6 +8335,8 @@ in {
uarray = callPackage ../development/python-modules/uarray { };
uc-micro-py = callPackage ../development/python-modules/uc-micro-py { };
ueberzug = callPackage ../development/python-modules/ueberzug {
inherit (pkgs.xorg) libX11 libXext;
};