From 8ba089c5ae1b0bba53629318bc4480dec99f4925 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Fri, 23 Oct 2015 21:00:52 +0300 Subject: [PATCH 1/4] darwin: ipython: fix build inputs for darwin --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f9c9a6698f1..116751155fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7932,6 +7932,10 @@ let sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da"; }; + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + buildInputs = with self; [nose] ++ optionals isPy27 [mock]; propagatedBuildInputs = with self; From e8daff21576a98c3c2977b20518cb1c1e26c8705 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Fri, 23 Oct 2015 20:58:38 +0300 Subject: [PATCH 2/4] darwin: appnope: init at 0.1.0 --- pkgs/top-level/python-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 116751155fd..7d097b71edf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -523,10 +523,15 @@ let src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/a/appnope/${name}.tar.gz"; - sha256 = "0wgdwp5v7r4g2bss8vbdxah12hsy2mvzxh3sil9s4iskjbz5z6cb"; + sha256 = "8b995ffe925347a2138d7ac0fe77155e4311a0ea6d6da4f5128fe4b3cbe5ed71"; }; - meta.platforms = platforms.darwin; + meta = { + description = "Disable App Nap on OS X"; + homepage = https://pypi.python.org/pypi/appnope; + platforms = platforms.darwin; + license = licenses.bsd3; + }; }; apsw = buildPythonPackage rec { From 02e14c4ffa9b02b0aa6f5d9982532e5aa723f3e3 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Fri, 23 Oct 2015 21:00:03 +0300 Subject: [PATCH 3/4] jupyter_console: init at 4.0.3 --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7d097b71edf..c0f6dadd416 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4528,6 +4528,29 @@ let }; }; + jupyter_console = buildPythonPackage rec { + version = "4.0.3"; + name = "jupyter_console-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jupyter_console/jupyter_console-4.0.3.tar.gz"; + sha256 = "555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85"; + }; + + propagatedBuildInputs = with self; [ + jupyter_client + ipython + ipykernel + ]; + + meta = { + description = "Jupyter terminal console"; + homepage = "http://jupyter.org/"; + license = licenses.bsd3; + platforms = platforms.all; + }; + }; + lti = buildPythonPackage rec { version = "0.4.0"; name = "PyLTI-${version}"; From 9529b6f11f9590da24413354a8db61711645d679 Mon Sep 17 00:00:00 2001 From: Asko Soukka Date: Fri, 23 Oct 2015 21:00:20 +0300 Subject: [PATCH 4/4] jupyter: init at 1.0.0 --- pkgs/top-level/python-packages.nix | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0f6dadd416..ed71333eb3d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4528,12 +4528,38 @@ let }; }; + jupyter = buildPythonPackage rec { + version = "1.0.0"; + name = "jupyter-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jupyter/${name}.tar.gz"; + sha256 = "d9dc4b3318f310e34c82951ea5d6683f67bed7def4b259fafbfe4f1beb1d8e5f"; + }; + + propagatedBuildInputs = with self; [ + notebook + qtconsole + jupyter_console + nbconvert + ipykernel + ipywidgets + ]; + + meta = { + description = "Installs all the Jupyter components in one go"; + homepage = "http://jupyter.org/"; + license = licenses.bsd3; + platforms = platforms.all; + }; + }; + jupyter_console = buildPythonPackage rec { version = "4.0.3"; name = "jupyter_console-${version}"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/j/jupyter_console/jupyter_console-4.0.3.tar.gz"; + url = "https://pypi.python.org/packages/source/j/jupyter_console/${name}.tar.gz"; sha256 = "555be6963a8f6431fbe1d424c7ffefee90824758058e4c9a2ab3aa045948eb85"; };