From f101bc6a93a09e239422141f8db97c44dc6409df Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:28 +0200 Subject: [PATCH 1/8] python3Packages.archinfo: 9.0.6885 -> 9.0.7491 --- 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 3a5db77cd476..47d3374bae81 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.6885"; + version = "9.0.7491"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j0Hxao04ctcV8xCjQjzyQEM4Y3VCFRPuEc9NIhDRut0="; + sha256 = "sha256-5mKXpvMhdcIKgvQkmj//YigvsgozZofvv6CvMdW3BHo="; }; checkInputs = [ From 91d18ea9236a39bff185940bf10ebfe76b03b750 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:31 +0200 Subject: [PATCH 2/8] python3Packages.ailment: 9.0.6885 -> 9.0.7491 --- 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 514194407929..fcc51360d0e4 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-AtaAVfMCIzStgwwPEt+6tAzjgpSK+KhhMksYK4BH9V0="; + sha256 = "sha256-rxrj+5cz6zNsc+zgrOp8+/XY/RZG93PJQU59mMy5lDA="; }; propagatedBuildInputs = [ pyvex ]; From 30b87fde6561cc1be61966f34f946832ad6ec57c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:34 +0200 Subject: [PATCH 3/8] python3Packages.pyvex: 9.0.6885 -> 9.0.7491 --- 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 618dfef4171c..de883fd3d898 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.6885"; + version = "9.0.7491"; src = fetchPypi { inherit pname version; - sha256 = "sha256-cWQdrGKJyGieBow3TiMj/uB2crIF32Kvl5tVUKg/z+E="; + sha256 = "sha256-tKfOkW1mLa4gCweF5bGVwnS7E+dRdc/PiuOfT7AgKNo="; }; propagatedBuildInputs = [ From 22736c8f684b36fcecfb25a54d0358b704f91a95 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:37 +0200 Subject: [PATCH 4/8] python3Packages.claripy: 9.0.6885 -> 9.0.7491 --- 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 4d8a79a8c991..6a301a780636 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UCO6kXI4W/fCFgevXaRrGMjMH3ZhG7dXmFi+pemX9sE="; + sha256 = "sha256-M6Irec8p4l2WNrVeqUob3m2xF3JMtdp7I+LSi0iArZk="; }; # Use upstream z3 implementation From bbd8c0f9f8f2b6e475a7861656895bebe4c19b10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:40 +0200 Subject: [PATCH 5/8] python3Packages.cle: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 51d0c263d302..30193032ff49 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.6885"; + version = "9.0.7491"; # 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-ubBs55ZIGssAwD+3YsZYzDA7/dwQ+UD9GtWPDGQrO80="; + sha256 = "sha256-P126IcUpq7b8u74YJFBXluGIIru+UOCnmHYmJBiK9Pc="; }; propagatedBuildInputs = [ From 421b5d89675e9e675b0e3a540c668cc867c4478f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 20 May 2021 23:21:43 +0200 Subject: [PATCH 6/8] python3Packages.angr: 9.0.6885 -> 9.0.7491 --- 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 5f545c96c9c0..0c7c68a55182 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -42,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-+d1CtouaGv2GussG3QlQMzX0qcmJht9V3QW8RwH6da8="; + sha256 = "sha256-d0EWPko3jWCexFNCWbofD6CjDIpjKb5mha2tRgtzL4M="; }; propagatedBuildInputs = [ From 1274ba1572f74a5c97b3ead0e88d3d30f0a5be09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 01:11:10 +0200 Subject: [PATCH 7/8] python3packages.pysmt: 0.9.0 -> 0.9.1.dev132 --- .../python-modules/pysmt/default.nix | 25 +++++++------------ 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/pysmt/default.nix b/pkgs/development/python-modules/pysmt/default.nix index ce5b6b8673a0..4adb96bf2341 100644 --- a/pkgs/development/python-modules/pysmt/default.nix +++ b/pkgs/development/python-modules/pysmt/default.nix @@ -1,28 +1,21 @@ { lib , buildPythonPackage -, fetchFromGitHub -, nose -, pytestCheckHook -, six +, fetchPypi }: buildPythonPackage rec { pname = "pysmt"; - version = "0.9.0"; + version = "0.9.1.dev132"; + format = "wheel"; # dev versions are only distributed as wheels - src = fetchFromGitHub { - owner = pname; - repo = pname; - rev = "v${version}"; - sha256 = "051j36kpz11ik9bhvp5jgxzc3h7f18i1pf5ssdhjwyabr0n0zra3"; + src = fetchPypi { + pname = "PySMT"; + inherit format version; + sha256 = "01iqs7yzms3alf1rdv0gnsnmfp7g8plkjcdqbari258zp4llf6x7"; }; - propagatedBuildInputs = [ six ]; - - checkInputs = [ - nose - pytestCheckHook - ]; + # No tests present, only GitHub release which is 0.9.0 + doCheck = false; pythonImportsCheck = [ "pysmt" ]; From 4c8e68bc07cfebe1f96b86ab25a2cdd55704779d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 24 May 2021 01:12:09 +0200 Subject: [PATCH 8/8] python3Packages.angrop: 9.0.6885 -> 9.0.7491 --- pkgs/development/python-modules/angrop/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angrop/default.nix b/pkgs/development/python-modules/angrop/default.nix index d1c80772bc3b..b9774b929549 100644 --- a/pkgs/development/python-modules/angrop/default.nix +++ b/pkgs/development/python-modules/angrop/default.nix @@ -4,25 +4,34 @@ , fetchFromGitHub , progressbar , pythonOlder +, tqdm }: buildPythonPackage rec { pname = "angrop"; - version = "9.0.6885"; + version = "9.0.7491"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-B/1BO0MnqklMbyXqdBPA2Dfhr4pMjIIrzXmTzr81OdY="; + sha256 = "sha256-UWqHNgJ8vUbLK3n9tvwOgHyOyTXsqRJKaAPWQfqi3lo="; }; propagatedBuildInputs = [ angr progressbar + tqdm ]; + postPatch = '' + # https://github.com/angr/angrop/issues/35 + substituteInPlace setup.py \ + --replace "packages=['angrop']," "packages=find_packages()," \ + --replace "from distutils.core import setup" "from setuptools import find_packages, setup" + ''; + # 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;