From e9767b9ad2078b72143fc1a86ff53f7c2b60fa06 Mon Sep 17 00:00:00 2001 From: Kirill Strukov Date: Fri, 13 Dec 2019 18:19:39 +0300 Subject: [PATCH 1/2] add novox maintainer --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 02ebefa1a0f..b23e1614915 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4679,6 +4679,12 @@ githubId = 2946283; name = "Brian Cohen"; }; + novoxudonoser = { + email = "radnovox@gmail.com"; + github = "novoxudonoser"; + githubId = 6052922; + name = "Kirill Struokov"; + }; np = { email = "np.nix@nicolaspouillard.fr"; github = "np"; From c2cf629a20c907bcbac0d557944db29fddf087d2 Mon Sep 17 00:00:00 2001 From: Kirill Strukov Date: Fri, 13 Dec 2019 18:26:17 +0300 Subject: [PATCH 2/2] dupeguru: init at 4.0.4 --- pkgs/applications/misc/dupeguru/default.nix | 62 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/applications/misc/dupeguru/default.nix diff --git a/pkgs/applications/misc/dupeguru/default.nix b/pkgs/applications/misc/dupeguru/default.nix new file mode 100644 index 00000000000..0e7155f374d --- /dev/null +++ b/pkgs/applications/misc/dupeguru/default.nix @@ -0,0 +1,62 @@ +{stdenv, python3Packages, gettext, qt5, fetchFromGitHub}: + +python3Packages.buildPythonApplication rec { + pname = "dupeguru"; + version = "4.0.4"; + + format = "other"; + + src = fetchFromGitHub { + owner = "arsenetar"; + repo = "dupeguru"; + rev = "${version}"; + sha256 = "0ma4f1c6vmpz8gi4sdy43x1ik7wh42wayvk1iq520d3i714kfcpy"; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + gettext + python3Packages.pyqt5 + qt5.wrapQtAppsHook + ]; + + pythonPath = with python3Packages; [ + pyqt5 + send2trash + sphinx + polib + hsaudiotag3k + ]; + + makeFlags = [ + "PREFIX=${placeholder ''out''}" + "NO_VENV=1" + ]; + + # TODO: package pytest-monkeyplus for running tests + # https://github.com/NixOS/nixpkgs/pull/75054/files#r357690123 + doCheck = false; + + # Avoid double wrapping Python programs. + dontWrapQtApps = true; + + preFixup = '' + # TODO: A bug in python wrapper + # see https://github.com/NixOS/nixpkgs/pull/75054#discussion_r357656916 + makeWrapperArgs="''${qtWrapperArgs[@]}" + ''; + + postFixup = '' + # Executable in $out/bin is a symlink to $out/share/dupeguru/run.py + # so wrapPythonPrograms hook does not handle it automatically. + wrapPythonProgramsIn "$out/share/dupeguru" "$out $pythonPath" + ''; + + meta = with stdenv.lib; { + description = "GUI tool to find duplicate files in a system"; + homepage = "https://github.com/arsenetar/dupeguru"; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = [ maintainers.novoxudonoser ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 67a338e5a79..ccd69f5568a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -215,6 +215,8 @@ in dispad = callPackage ../tools/X11/dispad { }; + dupeguru = callPackage ../applications/misc/dupeguru { }; + dump1090 = callPackage ../applications/radio/dump1090 { }; ebook2cw = callPackage ../applications/radio/ebook2cw { };