diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 12:40:53 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 12:40:53 +0000 |
| commit | cef7e52b5af177a01d277418d7771d7a983abc58 (patch) | |
| tree | ce24b6c6030e95c053c2a6ed55b2be228c8bcc98 /pkgs | |
| parent | 3c9f4e6e7230a2e5513021ddc0da764dda9c4b2f (diff) | |
| download | nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar.gz nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar.bz2 nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar.lz nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar.xz nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.tar.zst nixlib-cef7e52b5af177a01d277418d7771d7a983abc58.zip | |
* ipython: simplify.
svn path=/nixpkgs/branches/modular-python/; revision=26565
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/shells/ipython/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 |
2 files changed, 4 insertions, 14 deletions
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 68064dded3d9..92920818db1b 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage }: +{ stdenv, fetchurl, buildPythonPackage, pythonPackages }: buildPythonPackage { name = "ipython-0.10.1"; @@ -8,6 +8,8 @@ buildPythonPackage { sha256 = "18zwrg25zn72w4rmcwxzcw11ibgp001fawm2sz189zv86z70fxi2"; }; + propagatedBuildInputs = [ pythonPackages.readline ]; + doCheck = false; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 73e1f5b45fbe..63cfe630d082 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1506,19 +1506,7 @@ let dash = callPackage ../shells/dash { }; - 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; - }; - }; - }; + ipython = callPackage ../shells/ipython { }; tcsh = callPackage ../shells/tcsh { }; |