diff options
author | Rok Garbas <rok@garbas.si> | 2013-03-27 09:30:22 -0700 |
---|---|---|
committer | Rok Garbas <rok@garbas.si> | 2013-03-27 09:30:22 -0700 |
commit | 310c732276fec5f4b5a024b752022ebc950a2bb6 (patch) | |
tree | 146dba3b38d221a01c487fd8a12b831224ea7aba /pkgs | |
parent | 608fe14130e93bfff28674c58534d83774a491f7 (diff) | |
parent | 25c49767f33d63a018594c6e26536ad4805e08dc (diff) | |
download | nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar.gz nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar.bz2 nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar.lz nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar.xz nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.tar.zst nixlib-310c732276fec5f4b5a024b752022ebc950a2bb6.zip |
Merge pull request #415 from bjornfor/ipython-pylab
ipython: modularize and enable more features
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/shells/ipython/default.nix | 33 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 32 insertions, 3 deletions
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 1b3177bd23ae..82ca13185b3c 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,16 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null +, notebookSupport ? true # ipython notebook +, qtconsoleSupport ? true # ipython qtconsole +, pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) +, pylabQtSupport ? true # ipython --pylab=qt (backend: Qt4Agg - plot to window) +}: + +# ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt +# only works with pyqt4 (at least this is true for ipython 0.13.1). So just use +# pyqt4 for both. + +assert qtconsoleSupport == true -> pyqt4 != null; +assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { name = "ipython-0.13.1"; @@ -9,7 +21,24 @@ buildPythonPackage rec { sha256 = "1h7q2zlyfn7si2vf6gnq2d0krkm1f5jy5nbi105by7zxqjai1grv"; }; - propagatedBuildInputs = [ pythonPackages.readline pythonPackages.sqlite3 pythonPackages.tornado pythonPackages.pyzmq ]; + propagatedBuildInputs = [ + pythonPackages.readline + pythonPackages.sqlite3 # required for history support + ] ++ stdenv.lib.optionals notebookSupport [ + pythonPackages.tornado + pythonPackages.pyzmq + pythonPackages.jinja2 + ] ++ stdenv.lib.optionals qtconsoleSupport [ + pythonPackages.pygments + pythonPackages.pyzmq + pyqt4 + ] ++ stdenv.lib.optionals pylabSupport [ + pythonPackages.matplotlib + ] ++ stdenv.lib.optionals pylabQtSupport [ + pythonPackages.matplotlib + pyqt4 + sip + ]; doCheck = false; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2f23071588e6..effde24da998 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -49,7 +49,7 @@ pythonPackages = python.modules // rec { # packages defined elsewhere ipython = import ../shells/ipython { - inherit (pkgs) stdenv fetchurl; + inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; }; |