From 4bd5c723ae2028963b51ed6962c4a8696dd22e33 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:09 +0200 Subject: [PATCH 01/13] python311Packages.archinfo: 9.2.71 -> 9.2.72 Diff: https://github.com/angr/archinfo/compare/refs/tags/v9.2.71...v9.2.72 --- 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 a2ceae590f06..8c2746e5cff7 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.71"; + version = "9.2.72"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-AZMbE+/2uw7mFtBKwwLWCiVwupnB+EkUrgZFkGiKHtM="; + hash = "sha256-QTmp8RV2ggcktQvemG/ykjvxSzn7vjscHJCqHdlbOGM="; }; nativeBuildInputs = [ From 3cc504d1058017a2bbda953ab1589b84b909f1c1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:12 +0200 Subject: [PATCH 02/13] python311Packages.ailment: 9.2.71 -> 9.2.72 Diff: https://github.com/angr/ailment/compare/refs/tags/v9.2.71...v9.2.72 --- 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 76b289d49de5..1589ee392f6b 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.71"; + version = "9.2.72"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-urTztt+e0toD3tY0QwOmUhi6xzOv6NkrTzV8RerySSo="; + hash = "sha256-C984+ZYkU8jzEFCZBU/GbbLLDONDZVE0ZwGZh6UYI2E="; }; nativeBuildInputs = [ From 00945ffc90380cdbdd41f191ea9b39fd63067e44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:16 +0200 Subject: [PATCH 03/13] python311Packages.pyvex: 9.2.71 -> 9.2.72 --- 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 641ce68f9039..39bb88d76c8c 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.71"; + version = "9.2.72"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-AnSd9+r4+Qz3CyIgA3tOXAYJROOvAR3nI/9fSFeYl24="; + hash = "sha256-Bz3opuJRJugfqZY/eEf5Ibe1+FQQAdwe7ic1OvLoAZU="; }; nativeBuildInputs = [ From 3e15ff15ccba4f58efb98d46698254f1adacbf10 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:19 +0200 Subject: [PATCH 04/13] python311Packages.claripy: 9.2.71 -> 9.2.72 Diff: https://github.com/angr/claripy/compare/refs/tags/v9.2.71...v9.2.72 --- 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 a0f5144fab47..824957a5a4ce 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.71"; + version = "9.2.72"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-jdmgtW+oIxx/Xr8EI0z8HIUZ8MYVqaxA0zXJaLZJBJ4="; + hash = "sha256-f1CFVGZ68EjM1StcyVFXB7ee85CF5N9xnfePUGTf8lI="; }; nativeBuildInputs = [ From 1c795b4d26e40851dbd0a9f579b6adc2191d5171 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:23 +0200 Subject: [PATCH 05/13] python311Packages.angr: 9.2.71 -> 9.2.72 Diff: https://github.com/angr/angr/compare/refs/tags/v9.2.71...v9.2.72 --- 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 da7b016d131d..dddb37d5471c 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -32,7 +32,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.71"; + version = "9.2.72"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -41,7 +41,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qdH7lLetLoqXvZw+HmxOyiLzYjdbpeZygqwFYwGRTRQ="; + hash = "sha256-k36RT6E9Ye5F3dmTWS17D2/k3maXOlHhW6ygklolWjY="; }; propagatedBuildInputs = [ From 2140b05e6758c629e8d81a36945ee7e52894c514 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 11 Oct 2023 21:52:28 +0200 Subject: [PATCH 06/13] python311Packages.cle: 9.2.71 -> 9.2.72 Diff: https://github.com/angr/cle/compare/refs/tags/v9.2.71...v9.2.72 --- 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 3596c4751aae..9bc38b5d76f2 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,14 +16,14 @@ let # The binaries are following the argr projects release cycle - version = "9.2.71"; + version = "9.2.72"; # 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-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc7nSuHQ="; + hash = "sha256-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc1nSuHQ="; }; in @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Uc4W4dXZs3HcSvn5fES0y+14KhED21sS5vzi92QC5hI="; + hash = "sha256-Zmontxj0RdFrVh0v2209TSpyoEe3jJsS/WvR6h1HE10="; }; nativeBuildInputs = [ From 96c3d0ed6394d2afc7f9385aad00bd54f4ef4da0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 12:43:08 +0200 Subject: [PATCH 07/13] python311Packages.cle: update binaries for tests --- pkgs/development/python-modules/cle/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 9bc38b5d76f2..0af013c0ae5c 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -23,7 +23,7 @@ let owner = "angr"; repo = "binaries"; rev = "refs/tags/v${version}"; - hash = "sha256-jp0UcfrjSRTbDPkQStvJpZzbMiHosMJVUaUQc1nSuHQ="; + hash = "sha256-AUa3XejHasEattUh3m/BGwyp+qnvSASz+DZsTnlTuns="; }; in From 5338fc8906120dbadb65571df36a9bfa9114ba3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 14:00:58 +0200 Subject: [PATCH 08/13] python311Packages.cle: update disabled --- 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 0af013c0ae5c..65327f9c20fa 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -30,13 +30,13 @@ in buildPythonPackage rec { pname = "cle"; inherit version; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "cle"; rev = "refs/tags/v${version}"; hash = "sha256-Zmontxj0RdFrVh0v2209TSpyoEe3jJsS/WvR6h1HE10="; }; From 8fb2cff428ebe0d6d1cce69c439daf2448b4d364 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 14:01:30 +0200 Subject: [PATCH 09/13] python311Packages.angr: update disabled --- pkgs/development/python-modules/angr/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index dddb37d5471c..0732f18b1bb5 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -33,13 +33,13 @@ buildPythonPackage rec { pname = "angr"; version = "9.2.72"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { - owner = pname; - repo = pname; + owner = "angr"; + repo = "angr"; rev = "refs/tags/v${version}"; hash = "sha256-k36RT6E9Ye5F3dmTWS17D2/k3maXOlHhW6ygklolWjY="; }; From 77fb7cb5f848e42b7eba0897422af98dd0956c32 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 14:02:30 +0200 Subject: [PATCH 10/13] python311Packages.claripy: update disabled --- pkgs/development/python-modules/claripy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index 824957a5a4ce..25ba2b8d198a 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "claripy"; version = "9.2.72"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; - repo = pname; + repo = "claripy"; rev = "refs/tags/v${version}"; hash = "sha256-f1CFVGZ68EjM1StcyVFXB7ee85CF5N9xnfePUGTf8lI="; }; From c92ab33f231406c39f076a70c8aa4ab375b9e717 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 14:02:56 +0200 Subject: [PATCH 11/13] python311Packages.pyvex: update disabled --- 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 39bb88d76c8c..c6c4b7e87687 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -14,9 +14,9 @@ buildPythonPackage rec { pname = "pyvex"; version = "9.2.72"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchPypi { inherit pname version; From 8718efadd1a62432aac9b0177b63a55e86511c7c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Oct 2023 14:27:05 +0200 Subject: [PATCH 12/13] python311Packages.ailment: update disabled --- pkgs/development/python-modules/ailment/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 1589ee392f6b..b50520110cf1 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -9,9 +9,9 @@ buildPythonPackage rec { pname = "ailment"; version = "9.2.72"; - format = "pyproject"; + pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.11"; src = fetchFromGitHub { owner = "angr"; @@ -31,7 +31,9 @@ buildPythonPackage rec { # Tests depend on angr (possibly a circular dependency) doCheck = false; - #pythonImportsCheck = [ "ailment" ]; + pythonImportsCheck = [ + "ailment" + ]; meta = with lib; { description = "The angr Intermediate Language"; From 90c3c8ff8b4c862c63c764c71c2728718f05db72 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 14 Oct 2023 21:57:19 +0200 Subject: [PATCH 13/13] python311Packages.archinfo: add backports-strenum --- pkgs/development/python-modules/archinfo/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index 8c2746e5cff7..69b854298d9e 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -1,4 +1,5 @@ { lib +, backports-strenum , buildPythonPackage , fetchFromGitHub , pytestCheckHook @@ -9,7 +10,7 @@ buildPythonPackage rec { pname = "archinfo"; version = "9.2.72"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -24,6 +25,10 @@ buildPythonPackage rec { setuptools ]; + propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ + backports-strenum + ]; + nativeCheckInputs = [ pytestCheckHook ];