From b1952ff747a8c5dfe29908847a54f5d50fc80ef7 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Tue, 18 Apr 2017 11:57:10 +0200 Subject: [PATCH] pythonPackages.qtconsole: 4.2.1 -> 4.3.0 --- .../python-modules/qtconsole/default.nix | 37 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 23 +----------- 2 files changed, 38 insertions(+), 22 deletions(-) create mode 100644 pkgs/development/python-modules/qtconsole/default.nix diff --git a/pkgs/development/python-modules/qtconsole/default.nix b/pkgs/development/python-modules/qtconsole/default.nix new file mode 100644 index 000000000000..b09458de5683 --- /dev/null +++ b/pkgs/development/python-modules/qtconsole/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, nose +, isPy27 +, mock +, traitlets +, jupyter_core +, jupyter_client +, pygments +, ipykernel +, pyqt5 +}: + +buildPythonPackage rec { + pname = "qtconsole"; + version = "4.3.0"; + name = "${pname}-${version}"; + + src = fetchPypi { + inherit pname version; + sha256 = "2821ccf85853b83e4958521f82e36325208787eaf79b19b83905a99cc41aa209"; + }; + + buildInputs = [ nose ] ++ lib.optionals isPy27 [mock]; + propagatedBuildInputs = [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; + + # : cannot connect to X server + doCheck = false; + + meta = { + description = "Jupyter Qt console"; + homepage = http://jupyter.org/; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fridh ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acf5870eaf46..7e11ff182a76 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -22209,28 +22209,7 @@ in { }; }; - qtconsole = buildPythonPackage rec { - version = "4.2.1"; - name = "qtconsole-${version}"; - - src = pkgs.fetchurl { - url = "mirror://pypi/q/qtconsole/${name}.tar.gz"; - sha256 = "1vqqx9hdvrg2d336wjyw0vr5b5v97kflkqqvr7ryicr8als7vv15"; - }; - - buildInputs = with self; [ nose ] ++ optionals isPy27 [mock]; - propagatedBuildInputs = with self; [traitlets jupyter_core jupyter_client pygments ipykernel pyqt5]; - - # : cannot connect to X server - doCheck = false; - - meta = { - description = "Jupyter Qt console"; - homepage = http://jupyter.org/; - license = licenses.bsd3; - maintainers = with maintainers; [ fridh ]; - }; - }; + qtconsole = callPackage ../development/python-modules/qtconsole { }; quantities = buildPythonPackage rec { name = "quantities-0.10.1";