From bf946a808d69bc37823e43ab56df7a7bbe15d263 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Thu, 31 Oct 2019 09:58:08 +0100 Subject: [PATCH] Revert "pythonPackages.ipython: remove python2 frozen package" This reverts commit 0ccf10b955910dd511208720f3bbf49a2ffe9fbb. I think it was premature to drop the support a couple of weeks before the official deadline. At least sage still depends on it. --- pkgs/development/python-modules/ipython/5.nix | 62 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 5 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/ipython/5.nix diff --git a/pkgs/development/python-modules/ipython/5.nix b/pkgs/development/python-modules/ipython/5.nix new file mode 100644 index 000000000000..15e7d00bcece --- /dev/null +++ b/pkgs/development/python-modules/ipython/5.nix @@ -0,0 +1,62 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +# Build dependencies +, glibcLocales +# Test dependencies +, nose +, pygments +, testpath +, isPy27 +, mock +# Runtime dependencies +, backports_shutil_get_terminal_size +, decorator +, pathlib2 +, pickleshare +, requests +, simplegeneric +, traitlets +, prompt_toolkit +, pexpect +, appnope +}: + +buildPythonPackage rec { + pname = "ipython"; + version = "5.8.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906"; + }; + + prePatch = stdenv.lib.optionalString stdenv.isDarwin '' + substituteInPlace setup.py --replace "'gnureadline'" " " + ''; + + buildInputs = [ glibcLocales ]; + + checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock; + + propagatedBuildInputs = [ + backports_shutil_get_terminal_size decorator pickleshare prompt_toolkit + simplegeneric traitlets requests pathlib2 pexpect + ] ++ lib.optionals stdenv.isDarwin [ appnope ]; + + LC_ALL="en_US.UTF-8"; + + doCheck = false; # Circular dependency with ipykernel + + checkPhase = '' + nosetests + ''; + + meta = { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bjornfor orivej lnl7 ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6b3e434074ac..8fbe53f79045 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3552,7 +3552,10 @@ in { ipyparallel = callPackage ../development/python-modules/ipyparallel { }; - ipython = callPackage ../development/python-modules/ipython { }; + ipython = if pythonOlder "3.5" then + callPackage ../development/python-modules/ipython/5.nix { } + else + callPackage ../development/python-modules/ipython { }; ipython_genutils = callPackage ../development/python-modules/ipython_genutils { };