diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-07 14:02:48 +0100 |
| commit | 4aa3eec330f64afd9db78b9bb26db32bdbabe2c4 (patch) | |
| tree | 90cb19f6cfb8498dff0597a7ae2968b240b1e559 /pkgs/shells | |
| parent | 43c4d78bc6e19476c122efc82316122722e988aa (diff) | |
| parent | ad4ad11fbc8871811d65d0b2427fd4bc38e54a14 (diff) | |
| download | nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.gz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.bz2 nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.lz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.xz nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.tar.zst nixlib-4aa3eec330f64afd9db78b9bb26db32bdbabe2c4.zip | |
Merge branch 'master' into staging
Conflicts: pkgs/development/libraries/fontconfig/default.nix
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/ipython/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 990eb174bafc..b101e25f5744 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { - name = "ipython-2.2.0"; + name = "ipython-2.3.1"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1qk44lmir24gnwb3gxh0mqcghc8ln1i5ygxpalh06bx0ajx7gjmp"; + sha256 = "1764gi5m3ff481rjk336cw6i2h4zlc0nxam9rc5m8m7yl9m4d61y"; }; propagatedBuildInputs = [ |