From e5933639498775596fb31b6f51182daab3008a74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 26 Mar 2026 10:51:31 +0100 Subject: [PATCH 1/2] unblob: use the default nix-updates-script to handle cargoDeps hash update --- pkgs/by-name/un/unblob/package.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 557e1b934800..0cd69d87a4bf 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -3,7 +3,6 @@ libiconv, python3, fetchFromGitHub, - gitUpdater, makeWrapper, rustPlatform, stdenvNoCC, @@ -131,7 +130,6 @@ python3.pkgs.buildPythonApplication rec { ]; passthru = { - updateScript = gitUpdater { }; # helpful to easily add these to a nix-shell environment inherit runtimeDeps; }; From f260d101a4cec126dc51fb2c308310b9fd109c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Vask=C3=B3?= <1771332+vlaci@users.noreply.github.com> Date: Thu, 26 Mar 2026 11:08:28 +0100 Subject: [PATCH 2/2] unblob: 25.5.26 -> 26.3.30 --- pkgs/by-name/un/unblob/package.nix | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/un/unblob/package.nix b/pkgs/by-name/un/unblob/package.nix index 0cd69d87a4bf..af6967c337d5 100644 --- a/pkgs/by-name/un/unblob/package.nix +++ b/pkgs/by-name/un/unblob/package.nix @@ -46,27 +46,25 @@ let in python3.pkgs.buildPythonApplication rec { pname = "unblob"; - version = "25.5.26"; + version = "26.3.30"; pyproject = true; src = fetchFromGitHub { owner = "onekey-sec"; repo = "unblob"; tag = version; - hash = "sha256-vTakXZFAcD3cmd+y4CwYg3X4O4NmtOzuqMLWLMX2Duk="; + hash = "sha256-wYWuKvxAagctlmdO5Fi9/WzfJ4zkDgfXejgDTJPHsTI="; forceFetchGit = true; fetchLFS = true; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-NirDPuAcKuNquMs9mBZoEkQf+QJ+cMd7JXjj1anB9Zw="; + hash = "sha256-wjN4QPOUYFWWYMWL9aAgGqEucM7q+H6YyoS9Mv2dpp4="; }; strictDeps = true; - build-system = with python3.pkgs; [ poetry-core ]; - buildInputs = lib.optionals stdenvNoCC.hostPlatform.isDarwin [ libiconv ]; dependencies = with python3.pkgs; [ @@ -77,10 +75,13 @@ python3.pkgs.buildPythonApplication rec { dissect-cstruct lark lief.py + lzallright python3.pkgs.lz4 # shadowed by pkgs.lz4 plotext pluggy + pydantic pyfatfs + pymdown-extensions pyperscan python-magic pyzstd @@ -103,8 +104,6 @@ python3.pkgs.buildPythonApplication rec { "ubi-reader" ]; - pythonRelaxDeps = [ "lz4" ]; - pythonImportsCheck = [ "unblob" ]; makeWrapperArgs = [ @@ -114,19 +113,23 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = with python3.pkgs; [ + pexpect + psutil + pytest-cov-stub pytestCheckHook - pytest-cov # cannot use stub versionCheckHook ] ++ runtimeDeps; pytestFlags = [ - "--no-cov" + "--with-e2e" # Not that slow: increases test time by ~5s ]; disabledTests = [ # https://github.com/tytso/e2fsprogs/issues/152 "test_all_handlers[filesystem.extfs]" + # regression in erofs-utils 1.9 https://github.com/onekey-sec/unblob/commit/c7c9f20dd871a5694d41a95ca3041eb0c98e257a + "test_all_handlers[filesystem.android.erofs]" ]; passthru = {