Merge staging-next into staging
This commit is contained in:
@@ -30,5 +30,6 @@ buildPythonPackage rec {
|
||||
homepage = "https://github.com/ashishb/adb-enhanced";
|
||||
license = licenses.asl20;
|
||||
maintainers = with maintainers; [ vtuan10 ];
|
||||
mainProgram = "adbe";
|
||||
};
|
||||
}
|
||||
|
||||
@@ -7,14 +7,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ailment";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
|
||||
sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyvex ];
|
||||
|
||||
@@ -42,14 +42,14 @@ in
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angr";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
|
||||
sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -8,14 +8,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "angrop";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
|
||||
sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -7,13 +7,13 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "archinfo";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
|
||||
sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0=";
|
||||
};
|
||||
|
||||
checkInputs = [
|
||||
|
||||
@@ -13,14 +13,14 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "claripy";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
disabled = pythonOlder "3.6";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
|
||||
sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE=";
|
||||
};
|
||||
|
||||
# Use upstream z3 implementation
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
let
|
||||
# The binaries are following the argr projects release cycle
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
|
||||
binaries = fetchFromGitHub {
|
||||
@@ -35,7 +35,7 @@ buildPythonPackage rec {
|
||||
owner = "angr";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
|
||||
sha256 = "sha256-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{ lib, buildPythonPackage, fetchPypi, isPy3k
|
||||
, ffmpeg_3, async-timeout }:
|
||||
, async-timeout }:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "ha-ffmpeg";
|
||||
@@ -12,17 +12,21 @@ buildPythonPackage rec {
|
||||
sha256 = "8d92f2f5790da038d828ac862673e0bb43e8e972e4c70b1714dd9a0fb776c8d1";
|
||||
};
|
||||
|
||||
buildInputs = [ ffmpeg_3 ];
|
||||
|
||||
propagatedBuildInputs = [ async-timeout ];
|
||||
|
||||
# only manual tests
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [
|
||||
"haffmpeg.camera"
|
||||
"haffmpeg.sensor"
|
||||
"haffmpeg.tools"
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/pvizeli/ha-ffmpeg";
|
||||
description = "Library for home-assistant to handle ffmpeg";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ peterhoeg ];
|
||||
maintainers = teams.home-assistant.members;
|
||||
};
|
||||
}
|
||||
|
||||
@@ -1,35 +1,30 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, mock
|
||||
, six
|
||||
, pytestCheckHook
|
||||
, mock
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "IMAPClient";
|
||||
version = "2.1.0";
|
||||
version = "2.2.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "mjs";
|
||||
repo = "imapclient";
|
||||
rev = version;
|
||||
sha256 = "1zc8qj8ify2zygbz255b6fcg7jhprswf008ccwjmbrnj08kh9l4x";
|
||||
sha256 = "sha256-q/8LFKHgrY3pQV7Coz+5pZAw696uABMTEkYoli6C2KA=";
|
||||
};
|
||||
|
||||
# fix test failing in python 36
|
||||
postPatch = ''
|
||||
substituteInPlace tests/test_imapclient.py \
|
||||
--replace "if sys.version_info >= (3, 7):" "if sys.version_info >= (3, 6, 4):"
|
||||
'';
|
||||
|
||||
propagatedBuildInputs = [ six ];
|
||||
|
||||
checkInputs = [ mock ];
|
||||
checkInputs = [ pytestCheckHook mock ];
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://imapclient.readthedocs.io";
|
||||
description = "Easy-to-use, Pythonic and complete IMAP client library";
|
||||
license = licenses.bsd3;
|
||||
maintainers = [ maintainers.almac ];
|
||||
maintainers = with maintainers; [ almac dotlambda ];
|
||||
};
|
||||
}
|
||||
|
||||
@@ -4,22 +4,19 @@
|
||||
, pytestCheckHook
|
||||
, cffi
|
||||
, lmdb
|
||||
, ludios_wpull
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "lmdb";
|
||||
version = "1.1.1";
|
||||
version = "1.2.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "165cd1669b29b16c2d5cc8902b90fede15a7ee475c54d466f1444877a3f511ac";
|
||||
sha256 = "5f76a90ebd08922acca11948779b5055f7a262687178e9e94f4e804b9f8465bc";
|
||||
};
|
||||
|
||||
buildInputs = [ lmdb ];
|
||||
|
||||
propogatedBuildInputs = [ ludios_wpull ];
|
||||
|
||||
checkInputs = [ cffi pytestCheckHook ];
|
||||
|
||||
LMDB_FORCE_SYSTEM=1;
|
||||
|
||||
@@ -10,12 +10,12 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyturbojpeg";
|
||||
version = "1.4.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchPypi {
|
||||
pname = "PyTurboJPEG";
|
||||
inherit version;
|
||||
sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg=";
|
||||
sha256 = "sha256-juy8gVqOXKSGGq+gOBO2BuJEL2RHjjCWJDrwRCvrZIE=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
||||
@@ -11,11 +11,11 @@
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyvex";
|
||||
version = "9.0.6852";
|
||||
version = "9.0.6885";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM=";
|
||||
sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
||||
@@ -0,0 +1,44 @@
|
||||
{ lib
|
||||
, buildPythonPackage
|
||||
, fetchFromGitHub
|
||||
, sphinx
|
||||
, markdown
|
||||
, CommonMark
|
||||
, recommonmark
|
||||
, pydash
|
||||
, pyyaml
|
||||
, unify
|
||||
, yapf
|
||||
, python
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "sphinx-markdown-parser";
|
||||
version = "0.2.4";
|
||||
|
||||
# PyPi release does not include requirements.txt
|
||||
src = fetchFromGitHub {
|
||||
owner = "clayrisser";
|
||||
repo = "sphinx-markdown-parser";
|
||||
# Upstream maintainer currently does not tag releases
|
||||
# https://github.com/clayrisser/sphinx-markdown-parser/issues/35
|
||||
rev = "2fd54373770882d1fb544dc6524c581c82eedc9e";
|
||||
sha256 = "0i0hhapmdmh83yx61lxi2h4bsmhnzddamz95844g2ghm132kw5mv";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ sphinx markdown CommonMark pydash pyyaml unify yapf recommonmark ];
|
||||
|
||||
# Avoids running broken tests in test_markdown.py
|
||||
checkPhase = ''
|
||||
${python.interpreter} -m unittest -v tests/test_basic.py tests/test_sphinx.py
|
||||
'';
|
||||
|
||||
pythonImportsCheck = [ "sphinx_markdown_parser" ];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Write markdown inside of docutils & sphinx projects";
|
||||
homepage = "https://github.com/clayrisser/sphinx-markdown-parser";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ FlorianFranzen ];
|
||||
};
|
||||
}
|
||||
Reference in New Issue
Block a user