diff options
author | Ryan Mulligan <ryan@ryantm.com> | 2022-11-05 15:08:30 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-05 15:08:30 -0700 |
commit | 5b285d8f1d018778f7b1e1fba03605a2293de4d8 (patch) | |
tree | c7ff0b137f865d0684edc6031dae98ae62a72c53 | |
parent | e78d803fe47eef74764c389164583b087b9a5a5f (diff) | |
parent | 11b9b7bf86781e12342eab9ac15d3ac95a7c4c21 (diff) |
Merge pull request #199571 from mmlb/fix-flent-gui-and-update
flent: 2.0.1 -> 2.1.1; fixes
-rw-r--r-- | pkgs/applications/networking/flent/default.nix | 38 |
1 files changed, 27 insertions, 11 deletions
diff --git a/pkgs/applications/networking/flent/default.nix b/pkgs/applications/networking/flent/default.nix index 8df990ec4fa5..008579ea54fa 100644 --- a/pkgs/applications/networking/flent/default.nix +++ b/pkgs/applications/networking/flent/default.nix @@ -1,23 +1,39 @@ -{ lib, buildPythonApplication, fetchPypi, matplotlib, procps, pyqt5, python -, pythonPackages, qt5, sphinx, xvfb-run }: - +{ + lib, + buildPythonApplication, + fetchPypi, + procps, + python, + qt5, + xvfb-run, +}: buildPythonApplication rec { pname = "flent"; - version = "2.0.1"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "300a09938dc2b4a0463c9144626f25e0bd736fd47806a9444719fa024d671796"; + sha256 = "sha256-21gd6sPYCZll3Q2O7kucTRhXvc5byXeQr50+1bZVT3M="; }; - buildInputs = [ sphinx ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; - propagatedBuildInputs = [ matplotlib procps pyqt5 ]; - checkInputs = [ procps pythonPackages.mock pyqt5 xvfb-run ]; + buildInputs = [python.pkgs.sphinx]; + nativeBuildInputs = [qt5.wrapQtAppsHook]; + propagatedBuildInputs = [ + procps + python.pkgs.matplotlib + python.pkgs.pyqt5 + python.pkgs.qtpy + ]; + checkInputs = [ + python.pkgs.mock + xvfb-run + ]; checkPhase = '' + # we want the gui tests to always run + sed -i 's|self.skip|pass; #&|' unittests/test_gui.py + cat >test-runner <<EOF #!/bin/sh - ${python.pythonForBuild.interpreter} nix_run_setup test EOF chmod +x test-runner @@ -34,6 +50,6 @@ buildPythonApplication rec { homepage = "https://flent.org"; license = licenses.gpl3; - maintainers = [ maintainers.mmlb ]; + maintainers = [maintainers.mmlb]; }; } |