diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/shells/ipython/default.nix | 58 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 313 |
3 files changed, 293 insertions, 80 deletions
diff --git a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix index c8d33c24156c..a2813e0581b3 100644 --- a/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix +++ b/pkgs/desktops/gnome-3/3.16/apps/accerciser/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig gtk3 wrapGAppsHook itstool libxml2 python3 pyatspi - python3Packages.pygobject3 python3Packages.ipythonLight + python3Packages.pygobject3 python3Packages.ipython at_spi2_core dbus intltool libwnck3 gnome3.defaultIconTheme ]; diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix deleted file mode 100644 index 0283c48add9b..000000000000 --- a/pkgs/shells/ipython/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null -, notebookSupport ? true # ipython notebook -, qtconsoleSupport ? true # ipython qtconsole -, pylabSupport ? true # '%pylab' magic (backend: agg - no gui, just file) -, pylabQtSupport ? true # '%pylab qt' (backend: Qt4Agg - plot to window) -}: - -# ipython qtconsole works with both pyside and pyqt4. But ipython --pylab=qt -# only works with pyqt4 (at least this is true for ipython 0.13.1). So just use -# pyqt4 for both. - -assert qtconsoleSupport == true -> pyqt4 != null; -assert pylabQtSupport == true -> pyqt4 != null; - -buildPythonPackage rec { - name = "ipython-${version}"; - version = "3.2.1"; - namePrefix = ""; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "c913adee7ae5b338055274c51a7d2b3cea468b5b316046fa520cd8a434b09177"; - }; - - propagatedBuildInputs = [ - pythonPackages.readline - pythonPackages.sqlite3 # required for history support - ] ++ stdenv.lib.optionals notebookSupport [ - pythonPackages.tornado - pythonPackages.pyzmq - pythonPackages.jinja2 - pythonPackages.jsonschema - ] ++ stdenv.lib.optionals qtconsoleSupport [ - pythonPackages.pygments - pythonPackages.pyzmq - pyqt4 - ] ++ stdenv.lib.optionals pylabSupport [ - pythonPackages.matplotlib - ] ++ stdenv.lib.optionals pylabQtSupport [ - pythonPackages.matplotlib - pyqt4 - ]; - - doCheck = false; - - meta = { - homepage = http://ipython.scipy.org/; - description = "An interactive computing environment for Python"; - license = stdenv.lib.licenses.bsd3; - longDescription = '' - The goal of IPython is to create a comprehensive environment - for interactive and exploratory computing. It consists of an - enhanced interactive Python shell and an architecture for - interactive parallel computing. - ''; - maintainers = with stdenv.lib.maintainers; [ bjornfor jgeerds ]; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 24f28ae971a7..417a31d1ab30 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -120,20 +120,6 @@ let hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; }; }; - ipython = callPackage ../shells/ipython { - inherit pythonPackages; - - qtconsoleSupport = !pkgs.stdenv.isDarwin; # qt is not supported on darwin - pylabQtSupport = !pkgs.stdenv.isDarwin; - pylabSupport = !pkgs.stdenv.isDarwin; # cups is not supported on darwin - }; - - ipythonLight = lowPrio (self.ipython.override { - qtconsoleSupport = false; - pylabSupport = false; - pylabQtSupport = false; - }); - mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.openmpi; }; @@ -2625,6 +2611,27 @@ let license = licenses.mit; }; }; + + pytestrunner = buildPythonPackage rec { + version = "2.6.2"; + name = "pytest-runner-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pytest-runner/${name}.tar.gz"; + sha256 = "e775a40ee4a3a1d45018b199c44cc20bbe7f3df2dc8882f61465bb4141c78cdb"; + }; + + buildInputs = with self; [setuptools_scm pytest]; + + meta = { + description = "Invoke py.test as distutils command with dependency resolution"; + homepage = https://bitbucket.org/pytest-dev/pytest-runner; + license = licenses.mit; + }; + + # Trying to run tests fails with # RuntimeError: dictionary changed size during iteration + doCheck = false; + }; pytestquickcheck = buildPythonPackage rec { name = "pytest-quickcheck-0.8.2"; @@ -7110,6 +7117,81 @@ let homepage = http://pypi.python.org/pypi/IPy; }; }; + + ipykernel = buildPythonPackage rec { + version = "4.0.3"; + name = "ipykernel-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipykernel/${name}.tar.gz"; + sha256 = "a4d7d2d35a0af432c8391872cb4dae727d77031212f32ca858b5c84cd0ea821f"; + }; + + buildInputs = with self; [] ++ optionals isPy27 [mock]; + propagatedBuildInputs = with self; [ipython traitlets jupyter_client pexpect]; + + meta = { + description = "IPython Kernel for Jupyter"; + homepage = http://ipython.org/; + license = licenses.bsd3; + }; + }; + + ipyparallel = buildPythonPackage rec { + version = "4.0.2"; + name = "ipyparallel-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipyparallel/${name}.tar.gz"; + sha256 = "6b9e09ca441a45e055b97cb8e3e1dd30de85b935fae3aa0d97f138352fd3089b"; + }; + + propagatedBuildInputs = with self; [ipython_genutils decorator pyzmq ipython jupyter_client ipykernel]; + + meta = { + description = "Interactive Parallel Computing with IPython"; + homepage = http://ipython.org/; + license = licenses.bsd3; + }; + + }; + + ipython = buildPythonPackage rec { + version = "4.0.0"; + name = "ipython-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; + sha256 = "2fd276c407fb0b29e5d4884a7029a2c27fef0a06fd7a34924cce69b7cc43f4da"; + }; + + buildInputs = with self; [nose] ++ optionals isPy27 [mock]; + + propagatedBuildInputs = with self; [decorator pickleshare simplegeneric traitlets requests pexpect sqlite3]; + + meta = { + description = "IPython: Productive Interactive Computing"; + homepage = http://ipython.org/; + license = licenses.bsd3; + maintainers = with maintainers; [ bjornfor jgeerds ]; + }; + }; + + ipython_genutils = buildPythonPackage rec { + version = "0.1.0"; + name = "ipython_genutils-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/i/ipython_genutils/${name}.tar.gz"; + sha256 = "3a0624a251a26463c9dfa0ffa635ec51c4265380980d9a50d65611c3c2bd82a6"; + }; + + meta = { + description = "Vestigial utilities from IPython"; + homepage = http://ipython.org/; + license = licenses.bsd3; + }; + }; ipaddr = buildPythonPackage rec { @@ -7150,7 +7232,7 @@ let url = "http://pypi.python.org/packages/source/i/ipdb/${name}.zip"; md5 = "96dca0712efa01aa5eaf6b22071dd3ed"; }; - propagatedBuildInputs = with self; [ self.ipythonLight ]; + propagatedBuildInputs = with self; [ self.ipython ]; }; ipdbplugin = buildPythonPackage { @@ -7159,7 +7241,7 @@ let url = "https://pypi.python.org/packages/source/i/ipdbplugin/ipdbplugin-1.4.tar.gz"; md5 = "f9a41512e5d901ea0fa199c3f648bba7"; }; - propagatedBuildInputs = with self; [ self.nose self.ipythonLight ]; + propagatedBuildInputs = with self; [ self.nose self.ipython ]; }; iso8601 = buildPythonPackage { @@ -7321,6 +7403,42 @@ let license = licenses.mit; }; }; + + jupyter_client = buildPythonPackage rec { + version = "4.0.0"; + name = "jupyter_client-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jupyter_client/${name}.tar.gz"; + sha256 = "a39a4181ea2021daf6e821acae836999ef6e0fefe603813a7a7d4658d2ffa2ac"; + }; + + propagatedBuildInputs = with self; [traitlets jupyter_core pyzmq] ++ optional isPyPy py; + + meta = { + description = "Jupyter protocol implementation and client libraries"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + }; + }; + + jupyter_core = buildPythonPackage rec { + version = "4.0.4"; + name = "jupyter_core-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jupyter_core/${name}.tar.gz"; + sha256 = "fcf45478025f34174943993947f51a41ad871ac998a14bf1cb87d8eb61e75c6d"; + }; + + propagatedBuildInputs = with self; [traitlets]; + + meta = { + description = "Jupyter core package. A base package on which Jupyter projects rely"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + }; + }; jsonpath_rw = buildPythonPackage rec { @@ -8043,6 +8161,24 @@ let maintainers = with maintainers; [ thoughtpolice ]; }; }; + + mistune = buildPythonPackage rec { + version = "0.7.1"; + name = "mistune-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/m/mistune/${name}.tar.gz"; + sha256 = "6076dedf768348927d991f4371e5a799c6a0158b16091df08ee85ee231d929a7"; + }; + + buildInputs = with self; [nose]; + + meta = { + decription = "The fastest markdown parser in pure Python"; + homepage = https://github.com/lepture/mistune; + license = licenses.bsd3; + }; + }; mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; @@ -8526,6 +8662,44 @@ let license = licenses.lgpl21Plus; }; }; + + nbconvert = buildPythonPackage rec { + version = "4.0.0"; + name = "nbconvert-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nbconvert/${name}.tar.gz"; + sha256 = "472ad15d1a71f1ef00c4094c11bb93638858fc89fb2c5838b3aa6b67d981b437"; + }; + + buildInputs = with self; [nose]; + + propagatedBuildInputs = with self; [mistune jinja2 pygments traitlets jupyter_core nbformat ipykernel tornado jupyter_client]; + + meta = { + description = "Converting Jupyter Notebooks"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + }; + }; + + nbformat = buildPythonPackage rec { + version = "4.0.0"; + name = "nbformat-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/nbformat/${name}.tar.gz"; + sha256 = "daf9b990e96863d120aff123361156a316757757b81a8070eb6945e4a9774b2d"; + }; + + propagatedBuildInputs = with self; [ipython_genutils traitlets jsonschema jupyter_core]; + + meta = { + description = "The Jupyter Notebook format"; + homepage = "http://jupyter.org/"; + license = licenses.bsd3; + }; + }; nbxmpp = buildPythonPackage rec { name = "nbxmpp-0.5.3"; @@ -8855,7 +9029,26 @@ let buildInputs = with self; [ nose ]; }; - + + notebook = buildPythonPackage rec { + version = "4.0.4"; + name = "notebook-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/n/notebook/${name}.tar.gz"; + sha256 = "a57852514bce1b1cf41fa0311f6cf894960cf68b083b55e6c408316b598d5648"; + }; + + buildInputs = with self; [nose] ++ optionals isPy27 [mock]; + + propagatedBuildInputs = with self; [jinja2 tornado ipython_genutils traitlets jupyter_core jupyter_client nbformat nbconvert ipykernel terminado requests pexpect]; + + meta = { + description = "The Jupyter HTML notebook is a web-based notebook environment for interactive computing"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + }; + }; notify = pkgs.stdenv.mkDerivation (rec { name = "python-notify-0.1.1"; @@ -9557,19 +9750,27 @@ let }; pathpy = buildPythonPackage rec { - name = "path.py-5.2"; + version = "7.6"; + name = "path.py-${version}"; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/p/path.py/${name}.zip"; - sha256 = "0n1kpbbm1dg5f484yzxr7gb3ak6vjp92j70nw3bgjzsj9fh26afq"; + url = "https://pypi.python.org/packages/source/p/path.py/${name}.tar.gz"; + sha256 = "5cdf60f359f1add18f8556c9a1855cbd1d517f0780e3d386c256515f698ba0e0"; }; - + + buildInputs = with self; [setuptools_scm pytestrunner pytest]; + meta = { 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 + # Also during tests with python 3.4: RuntimeError: dictionary changed size during iteration + # Caused by pytestrunner + doCheck = false; }; paypalrestsdk = buildPythonPackage rec { @@ -9814,6 +10015,24 @@ let }; }; + pickleshare = buildPythonPackage rec { + version = "0.5"; + name = "pickleshare-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pickleshare/${name}.tar.gz"; + sha256 = "c0be5745035d437dbf55a96f60b7712345b12423f7d0951bd7d8dc2141ca9286"; + }; + + propagatedBuildInputs = with self; [pathpy]; + + meta = { + description = "Tiny 'shelve'-like database with concurrency support"; + homepage = https://github.com/vivainio/pickleshare; + license = licenses.mit; + }; + }; + pip = buildPythonPackage rec { version = "1.5.6"; name = "pip-${version}"; @@ -12193,6 +12412,25 @@ let license = licenses.bsd3; }; }; + + qtconsole = buildPythonPackage rec { + version = "4.0.1"; + name = "qtconsole-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/q/qtconsole/${name}.tar.gz"; + sha256 = "7d2cf976bb960df11f413709b5b5b809365c48426110e946d0c12117e6ced3a5"; + }; + + buildInputs = with self; [] ++ optionals isPy27 [mock]; + propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt4]; + + meta = { + description = "Jupyter Qt console"; + homepage = http://jupyter.org/; + license = licenses.bsd3; + }; + }; quantities = buildPythonPackage rec { name = "quantities-0.10.1"; @@ -12947,6 +13185,22 @@ let license = "unspecified"; # ! }; }; + + simplegeneric = buildPythonPackage rec { + version = "0.8.1"; + name = "simplegeneric-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/s/simplegeneric/${name}.zip"; + sha256 = "dc972e06094b9af5b855b3df4a646395e43d1c9d0d39ed345b7393560d0b9173"; + }; + + meta = { + description = "Simple generic functions"; + homepage = http://cheeseshop.python.org/pypi/simplegeneric; + license = licenses.zpt21; + }; + }; simplejson = buildPythonPackage (rec { @@ -14191,6 +14445,23 @@ let }; }; + traitlets = buildPythonPackage rec { + version = "4.0.0"; + name = "traitlets-${version}"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/traitlets/${name}.tar.gz"; + sha256 = "0b140b4a94a4f1951887d9bce4650da211f79600fc9fdb422acc90c5bbe0233b"; + }; + + propagatedBuildInputs = with self; [ipython_genutils decorator]; + + meta = { + description = "Traitlets Python config system"; + homepage = http://ipython.org/; + license = licenses.bsd3; + }; + }; python_mimeparse = buildPythonPackage rec { name = "python-mimeparse-${version}"; |