From 92ef3413aca8e8155c8304db8c4c6dc1df826c14 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Apr 2017 11:54:43 +0200 Subject: [PATCH] pythonPackages.notebook: 4.4.1 -> 5.0.0 --- .../python-modules/notebook/default.nix | 52 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 30 +---------- 2 files changed, 53 insertions(+), 29 deletions(-) create mode 100644 pkgs/development/python-modules/notebook/default.nix diff --git a/pkgs/development/python-modules/notebook/default.nix b/pkgs/development/python-modules/notebook/default.nix new file mode 100644 index 00000000000..0fa94854640 --- /dev/null +++ b/pkgs/development/python-modules/notebook/default.nix @@ -0,0 +1,52 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, glibcLocales +, isPy27 +, mock +, jinja2 +, tornado +, ipython_genutils +, traitlets +, jupyter_core +, jupyter_client +, nbformat +, nbconvert +, ipykernel +, terminado +, requests2 +, pexpect +}: + +buildPythonPackage rec { + pname = "notebook"; + version = "5.0.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "1cea3bbbd03c8e5842a1403347a8cc8134486b3ce081a2e5b1952a00ea66ed54"; + }; + + LC_ALL = "en_US.UTF-8"; + + buildInputs = [nose glibcLocales] ++ lib.optionals isPy27 [mock]; + + propagatedBuildInputs = [jinja2 tornado ipython_genutils traitlets jupyter_core + jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect ]; + + checkPhase = '' + nosetests -v + ''; + + # Certain tests fail due to being in a chroot. + # PermissionError + doCheck = false; + meta = { + description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 38cab5cc0a2..acf5870eaf4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16007,35 +16007,7 @@ in { buildInputs = with self; [ nose ]; }; - notebook = buildPythonPackage rec { - version = "4.4.1"; - name = "notebook-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/n/notebook/${name}.tar.gz"; - sha256 = "dfadef2babd7c04c6c257df7d07d7ba587e503dbb4e4c95305f9a95b8d3a9765"; - }; - - LC_ALL = "en_US.UTF-8"; - - buildInputs = with self; [nose pkgs.glibcLocales] ++ optionals isPy27 [mock]; - - propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests2 pexpect]; - - checkPhase = '' - nosetests -v - ''; - - # Certain tests fail due to being in a chroot. - # PermissionError - doCheck = false; - meta = { - description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + notebook = callPackage ../development/python-modules/notebook { }; notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1";