public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* ipython: simplify.

Browse Source 
svn path=/nixpkgs/branches/modular-python/; revision=26565
This commit is contained in:
Eelco Dolstra 2011-03-28 12:40:53 +00:00
parent 3c9f4e6e72
commit cef7e52b5a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/shells/ipython/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, buildPythonPackage }: { stdenv, fetchurl, buildPythonPackage, pythonPackages }:
buildPythonPackage { buildPythonPackage {
name = "ipython-0.10.1"; name = "ipython-0.10.1";
@ -8,6 +8,8 @@ buildPythonPackage {
sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2"; sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2";
}; };
propagatedBuildInputs = [ pythonPackages.readline ];
doCheck = false; doCheck = false;
meta = { meta = {

14
pkgs/top-level/all-packages.nix
View File

@ -1506,19 +1506,7 @@ let
dash = callPackage ../shells/dash { }; dash = callPackage ../shells/dash { };
ipython = callPackage ../shells/ipython { ipython = callPackage ../shells/ipython { };
# I did not find any better way of reusing buildPythonPackage+setuptools
# for a python with openssl support
buildPythonPackage = assert pythonFull.readlineSupport;
import ../development/python-modules/generic {
inherit makeWrapper lib;
python = pythonFull;
setuptools = builderDefsPackage (import ../development/python-modules/setuptools) {
inherit makeWrapper;
python = pythonFull;
};
};
};
tcsh = callPackage ../shells/tcsh { }; tcsh = callPackage ../shells/tcsh { };