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

Merge branch 'staging-next' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2020-08-23 02:18:27 +02:00
parent 728f8e21d4 91104b5417
commit 58377555ed
516 changed files with 15983 additions and 9551 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+22
View File
@@ -184,6 +184,8 @@ in {
aioamqp = callPackage ../development/python-modules/aioamqp { };
aiojobs = callPackage ../development/python-modules/aiojobs { };
aioredis = callPackage ../development/python-modules/aioredis { };
aiorun = callPackage ../development/python-modules/aiorun { };
@@ -764,6 +766,8 @@ in {
filemagic = callPackage ../development/python-modules/filemagic { };
finalfusion = callPackage ../development/python-modules/finalfusion { };
fints = callPackage ../development/python-modules/fints { };
fire = callPackage ../development/python-modules/fire { };
@@ -2050,10 +2054,12 @@ in {
binwalk = callPackage ../development/python-modules/binwalk {
pyqtgraph = null;
matplotlib = null;
};
binwalk-full = appendToName "full" (self.binwalk.override {
pyqtgraph = self.pyqtgraph;
matplotlib = self.matplotlib;
});
bitmath = callPackage ../development/python-modules/bitmath { };
@@ -3377,6 +3383,10 @@ in {
measurement = callPackage ../development/python-modules/measurement {};
mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override {
python3Packages = self;
}));
midiutil = callPackage ../development/python-modules/midiutil {};
mido = callPackage ../development/python-modules/mido { };
@@ -3826,6 +3836,8 @@ in {
django-webpack-loader = callPackage ../development/python-modules/django-webpack-loader { };
django-widget-tweaks = callPackage ../development/python-modules/django-widget-tweaks { };
django_tagging = callPackage ../development/python-modules/django_tagging { };
django_classytags = callPackage ../development/python-modules/django_classytags { };
@@ -4085,6 +4097,8 @@ in {
cudaSupport = false;
};
pytorch-lightning = callPackage ../development/python-modules/pytorch-lightning { };
pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { };
pythondialog = callPackage ../development/python-modules/pythondialog { };
@@ -4856,6 +4870,8 @@ in {
else
callPackage ../development/python-modules/mock { };
mocket = callPackage ../development/python-modules/mocket { };
mock-open = callPackage ../development/python-modules/mock-open { };
mockito = callPackage ../development/python-modules/mockito { };
@@ -5958,6 +5974,8 @@ in {
rdflib = callPackage ../development/python-modules/rdflib { };
rdflib-jsonld = callPackage ../development/python-modules/rdflib-jsonld { };
isodate = callPackage ../development/python-modules/isodate { };
owslib = callPackage ../development/python-modules/owslib { };
@@ -7170,6 +7188,8 @@ in {
xcffib = callPackage ../development/python-modules/xcffib {};
xpybutil = callPackage ../development/python-modules/xpybutil {};
pafy = callPackage ../development/python-modules/pafy { };
suds = callPackage ../development/python-modules/suds { };
@@ -7636,6 +7656,8 @@ in {
pure-pcapy3 = callPackage ../development/python-modules/pure-pcapy3 { };
cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
behave = callPackage ../development/python-modules/behave { };
bellows = callPackage ../development/python-modules/bellows { };