Merge master into staging-next

This commit is contained in:
github-actions[bot]
2021-01-15 18:52:54 +00:00
committed by GitHub
18 changed files with 183 additions and 64 deletions

View File

@@ -1,13 +1,13 @@
{ lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }:
buildPythonPackage rec {
version = "4.25.1";
version = "4.26.0";
pname = "breathe";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "bf81658ed31f8f586247d203923479fcde6c3797d376c804bdafa7e56ffd43b5";
sha256 = "72543e3ef896b402eec4067c8be2f384570a27421b803ea6980455d7a9859cb1";
};
propagatedBuildInputs = [ docutils six sphinx ];

View File

@@ -1,18 +1,19 @@
{ lib, stdenv
{ lib
, buildPythonPackage
, fetchFromGitHub
, python
, stdenv
}:
buildPythonPackage rec {
pname = "pyelftools";
version = "unstable-2020-09-23";
version = "0.27";
src = fetchFromGitHub {
owner = "eliben";
repo = pname;
rev = "ab84e68837113b2d700ad379d94c1dd4a73125ea";
sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q=";
rev = "v${version}";
sha256 = "09igdym2qj2fvfcazbz25qybmgz7ccrn25xn3havfkdkka0z0i3p";
};
doCheck = stdenv.is64bit && !stdenv.isDarwin;
@@ -25,10 +26,9 @@ buildPythonPackage rec {
pythonImportsCheck = [ "elftools" ];
meta = with lib; {
description = "A library for analyzing ELF files and DWARF debugging information";
description = "Python library for analyzing ELF files and DWARF debugging information";
homepage = "https://github.com/eliben/pyelftools";
license = licenses.publicDomain;
maintainers = with maintainers; [ igsha pamplemousse ];
};
}

View File

@@ -0,0 +1,27 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
}:
buildPythonPackage rec {
pname = "upnpy";
version = "1.1.8";
src = fetchFromGitHub {
owner = "5kyc0d3r";
repo = pname;
rev = "v${version}";
sha256 = "17rqcmmwsl0m4722b1cr74f80kqwq7cgxsy7lq9c88zf6srcgjsf";
};
# Project has not published tests yet
doCheck = false;
pythonImportsCheck = [ "upnpy" ];
meta = with lib; {
description = "UPnP client library for Python";
homepage = "https://github.com/5kyc0d3r/upnpy";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}