From 6254357e9a5bb00bb96ee4a3908620b5424a15ba Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Wed, 7 Oct 2015 21:59:41 +1100 Subject: [PATCH 1/4] appnope: init at 0.1.0 --- pkgs/top-level/python-packages.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 00b67937145e..2288cfdb91f0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -504,6 +504,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"; From dbaff49b2bb74d8e57d7a99ba5f303e36d581e96 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Wed, 7 Oct 2015 21:59:58 +1100 Subject: [PATCH 2/4] gnureadline: init at 6.3.3 --- pkgs/top-level/python-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2288cfdb91f0..949d7046f6be 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3763,6 +3763,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 { From bb82a564c8bd5291afa62aac8082d1283991a41a Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Wed, 7 Oct 2015 22:00:32 +1100 Subject: [PATCH 3/4] pathpy: allow use on all platforms --- pkgs/top-level/python-packages.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 949d7046f6be..fdd7bc4d0b82 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10093,7 +10093,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 From 2e2b2c39d571a1ca1c4c4d012842b45e42088d37 Mon Sep 17 00:00:00 2001 From: Tim Cuthbertson Date: Wed, 7 Oct 2015 22:00:47 +1100 Subject: [PATCH 4/4] ipython: add darwin-specific dependencies --- pkgs/top-level/python-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fdd7bc4d0b82..19cda7e3290d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7375,7 +7375,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";