From 3da2cf5201821196f1fa1ebfeb18794b9db80ea0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:32 +0200 Subject: [PATCH 01/12] python311Packages.archinfo: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 2b335fb37160..97ef74e2bcb4 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "angr"; repo = "archinfo"; rev = "refs/tags/v${version}"; - hash = "sha256-X8rMTQvNolYjSPyXbP2i5MYTPEvQlwoUQmXeEW56wQs="; + hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU="; }; build-system = [ From 9c8521432ebbb7e0f19887008c786a29611ac173 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:34 +0200 Subject: [PATCH 02/12] python311Packages.ailment: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index f379322c502c..ac1080abb4f8 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = "ailment"; rev = "refs/tags/v${version}"; - hash = "sha256-R6OBc7qK4zP0t8m26V17he8Oy39eSK8/Dm84ScnBy3s="; + hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY="; }; build-system = [ From 1507840f1f90554c90f9b3ca9929a65000f95e85 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:37 +0200 Subject: [PATCH 03/12] python311Packages.pyvex: 9.2.97 -> 9.2.98 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 659db729aadd..3a166921591b 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; - hash = "sha256-GIBsWtj8nLuzGX/C6Ioe8mSfKg3QXtEJf3+d5h9M02c="; + hash = "sha256-+X4G5jLG7c75XIItNlQLF5YV0XUQwdA6JyF1IGBfiE0="; }; build-system = [ From 91b458ad5ba4e74c963874db62595db0131abb7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:40 +0200 Subject: [PATCH 04/12] python311Packages.claripy: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 5f0cec61b1ed..190a0f5afd3e 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = "claripy"; 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 From 3c9f185697a33acb52b865dd8a82a60fd707a61f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 22:57:43 +0200 Subject: [PATCH 05/12] python311Packages.angr: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 688c988fb2f1..1f7a3d275c38 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.97"; + version = "9.2.98"; pyproject = true; disabled = pythonOlder "3.11"; @@ -45,7 +45,7 @@ buildPythonPackage rec { owner = "angr"; repo = "angr"; rev = "refs/tags/v${version}"; - hash = "sha256-eJkxflAQFI/sEL4JMlMe+kClnaVSxtoOrPg8HQpH78g="; + hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI="; }; pythonRelaxDeps = [ From 7c4922897ec3ec93a9ffdeb05d9751637d164f14 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:01:50 +0200 Subject: [PATCH 06/12] python311Packages.cle: 9.2.97 -> 9.2.98 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.97...v9.2.98 --- pkgs/development/python-modules/cle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 543c14407476..a6dd38f55743 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -17,14 +17,14 @@ let # 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) binaries = fetchFromGitHub { owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-FiPEqfNaAXI+xSWE+So//Uwz9k3bANHQ++nRSPKkddM="; + hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q="; }; in @@ -39,7 +39,7 @@ buildPythonPackage rec { owner = "angr"; repo = "cle"; rev = "refs/tags/v${version}"; - hash = "sha256-tain1I7Td+0v7n+px3mQnz7reKZUbGYDWfKnDhvmU8I="; + hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0="; }; build-system = [ From 8849930598beb4472597c133cd31812f96768a00 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:13:27 +0200 Subject: [PATCH 07/12] python311Packages.ailment: format with nixfmt --- .../python-modules/ailment/default.nix | 25 ++++++++----------- 1 file changed, 10 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index ac1080abb4f8..c01ea491bcd3 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -1,9 +1,10 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pythonOlder -, pyvex -, setuptools +{ + lib, + buildPythonPackage, + fetchFromGitHub, + pythonOlder, + pyvex, + setuptools, }: buildPythonPackage rec { @@ -20,20 +21,14 @@ buildPythonPackage rec { hash = "sha256-ue780bhPpxv7Bnx9PX+HdQt3gcDSvTvK0FLPMopXQRY="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = [ - pyvex - ]; + dependencies = [ pyvex ]; # Tests depend on angr (possibly a circular dependency) doCheck = false; - pythonImportsCheck = [ - "ailment" - ]; + pythonImportsCheck = [ "ailment" ]; meta = with lib; { description = "The angr Intermediate Language"; From 376df0333ec979a2735856e1429c4d2fb01b6b89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:14:20 +0200 Subject: [PATCH 08/12] python311Packages.angr: format with nixfmt --- .../python-modules/angr/default.nix | 77 +++++++++---------- 1 file changed, 37 insertions(+), 40 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index 1f7a3d275c38..5b2d7bd54684 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -1,37 +1,38 @@ -{ lib -, stdenv -, ailment -, archinfo -, buildPythonPackage -, cachetools -, capstone -, cffi -, claripy -, cle -, cppheaderparser -, dpkt -, fetchFromGitHub -, gitpython -, itanium-demangler -, mulpyplexer -, nampa -, networkx -, progressbar2 -, protobuf -, psutil -, pycparser -, pyformlang -, pythonOlder -, pythonRelaxDepsHook -, pyvex -, rich -, rpyc -, setuptools -, sortedcontainers -, sqlalchemy -, sympy -, unicorn -, unique-log-filter +{ + lib, + stdenv, + ailment, + archinfo, + buildPythonPackage, + cachetools, + capstone, + cffi, + claripy, + cle, + cppheaderparser, + dpkt, + fetchFromGitHub, + gitpython, + itanium-demangler, + mulpyplexer, + nampa, + networkx, + progressbar2, + protobuf, + psutil, + pycparser, + pyformlang, + pythonOlder, + pythonRelaxDepsHook, + pyvex, + rich, + rpyc, + setuptools, + sortedcontainers, + sqlalchemy, + sympy, + unicorn, + unique-log-filter, }: buildPythonPackage rec { @@ -48,9 +49,7 @@ buildPythonPackage rec { hash = "sha256-9NLQtwakM041yNY/mb9WbSGC1Q8AHHkiqqjf5bZUOlI="; }; - pythonRelaxDeps = [ - "capstone" - ]; + pythonRelaxDeps = [ "capstone" ]; build-system = [ pythonRelaxDepsHook @@ -88,9 +87,7 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { - AngrDB = [ - sqlalchemy - ]; + AngrDB = [ sqlalchemy ]; }; setupPyBuildFlags = lib.optionals stdenv.isLinux [ From d3606244daa0628b7721b4560f56f4c8917635a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:14:51 +0200 Subject: [PATCH 09/12] python311Packages.archinfo: format with nixfmt --- .../python-modules/archinfo/default.nix | 31 +++++++------------ 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 97ef74e2bcb4..391884310aff 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,10 +1,11 @@ -{ lib -, backports-strenum -, buildPythonPackage -, fetchFromGitHub -, pytestCheckHook -, pythonOlder -, setuptools +{ + lib, + backports-strenum, + buildPythonPackage, + fetchFromGitHub, + pytestCheckHook, + pythonOlder, + setuptools, }: buildPythonPackage rec { @@ -21,21 +22,13 @@ buildPythonPackage rec { hash = "sha256-EdVGm4453XxGrq2D1v5JzSZyroRNzluZ5/r74YAt5zU="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; - dependencies = lib.optionals (pythonOlder "3.11") [ - backports-strenum - ]; + dependencies = lib.optionals (pythonOlder "3.11") [ backports-strenum ]; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "archinfo" - ]; + pythonImportsCheck = [ "archinfo" ]; meta = with lib; { description = "Classes with architecture-specific information"; From d7361d9da92767eb2717767e19fb92edb047301b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:15:47 +0200 Subject: [PATCH 10/12] python311Packages.claripy: format with nixfmt --- .../python-modules/claripy/default.nix | 35 ++++++++----------- 1 file changed, 15 insertions(+), 20 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 190a0f5afd3e..0da9d861642f 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -1,14 +1,15 @@ -{ lib -, buildPythonPackage -, cachetools -, decorator -, fetchFromGitHub -, pysmt -, pytestCheckHook -, pythonOlder -, pythonRelaxDepsHook -, setuptools -, z3-solver +{ + lib, + buildPythonPackage, + cachetools, + decorator, + fetchFromGitHub, + pysmt, + pytestCheckHook, + pythonOlder, + pythonRelaxDepsHook, + setuptools, + z3-solver, }: buildPythonPackage rec { @@ -26,9 +27,7 @@ buildPythonPackage rec { }; # z3 does not provide a dist-info, so python-runtime-deps-check will fail - pythonRemoveDeps = [ - "z3-solver" - ]; + pythonRemoveDeps = [ "z3-solver" ]; build-system = [ pythonRelaxDepsHook @@ -42,13 +41,9 @@ buildPythonPackage rec { z3-solver ] ++ z3-solver.requiredPythonModules; - nativeCheckInputs = [ - pytestCheckHook - ]; + nativeCheckInputs = [ pytestCheckHook ]; - pythonImportsCheck = [ - "claripy" - ]; + pythonImportsCheck = [ "claripy" ]; meta = with lib; { description = "Python abstraction layer for constraint solvers"; From 2dd22d5265225f34af0bff9cc175ff43b2f71806 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:16:32 +0200 Subject: [PATCH 11/12] python311Packages.cle: format with nixfmt --- .../python-modules/cle/default.nix | 40 +++++++++---------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index a6dd38f55743..a2dda712f417 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -1,18 +1,19 @@ -{ lib -, archinfo -, buildPythonPackage -, cffi -, fetchFromGitHub -, minidump -, pefile -, pyelftools -, pynose -, pytestCheckHook -, pythonOlder -, pyvex -, pyxbe -, setuptools -, sortedcontainers +{ + lib, + archinfo, + buildPythonPackage, + cffi, + fetchFromGitHub, + minidump, + pefile, + pyelftools, + pynose, + pytestCheckHook, + pythonOlder, + pyvex, + pyxbe, + setuptools, + sortedcontainers, }: let @@ -26,7 +27,6 @@ let rev = "refs/tags/v${version}"; hash = "sha256-hnYMAgEnDHXg1jUrzhLWuun+Gv+2xnd4Da6OC9IGa2Q="; }; - in buildPythonPackage rec { pname = "cle"; @@ -42,9 +42,7 @@ buildPythonPackage rec { hash = "sha256-6gJKhyjKBgtSwGk5lqkaQVxe0ZC5WHVIYQMeREfz9A0="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ archinfo @@ -82,9 +80,7 @@ buildPythonPackage rec { "test_remote_file_map" ]; - pythonImportsCheck = [ - "cle" - ]; + pythonImportsCheck = [ "cle" ]; meta = with lib; { description = "Python loader for many binary formats"; From d037ae232e2b79745dd3ce5f1bcb3c2c69de2620 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 9 Apr 2024 23:17:11 +0200 Subject: [PATCH 12/12] python311Packages.angrop: format with nixfmt --- .../python-modules/angrop/default.nix | 25 ++++++++----------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index b491ef83fe5f..939517887e40 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -1,11 +1,12 @@ -{ lib -, angr -, buildPythonPackage -, fetchFromGitHub -, progressbar -, pythonOlder -, setuptools -, tqdm +{ + lib, + angr, + buildPythonPackage, + fetchFromGitHub, + progressbar, + pythonOlder, + setuptools, + tqdm, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-T07Y23UDp9eL2DK5gakV8kPNGsXf+4EofZJDSW/JS1Q="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ angr @@ -36,9 +35,7 @@ buildPythonPackage rec { # 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";