alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

ipython: modularize and enable more features

Browse source 
Add these new attributes (all default to true):

  notebookSupport
  qtconsoleSupport
  pylabSupport
  pylabQtSupport

This adds jinja2, matplotlib, pyqt4 and sip as new dependencies of
ipython.

This commit fixes "ipython --pylab" so that it no more errors out with
"ImportError: No module named matplotlib" (which was my initial goal).
This commit is contained in:
Bjørn Forsman 2013-03-27 13:35:39 +01:00
parent 66969547a2
commit 25c49767f3
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
pkgs/shells/ipython/default.nix
View file

@ -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;

2
pkgs/top-level/python-packages.nix
View file

@ -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;
};