Skip to content

Commit 3b8d77a

Browse files
chcmedeiroschcmedeiros
authored
Merge pull request #246 from Zondax/chore/dependabot-roundup
chore(deps): dependabot roundup + adapt to RUSTUP_TOOLCHAIN nightly (immediate-abort)
2 parents 0287fe7 + c8d7cbb commit 3b8d77a

30 files changed

Lines changed: 66 additions & 55 deletions

File tree

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,4 @@ jobs:
1616
with:
1717
runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
1818
check_rust: true
19+
use_latest_builder: true

‎.github/workflows/main.yml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ jobs:
1616
runs-on: ${{ github.repository_owner == 'zondax' && 'zondax-runners' || 'ubuntu-latest' }}
1717
has-rust: true
1818
node-version: "22"
19+
# Match the builder's RUSTUP_TOOLCHAIN so build_ledger/build_package install
20+
# rust-src for the nightly the device build actually uses (-Zbuild-std).
21+
rust-version: "nightly-2025-12-05"

‎app/Makefile.version‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
APPVERSION_M=2
22
APPVERSION_N=8
3-
APPVERSION_P=6
3+
APPVERSION_P=7

‎app/rust/.cargo/config.toml‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,10 @@ rustflags = [
66
"-C", "relocation-model=ropi",
77
"-C", "link-arg=-nostartfiles",
88
"-C", "link-arg=-Tlink.ld",
9+
"-Z", "unstable-options",
10+
"-C", "panic=immediate-abort",
911
]
1012
[unstable]
1113
build-std=["core"]
12-
build-std-features=["panic_immediate_abort"]
14+
# panic_immediate_abort is no longer a build-std feature (nightly-2025-12-05);
15+
# immediate-abort is selected via the device-target rustflags above.

‎app/rust/Cargo.lock‎

Lines changed: 13 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/rust/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ crate-type = ["staticlib"]
1313
clippy = []
1414

1515
[dependencies]
16-
rand={ version = "0.7.3", default-features = false}
16+
rand={ version = "0.8.6", default-features = false}
1717
merlin = {version = "2.0.0", default-features=false}
1818
zeroize = {version = "1.1.1", default-features=false}
1919

‎deps/ledger-zxlib‎

‎js/yarn.lock‎

Lines changed: 40 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -739,9 +739,9 @@
739739
"@babel/helper-plugin-utils" "^7.28.6"
740740

741741
"@babel/plugin-transform-modules-systemjs@^7.29.0":
742-
version "7.29.0"
743-
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.0.tgz#e458a95a17807c415924106a3ff188a3b8dee964"
744-
integrity sha512-PrujnVFbOdUpw4UHiVwKvKRLMMic8+eC0CuNlxjsyZUiBjhFdPsewdXCkveh2KqBA9/waD0W1b4hXSOBQJezpQ==
742+
version "7.29.4"
743+
resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.29.4.tgz#f621105da99919c15cf4bde6fcc7346ef95e7b20"
744+
integrity sha512-N7QmZ0xRZfjHOfZeQLJjwgX2zS9pdGHSVl/cjSGlo4dXMqvurfxXDMKY4RqEKzPozV78VMcd0lxyG13mlbKc4w==
745745
dependencies:
746746
"@babel/helper-module-transforms" "^7.28.6"
747747
"@babel/helper-plugin-utils" "^7.28.6"
@@ -3516,14 +3516,14 @@ flat-cache@^4.0.0:
35163516
keyv "^4.5.4"
35173517

35183518
flatted@^3.2.9:
3519-
version "3.3.3"
3520-
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.3.3.tgz#67c8fad95454a7c7abebf74bb78ee74a44023358"
3521-
integrity sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==
3519+
version "3.4.2"
3520+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.4.2.tgz#f5c23c107f0f37de8dbdf24f13722b3b98d52726"
3521+
integrity sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==
35223522

35233523
follow-redirects@^1.15.6:
3524-
version "1.15.11"
3525-
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
3526-
integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
3524+
version "1.16.0"
3525+
resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.16.0.tgz#28474a159d3b9d11ef62050a14ed60e4df6d61bc"
3526+
integrity sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==
35273527

35283528
for-each@^0.3.3, for-each@^0.3.5:
35293529
version "0.3.5"
@@ -4614,9 +4614,9 @@ lodash.debounce@^4.0.8:
46144614
integrity sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==
46154615

46164616
lodash@^4.17.21:
4617-
version "4.17.21"
4618-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
4619-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
4617+
version "4.18.1"
4618+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.18.1.tgz#ff2b66c1f6326d59513de2407bf881439812771c"
4619+
integrity sha512-dMInicTPVE8d1e5otfwmmjlxkZoUpiVLwyeTdUsi/Caj/gfzzblBcCE5sRHV/AsjuCmxWrte2TNGSYuCeCq+0Q==
46204620

46214621
loose-envify@^1.1.0:
46224622
version "1.4.0"
@@ -5560,7 +5560,16 @@ string-length@^4.0.2:
55605560
char-regex "^1.0.2"
55615561
strip-ansi "^6.0.0"
55625562

5563-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
5563+
"string-width-cjs@npm:string-width@^4.2.0":
5564+
version "4.2.3"
5565+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
5566+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
5567+
dependencies:
5568+
emoji-regex "^8.0.0"
5569+
is-fullwidth-code-point "^3.0.0"
5570+
strip-ansi "^6.0.1"
5571+
5572+
string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
55645573
version "4.2.3"
55655574
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
55665575
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -5617,7 +5626,14 @@ string_decoder@^1.1.1:
56175626
dependencies:
56185627
safe-buffer "~5.2.0"
56195628

5620-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
5629+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
5630+
version "6.0.1"
5631+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
5632+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
5633+
dependencies:
5634+
ansi-regex "^5.0.1"
5635+
5636+
strip-ansi@^6.0.0, strip-ansi@^6.0.1:
56215637
version "6.0.1"
56225638
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
56235639
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -6032,7 +6048,16 @@ word-wrap@^1.2.5:
60326048
resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
60336049
integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==
60346050

6035-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
6051+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
6052+
version "7.0.0"
6053+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
6054+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
6055+
dependencies:
6056+
ansi-styles "^4.0.0"
6057+
string-width "^4.1.0"
6058+
strip-ansi "^6.0.0"
6059+
6060+
wrap-ansi@^7.0.0:
60366061
version "7.0.0"
60376062
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
60386063
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

‎tests_tools/Cargo.lock‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎tests_zemu/snapshots/ap-adr0008-0-mainmenu/00004.png‎

1 Byte
Loading

0 commit comments

Comments
 (0)