Skip to content

Commit 293c772

Browse files
authored
ubi_reader: 0.8.9 -> 0.8.10 (#381211)
2 parents b5dd9ef + 686715f commit 293c772

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

pkgs/by-name/ub/ubi_reader/package.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
{
22
fetchFromGitHub,
3+
gitUpdater,
34
lib,
45
python3,
56
}:
67

78
python3.pkgs.buildPythonApplication rec {
89
pname = "ubi_reader";
9-
version = "0.8.9";
10+
version = "0.8.10";
1011
pyproject = true;
12+
disabled = python3.pkgs.pythonOlder "3.9";
1113

1214
src = fetchFromGitHub {
1315
owner = "onekey-sec";
1416
repo = "ubi_reader";
1517
rev = "v${version}";
16-
hash = "sha256-04HwzkonPzzWfX8VE//fMoVv5ggAS+61zx2W8VEUIy4=";
18+
hash = "sha256-fXJiQZ1QWUmkRM+WI8DSIsay9s1w3hKloRuCcUNwZjM=";
1719
};
1820

1921
build-system = [ python3.pkgs.poetry-core ];
@@ -23,6 +25,13 @@ python3.pkgs.buildPythonApplication rec {
2325
# There are no tests in the source
2426
doCheck = false;
2527

28+
passthru = {
29+
updateScript = gitUpdater {
30+
rev-prefix = "v";
31+
ignoredVersions = "_[a-z]+$";
32+
};
33+
};
34+
2635
meta = {
2736
description = "Python scripts capable of extracting and analyzing the contents of UBI and UBIFS images";
2837
homepage = "https://github.com/onekey-sec/ubi_reader";

pkgs/by-name/un/unblob/package.nix

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,12 +106,25 @@ python3.pkgs.buildPythonApplication rec {
106106

107107
versionCheckProgramArg = "--version";
108108

109-
pytestFlagsArray = [
110-
"--no-cov"
111-
# `disabledTests` swallows the parameters between square brackets
112-
# https://github.com/tytso/e2fsprogs/issues/152
113-
"-k 'not test_all_handlers[filesystem.extfs]'"
114-
];
109+
pytestFlagsArray =
110+
let
111+
# `disabledTests` swallows the parameters between square brackets
112+
disabled = [
113+
# https://github.com/tytso/e2fsprogs/issues/152
114+
"test_all_handlers[filesystem.extfs]"
115+
116+
# Should be dropped after upgrading to next version
117+
# Needs https://github.com/onekey-sec/unblob/pull/1128/commits/c6af67f0c6f32fa01d7abbf495eb0293e9184438
118+
# Unfortunately patches touching LFS stored assets cannot be applied
119+
"test_all_handlers[filesystem.ubi.ubi]"
120+
"test_all_handlers[archive.dlink.encrpted_img]"
121+
"test_all_handlers[archive.dlink.shrs]"
122+
];
123+
in
124+
[
125+
"--no-cov"
126+
"-k 'not ${lib.concatStringsSep " and not " disabled}'"
127+
];
115128

116129
passthru = {
117130
updateScript = gitUpdater { };

0 commit comments

Comments
 (0)