diff options
| author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2018-07-29 09:13:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-29 09:13:54 +0200 |
| commit | e46e7f44c22fcf328d62c10152926852e6e4b896 (patch) | |
| tree | 1ffa67a69459037477ac3f5180e0ef80d81d5c59 /pkgs/applications | |
| parent | 2226b7de076f94d0b7c718d7c87f5d4eb9e8bbad (diff) | |
| parent | a670a3de5b430308a2018ea029dd63da1288df08 (diff) | |
| download | nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar.gz nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar.bz2 nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar.lz nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar.xz nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.tar.zst nixlib-e46e7f44c22fcf328d62c10152926852e6e4b896.zip | |
Merge staging-next into master
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/rtv/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/applications/science/spyder/default.nix | 18 |
2 files changed, 9 insertions, 24 deletions
diff --git a/pkgs/applications/misc/rtv/default.nix b/pkgs/applications/misc/rtv/default.nix index 5c16a02ddb8c..be27e28c9938 100644 --- a/pkgs/applications/misc/rtv/default.nix +++ b/pkgs/applications/misc/rtv/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchFromGitHub, pythonPackages }: +{ stdenv, fetchFromGitHub, python3Packages }: -with pythonPackages; +with python3Packages; buildPythonApplication rec { version = "1.23.0"; - name = "rtv-${version}"; + pname = "rtv"; src = fetchFromGitHub { owner = "michael-lazar"; @@ -19,7 +19,7 @@ buildPythonApplication rec { py.test ''; - buildInputs = [ + checkInputs = [ coverage coveralls docopt @@ -30,18 +30,11 @@ buildPythonApplication rec { ]; propagatedBuildInputs = [ - backports_functools_lru_cache beautifulsoup4 - configparser - contextlib2 decorator kitchen - mailcap-fix - mccabe requests six - tornado - pyyaml ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 0564f3de1b78..71def712db6c 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -1,18 +1,10 @@ -{ stdenv, fetchPypi, buildPythonApplication, makeDesktopItem -# mandatory -, numpydoc, qtconsole, qtawesome, jedi, pycodestyle, psutil -, pyflakes, rope, nbconvert, mccabe, pyopengl, cloudpickle -# optional -, numpy ? null, scipy ? null, matplotlib ? null -# optional -, pylint ? null -}: - -buildPythonApplication rec { +{ stdenv, python3, makeDesktopItem }: + +python3.pkgs.buildPythonApplication rec { pname = "spyder"; version = "3.2.8"; - src = fetchPypi { + src = python3.pkgs.fetchPypi { inherit pname version; sha256 = "0iwcby2bxvayz0kp282yh864br55w6gpd8rqcdj1cp3jbn3q6vg5"; }; @@ -22,7 +14,7 @@ buildPythonApplication rec { sed -i -e '/pyqt5/d' setup.py ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ jedi pycodestyle psutil pyflakes rope numpy scipy matplotlib pylint numpydoc qtconsole qtawesome nbconvert mccabe pyopengl cloudpickle ]; |