diff options
author | Fabian Affolter <fabian@affolter-engineering.ch> | 2022-06-23 22:07:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-23 22:07:44 +0200 |
commit | f25b909c6c478b813e577355bb2e328db80461ef (patch) | |
tree | a362d732305ae70bf36ef2d248abc7bf8c345cbb | |
parent | 8f74f0fe7aab2165eb75389ba73972c4a9cae150 (diff) | |
parent | 93c256b94d0052fc1257fbac9ed1935cd9b04140 (diff) | |
download | nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar.gz nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar.bz2 nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar.lz nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar.xz nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.tar.zst nixpkgs-f25b909c6c478b813e577355bb2e328db80461ef.zip |
Merge pull request #178705 from fabaff/bump-angr
python310Packages.angr: 9.2.6 -> 9.2.7
7 files changed, 22 insertions, 14 deletions
diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 01617f7980e..0b6ba901df5 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-SymOCHKIr0SOi4OM+OONA7+A2nV4JMA467OkoqDhZ+M="; + hash = "sha256-zQz8tbxo1Trfeg7zeW/htm+zD4n++guYXUdCHp3cikw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index a6a5aa49953..72481814f9d 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -46,7 +46,7 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-qXzkrfF8FkALkEaFLSmaadovwLc2DkXXJivdrT6srTc="; + hash = "sha256-77RLoSZnzggt8ZWQwRcvMhCYGupF2Kp+u2LFZ9ozXlw="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index 63dce4bdbed..cfd27ae4cbf 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , progressbar , pythonOlder +, pythonRelaxDepsHook , tqdm }: @@ -21,12 +22,20 @@ buildPythonPackage rec { hash = "sha256-qaDAicmYZxLPTl17il61ij01prRv2H4xxe07Xg4KWhI="; }; + nativeBuildInputs = [ + pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ angr progressbar tqdm ]; + pythonRelaxDeps = [ + "angr" + ]; + # 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; diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 348a022d2cc..f87c7863c26 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-yMUcuZ9v1dVbh/t456fpMu8tDFWIdh55LZh7FLkz9GM="; + hash = "sha256-sl5qCH/biH3QBrnfZAQMWd55yKM0PGE/Rx2MscKn4Nk="; }; checkInputs = [ diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 7dccab0b762..efceffd786d 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-mBpAwKUclwvgOeGD6BvPUKZHdjngfvuHdtKY3nx7jzM="; + hash = "sha256-4t1PbxcHxiv8W/M9McaBu7CTLc74gCZ7om3K4fgpFFI="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 25765fc11d3..db926aad32b 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,14 +15,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.6"; + version = "9.2.7"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "v${version}"; - sha256 = "1qlrxfj1n34xvwkac6mbcc7zmixxbp34fj7lkf0fvp7zcz1rpla1"; + hash = "sha256-LpYi5Ty6OBcW0zokCliMDhujJ7tPPl1XdPs5ad1tv5s="; }; in @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-GOrjT5CM+yzboOTgkVriuf1UpNDVhDgGpS8vp4D39W0="; + hash = "sha256-IQLtkS4LNyyEOwInd9A3pHGtj80yXARXcQKA3FonPUE="; }; propagatedBuildInputs = [ @@ -66,7 +66,6 @@ buildPythonPackage rec { "test_ppc_rel24_relocation" "test_ppc_addr16_ha_relocation" "test_ppc_addr16_lo_relocation" - # Binary not found, seems to be missing in the current binaries release "test_plt_full_relro" # Test fails "test_tls_pe_incorrect_tls_data_start" diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index b7bff273b23..8710fea109f 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.6"; + version = "9.2.7"; format = "pyproject"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-I2ZQJ/CDvNq5uJoLT9SHDGzeuI32YUy/6fMSNR9WM8I="; + hash = "sha256-vSVkredOekqUAre38jDCE8f8OXd0cNmZ2SmpEQ7+I28="; }; propagatedBuildInputs = [ |