From 4820c043565cfbb0ba087dd257cbfdbaaa651e5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 09:14:33 -0800 Subject: [PATCH 1/3] python310Packages.unrpa: specify passthru.optional-dependencies --- pkgs/development/python-modules/unrpa/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index aad23c6fdf9f..e2543714c0f4 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -6,15 +6,22 @@ buildPythonPackage rec { disabled = isPy27; + format = "setuptools"; + src = fetchPypi { inherit pname version; sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; }; - propagatedBuildInputs = [ uncompyle6 ]; + passthru.optional-dependencies = { + ZiX = [ uncompyle6 ]; + }; pythonImportsCheck = [ "unrpa" ]; + # upstream has no unit tests + doCheck = false; + meta = with lib; { homepage = "https://github.com/Lattyware/unrpa"; description = "A program to extract files from the RPA archive format"; From 48c39f18fcac052ea18fada22b518699ba1106cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 09:15:39 -0800 Subject: [PATCH 2/3] unrpa: use python310 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8086a44fe793..4c6ced5fc767 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13030,7 +13030,7 @@ with pkgs; unrtf = callPackage ../tools/text/unrtf { }; - unrpa = with python38Packages; toPythonApplication unrpa; + unrpa = with python3Packages; toPythonApplication unrpa; untex = callPackage ../tools/text/untex { }; From 42613a29e5c98613ac290902e2945da4778dfaf7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Mar 2023 21:42:43 +0100 Subject: [PATCH 3/3] python310Packages.unrpa: update disabled - add changelog to meta --- pkgs/development/python-modules/unrpa/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/unrpa/default.nix b/pkgs/development/python-modules/unrpa/default.nix index e2543714c0f4..eeddbd1d6b62 100644 --- a/pkgs/development/python-modules/unrpa/default.nix +++ b/pkgs/development/python-modules/unrpa/default.nix @@ -1,13 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi, uncompyle6, isPy27 }: +{ lib +, buildPythonPackage +, fetchPypi +, uncompyle6 +, pythonOlder +}: buildPythonPackage rec { pname = "unrpa"; version = "2.3.0"; - - disabled = isPy27; - format = "setuptools"; + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; sha256 = "0yl4qdwp3in170ks98qnldqz3r2iyzil5g1775ccg98qkh95s724"; @@ -24,6 +28,7 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://github.com/Lattyware/unrpa"; + changelog = "https://github.com/Lattyware/unrpa/releases/tag/${version}"; description = "A program to extract files from the RPA archive format"; license = licenses.gpl3; maintainers = with maintainers; [ leo60228 ];