hwi: 1.0.3 -> 1.1.2

hidapi needed to be added as a custom dependency to be able to build
from unstable.
This commit is contained in:
nixbitcoin 2020-07-19 13:52:46 +00:00
parent fe6e118bb3
commit ae364a68ad
No known key found for this signature in database
GPG Key ID: DD11F9AD5308B3BA
2 changed files with 39 additions and 3 deletions

View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, fetchFromGitHub, python3 }: { pkgs, stdenv, fetchurl, fetchFromGitHub, python3 }:
with stdenv.lib; with stdenv.lib;
@ -9,18 +9,22 @@ let
mnemonic = self.callPackage ./mnemonic {}; mnemonic = self.callPackage ./mnemonic {};
# HWI requires ecdsa <0.14 but nixpkgs has a newer version # HWI requires ecdsa <0.14 but nixpkgs has a newer version
ecdsa = self.callPackage ./ecdsa {}; ecdsa = self.callPackage ./ecdsa {};
# HWI requires hidapi 0.7.99 but nixpkgs has a newer version
hidapi = self.callPackage ./hidapi {
inherit (pkgs) udev libusb1;
};
}; };
}; };
in in
python.pkgs.buildPythonPackage rec { python.pkgs.buildPythonPackage rec {
pname = "hwi"; pname = "hwi";
version = "1.0.3"; version = "1.1.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitcoin-core"; owner = "bitcoin-core";
repo = "HWI"; repo = "HWI";
rev = version; rev = version;
sha256 = "1xb8w6w6j6vv2ik2bb25y2w6m0gikmh5446jar0frfp6r6das5nn"; sha256 = "01xjkv74ksj8m0l6frk03wq82ilzp5gkz4rf7lhi1h6qkb9kb1x0";
}; };
# TODO: enable tests # TODO: enable tests

View File

@ -0,0 +1,32 @@
{ stdenv, libusb1, udev, darwin, fetchPypi, buildPythonPackage, cython }:
buildPythonPackage rec {
pname = "hidapi";
version = "0.7.99.post21";
src = fetchPypi {
inherit pname version;
sha256 = "e0be1aa6566979266a8fc845ab0e18613f4918cf2c977fe67050f5dc7e2a9a97";
};
propagatedBuildInputs =
stdenv.lib.optionals stdenv.isLinux [ libusb1 udev ] ++
stdenv.lib.optionals stdenv.isDarwin [ darwin.IOKit darwin.apple_sdk.frameworks.CoreFoundation ] ++
[ cython ];
# Fix the USB backend library lookup
postPatch = stdenv.lib.optionalString stdenv.isLinux ''
libusb=${libusb1.dev}/include/libusb-1.0
test -d $libusb || { echo "ERROR: $libusb doesn't exist, please update/fix this build expression."; exit 1; }
sed -i -e "s|/usr/include/libusb-1.0|$libusb|" setup.py
'';
meta = with stdenv.lib; {
description = "A Cython interface to the hidapi from https://github.com/signal11/hidapi";
homepage = "https://github.com/trezor/cython-hidapi";
# license can actually be either bsd3 or gpl3
# see https://github.com/trezor/cython-hidapi/blob/master/LICENSE-orig.txt
license = licenses.bsd3;
maintainers = with maintainers; [ np ];
};
}