diff options
| author | Doron Behar <doron.behar@gmail.com> | 2022-02-15 08:07:34 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2022-02-15 08:23:45 +0200 |
| commit | 4c1298943b123012433bc8b5b4269229a3774da6 (patch) | |
| tree | cc30aadb0476a2ab17328b4495d4be06dc97c831 /pkgs/applications/misc/dupeguru/default.nix | |
| parent | 3a641defd170a4ef25ce8c7c64cb13f91f867fca (diff) | |
dupeguru: 4.0.4 -> 4.1.1
Fix pyqt5_sip issue, and enable tests.
Diffstat (limited to 'pkgs/applications/misc/dupeguru/default.nix')
| -rw-r--r-- | pkgs/applications/misc/dupeguru/default.nix | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7612153fe563c..2e8dfa6b80407 100644 --- a/pkgs/applications/misc/dupeguru/default.nix +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -1,8 +1,8 @@ -{lib, python3Packages, fetchpatch, gettext, qt5, fetchFromGitHub}: +{lib, python3Packages, gettext, qt5, fetchFromGitHub}: python3Packages.buildPythonApplication rec { pname = "dupeguru"; - version = "4.0.4"; + version = "4.1.1"; format = "other"; @@ -10,19 +10,10 @@ python3Packages.buildPythonApplication rec { owner = "arsenetar"; repo = "dupeguru"; rev = version; - sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; + sha256 = "sha256-0lJocrNQHTrpslbPE6xjZDWhzza8cAt2js35LvicZKg="; fetchSubmodules = true; }; - patches = [ - # already merged to master, remove next version bump - (fetchpatch { - name = "remove-m-from-so-var.patch"; - url = "https://github.com/arsenetar/dupeguru/commit/bd0f53bcbe463c48fe141b73af13542da36d82ba.patch"; - sha256 = "07iisz8kcr7v8lb21inzj1avlpfhh9k8wcivbd33w49cr3mmnr26"; - }) - ]; - nativeBuildInputs = [ gettext python3Packages.pyqt5 @@ -31,6 +22,7 @@ python3Packages.buildPythonApplication rec { pythonPath = with python3Packages; [ pyqt5 + pyqt5.pyqt5_sip send2trash sphinx polib @@ -42,9 +34,12 @@ python3Packages.buildPythonApplication rec { "NO_VENV=1" ]; - # TODO: package pytest-monkeyplus for running tests - # https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123 - doCheck = false; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + preCheck = '' + export HOME="$(mktemp -d)" + ''; # Avoid double wrapping Python programs. dontWrapQtApps = true; |