Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-09 14:33:52 +01:00
313 changed files with 7523 additions and 7431 deletions
+22 -2
View File
@@ -913,6 +913,8 @@ in {
bluepy = callPackage ../development/python-modules/bluepy { };
bme680 = callPackage ../development/python-modules/bme680 { };
bokeh = callPackage ../development/python-modules/bokeh { };
boltons = callPackage ../development/python-modules/boltons { };
@@ -1200,6 +1202,8 @@ in {
click-didyoumean = callPackage ../development/python-modules/click-didyoumean { };
click-help-colors = callPackage ../development/python-modules/click-help-colors { };
click-log = callPackage ../development/python-modules/click-log { };
click-plugins = callPackage ../development/python-modules/click-plugins { };
@@ -1811,8 +1815,6 @@ in {
dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; };
dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; };
dparse = callPackage ../development/python-modules/dparse { };
dpath = callPackage ../development/python-modules/dpath { };
@@ -2472,6 +2474,8 @@ in {
google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { };
google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { };
google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { };
google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { };
@@ -2560,6 +2564,10 @@ in {
gpyopt = callPackage ../development/python-modules/gpyopt { };
gradient_sdk = callPackage ../development/python-modules/gradient_sdk { };
gradient_statsd = callPackage ../development/python-modules/gradient_statsd { };
grammalecte = callPackage ../development/python-modules/grammalecte { };
grandalf = callPackage ../development/python-modules/grandalf { };
@@ -2826,6 +2834,8 @@ in {
hyperlink = callPackage ../development/python-modules/hyperlink { };
hyperopt = callPackage ../development/python-modules/hyperopt { };
hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix
{ }; # File name is called 2.nix because this one will need to remain for Python 2.
@@ -2925,6 +2935,8 @@ in {
infoqscraper = callPackage ../development/python-modules/infoqscraper { };
inform = callPackage ../development/python-modules/inform { };
iniconfig = callPackage ../development/python-modules/iniconfig { };
inifile = callPackage ../development/python-modules/inifile { };
@@ -4000,6 +4012,8 @@ in {
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
nestedtext = callPackage ../development/python-modules/nestedtext { };
netaddr = callPackage ../development/python-modules/netaddr { };
netcdf4 = callPackage ../development/python-modules/netcdf4 { };
@@ -5291,6 +5305,8 @@ in {
pyparted = callPackage ../development/python-modules/pyparted { };
pypass = callPackage ../development/python-modules/pypass { };
pypblib = callPackage ../development/python-modules/pypblib { };
pypcap = callPackage ../development/python-modules/pypcap { };
@@ -6650,6 +6666,8 @@ in {
smartypants = callPackage ../development/python-modules/smartypants { };
smbus-cffi = callPackage ../development/python-modules/smbus-cffi { };
smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
smmap = callPackage ../development/python-modules/smmap { };
@@ -6832,6 +6850,8 @@ in {
sqlitedict = callPackage ../development/python-modules/sqlitedict { };
sqlite-utils = callPackage ../development/python-modules/sqlite-utils { };
sqlmap = callPackage ../development/python-modules/sqlmap { };
sqlobject = callPackage ../development/python-modules/sqlobject { };