nixpkgs: remove redundant attribute sip

Because:

 1. It is a mere alias of `pythonPackages.sip`
 2. It is usually not needed since propagated by `pyqt4`
 3. It makes it easy to have a packages depend on two different versions
 of sip
This commit is contained in:
Vincent Laporte
2014-12-23 08:42:30 +01:00
parent 49f53f63f5
commit 81a2b58c39
7 changed files with 12 additions and 14 deletions

View File

@@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null
{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null
, notebookSupport ? true # ipython notebook
, qtconsoleSupport ? true # ipython qtconsole
, pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file)
@@ -10,7 +10,7 @@
# pyqt4 for both.
assert qtconsoleSupport == true -> pyqt4 != null;
assert pylabQtSupport == true -> pyqt4 != null && sip != null;
assert pylabQtSupport == true -> pyqt4 != null;
buildPythonPackage rec {
name = "ipython-2.3.1";
@@ -37,7 +37,6 @@ buildPythonPackage rec {
] ++ stdenv.lib.optionals pylabQtSupport [
pythonPackages.matplotlib
pyqt4
sip
];
doCheck = false;