public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #119294 from fabaff/bump-aiodiscover

Browse Source
This commit is contained in:
Martin Weinelt 2021-04-14 01:53:09 +02:00 committed by GitHub
commit f3ef3cb107
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/development/python-modules/aiodiscover/default.nix
View File

@ -2,22 +2,23 @@
, async-dns , async-dns
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, ifaddr , ifaddr
, pyroute2 , pyroute2
, pytest-asyncio
, pytestCheckHook
, pythonOlder , pythonOlder
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "aiodiscover"; pname = "aiodiscover";
version = "1.3.3"; version = "1.3.4";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bdraco"; owner = "bdraco";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "186agrjx818vn00d3pqlka5ir48rgpbfyn1cifkn9ylsxg9cz3ph"; sha256 = "sha256-TmWl5d5HwyqWPUjwtEvc5FzVfxV/K1pekljcMkGN0Ag=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -30,9 +31,21 @@ buildPythonPackage rec {
substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" substituteInPlace setup.py --replace '"pytest-runner>=5.2",' ""
''; '';
checkInputs = [
pytest-asyncio
pytestCheckHook
];
preBuild = ''
export HOME=$TMPDIR
'';
disabledTests = [
# Tests require access to /etc/resolv.conf # Tests require access to /etc/resolv.conf
# pythonImportsCheck doesn't work as async-dns wants to create its CONFIG_DIR "test_async_discover_hosts"
doCheck = false; ];
pythonImportsCheck = ["aiodiscover"];
meta = with lib; { meta = with lib; {
description = "Python module to discover hosts via ARP and PTR lookup"; description = "Python module to discover hosts via ARP and PTR lookup";

15
pkgs/development/python-modules/pyroute2/default.nix
View File

@ -1,22 +1,27 @@
{lib, buildPythonPackage, fetchPypi}: { lib
, buildPythonPackage
, fetchPypi
}:
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyroute2"; pname = "pyroute2";
version = "0.5.14"; version = "0.5.18";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
sha256 = "774c5ecf05fe40f0f601a7ab33c19ca0b24f00bf4a094e58deaa5333b7ca49b5"; sha256 = "sha256-CKxAytUsC7Lg8gCHUgWZqpH8zgsiHdJukEIzBCiBC8U=";
}; };
# requires root priviledges # Requires root privileges, https://github.com/svinota/pyroute2/issues/778
doCheck = false; doCheck = false;
pythonImportsCheck = [ "pyroute2" ];
meta = with lib; { meta = with lib; {
description = "Python Netlink library"; description = "Python Netlink library";
homepage = "https://github.com/svinota/pyroute2"; homepage = "https://github.com/svinota/pyroute2";
license = licenses.asl20; license = licenses.asl20;
maintainers = [maintainers.mic92]; maintainers = with maintainers; [ mic92 ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }