Merge pull request #302936 from fabaff/angr-bump

python311Packages.angr: 9.2.97 -> 9.2.98
This commit is contained in:
Fabian Affolter 2024-04-10 00:43:28 +02:00 committed by GitHub
commit 47b9e6e557
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 116 additions and 143 deletions

View File

@ -1,14 +1,15 @@
{ lib {
, buildPythonPackage lib,
, fetchFromGitHub buildPythonPackage,
, pythonOlder fetchFromGitHub,
, pyvex pythonOlder,
, setuptools pyvex,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "ailment"; pname = "ailment";
version = "9.2.97"; version = "9.2.98";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -17,23 +18,17 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = "ailment"; repo = "ailment";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-R6OBc7qK4zP0t8m26V17he8Oy39eSK8/Dm84ScnBy3s="; hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
];
dependencies = [ dependencies = [ pyvex ];
pyvex
];
# Tests depend on angr (possibly a circular dependency) # Tests depend on angr (possibly a circular dependency)
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "ailment" ];
"ailment"
];
meta = with lib; { meta = with lib; {
description = "The angr Intermediate Language"; description = "The angr Intermediate Language";

View File

@ -1,42 +1,43 @@
{ lib {
, stdenv lib,
, ailment stdenv,
, archinfo ailment,
, buildPythonPackage archinfo,
, cachetools buildPythonPackage,
, capstone cachetools,
, cffi capstone,
, claripy cffi,
, cle claripy,
, cppheaderparser cle,
, dpkt cppheaderparser,
, fetchFromGitHub dpkt,
, gitpython fetchFromGitHub,
, itanium-demangler gitpython,
, mulpyplexer itanium-demangler,
, nampa mulpyplexer,
, networkx nampa,
, progressbar2 networkx,
, protobuf progressbar2,
, psutil protobuf,
, pycparser psutil,
, pyformlang pycparser,
, pythonOlder pyformlang,
, pythonRelaxDepsHook pythonOlder,
, pyvex pythonRelaxDepsHook,
, rich pyvex,
, rpyc rich,
, setuptools rpyc,
, sortedcontainers setuptools,
, sqlalchemy sortedcontainers,
, sympy sqlalchemy,
, unicorn sympy,
, unique-log-filter unicorn,
unique-log-filter,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "angr"; pname = "angr";
version = "9.2.97"; version = "9.2.98";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -45,12 +46,10 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = "angr"; repo = "angr";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-eJkxflAQFI/sEL4JMlMe+kClnaVSxtoOrPg8HQpH78g="; hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [ "capstone" ];
"capstone"
];
build-system = [ build-system = [
pythonRelaxDepsHook pythonRelaxDepsHook
@ -88,9 +87,7 @@ buildPythonPackage rec {
]; ];
passthru.optional-dependencies = { passthru.optional-dependencies = {
AngrDB = [ AngrDB = [ sqlalchemy ];
sqlalchemy
];
}; };
setupPyBuildFlags = lib.optionals stdenv.isLinux [ setupPyBuildFlags = lib.optionals stdenv.isLinux [

View File

@ -1,11 +1,12 @@
{ lib {
, angr lib,
, buildPythonPackage angr,
, fetchFromGitHub buildPythonPackage,
, progressbar fetchFromGitHub,
, pythonOlder progressbar,
, setuptools pythonOlder,
, tqdm setuptools,
tqdm,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
@ -22,9 +23,7 @@ buildPythonPackage rec {
hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
];
dependencies = [ dependencies = [
angr angr
@ -36,9 +35,7 @@ buildPythonPackage rec {
# cle is executing the tests with the angr binaries already and is a requirement of angr # cle is executing the tests with the angr binaries already and is a requirement of angr
doCheck = false; doCheck = false;
pythonImportsCheck = [ pythonImportsCheck = [ "angrop" ];
"angrop"
];
meta = with lib; { meta = with lib; {
description = "ROP gadget finder and chain builder"; description = "ROP gadget finder and chain builder";

View File

@ -1,15 +1,16 @@
{ lib {
, backports-strenum lib,
, buildPythonPackage backports-strenum,
, fetchFromGitHub buildPythonPackage,
, pytestCheckHook fetchFromGitHub,
, pythonOlder pytestCheckHook,
, setuptools pythonOlder,
setuptools,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "archinfo"; pname = "archinfo";
version = "9.2.97"; version = "9.2.98";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -18,24 +19,16 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = "archinfo"; repo = "archinfo";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-X8rMTQvNolYjSPyXbP2i5MYTPEvQlwoUQmXeEW56wQs="; hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
];
dependencies = lib.optionals (pythonOlder "3.11") [ dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ];
backports-strenum
];
nativeCheckInputs = [ nativeCheckInputs = [ pytestCheckHook ];
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [ "archinfo" ];
"archinfo"
];
meta = with lib; { meta = with lib; {
description = "Classes with architecture-specific information"; description = "Classes with architecture-specific information";

View File

@ -1,19 +1,20 @@
{ lib {
, buildPythonPackage lib,
, cachetools buildPythonPackage,
, decorator cachetools,
, fetchFromGitHub decorator,
, pysmt fetchFromGitHub,
, pytestCheckHook pysmt,
, pythonOlder pytestCheckHook,
, pythonRelaxDepsHook pythonOlder,
, setuptools pythonRelaxDepsHook,
, z3-solver setuptools,
z3-solver,
}: }:
buildPythonPackage rec { buildPythonPackage rec {
pname = "claripy"; pname = "claripy";
version = "9.2.97"; version = "9.2.98";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
@ -22,13 +23,11 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = "claripy"; repo = "claripy";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ZSDG1KmVi0kZX4WmrYIyd5+zRR/rjrugm8UjFlI5pfU="; hash = "sha256-qGkVGRDVX8YMWgvRAqKM9Pxjv9uqu4UNSDtvhzVVeSU=";
}; };
# z3 does not provide a dist-info, so python-runtime-deps-check will fail # z3 does not provide a dist-info, so python-runtime-deps-check will fail
pythonRemoveDeps = [ pythonRemoveDeps = [ "z3-solver" ];
"z3-solver"
];
build-system = [ build-system = [
pythonRelaxDepsHook pythonRelaxDepsHook
@ -42,13 +41,9 @@ buildPythonPackage rec {
z3-solver z3-solver
] ++ z3-solver.requiredPythonModules; ] ++ z3-solver.requiredPythonModules;
nativeCheckInputs = [ nativeCheckInputs = [ pytestCheckHook ];
pytestCheckHook
];
pythonImportsCheck = [ pythonImportsCheck = [ "claripy" ];
"claripy"
];
meta = with lib; { meta = with lib; {
description = "Python abstraction layer for constraint solvers"; description = "Python abstraction layer for constraint solvers";

View File

@ -1,32 +1,32 @@
{ lib {
, archinfo lib,
, buildPythonPackage archinfo,
, cffi buildPythonPackage,
, fetchFromGitHub cffi,
, minidump fetchFromGitHub,
, pefile minidump,
, pyelftools pefile,
, pynose pyelftools,
, pytestCheckHook pynose,
, pythonOlder pytestCheckHook,
, pyvex pythonOlder,
, pyxbe pyvex,
, setuptools pyxbe,
, sortedcontainers setuptools,
sortedcontainers,
}: }:
let let
# The binaries are following the argr projects release cycle # The binaries are following the argr projects release cycle
version = "9.2.97"; version = "9.2.98";
# Binary files from https://github.com/angr/binaries (only used for testing and only here) # Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub { binaries = fetchFromGitHub {
owner = "angr"; owner = "angr";
repo = "binaries"; repo = "binaries";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-FiPEqfNaAXI+xSWE+So//Uwz9k3bANHQ++nRSPKkddM="; hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q=";
}; };
in in
buildPythonPackage rec { buildPythonPackage rec {
pname = "cle"; pname = "cle";
@ -39,12 +39,10 @@ buildPythonPackage rec {
owner = "angr"; owner = "angr";
repo = "cle"; repo = "cle";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-tain1I7Td+0v7n+px3mQnz7reKZUbGYDWfKnDhvmU8I="; hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0=";
}; };
build-system = [ build-system = [ setuptools ];
setuptools
];
dependencies = [ dependencies = [
archinfo archinfo
@ -82,9 +80,7 @@ buildPythonPackage rec {
"test_remote_file_map" "test_remote_file_map"
]; ];
pythonImportsCheck = [ pythonImportsCheck = [ "cle" ];
"cle"
];
meta = with lib; { meta = with lib; {
description = "Python loader for many binary formats"; description = "Python loader for many binary formats";

View File

@ -11,14 +11,14 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "pyvex"; pname = "pyvex";
version = "9.2.97"; version = "9.2.98";
pyproject = true; pyproject = true;
disabled = pythonOlder "3.11"; disabled = pythonOlder "3.11";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-GIBsWtj8nLuzGX/C6Ioe8mSfKg3QXtEJf3+d5h9M02c="; hash = "sha256-+X4G5jLG7c75XIItNlQLF5YV0XUQwdA6JyF1IGBfiE0=";
}; };
build-system = [ build-system = [