about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2015-10-28 13:18:28 +0100
committerVladimír Čunát <vcunat@gmail.com>2015-10-28 13:20:57 +0100
commit1e285a7eef633d276465f8508bd6dc9a45785fe8 (patch)
tree2da3ebe8da5d8e46e2b9da1afd878b7931c19203
parent51ca02f95fce5cbe1021e66047206841b84d7075 (diff)
parent2e2b2c39d571a1ca1c4c4d012842b45e42088d37 (diff)
Merge #10250: ipython: add dawin-specific dependencies
It seems safe enough. I verified tarball builds at least.
-rw-r--r--pkgs/top-level/python-packages.nix29
1 files changed, 27 insertions, 2 deletions
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 62ccc2e79f1d1..a31a2419d648f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -517,6 +517,17 @@ let
     };
   };
 
+  appnope = buildPythonPackage rec {
+    version = "0.1.0";
+    name = "appnope-${version}";
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/a/appnope/${name}.tar.gz";
+      sha256 = "0wgdwp5v7r4g2bss8vbdxah12hsy2mvzxh3sil9s4iskjbz5z6cb";
+    };
+
+    meta.platforms = platforms.darwin;
+  };
 
   apsw = buildPythonPackage rec {
     name = "apsw-3.7.6.2-r1";
@@ -3943,6 +3954,19 @@ let
     };
   };
 
+  gnureadline = buildPythonPackage rec {
+    version = "6.3.3";
+    name = "gnureadline-${version}";
+    disabled = isPyPy;
+
+    src = pkgs.fetchurl {
+      url = "https://pypi.python.org/packages/source/g/gnureadline/${name}.tar.gz";
+      sha256 = "1ghck2zz4xbqa3wz73brgjhrqj55p9hc1fq6c9zb09dnyhwb0nd2";
+    };
+
+    buildInputs = [ pkgs.ncurses ];
+  };
+
   gnutls = buildPythonPackage rec {
     name = "python-gnutls";
     src = pkgs.fetchurl {
@@ -7688,7 +7712,9 @@ let
 
     buildInputs = with self; [nose] ++ optionals isPy27 [mock];
 
-    propagatedBuildInputs = with self; [decorator pickleshare simplegeneric traitlets readline requests pexpect sqlite3];
+    propagatedBuildInputs = with self;
+      [decorator pickleshare simplegeneric traitlets readline requests pexpect sqlite3]
+      ++ optionals stdenv.isDarwin [appnope gnureadline];
 
     meta = {
       description = "IPython: Productive Interactive Computing";
@@ -11675,7 +11701,6 @@ let
       description = "A module wrapper for os.path";
       homepage = http://github.com/jaraco/path.py;
       license = licenses.mit;
-      platforms = platforms.linux;
     };
 
     # Test fails with python 2.7: TestUnicodePaths.test_walkdirs_with_unicode_name