diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-06-11 12:04:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-11 12:04:38 +0000 |
| commit | 212846c302a1e805d325b256111e6833f2ae30ba (patch) | |
| tree | a127e4f094b2451a3818dcadf277ba9d8b5a5246 /pkgs/applications/blockchains | |
| parent | c6b711737d1bc9dc61e0072b5a34112dcbbab84c (diff) | |
| parent | 8abb6b4488e75203a9b20fbe286e53ee2582c026 (diff) | |
| download | nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar.gz nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar.bz2 nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar.lz nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar.xz nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.tar.zst nixpkgs-212846c302a1e805d325b256111e6833f2ae30ba.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/blockchains')
| -rw-r--r-- | pkgs/applications/blockchains/chia/default.nix | 16 | ||||
| -rw-r--r-- | pkgs/applications/blockchains/trezor-suite/default.nix | 7 |
2 files changed, 17 insertions, 6 deletions
diff --git a/pkgs/applications/blockchains/chia/default.nix b/pkgs/applications/blockchains/chia/default.nix index 22bb3d445ad..7b85a242eff 100644 --- a/pkgs/applications/blockchains/chia/default.nix +++ b/pkgs/applications/blockchains/chia/default.nix @@ -1,4 +1,8 @@ -{ lib, fetchFromGitHub, python3Packages }: +{ lib +, fetchFromGitHub +, fetchpatch +, python3Packages +}: python3Packages.buildPythonApplication rec { pname = "chia"; @@ -14,6 +18,12 @@ python3Packages.buildPythonApplication rec { patches = [ # tweak version requirements to what's available in Nixpkgs ./dependencies.patch + # Allow later websockets release, https://github.com/Chia-Network/chia-blockchain/pull/6304 + (fetchpatch { + name = "later-websockets.patch"; + url = "https://github.com/Chia-Network/chia-blockchain/commit/a188f161bf15a30e8e2efc5eec824e53e2a98a5b.patch"; + sha256 = "1s5qjhd4kmi28z6ni7pc5n09czxvh8qnbwmnqsmms7cpw700g78s"; + }) ]; nativeBuildInputs = [ @@ -47,8 +57,8 @@ python3Packages.buildPythonApplication rec { websockets ]; - checkInputs = [ - python3Packages.pytestCheckHook + checkInputs = with python3Packages; [ + pytestCheckHook ]; disabledTests = [ diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 585f01290bb..bd9e26ae73a 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.5.1"; + version = "21.6.1"; name = "${pname}-${version}"; suffix = { @@ -20,8 +20,8 @@ let url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; # sha512 hashes are obtained from latest-linux-arm64.yml and latest-linux.yml sha512 = { - aarch64-linux = "sha512-nqwfonWySc+wBSJjC8BW9vm+v5zHbKqbbrTTRmoZdEYBJg2SthMtTULNLVpXaX9NHxr6guZnOWdBlzVk2dQkfQ=="; - x86_64-linux = "sha512-tfvdNXsjMe8YXJwTuujz4tKTdfsCuR/9VECF8EkcRP95YM7vuDV8dumru1jKtdiv0gaS1GT3SPEeAfmczY5jGg=="; + aarch64-linux = "sha512-IxWiOJEk2PHdKf4QPHH9Y5rdyhKF3aQCHJe1crS4sYrE+4BLj3rFwRPIIGhJLqzqPyW24Hw/A4lnRnDd/UpsNA=="; + x86_64-linux = "sha512-pSJ+4y9v1ltXun3F4UyQoSTJdaFSelIHx49DBbd180MSbpETecVa7OFadKjlSUKD1sknNXG9MDb2hv7SRNdDYw=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -57,6 +57,7 @@ appimageTools.wrapType2 rec { meta = with lib; { description = "Trezor Suite - Desktop App for managing crypto"; homepage = "https://suite.trezor.io"; + changelog = "https://github.com/trezor/trezor-suite/releases/tag/v${version}"; license = licenses.unfree; maintainers = with maintainers; [ prusnak ]; platforms = [ "aarch64-linux" "x86_64-linux" ]; |