diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2022-02-15 07:34:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-15 07:34:35 +0000 |
| commit | b081abfa4cd2bc905d07c2d5c9f94f7fc4f977d2 (patch) | |
| tree | ea8e27134827f2adc49a2ff34284ae25c8edb7bb | |
| parent | defa202ec6d091a7fcd33b296677e06ec85a6c44 (diff) | |
| parent | 902705927a61ed68911d8017a262728c1ac263e9 (diff) | |
Merge pull request #160107 from doronbehar/pkg/dupeguru
dupeguru: 4.0.4 -> 4.1.1
| -rw-r--r-- | maintainers/maintainer-list.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/misc/dupeguru/default.nix | 27 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyqt/5.x.nix | 2 |
3 files changed, 14 insertions, 19 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ab735602fc057..4ffcc6238a535 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8916,9 +8916,9 @@ githubId = 2946283; name = "Brian Cohen"; }; - novoxudonoser = { + novoxd = { email = "radnovox@gmail.com"; - github = "novoxudonoser"; + github = "novoxd"; githubId = 6052922; name = "Kirill Struokov"; }; diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix index 7612153fe563c..2cc0c588b1118 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; @@ -66,6 +61,6 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/arsenetar/dupeguru"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = [ maintainers.novoxudonoser ]; + maintainers = [ maintainers.novoxd ]; }; } diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index f6b84972324b4..93730fa664d53 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -88,7 +88,7 @@ in buildPythonPackage rec { ]; passthru = { - inherit sip; + inherit sip pyqt5_sip; multimediaEnabled = withMultimedia; webKitEnabled = withWebKit; WebSocketsEnabled = withWebSockets; |