Merge branch 'staging-next' into staging

This commit is contained in:
Jan Tojnar
2021-04-25 08:22:13 +02:00
144 changed files with 1324 additions and 720 deletions
@@ -7,14 +7,14 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.0.6790";
version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw=";
sha256 = "sha256-yIYZubZ8073voe4C78QITP3Pau/mrpNTyhPpU/QftXo=";
};
propagatedBuildInputs = [ pyvex ];
@@ -42,14 +42,14 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.0.6790";
version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc=";
sha256 = "sha256-8BN706jqflhKmHVLQ1Y0k3GMScB1Hs5E/zndgq0sXB8=";
};
propagatedBuildInputs = [
@@ -81,7 +81,9 @@ buildPythonPackage rec {
# Tests have additional requirements, e.g., pypcode and angr binaries
# cle is executing the tests with the angr binaries
doCheck = false;
pythonImportsCheck = [ "angr" ];
# See http://angr.io/api-doc/
pythonImportsCheck = [ "angr" "claripy" "cle" "pyvex" "archinfo" ];
meta = with lib; {
description = "Powerful and user-friendly binary analysis platform";
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.0.6790";
version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "16r22ajkj8sxbgsym0i85xdjvphgf1566p5s7d915kkj37qdrrpy";
sha256 = "sha256-uOf2d3TbTdLobqfdOUSVQ/mqyD3TaYPlPCNFsqcPrXo=";
};
propagatedBuildInputs = [
@@ -7,13 +7,13 @@
buildPythonPackage rec {
pname = "archinfo";
version = "9.0.6790";
version = "9.0.6852";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk=";
sha256 = "sha256-NlL/uRI568HYkt8T2kuzyHNXpWybOLbFduE+1dzm4Qo=";
};
checkInputs = [
@@ -22,13 +22,13 @@
buildPythonPackage rec {
pname = "binwalk";
version = "27";
version = "2.3.1";
src = fetchFromGitHub {
owner = "ReFirmLabs";
repo = "binwalk";
rev = "python${version}";
sha256 = "03kqhs3j9czdc2pnr1v8iszwx254ljpvrmmj0j5ls0ssjrfxacyx";
rev = "v${version}";
sha256 = "108mj4jjffdmaz6wjvglbv44j7fkhspaxz1rj2bi1fcnwsri5wsm";
};
propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract squashfsTools xz pycrypto ]
@@ -53,5 +53,6 @@ buildPythonPackage rec {
homepage = "https://github.com/ReFirmLabs/binwalk";
description = "A tool for searching a given binary image for embedded files";
maintainers = [ maintainers.koral ];
license = licenses.mit;
};
}
@@ -13,14 +13,14 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.0.6790";
version = "9.0.6852";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE=";
sha256 = "sha256-31zaL3PJDXyLvVD3Xdc2qoLSrXipwTawHoj+I+Y6fng=";
};
# Use upstream z3 implementation
@@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.0.6790";
version = "9.0.6852";
# 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-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM=";
sha256 = "sha256-IRyRio3M7YZtdBqb7PGoWs2Lyt8hjBLYM1zQYbhjYEs=";
};
propagatedBuildInputs = [
@@ -8,7 +8,6 @@
, scipy
, scikitlearn
, pytest
, setuptools-scm
}:
buildPythonPackage rec {
@@ -0,0 +1,33 @@
{ lib
, buildPythonPackage
, fetchPypi
, requests
, requests_oauthlib
}:
buildPythonPackage rec {
pname = "homeconnect";
version = "0.6.3";
src = fetchPypi {
inherit pname version;
sha256 = "0n4h4mi23zw3v6fbkz17fa6kkl5v9bfmj0p57jvfzcfww511y9mn";
};
propagatedBuildInputs = [
requests
requests_oauthlib
];
# Project has no tests
doCheck = false;
pythonImportsCheck = [ "homeconnect" ];
meta = with lib; {
description = "Python client for the BSH Home Connect REST API";
homepage = "https://github.com/DavidMStraub/homeconnect";
changelog = "https://github.com/DavidMStraub/homeconnect/releases/tag/v${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -15,7 +15,7 @@ let
node = callPackage ./node {};
in buildPythonPackage rec {
pname = "panel";
version = "0.11.1";
version = "0.11.3";
# Don't forget to also update the node packages
# 1. retrieve the package.json file
@@ -23,7 +23,7 @@ in buildPythonPackage rec {
# 3. node2nix
src = fetchPypi {
inherit pname version;
sha256 = "ce531e5c0c8a8ae74d523762aeb1666650caebbe1867aba16129d29791e921f9";
sha256 = "sha256-HpHYHysPE6MRxR0kek5C7sunHMfBsUGdZfxamz2jcLc=";
};
# Since 0.10.0 panel attempts to fetch from the web.
@@ -4,13 +4,13 @@
let
sources = {
"@bokeh/bokehjs-2.3.0" = {
"@bokeh/bokehjs-2.3.1" = {
name = "_at_bokeh_slash_bokehjs";
packageName = "@bokeh/bokehjs";
version = "2.3.0";
version = "2.3.1";
src = fetchurl {
url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.0.tgz";
sha512 = "geKBhYUVJ5IaY0UNk9k2P0yiYLCj+DOeNjdDneuTJ8K5R9fs0Rpp4iiaQKUGr1yUyQHGHLU8sk4CFZ+Bd5ZILg==";
url = "https://registry.npmjs.org/@bokeh/bokehjs/-/bokehjs-2.3.1.tgz";
sha512 = "DlNZaqAJFUw38IuSk2TUOcfyiK8Ya3kDRpYt/RgVUftIDW2CWLbBo47kbug9+ykEF49rcnlxcCXhNXzpg4V7gw==";
};
};
"@bokeh/numbro-1.6.2" = {
@@ -476,10 +476,10 @@ let
args = {
name = "_at_holoviz_slash_panel";
packageName = "@holoviz/panel";
version = "0.11.1";
version = "0.11.3";
src = ./.;
dependencies = [
sources."@bokeh/bokehjs-2.3.0"
sources."@bokeh/bokehjs-2.3.1"
sources."@bokeh/numbro-1.6.2"
(sources."@bokeh/slickgrid-2.4.2702" // {
dependencies = [
@@ -0,0 +1,37 @@
{ lib
, buildPythonPackage
, fetchPypi
, cython
, matplotlib
}:
buildPythonPackage rec {
pname = "pycocotools";
version = "2.0.2";
format = "setuptools";
src = fetchPypi {
inherit pname version;
sha256 = "06hz0iz4kqxhqby4j7bah8l41kg68bb118jawp172i4vg497lw94";
};
propagatedBuildInputs = [
cython
matplotlib
];
pythonImportsCheck = [
"pycocotools.coco"
"pycocotools.cocoeval"
];
# has no tests
doCheck = false;
meta = with lib; {
description = "Official APIs for the MS-COCO dataset";
homepage = "https://github.com/cocodataset/cocoapi/tree/master/PythonAPI";
license = licenses.bsd2;
maintainers = with maintainers; [ hexa piegames ];
};
}
@@ -8,15 +8,15 @@
}:
buildPythonPackage rec {
pname = "PyMetno";
version = "0.8.2";
pname = "pymetno";
version = "0.8.3";
format = "setuptools";
src = fetchFromGitHub {
repo = pname;
owner = "Danielhiversen";
repo = "PyMetno";
rev = version;
sha256 = "0b1zm60yqj1mivc3zqw2qm9rqh8cbmx0r58jyyvm3pxzq5cafdg5";
sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g=";
};
propagatedBuildInputs = [
@@ -34,7 +34,7 @@ buildPythonPackage rec {
doCheck = false;
meta = with lib; {
description = "A library to communicate with the met.no api";
description = "A library to communicate with the met.no API";
homepage = "https://github.com/Danielhiversen/pyMetno/";
license = licenses.mit;
maintainers = with maintainers; [ flyfloh ];
@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, httpsig
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pysmartapp";
version = "0.3.3";
src = fetchFromGitHub {
owner = "andrewsayre";
repo = pname;
rev = version;
sha256 = "03wk44siqxl15pa46x5vkg4q0mnga34ir7qn897576z2ivbx7awh";
};
propagatedBuildInputs = [
httpsig
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pysmartapp" ];
meta = with lib; {
description = "Python implementation to work with SmartApp lifecycle events";
homepage = "https://github.com/andrewsayre/pysmartapp";
changelog = "https://github.com/andrewsayre/pysmartapp/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -0,0 +1,38 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "pysmartthings";
version = "0.7.6";
src = fetchFromGitHub {
owner = "andrewsayre";
repo = pname;
rev = version;
sha256 = "0m91lfzdbmq6qv6bihd278psi9ghldxpa1d0dsbii2zf338188qj";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
pythonImportsCheck = [ "pysmartthings" ];
meta = with lib; {
description = "Python library for interacting with the SmartThings cloud API";
homepage = "https://github.com/andrewsayre/pysmartthings";
changelog = "https://github.com/andrewsayre/pysmartthings/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -10,12 +10,12 @@
buildPythonPackage rec {
pname = "pyturbojpeg";
version = "1.4.2";
version = "1.4.3";
src = fetchPypi {
pname = "PyTurboJPEG";
inherit version;
sha256 = "sha256-dWmj/huCkborcShf2BT+L3ybEfgdKVIGiJnkz755xwo=";
sha256 = "sha256-Q7KVfR9kA32QPQFWgSSCVB5sNOmSF8y5J4dmBc14jvg=";
};
patches = [
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "pyvex";
version = "9.0.6790";
version = "9.0.6852";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-bqOLHGlLQ12nYzbv9H9nJ0/Q5APJb/9B82YtHk3IvYQ=";
sha256 = "sha256-O84QErqHIRYQZh9mR71opm+j7kb9a4s5f1yj0WNiJAM=";
};
propagatedBuildInputs = [
@@ -2,15 +2,16 @@
, fetchPypi
, lib
, param
, panel
}:
buildPythonPackage rec {
pname = "pyviz_comms";
version = "2.0.1";
version = "0.7.6";
src = fetchPypi {
inherit pname version;
sha256 = "be63957a49772895ddebeac02c697e1675e0bdf1515824f60fcc261914f23624";
sha256 = "sha256-zZZJqeqd/LmzTXj5pk4YcKqLa5TeVG4smca7U9ZKtdE=";
};
propagatedBuildInputs = [ param ];
@@ -18,6 +19,10 @@ buildPythonPackage rec {
# there are not tests with the package
doCheck = false;
passthru.tests = {
inherit panel;
};
meta = with lib; {
description = "Launch jobs, organize the output, and dissect the results";
homepage = "https://pyviz.org/";
@@ -0,0 +1,49 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
, numpy
, scikitlearn
, perl
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "seqeval";
version = "1.2.2";
format = "setuptools";
src = fetchFromGitHub {
owner = "chakki-works";
repo = "seqeval";
rev = "v${version}";
sha256 = "0qv05gn54kc4wpmwnflmfqw4gwwb8lxqhkiihl0pvl7s2i7qzx2j";
};
postPatch = ''
substituteInPlace setup.py \
--replace "use_scm_version=True," "version='${version}'," \
--replace "setup_requires=['setuptools_scm']," "setup_requires=[],"
'';
propagatedBuildInputs = [
numpy
scikitlearn
];
checkInputs = [
pytestCheckHook
];
disabledTests = [
# tests call perl script and get stuck in there
"test_statistical_tests"
"test_by_ground_truth"
];
meta = with lib; {
description = "A Python framework for sequence labeling evaluation";
homepage = "https://github.com/chakki-works/seqeval";
license = licenses.mit;
maintainers = with maintainers; [ hexa ];
};
}
@@ -0,0 +1,47 @@
{ lib
, aiohttp
, buildPythonPackage
, fetchFromGitHub
, pytest-asyncio
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "smhi-pkg";
version = "1.0.14";
src = fetchFromGitHub {
owner = "joysoftware";
repo = "pypi_smhi";
rev = version;
sha256 = "186xwrg3hvr0hszq2kxvygd241q2sp11gfk6mwj9z4zqywwfcbn3";
};
propagatedBuildInputs = [
aiohttp
];
checkInputs = [
pytest-asyncio
pytestCheckHook
];
disabledTests = [
# Disable tests that needs network access
"test_smhi_integration_test"
"test_smhi_async_integration_test"
"test_smhi_async_integration_test_use_session"
"test_smhi_async_get_forecast_integration2"
"test_async_error_from_api"
];
pythonImportsCheck = [ "smhi" ];
meta = with lib; {
description = "Python library for accessing SMHI open forecast data";
homepage = "https://github.com/joysoftware/pypi_smhi";
changelog = "https://github.com/joysoftware/pypi_smhi/releases/tag/${version}";
license = with licenses; [ mit ];
maintainers = with maintainers; [ fab ];
};
}
@@ -1,16 +1,19 @@
{ lib
, buildPythonPackage
, pythonOlder
, fetchPypi
, wrapio
}:
buildPythonPackage rec {
pname = "survey";
version = "3.4.2";
version = "3.4.3";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-aF7ZS5oxeIOb7mJsrusdc3HefcPE+3OTXcJB/pjJxFY=";
sha256 = "sha256-TK89quY3bpNIEz1n3Ecew4FnTH6QgeSLdDNV86gq7+I=";
};
propagatedBuildInputs = [