Merge remote-tracking branch 'origin/master' into staging-next

Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix

pkgs/development/python-modules/ipykernel/4.nix

@@ -5,7 +5,7 @@
 , isPy27
 , mock
 , ipython
-, jupyter_client
+, jupyter-client
 , pexpect
 , traitlets
 , tornado
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   checkInputs = [ nose ] ++ lib.optional isPy27 mock;
   propagatedBuildInputs = [
     ipython
-    jupyter_client
+    jupyter-client
     pexpect
     traitlets
     tornado

pkgs/development/python-modules/ipykernel/default.nix

@@ -5,7 +5,7 @@
 , fetchPypi
 , debugpy
 , ipython
-, jupyter_client
+, jupyter-client
 , tornado
 , traitlets
 , pythonOlder
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     debugpy
     ipython
-    jupyter_client
+    jupyter-client
     tornado
     traitlets
   ];