From 25c49767f33d63a018594c6e26536ad4805e08dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Wed, 27 Mar 2013 13:35:39 +0100
Subject: [PATCH] ipython: modularize and enable more features
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).
---
pkgs/shells/ipython/default.nix | 33 ++++++++++++++++++++++++++++--
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 1b3177bd23a..82ca13185b3 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 9c816188b71..94d6995474d 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;
};