1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-26 07:31:20 +00:00

Merge pull request #125177 from fabaff/bump-adext

python3Packages.adext: 0.4.1 -> 0.4.2
This commit is contained in:
Fabian Affolter 2021-06-02 11:06:23 +02:00 committed by GitHub
commit 449cea71eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 16 deletions

View file

@ -1,19 +1,24 @@
{ lib
, buildPythonPackage
, fetchPypi
, fetchFromGitHub
, setuptools-scm
, alarmdecoder
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "adext";
version = "0.4.1";
version = "0.4.2";
src = fetchPypi {
inherit pname version;
sha256 = "1yz1rpfvhbf7kfjck5vadbj9rd3bkx5248whaa3impdrjh7vs03x";
src = fetchFromGitHub {
owner = "ajschmidt8";
repo = pname;
rev = "v${version}";
sha256 = "0h5k9kzms2f0r48pdhsgv8pimk0vsxw8vs0k6880mank8ij914wr";
};
SETUPTOOLS_SCM_PRETEND_VERSION = version;
nativeBuildInputs = [
setuptools-scm
];
@ -22,8 +27,10 @@ buildPythonPackage rec {
alarmdecoder
];
# Tests are not published yet
doCheck = false;
checkInputs = [
pytestCheckHook
];
pythonImportsCheck = [ "adext" ];
meta = with lib; {

View file

@ -1,28 +1,51 @@
{ lib, buildPythonPackage, fetchFromGitHub, pyserial, pyftdi, pyusb
, pyopenssl, nose, isPy3k, pythonOlder, mock }:
{ lib
, buildPythonPackage
, fetchFromGitHub
, mock
, pyftdi
, pyopenssl
, pyserial
, pytestCheckHook
, pythonOlder
, pyusb
}:
buildPythonPackage rec {
pname = "alarmdecoder";
version = "1.13.10";
version = "1.13.11";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "nutechsoftware";
repo = "alarmdecoder";
rev = version;
sha256 = "05581j78181p6mwbfpbkp5irnrzsvps1lslgqrh7xbdcmz5b2nxd";
sha256 = "sha256-q2s+wngDKtWm5mxGHNAc63Ed6tiQD9gLHVoQZNWFB0w=";
};
propagatedBuildInputs = [ pyserial pyftdi pyusb pyopenssl ];
propagatedBuildInputs = [
pyftdi
pyopenssl
pyserial
pyusb
];
checkInputs = [
mock
pytestCheckHook
];
disabledTests = [
# Socket issue, https://github.com/nutechsoftware/alarmdecoder/issues/45
"test_ssl"
"test_ssl_exception"
];
doCheck = !isPy3k;
checkInputs = [ nose mock ];
pythonImportsCheck = [ "alarmdecoder" ];
meta = with lib; {
description = "Python interface for the Alarm Decoder (AD2USB, AD2SERIAL and AD2PI) devices";
homepage = "https://github.com/nutechsoftware/alarmdecoder";
description =
"Python interface for the Alarm Decoder (AD2) family of alarm devices. (AD2USB, AD2SERIAL and AD2PI)";
license = licenses.mit;
maintainers = with maintainers; [ fab ];
};
}