From 32a48c3038842612c6c76fbf8c10c21c74ab3f9c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:29:41 +0100 Subject: [PATCH 1/7] python310Packages.archinfo: 9.2.32 -> 9.2.33 --- 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 bc1b290a1f26..1ef304b1bf17 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-LChk65iM238jB1jwgEis5Wfz8YGmb9UCOdmQcU+3bFA="; + hash = "sha256-6y5GkoC/U2tNHnKxLPyDxrf3zZkDNPbje0RQRkaKDuY="; }; nativeBuildInputs = [ From ee8cafa8fbca5b7ca6dba906e82db73a16155f0a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:29:46 +0100 Subject: [PATCH 2/7] python310Packages.ailment: 9.2.32 -> 9.2.33 --- 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 00b2df625637..241f46b0d682 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.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-JHKF1uTzAzYrVx1iOtOjJYFbnvFeTzUjTmm24leHIMs="; + hash = "sha256-PngFhzeBm3lm69KKjcj4NvFb1DVspdkQaiVSg0FZnV4="; }; nativeBuildInputs = [ From d71629096b80c91b04e6d5c0a25a9c6d7a24c7c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:29:53 +0100 Subject: [PATCH 3/7] python310Packages.pyvex: 9.2.32 -> 9.2.33 --- 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 12cfd4e71779..356105590204 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-5ZCFAEHcM+3yH9pFyrduG8Uo1Ofr4JkvcXjJEi5KRMc="; + hash = "sha256-RDCNoP3B1+kyyEBszAbAm9G+G+4LE3ceojB5uQup7Ng="; }; nativeBuildInputs = [ From d5dc370ff217617add282c194b3861e3ea41a129 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:29:57 +0100 Subject: [PATCH 4/7] python310Packages.claripy: 9.2.32 -> 9.2.33 --- 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 9c7bb0898d86..48dad49a58dc 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-Cf56Q2ZqBq3uoCGqG5pYxA6ANP8VLC6pAMZIL5ubq30="; + hash = "sha256-ItWL2DGoMkOMOMsTTfal8W9DZCmXMuZs0cZbYESlFU4="; }; nativeBuildInputs = [ From ff64d349b6cc0935c4a397543b0d6ca8dc931ddb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:30:03 +0100 Subject: [PATCH 5/7] python310Packages.cle: 9.2.32 -> 9.2.33 --- 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 3e876db6d66a..aa713ed4a768 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.32"; + version = "9.2.33"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-KYWhwL3DAa/2Hb4I1NfYWA5gXrwEeMpDpAWCWGLqFeE="; + hash = "sha256-Abh6kSHnTtz/pz5xPJeg0UZcRQDah4D0tlsLnkyI2lE="; }; nativeBuildInputs = [ From 56f69696546ac65d19572271e2b87b4a32a2631c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 21:30:09 +0100 Subject: [PATCH 6/7] python310Packages.angr: 9.2.32 -> 9.2.33 --- 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 0646d10a1373..d56a99685cd1 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.32"; + version = "9.2.33"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-nyFEyOo4qtkyjAmkOV0JEOKAKWJKwjRrywKqP2yoJ54="; + hash = "sha256-Uq/weFiqbfGLqYlu5hH/l++YglqCGpL2NtNccI3gOqQ="; }; propagatedBuildInputs = [ From 39a0eed453314e1687db79cd0d0dc2ecbd872525 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 10 Jan 2023 22:30:39 +0100 Subject: [PATCH 7/7] python310Packages.claripy: adjust inputs --- pkgs/development/python-modules/claripy/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 48dad49a58dc..8e508bbe8b64 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -5,11 +5,9 @@ , decorator , fetchFromGitHub , future -, nose , pysmt , pythonOlder , pytestCheckHook -, six , z3 }: @@ -23,7 +21,7 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "angr"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-ItWL2DGoMkOMOMsTTfal8W9DZCmXMuZs0cZbYESlFU4="; }; @@ -40,15 +38,13 @@ buildPythonPackage rec { ]; checkInputs = [ - nose pytestCheckHook - six ]; postPatch = '' # Use upstream z3 implementation substituteInPlace setup.cfg \ - --replace "z3-solver == 4.10.2.0" "" + --replace "z3-solver==4.10.2.0" "" ''; pythonImportsCheck = [