Merge remote-tracking branch 'NixOS/master' into staging

2019-04-23 22:00:42 -04:00
parent dc552fd2ff 6088a4793f
commit 84d00355e8
395 changed files with 10057 additions and 5223 deletions
--- a/pkgs/development/python-modules/notebook/default.nix
+++ b/pkgs/development/python-modules/notebook/default.nix
@@ -66,7 +66,7 @@ buildPythonPackage rec {

  meta = {
    description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing";
-    homepage = http://jupyter.org/;
+    homepage = https://jupyter.org/;
    license = lib.licenses.bsd3;
    maintainers = with lib.maintainers; [ fridh globin ];
  };