Merge branch 'master' into staging-next

2018-08-30 21:56:13 +02:00
parent 91b01208a0 efb16b5829
commit a9780a095b
95 changed files with 1171 additions and 395 deletions
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -5,6 +5,7 @@
 , nbformat
 , pytz
 , requests
+, retrying
 , six
 }:

@@ -22,6 +23,7 @@ buildPythonPackage rec {
    nbformat
    pytz
    requests
+    retrying
    six
  ];