From 060f432327551dbe4063a14cdbb7ca1d0bc2b3da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 21:46:10 +0200 Subject: [PATCH 1/6] python3Packages.archinfo: 9.0.6281 -> 9.0.6790 --- 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 ec1db2e33dcb..fc83073a3a24 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.6281"; + version = "9.0.6790"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ZO2P53RdR3cYhDbtrdGJnadFZgKkBdDi5gR/CB7YTpI="; + sha256 = "sha256-A4WvRElahRv/XmlmS4WexMqm8FIZ1SSUnbdoAWWECMk="; }; checkInputs = [ From d3346f5b7f44e493453edb3a3b4353e05e2ef3c0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 21:46:12 +0200 Subject: [PATCH 2/6] python3Packages.ailment: 9.0.6281 -> 9.0.6790 --- 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 a34fa36734df..121182083d35 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.6281"; + version = "9.0.6790"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-IFUGtTO+DY8FIxLgvmwM/y/RQr42T9sABPpnJMILkqg="; + sha256 = "sha256-RcLa18JqQ7c8u+fhyNHmJEXt/Lg73JDAImtUtiaZbTw="; }; propagatedBuildInputs = [ pyvex ]; From cc8ecf263f477df610716b01b6c24c428392ca7d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 21:46:16 +0200 Subject: [PATCH 3/6] python3Packages.claripy: 9.0.6281 -> 9.0.6790 --- 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 39413d0f9c72..9f077df96f05 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.6281"; + version = "9.0.6790"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gvo8I6LQRAEUa7QiV5Sugrt+e2SmGkkKfsGn/IKz+Mk="; + sha256 = "sha256-GpWHj3bNgr7nQoIKM4VQtVkbObxqw6QkuEmfmPEiJmE="; }; # Use upstream z3 implementation From 4f737c080be54a000a9181f6b26bfcaf600e189e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 22:15:56 +0200 Subject: [PATCH 4/6] python3Packages.cle: 9.0.6281 -> 9.0.6790 --- pkgs/development/python-modules/cle/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 436a364b2b5a..feaab56600f1 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.6281"; + version = "9.0.6790"; # 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 = "0f2zc02dljmgp6ny6ja6917j08kqhwckncan860dq4xv93g61rmg"; + sha256 = "sha256-zQggVRdc8fV1ulFnOlzYLvSOSOP3+dY8j+6lo+pXSkM="; }; propagatedBuildInputs = [ @@ -64,6 +64,8 @@ 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" ]; pythonImportsCheck = [ "cle" ]; From 6c28f4a26bbccd0749c85c188901c16c7473ee28 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 19 Apr 2021 22:45:17 +0200 Subject: [PATCH 5/6] python3Packages.angr: 9.0.6281 -> 9.0.6790 --- pkgs/development/python-modules/angr/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index ba0b3b68be26..1875c1deea06 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -18,7 +18,6 @@ , protobuf , psutil , pycparser -, pkgs , pythonOlder , pyvex , sqlalchemy @@ -43,14 +42,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.6281"; + version = "9.0.6790"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "10i4qdk8f342gzxiwy0pjdc35lc4q5ab7l5q420ca61cgdvxkk4r"; + sha256 = "sha256-PRghK/BdgxGpPuinkGr+rREza1pQXz2gxnXiSmxBSTc="; }; propagatedBuildInputs = [ From 2440917f0fcc16bd7a6f09a88fefefc8c9dd2c06 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 22 Apr 2021 00:47:23 +0200 Subject: [PATCH 6/6] python3Packages.pyvex: 9.0.6281 -> 9.0.6790 --- pkgs/development/python-modules/pyvex/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 75637acc3951..566cd79b01c1 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.6281"; + version = "9.0.6790"; src = fetchPypi { inherit pname version; - sha256 = "sha256-E8BYCzV71qVNRzWCCI2yTVU88JVMA08eqnIO8OtbNlM="; + sha256 = "sha256-bqOLHGlLQ12nYzbv9H9nJ0/Q5APJb/9B82YtHk3IvYQ="; }; propagatedBuildInputs = [ @@ -26,9 +26,8 @@ buildPythonPackage rec { pycparser ]; - postPatch = '' - substituteInPlace pyvex_c/Makefile \ - --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" + preBuild = '' + export CC=${stdenv.cc.targetPrefix}cc ''; # No tests are available on PyPI, GitHub release has tests