diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 18:07:33 +0200 |
commit | 98ef78326d4349a14e328b322495e34242d796cc (patch) | |
tree | 1582a9a7d560d91b7125a4b5a4c49dab62a0479d /pkgs/applications/networking/flent | |
parent | 92b96ce63fa8752d0487edbe026a37ff765b33b3 (diff) | |
parent | 96e5474329a3c2b2309872fb01b007daaf6d7bdc (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/networking/flent')
-rw-r--r-- | pkgs/applications/networking/flent/default.nix | 41 |
1 files changed, 25 insertions, 16 deletions
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index bc0a519a0eee6..bbd9a7601acdb 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,30 +1,39 @@ -{ stdenv, buildPythonApplication, fetchFromGitHub, matplotlib, procps, pyqt5 -, sphinx -}: +{ stdenv, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python +, pythonPackages, qt5, sphinx, xvfb_run }: buildPythonApplication rec { pname = "flent"; - version = "1.2.2"; - src = fetchFromGitHub { - owner = "tohojo"; - repo = "flent"; - rev = "v${version}"; - sha256 = "1llcdakk0nk9xlpjjz7mv4a80yq4sjnbqhaqvyj9m6lbcxgssh2r"; + version = "1.3.0"; + src = fetchPypi { + inherit pname version; + sha256 = "099779i0ghjd9ikq77z6m6scnlmk946lw9issrgz8zm7babiw4d7"; }; buildInputs = [ sphinx ]; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ matplotlib procps pyqt5 ]; + checkInputs = [ procps pythonPackages.mock pyqt5 xvfb_run ]; - checkInputs = [ procps ]; + checkPhase = '' + cat >test-runner <<EOF + #!/bin/sh - propagatedBuildInputs = [ - matplotlib - procps - pyqt5 - ]; + ${python.pythonForBuild.interpreter} nix_run_setup test + EOF + chmod +x test-runner + wrapQtApp test-runner --prefix PYTHONPATH : $PYTHONPATH + xvfb-run -s '-screen 0 800x600x24' ./test-runner + ''; + + postInstall = '' + for program in $out/bin/*; do + wrapQtApp $program --prefix PYTHONPATH : $PYTHONPATH + done + ''; meta = with stdenv.lib; { description = "The FLExible Network Tester"; - homepage = https://flent.org; + homepage = "https://flent.org"; license = licenses.gpl3; maintainers = [ maintainers.mmlb ]; |