diff options
| author | Sebastián Mancilla <smancill@smancill.dev> | 2021-11-22 20:30:12 -0300 |
|---|---|---|
| committer | Sebastián Mancilla <smancill@smancill.dev> | 2021-11-22 20:30:12 -0300 |
| commit | 0824be950d5991c9e46f7f1f4d155dd56114c085 (patch) | |
| tree | 533a1a926123be75f0dff4343a8df52784f26302 /pkgs | |
| parent | fbd3124b92cc7ba1b354261c9aba092d2f2b3c20 (diff) | |
| download | nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar.gz nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar.bz2 nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar.lz nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar.xz nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.tar.zst nixpkgs-0824be950d5991c9e46f7f1f4d155dd56114c085.zip | |
python3Packages.ledgerwallet: use upstream patch
Follow up to 5d56c78f373 (python3Packages.ledgerwallet: fix build, 2021-11-17), now with upstream patch.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/python-modules/ledgerwallet/default.nix | 11 | ||||
| -rw-r--r-- | pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch | 19 |
2 files changed, 7 insertions, 23 deletions
diff --git a/pkgs/development/python-modules/ledgerwallet/default.nix b/pkgs/development/python-modules/ledgerwallet/default.nix index 421a24e9ee1..cf2be98f922 100644 --- a/pkgs/development/python-modules/ledgerwallet/default.nix +++ b/pkgs/development/python-modules/ledgerwallet/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , buildPythonPackage , cryptography , click @@ -26,10 +27,12 @@ buildPythonPackage rec { }; patches = [ - # Fix removed function in construct library - # https://github.com/LedgerHQ/ledgerctl/issues/17 - # https://github.com/construct/construct/commit/8915512f53552b1493afdbce5bbf8bb6f2aa4411 - ./remove-iterateints.patch + (fetchpatch { + # Fix removed function in construct library + url = "https://github.com/LedgerHQ/ledgerctl/commit/fd23d0e14721b93789071e80632e6bd9e47c1256.patch"; + sha256 = "sha256-YNlENguPQW5FNFT7mqED+ghF3TJiKao4H+56Eu+j+Eo="; + excludes = [ "setup.py" ]; + }) ]; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; diff --git a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch b/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch deleted file mode 100644 index c97785f1d04..00000000000 --- a/pkgs/development/python-modules/ledgerwallet/remove-iterateints.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/ledgerwallet/params.py 2021-11-17 20:31:10.488954050 -0300 -+++ b/ledgerwallet/params.py 2021-11-17 20:31:30.619477930 -0300 -@@ -19,7 +19,6 @@ - ) - from construct.core import ( - byte2int, -- iterateints, - singleton, - stream_read, - stream_write, -@@ -40,7 +39,7 @@ - num_bytes = byte & 0x80 - encoded_len = stream_read(stream, num_bytes) - num = 0 -- for len_byte in iterateints(encoded_len): -+ for len_byte in encoded_len: - num = num << 8 + len_byte - return num - |