1
0
mirror of https://github.com/trezor/trezor-firmware.git synced 2024-11-24 08:28:12 +00:00

chore: update dependencies

[no changelog]

Co-Authored-By: Martin Milata <martin@martinmilata.cz>
This commit is contained in:
Pavol Rusnak 2022-02-11 12:05:20 +01:00 committed by matejcik
parent aff3f512c4
commit b9bbd5fcd7
10 changed files with 621 additions and 601 deletions

View File

@ -1,12 +1,14 @@
{ pkgs, nodejs, stdenv, lib, ... }:
{ pkgs, nodejs-14_x, stdenv, lib, ... }:
let
packageName = with lib; concatStrings (map (entry: (concatStrings (mapAttrsToList (key: value: "${key}-${value}") entry))) (importJSON ./package.json));
nodePackages = import ./node-composition.nix {
inherit pkgs nodejs;
inherit pkgs;
inherit (stdenv.hostPlatform) system;
# FIXME: drop after https://github.com/NixOS/nixpkgs/issues/145432 is fixed
nodejs = nodejs-14_x;
};
in
nodePackages."${packageName}".override {

View File

@ -3,15 +3,15 @@
}:
let
# the last commit from master as of 2021-12-06
# the last commit from master as of 2022-02-08
rustOverlay = import (builtins.fetchTarball {
url = "https://github.com/oxalica/rust-overlay/archive/96f1bd1ec11d9c9e8b41c7560df9efae8d091908.tar.gz";
sha256 = "07qfya55d3lw4mblm62ykx8h9zg2ms3891ik30qzzpywwacafi8j";
url = "https://github.com/oxalica/rust-overlay/archive/2eae19e246433530998cbf239d5505b7b87bc854.tar.gz";
sha256 = "0panx24sqcvx52wza02zsxmpkhg6xld7hklrv7dybc59akqm2ira";
});
# the last successful build of nixpkgs-unstable as of 2021-11-18
# the last successful build of nixpkgs-unstable as of 2022-02-10
nixpkgs = import (builtins.fetchTarball {
url = "https://github.com/NixOS/nixpkgs/archive/7fad01d9d5a3f82081c00fb57918d64145dc904c.tar.gz";
sha256 = "0g0jn8cp1f3zgs7xk2xb2vwa44gb98qlp7k0dvigs0zh163c2kim";
url = "https://github.com/NixOS/nixpkgs/archive/1882c6b7368fd284ad01b0a5b5601ef136321292.tar.gz";
sha256 = "0zg7ak2mcmwzi2kg29g4v9fvbvs0viykjsg2pwaphm1fi13s7s0i";
}) { overlays = [ rustOverlay ]; };
# commit before python36 was removed
python36nixpkgs = import (builtins.fetchTarball {
@ -28,7 +28,7 @@ let
${nixpkgs.patchelf}/bin/patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out"
chmod -w $out
'';
rustStable = nixpkgs.rust-bin.stable."1.57.0".minimal.override {
rustStable = nixpkgs.rust-bin.stable."1.58.1".minimal.override {
targets = [
"thumbv7em-none-eabihf" # TT
"thumbv7m-none-eabi" # T1
@ -38,7 +38,7 @@ let
extensions = [ "clippy" ];
};
gcc = nixpkgs.gcc11;
llvmPackages = nixpkgs.llvmPackages_12;
llvmPackages = nixpkgs.llvmPackages_13;
# see pyright/README.md for update procedure
pyright = nixpkgs.callPackage ./pyright {};
# HWI tests need https://github.com/bitcoin/bitcoin/pull/22558
@ -60,9 +60,10 @@ stdenvNoCC.mkDerivation ({
bitcoind
# install other python versions for tox testing
# NOTE: running e.g. "python3" in the shell runs the first version in the following list,
# and poetry uses the default version (currently 3.8)
python38
# and poetry uses the default version (currently 3.9)
python39
python310
python38
python37
python36nixpkgs.python36
] ++ [

View File

@ -772,7 +772,7 @@ class Bitcoin:
return SigHashType.SIGHASH_ALL
def get_sighash_type(self, txi: TxInput) -> SigHashType:
""" Return the nHashType flags."""
"""Return the nHashType flags."""
# The nHashType is the 8 least significant bits of the sighash type.
# Some coins set the 24 most significant bits of the sighash type to
# the fork ID value.

View File

@ -77,7 +77,6 @@ if not utils.BITCOIN_ONLY:
assert common_seed is not None
return common_seed
else:
# === Bitcoin-only variant ===
# We use the simple version of `get_seed` that never needs to derive anything else.

View File

@ -44,7 +44,6 @@ if __debug__:
display.bar(Display.WIDTH - side, 0, side, side, 0xF800)
display.refresh()
else:
refresh = display.refresh # type: ignore

View File

@ -35,7 +35,6 @@ if __debug__:
def __exit__(self, exc_type: Any, value: Any, traceback: Any) -> None:
self.in_use = False
else:
class BufferLock:

1181
poetry.lock generated

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@ authors = ["SatoshiLabs <info@satoshilabs.com>"]
[tool.poetry.dependencies]
# all
python = "^3.6"
python = "^3.7"
trezor = {path = "./python", develop = true}
scons = "*"
protobuf = "*"
@ -54,7 +54,7 @@ click = "^7"
ed25519 = "^1.4"
requests = "^2.19"
termcolor = "*"
Pillow = "^8.0"
Pillow = "^9"
# crypto
ecdsa = "^0.16"

View File

@ -107,7 +107,7 @@ __b58base = len(__b58chars)
def b58encode(v: bytes) -> str:
""" encode v, which is a string of bytes, to base58."""
"""encode v, which is a string of bytes, to base58."""
long_value = 0
for c in v:
@ -133,7 +133,7 @@ def b58encode(v: bytes) -> str:
def b58decode(v: AnyStr, length: Optional[int] = None) -> bytes:
""" decode v into a string of len bytes."""
"""decode v into a string of len bytes."""
str_v = v.decode() if isinstance(v, bytes) else v
for c in str_v:

View File

@ -4,6 +4,7 @@ envlist =
py37,
py38,
py39,
py310
[testenv]
deps =