swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-20 20:39:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #160107 from doronbehar/pkg/dupeguru

Browse source 
dupeguru: 4.0.4 -> 4.1.1
This commit is contained in:
Jörg Thalheim 2022-02-15 07:34:35 +00:00 committed by GitHub
parent defa202ec6 902705927a
commit b081abfa4c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
maintainers/maintainer-list.nix
View file

@ -8916,9 +8916,9 @@
githubId = 2946283;
name = "Brian Cohen";
};
novoxudonoser = {
novoxd = {
email = "radnovox@gmail.com";
github = "novoxudonoser";
github = "novoxd";
githubId = 6052922;
name = "Kirill Struokov";
};

27
pkgs/applications/misc/dupeguru/default.nix
View file

@ -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 ];
};
}

2
pkgs/development/python-modules/pyqt/5.x.nix
View file

@ -88,7 +88,7 @@ in buildPythonPackage rec {
];
passthru = {
inherit sip;
inherit sip pyqt5_sip;
multimediaEnabled = withMultimedia;
webKitEnabled = withWebKit;
WebSocketsEnabled = withWebSockets;