dupeguru: 4.3.1 -> 4.3.1-unstable-2026-01-06, fix build, update license, build docs from source, migrate to pkgs/by-name (#496465)

This commit is contained in:
Sandro
2026-05-07 00:06:34 +00:00
committed by GitHub
3 changed files with 14 additions and 47 deletions
@@ -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():
@@ -4,42 +4,40 @@
python3Packages,
gettext,
qt5,
writableTmpDirAsHomeHook,
fetchFromGitHub,
}:
python3Packages.buildPythonApplication rec {
python3Packages.buildPythonApplication (finalAttrs: {
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
writableTmpDirAsHomeHook
];
propagatedBuildInputs = with python3Packages; [
hsaudiotag3k
distro
mutagen
polib
pyqt5
pyqt5-sip
semantic-version
send2trash
sphinx
xxhash
];
makeFlags = [
@@ -51,13 +49,11 @@ python3Packages.buildPythonApplication rec {
pytestCheckHook
];
preCheck = ''
export HOME="$(mktemp -d)"
'';
# Avoid double wrapping Python programs.
dontWrapQtApps = true;
installTargets = "install installdocs";
# TODO: A bug in python wrapper
# see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916
preFixup = ''
@@ -74,9 +70,10 @@ python3Packages.buildPythonApplication rec {
broken = stdenv.hostPlatform.isDarwin;
description = "GUI tool to find duplicate files in a system";
homepage = "https://github.com/arsenetar/dupeguru";
license = lib.licenses.bsd3;
changelog = "https://github.com/arsenetar/dupeguru/releases/tag/${builtins.head (lib.strings.splitString "-" finalAttrs.version)}";
license = lib.licenses.gpl3;
platforms = lib.platforms.unix;
maintainers = with lib.maintainers; [ novoxd ];
mainProgram = "dupeguru";
};
}
})
-3
View File
@@ -485,9 +485,6 @@ with pkgs;
buildDotnetPackage = callPackage ../build-support/dotnet/build-dotnet-package { };
fetchNuGet = callPackage ../build-support/dotnet/fetchnuget { };
dupeguru = callPackage ../applications/misc/dupeguru {
python3Packages = python311Packages;
};
fetchbzr = callPackage ../build-support/fetchbzr { };