From 16c7b8cd98c8548a5233d2116c09077c0afec8be Mon Sep 17 00:00:00 2001 From: magicquark <198001825+magicquark@users.noreply.github.com> Date: Tue, 3 Mar 2026 23:50:53 +0000 Subject: [PATCH] dupeguru: 4.3.1 -> 4.3.1-unstable-2026-01-06 --- pkgs/by-name/du/dupeguru/package.nix | 20 +++++--------- .../dupeguru/remove-setuptools-sandbox.patch | 27 ------------------- 2 files changed, 7 insertions(+), 40 deletions(-) delete mode 100644 pkgs/by-name/du/dupeguru/remove-setuptools-sandbox.patch diff --git a/pkgs/by-name/du/dupeguru/package.nix b/pkgs/by-name/du/dupeguru/package.nix index 6de1948fb9af..d8d12c1c4a17 100644 --- a/pkgs/by-name/du/dupeguru/package.nix +++ b/pkgs/by-name/du/dupeguru/package.nix @@ -1,47 +1,41 @@ { stdenv, lib, - python311Packages, + python3Packages, gettext, qt5, fetchFromGitHub, }: -let - python3Packages = python311Packages; -in python3Packages.buildPythonApplication rec { pname = "dupeguru"; - version = "4.3.1"; + version = "4.3.1-unstable-2026-01-06"; pyproject = false; src = fetchFromGitHub { owner = "arsenetar"; repo = "dupeguru"; - rev = version; - hash = "sha256-/jkZiCapmCLMp7WfgUmpsR8aNCfb3gBELlMYaC4e7zI="; + rev = "16aa6c21ffc2c33d44ff4a47bfa1a623c16ed626"; + hash = "sha256-0x2ZpjaxpWVhm9vimDA06y1BOvpoU6KZYz5MPAoWAts="; }; - patches = [ - ./remove-setuptools-sandbox.patch - ]; - nativeBuildInputs = [ gettext python3Packages.pyqt5 python3Packages.setuptools + python3Packages.sphinx qt5.wrapQtAppsHook ]; propagatedBuildInputs = with python3Packages; [ - hsaudiotag3k + distro mutagen polib pyqt5 pyqt5-sip semantic-version send2trash - sphinx + xxhash ]; makeFlags = [ diff --git a/pkgs/by-name/du/dupeguru/remove-setuptools-sandbox.patch b/pkgs/by-name/du/dupeguru/remove-setuptools-sandbox.patch deleted file mode 100644 index 983ea4dd7efc..000000000000 --- a/pkgs/by-name/du/dupeguru/remove-setuptools-sandbox.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff --git a/build.py b/build.py -index 06905a11..56d54a17 100644 ---- a/build.py -+++ b/build.py -@@ -10,7 +10,7 @@ from optparse import OptionParser - import shutil - from multiprocessing import Pool - --from setuptools import sandbox -+import subprocess - from hscommon import sphinxgen - from hscommon.build import ( - add_to_pythonpath, -@@ -118,7 +118,12 @@ def build_normpo(): - def build_pe_modules(): - print("Building PE Modules") - # Leverage setup.py to build modules -- sandbox.run_setup("setup.py", ["build_ext", "--inplace"]) -+ result = subprocess.run( -+ [sys.executable, "setup.py", "build_ext", "--inplace"], -+ check=True, -+ ) -+ if result.returncode != 0: -+ sys.exit("Error building PE modules. Please check the output above.") - - - def build_normal():