| commit | a6df132b68f8e08c2b0ab428377d478436376556 | [log] [tgz] |
|---|---|---|
| author | Ross Burton <ross.burton@arm.com> | Tue Nov 02 11:12:04 2021 +0000 |
| committer | Dávid Vincze <david.vincze@arm.com> | Wed Nov 03 14:19:31 2021 +0100 |
| tree | f444d1e56994fbc857d37a99d8ed2a258aef9f85 | |
| parent | 1a9c6d8495e4dbe7d02edf14bb8a9fa1d4e955c0 [diff] [blame] |
imgtool: prefer cbor2 over cbor The cbor module is unmaintained, with the last release in 2016[1]. The cbor2 module however is under active development and was last released just last month[2]. As the APIs are identical, we can import cbor2 and if that fails fall back to cbor. [1] https://pypi.org/project/cbor/#history [2] https://pypi.org/project/cbor2/#history Closes #1189 Signed-off-by: Ross Burton <ross.burton@arm.com> Change-Id: Iaf2d0df625a200a5cebf72dec4a89877a26194ea
diff --git a/scripts/imgtool.nix b/scripts/imgtool.nix index 9ac41bc..ea9ba8b 100644 --- a/scripts/imgtool.nix +++ b/scripts/imgtool.nix
@@ -20,7 +20,7 @@ python37.pkgs.cryptography python37.pkgs.intelhex python37.pkgs.setuptools - python37.pkgs.cbor + python37.pkgs.cbor2 ] ); in