From 2bdfb86e0887e70c9b06d734b7f3cc411b9d461d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Mon, 21 Sep 2020 20:19:43 +0200 Subject: [PATCH 1/2] pythonPackages.unrardll: init at 0.1.4 --- .../python-modules/unrardll/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/unrardll/default.nix diff --git a/pkgs/development/python-modules/unrardll/default.nix b/pkgs/development/python-modules/unrardll/default.nix new file mode 100644 index 000000000000..49e070b84631 --- /dev/null +++ b/pkgs/development/python-modules/unrardll/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, unrar }: + +buildPythonPackage rec { + pname = "unrardll"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "4149c0729cf96a0bae80360e7d94dc40af1088c8da7f6eb8d10e09b8632e92ad"; + }; + + buildInputs = [ unrar ]; + + pythonImportsCheck = [ "unrardll" ]; + + meta = with lib; { + description = "Wrap the Unrar DLL to enable unraring of files in python"; + homepage = "https://github.com/kovidgoyal/unrardll"; + license = licenses.bsd3; + maintainers = with maintainers; [ nyanloutre ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3c07aea7494..dda505cf719a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7258,6 +7258,8 @@ in { unpaddedbase64 = callPackage ../development/python-modules/unpaddedbase64 { }; + unrardll = callPackage ../development/python-modules/unrardll { }; + unrpa = callPackage ../development/python-modules/unrpa { }; untangle = callPackage ../development/python-modules/untangle { }; From 2e73a9ab84cd1ac84465dbd8b290ca3517d3c1d5 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 22 Sep 2020 01:24:50 +0200 Subject: [PATCH 2/2] calibre: add unrardll optional dependency --- pkgs/applications/misc/calibre/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 92a491a0056f..8ea1dba54ed8 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -99,7 +99,7 @@ mkDerivation rec { sip # the following are distributed with calibre, but we use upstream instead odfpy - ] + ] ++ lib.optional (unrarSupport) unrardll ); installPhase = ''