From a362c7fb1e1bbe370042a7e09bbea669adfd466d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 03:17:11 +0000 Subject: [PATCH 1/4] python312Packages.apkinspector: 1.2.2 -> 1.2.3 --- pkgs/development/python-modules/apkinspector/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index 9bc15aafb82a..fa54275e3dc6 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "apkinspector"; - version = "1.2.2"; + version = "1.2.3"; pyproject = true; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-6n5WCQ6V63kbWT6b7t9PEFbrJpxEg1WOE9XV70tHnGA="; + hash = "sha256-EztaCoUVbV9pIoba4X4liqPRZiZB6F65PB9cdb/eA+A="; }; nativeBuildInputs = [ From 67da5a7e3873fec968646b0ec470303a658c8899 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 10:49:44 +0200 Subject: [PATCH 2/4] python312Packages.apkinspector: refactor --- pkgs/development/python-modules/apkinspector/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index fa54275e3dc6..f00d6eed8843 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { hash = "sha256-EztaCoUVbV9pIoba4X4liqPRZiZB6F65PB9cdb/eA+A="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; @@ -32,9 +32,10 @@ buildPythonPackage rec { meta = with lib; { description = "Module designed to provide detailed insights into the zip structure of APK files"; - mainProgram = "apkInspector"; homepage = "https://github.com/erev0s/apkInspector"; + changelog = "https://github.com/erev0s/apkInspector/releases/tag/v${version}"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; + mainProgram = "apkInspector"; }; } From 6cec50eeb0c85bf3720420e18331c7a7470fee48 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 10:50:01 +0200 Subject: [PATCH 3/4] python312Packages.apkinspector: format with nixfmt --- .../python-modules/apkinspector/default.nix | 21 ++++++++----------- 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index f00d6eed8843..a05d3f604530 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchPypi -, poetry-core -, pytestCheckHook -, pythonOlder +{ + lib, + buildPythonPackage, + fetchPypi, + poetry-core, + pytestCheckHook, + pythonOlder, }: buildPythonPackage rec { @@ -18,17 +19,13 @@ buildPythonPackage rec { hash = "sha256-EztaCoUVbV9pIoba4X4liqPRZiZB6F65PB9cdb/eA+A="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; # Tests are not available # https://github.com/erev0s/apkInspector/issues/21 doCheck = false; - pythonImportsCheck = [ - "apkInspector" - ]; + pythonImportsCheck = [ "apkInspector" ]; meta = with lib; { description = "Module designed to provide detailed insights into the zip structure of APK files"; From f0fb9cc0ffbd4dc73b62e8e3b202ae786b06ae9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 20 Apr 2024 10:54:02 +0200 Subject: [PATCH 4/4] python312Packages.apkinspector: enable tests --- .../python-modules/apkinspector/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix index a05d3f604530..925845c73da3 100644 --- a/pkgs/development/python-modules/apkinspector/default.nix +++ b/pkgs/development/python-modules/apkinspector/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, - fetchPypi, + fetchFromGitHub, poetry-core, pytestCheckHook, pythonOlder, @@ -14,16 +14,16 @@ buildPythonPackage rec { disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - hash = "sha256-EztaCoUVbV9pIoba4X4liqPRZiZB6F65PB9cdb/eA+A="; + src = fetchFromGitHub { + owner = "erev0s"; + repo = "apkInspector"; + rev = "refs/tags/v${version}"; + hash = "sha256-n6uVyN5XBEM/nuN7mvhNRwMUgUT5abOsh3CbhKK6ifY="; }; build-system = [ poetry-core ]; - # Tests are not available - # https://github.com/erev0s/apkInspector/issues/21 - doCheck = false; + nativeCheckInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "apkInspector" ];