diff --git a/pkgs/by-name/ub/ubi_reader/package.nix b/pkgs/by-name/ub/ubi_reader/package.nix index 20c3782e9062..469d09422700 100644 --- a/pkgs/by-name/ub/ubi_reader/package.nix +++ b/pkgs/by-name/ub/ubi_reader/package.nix @@ -1,19 +1,21 @@ { fetchFromGitHub, + gitUpdater, lib, python3, }: python3.pkgs.buildPythonApplication rec { pname = "ubi_reader"; - version = "0.8.9"; + version = "0.8.10"; pyproject = true; + disabled = python3.pkgs.pythonOlder "3.9"; src = fetchFromGitHub { owner = "onekey-sec"; repo = "ubi_reader"; rev = "v${version}"; - hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4="; + hash = "sha256-fXJiQZ1QWUmkRM+WI8DSIsay9s1w3hKloRuCcUNwZjM="; }; build-system = [ python3.pkgs.poetry-core ]; @@ -23,6 +25,13 @@ python3.pkgs.buildPythonApplication rec { # There are no tests in the source doCheck = false; + passthru = { + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "_[a-z]+$"; + }; + }; + meta = { description = "Python scripts capable of extracting and analyzing the contents of UBI and UBIFS images"; homepage = "https://github.com/onekey-sec/ubi_reader"; diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 741d548a97f7..fd682ee27366 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -106,12 +106,25 @@ python3.pkgs.buildPythonApplication rec { versionCheckProgramArg = "--version"; - pytestFlagsArray = [ - "--no-cov" - # `disabledTests` swallows the parameters between square brackets - # https://github.com/tytso/e2fsprogs/issues/152 - "-k 'not test_all_handlers[filesystem.extfs]'" - ]; + pytestFlagsArray = + let + # `disabledTests` swallows the parameters between square brackets + disabled = [ + # https://github.com/tytso/e2fsprogs/issues/152 + "test_all_handlers[filesystem.extfs]" + + # Should be dropped after upgrading to next version + # Needs https://github.com/onekey-sec/unblob/pull/1128/commits/c6af67f0c6f32fa01d7abbf495eb0293e9184438 + # Unfortunately patches touching LFS stored assets cannot be applied + "test_all_handlers[filesystem.ubi.ubi]" + "test_all_handlers[archive.dlink.encrpted_img]" + "test_all_handlers[archive.dlink.shrs]" + ]; + in + [ + "--no-cov" + "-k 'not ${lib.concatStringsSep " and not " disabled}'" + ]; passthru = { updateScript = gitUpdater { };