Merge pull request #155525 from fabaff/bump-angr

python3Packages.angr: 9.1.10913 -> 9.1.11508
This commit is contained in:
Fabian Affolter 2022-01-19 20:05:09 +01:00 committed by GitHub
commit eabc5878e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 95 additions and 49 deletions

View File

@ -7,20 +7,25 @@
buildPythonPackage rec {
pname = "ailment";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-S+ntSC9KySj2njkxEkr7p2TDsBqY0Gf+zzwomnGwSEk=";
hash = "sha256-ZT3rMzWwMG1tpPcpOqGvlFt0nuiPD0d3nECVDC7XDv8=";
};
propagatedBuildInputs = [ pyvex ];
propagatedBuildInputs = [
pyvex
];
# Tests depend on angr (possibly a circular dependency)
doCheck = false;
#pythonImportsCheck = [ "ailment" ];
meta = with lib; {

View File

@ -22,6 +22,7 @@
, pycparser
, pythonOlder
, pyvex
, sympy
, sqlalchemy
, rpyc
, sortedcontainers
@ -45,18 +46,18 @@ in
buildPythonPackage rec {
pname = "angr";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = "v${version}";
sha256 = "sha256-AZlqSalTOQh3QR959ZuanFuTZVKi9valKJ3snsquC/A=";
hash = "sha256-8Cuh+QxKU3wYRRDYrMXPrzp4yg1pyH4QbJeEsTHDZqA=";
};
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
propagatedBuildInputs = [
ailment
archinfo
@ -75,20 +76,24 @@ buildPythonPackage rec {
progressbar2
protobuf
psutil
sqlalchemy
pycparser
pyvex
sqlalchemy
rpyc
sortedcontainers
sqlalchemy
sympy
unicorn'
];
setupPyBuildFlags = lib.optionals stdenv.isLinux [
"--plat-name"
"linux"
];
# Tests have additional requirements, e.g., pypcode and angr binaries
# cle is executing the tests with the angr binaries
doCheck = false;
# See http://angr.io/api-doc/
pythonImportsCheck = [
"angr"
"claripy"

View File

@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "fmagin";
repo = "angr-cli";
rev = "v${version}";
sha256 = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
hash = "sha256-a5ajUBQwt3xUNkeSOeGOAFf47wd4UVk+LcuAHGqbq4s=";
};
propagatedBuildInputs = [

View File

@ -9,14 +9,16 @@
buildPythonPackage rec {
pname = "angrop";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-8M3d8lG7jDNgICjzjFRi9Wl2I7aYI5b5IvjEhixsk9k=";
hash = "sha256-lAPruvMLCQD1TwQBlKZnLrCEkrKf676dK++e7fBmPQA=";
};
propagatedBuildInputs = [
@ -28,7 +30,10 @@ buildPythonPackage rec {
# Tests have additional requirements, e.g., angr binaries
# cle is executing the tests with the angr binaries already and is a requirement of angr
doCheck = false;
pythonImportsCheck = [ "angrop" ];
pythonImportsCheck = [
"angrop"
];
meta = with lib; {
description = "ROP gadget finder and chain builder";

View File

@ -3,17 +3,21 @@
, fetchFromGitHub
, pytestCheckHook
, nose
, pythonOlder
}:
buildPythonPackage rec {
pname = "archinfo";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-VLFbjKX7WXWoJCS9hYwtEikGC48gRg7E24D9Un+/gdc=";
hash = "sha256-r21n0rbHxb/e34PGpbA5KpnILFtmkXThBWbASChvVs0=";
};
checkInputs = [
@ -21,7 +25,9 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "archinfo" ];
pythonImportsCheck = [
"archinfo"
];
meta = with lib; {
description = "Classes with architecture-specific information";

View File

@ -13,21 +13,18 @@
buildPythonPackage rec {
pname = "claripy";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-66dc0y4mu5S5PtTx2fRkBdpNlH53ZpTiKyM3s0OUamw=";
sha256 = "sha256-xCtITYRiIBtJQ8FIr0NJC30YWoU8iZ4gMGv2blnFNIk=";
};
# Use upstream z3 implementation
postPatch = ''
substituteInPlace setup.py --replace "z3-solver>=4.8.5.0" ""
'';
propagatedBuildInputs = [
cachetools
decorator
@ -41,7 +38,15 @@ buildPythonPackage rec {
pytestCheckHook
];
pythonImportsCheck = [ "claripy" ];
postPatch = ''
# Use upstream z3 implementation
substituteInPlace setup.py \
--replace "z3-solver>=4.8.5.0" ""
'';
pythonImportsCheck = [
"claripy"
];
meta = with lib; {
description = "Python abstraction layer for constraint solvers";

View File

@ -15,7 +15,7 @@
let
# The binaries are following the argr projects release cycle
version = "9.1.10913";
version = "9.1.11508";
# Binary files from https://github.com/angr/binaries (only used for testing and only here)
binaries = fetchFromGitHub {
@ -29,13 +29,15 @@ in
buildPythonPackage rec {
pname = "cle";
inherit version;
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "angr";
repo = pname;
rev = "v${version}";
sha256 = "sha256-z8hBOqeI7T6Rov00OySDBdzUQ6jeBRseE7sz8VfIJmk=";
hash = "sha256-/5GKuf+nmt1/M6yAhZy9+itMnIVUGHP7BqEIxjNjep8=";
};
propagatedBuildInputs = [

View File

@ -1,30 +1,36 @@
{ buildPythonPackage
{ lib
, buildPythonPackage
, fetchFromGitHub
, lib
, pytest
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "itanium_demangler";
pname = "itanium-demangler";
version = "1.0"; # pulled from pypi version
src = fetchFromGitHub {
owner = "whitequark";
repo = "python-${pname}";
repo = "python-itanium_demangler";
rev = "29c77860be48e6dafe3496e4d9d0963ce414e366";
sha256 = "0qm95l6542nk63986w9lgzkxg824l31714i584s02rh9xwfg1xfx";
hash = "sha256-3fXwHO8JZgE0QSWScMKgRKDX5380cYPSMNMKUgwtqWI=";
};
checkInputs = [ pytest ];
checkInputs = [
pytestCheckHook
];
checkPhase = ''
pytest tests/test.py
'';
pytestFlagsArray = [
"tests/test.py"
];
pythonImportsCheck = [
" itanium_demangler "
];
meta = with lib; {
description = "A pure Python parser for the Itanium C++ ABI symbol mangling language";
description = "Python parser for the Itanium C++ ABI symbol mangling language";
homepage = "https://github.com/whitequark/python-itanium_demangler";
license = licenses.bsd0;
maintainers = [ maintainers.pamplemousse ];
maintainers = with maintainers; [ pamplemousse ];
};
}

View File

@ -7,23 +7,21 @@
, fetchPypi
, future
, pycparser
, pythonOlder
}:
buildPythonPackage rec {
pname = "pyvex";
version = "9.1.10913";
version = "9.1.11508";
format = "setuptools";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
sha256 = "sha256-EUgCyjD5ia5KQMvZWVAsXeKRjmSVE7tRRYH5u/Ozug0=";
hash = "sha256-FNCAvag0ErVjzgXqiwDnX80WnjUdnWHtcLYuanlj0ME=";
};
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace vex/Makefile-gcc --replace '/usr/bin/ar' 'ar'
'';
setupPyBuildFlags = lib.optionals stdenv.isLinux [ "--plat-name" "linux" ];
propagatedBuildInputs = [
archinfo
bitstring
@ -32,15 +30,29 @@ buildPythonPackage rec {
pycparser
];
postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace vex/Makefile-gcc \
--replace '/usr/bin/ar' 'ar'
'';
setupPyBuildFlags = lib.optionals stdenv.isLinux [
"--plat-name"
"linux"
];
preBuild = ''
export CC=${stdenv.cc.targetPrefix}cc
substituteInPlace pyvex_c/Makefile --replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
substituteInPlace pyvex_c/Makefile \
--replace 'AR=ar' 'AR=${stdenv.cc.targetPrefix}ar'
'';
# No tests are available on PyPI, GitHub release has tests
# Switch to GitHub release after all angr parts are present
doCheck = false;
pythonImportsCheck = [ "pyvex" ];
pythonImportsCheck = [
"pyvex"
];
meta = with lib; {
description = "Python interface to libVEX and VEX IR";