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

Merge remote-tracking branch 'upstream/nixpkgs-unstable' into staging

Browse Source
This commit is contained in:
John Ericson
2020-06-14 21:46:35 +00:00
parent c681045630 00e448172f
commit fd4dcae884
80 changed files with 732 additions and 668 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+21
View File
@@ -1262,6 +1262,8 @@ in {
pynisher = callPackage ../development/python-modules/pynisher { };
pynput = callPackage ../development/python-modules/pynput { };
pyparser = callPackage ../development/python-modules/pyparser { };
pyres = callPackage ../development/python-modules/pyres { };
@@ -2634,6 +2636,8 @@ in {
libais = callPackage ../development/python-modules/libais { };
libevdev = callPackage ../development/python-modules/libevdev { };
libfdt = toPythonModule (pkgs.dtc.override {
inherit python;
pythonSupport = true;
@@ -2820,6 +2824,8 @@ in {
fake_factory = callPackage ../development/python-modules/fake_factory { };
fake-useragent = callPackage ../development/python-modules/fake-useragent { };
factory_boy = callPackage ../development/python-modules/factory_boy { };
Fabric = callPackage ../development/python-modules/Fabric { };
@@ -3466,6 +3472,8 @@ in {
samplerate = callPackage ../development/python-modules/samplerate { };
screeninfo = callPackage ../development/python-modules/screeninfo { };
ssdeep = callPackage ../development/python-modules/ssdeep { };
ssdp = callPackage ../development/python-modules/ssdp { };
@@ -3488,6 +3496,8 @@ in {
setuptools-git = callPackage ../development/python-modules/setuptools-git { };
setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
sievelib = callPackage ../development/python-modules/sievelib { };
watchdog = callPackage ../development/python-modules/watchdog { };
@@ -3909,6 +3919,11 @@ in {
gdrivefs = callPackage ../development/python-modules/gdrivefs { };
geant4 = disabledIf (!isPy3k) (toPythonModule (pkgs.geant4.override {
enablePython = true;
python3 = python;
}));
genshi = callPackage ../development/python-modules/genshi { };
gentools = callPackage ../development/python-modules/gentools { };
@@ -6942,6 +6957,12 @@ in {
scrapy = callPackage ../development/python-modules/scrapy { };
scrapy-fake-useragent = callPackage ../development/python-modules/scrapy-fake-useragent { };
scrapy-deltafetch = callPackage ../development/python-modules/scrapy-deltafetch { };
scrapy-splash = callPackage ../development/python-modules/scrapy-splash { };
pandocfilters = callPackage ../development/python-modules/pandocfilters { };
pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { };