From patchwork Fri Sep 27 18:34:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31521 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7F61F27BBEA; Fri, 27 Sep 2024 19:37:36 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4492E27BBE2 for ; Fri, 27 Sep 2024 19:37:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpd-00058z-SX; Fri, 27 Sep 2024 14:36:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpU-0004Z7-HN for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:37 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpS-0001tD-UD; Fri, 27 Sep 2024 14:36:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:In-Reply-To:References:Subject; bh=u23gmzYxV4oWxkfPycAPyiKr0A2Arplm7ADM/T8OllQ=; b=IdDY/0uuiRV8aihRY368je5ZbTAy53a8a4qB8xADtmUtIuhoXhJOcadWCurfNiZ9EnrxEVj5dn7WWxkVnmC7cNGi6Yv+unX+fkJzYcE8qYkIjSTNQeqQIPcEMZgm8xFptTToECk3mbD9AfbHF9OkdJCzeXMxmECr92pkNq1RSfgJ9C7bLHYIWO4uXTH2T0ciTQ80m2XOnYJIfa1j2uheZLzEhMjtGVqWH4MNKrLueYSd9Q5Gh9VYkAyKz72gvv2J3GwzHjV3JjmYiM8BK08Prd/xPAfmoaZtjItLVh9HbK7RacVpoF4GanZ6KWF3Ao7ccQpro8IRhw0s3Qt1wWgUmw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpu-0007Zy-3b; Fri, 27 Sep 2024 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 01/10] gnu: python-ailment: Update to 9.2.112. References: In-Reply-To: Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746216428887 (code B ref 72393); Fri, 27 Sep 2024 18:37:02 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:04 +0000 Received: from localhost ([127.0.0.1]:47126 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFow-0007Vg-WF for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:04 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFou-0007VD-Sv; Fri, 27 Sep 2024 14:36:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=u23gmzYx V4oWxkfPycAPyiKr0A2Arplm7ADM/T8OllQ=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=On6IXkmwM8CoW4sHjLTvQFEd+LAAQXfUPU3O8CRgjKkNRyJ 5o83MEb+NraAki9Ny2z2U5kgp/0mAJwEqVAhOD++ebAyRl/DRKej6TJ++WijLRyHij71fg q+6V3oXThpJj9luHYoyYPjabnUmhu3Bx1wkCMPeH9M1KULRAzBMfF8= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 79403030 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:26 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:54 +0200 Message-ID: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-ailment): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) base-commit: 9a141b5bd633227ea31776b9ce7ca40928de2442 diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 22351e813a..45fcaa63f4 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34059,13 +34059,13 @@ (define-public python-ailment (package (name "python-ailment") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "ailment" version)) (sha256 - (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (base32 "1rv8rwvdm7fc9mf8z5hqb54dsj0n7jlnwghd12ll0b2jmh2ix8mn")))) (build-system pyproject-build-system) (arguments `(#:phases (modify-phases %standard-phases From patchwork Fri Sep 27 18:34:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31520 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 67C7027BBE2; Fri, 27 Sep 2024 19:37:34 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4EBE027BBEA for ; Fri, 27 Sep 2024 19:37:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpm-0005cG-Dd; Fri, 27 Sep 2024 14:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpa-0004vq-4j for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpZ-0001uA-RU; Fri, 27 Sep 2024 14:36:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=g2lAWOMvHeOEKkVpPNLpqtZqsnzQdls5U5wK8MLq0HU=; b=IlwQaB5nrLoh2LZ9K1/qE/QeTJs4OyJsP3Aq8o2hE7Tmwz9paO4q6/IvnjgghHR1p391swcvuIRIvMXKBrl2G2aedTStRw3pMi/X4M/cYP1yzVptkxolR+pqQ1pItEn5xrg0uEQz1ufjx6zYrVinxyyaK2eUi8y+fxLOEoYAarxqyhbPANxdfWAyC8/cETV+JkbBhLveoJdppXrygle4E5fzgKhSS5dv4f/rn0lzj4WDRla/wv7b4uyGqezBTZh7PIEyQX+iNUUqtus62l3brp6rypbRGDZ2Fwkpb8FRh0owSXx3hnF4j81hX4rtzp6juAVdpIPBNsHOv7WgEp7o1A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpu-0007a6-Im; Fri, 27 Sep 2024 14:37:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 02/10] gnu: python-pyvex: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217028948 (code B ref 72393); Fri, 27 Sep 2024 18:37:02 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:10 +0000 Received: from localhost ([127.0.0.1]:47141 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp3-0007Wg-44 for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:10 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFow-0007VD-1L; Fri, 27 Sep 2024 14:36:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=g2lAWOMv HeOEKkVpPNLpqtZqsnzQdls5U5wK8MLq0HU=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=OQzcl/kt0+pp7SgReSQlOJ0gy/P zG3c6lmdP5DZWPvMhaLLwOKCQ0e/wIamBPfGRHJOwryIGfQRaeODjczY5hrBzw1F4Erb3v vaNjZsG+hD8mAYigyWoDwVSIEgG0AZPDOQ/7QvrNUzOhgfXWPj6LHQ0ug8qvu+9hlhc/Ji 3u9U= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 65c3c681 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:27 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:55 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-pyvex): Update to 9.2.112. * gnu/packages/patches/python-pyvex-remove-angr-dependency.patch: Remove patch (merged upstream and included in new release). --- gnu/local.mk | 1 - .../python-pyvex-remove-angr-dependency.patch | 80 ------------------- gnu/packages/python-xyz.scm | 5 +- 3 files changed, 2 insertions(+), 84 deletions(-) delete mode 100644 gnu/packages/patches/python-pyvex-remove-angr-dependency.patch diff --git a/gnu/local.mk b/gnu/local.mk index c2027f9eeb..669a65dfd6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2039,7 +2039,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ %D%/packages/patches/python-pytorch-without-kineto.patch \ - %D%/packages/patches/python-pyvex-remove-angr-dependency.patch \ %D%/packages/patches/python-robotframework-atest.patch \ %D%/packages/patches/python-robotframework-source-date-epoch.patch \ %D%/packages/patches/python-robotframework-sshlibrary-rf5-compat.patch \ diff --git a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch deleted file mode 100644 index dccf22bbc6..0000000000 --- a/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch +++ /dev/null @@ -1,80 +0,0 @@ -This patch removes the angr dependency from the pyvex these, thus -resolving a circular dependency (as angr depends on pyvex). This -patch has been taken from upstream. - -This patch is a squashed version of the following upstream patches: - -* https://github.com/angr/pyvex/commit/61fb26f223a8d8a276b702d2448a12e02c5c9c6b -* https://github.com/angr/pyvex/commit/a1fb2a4d0826b0e43bd8bbdd00b6db032643ec95 - -diff --git a/tests/test_spotter.py b/tests/test_spotter.py -index 9271ccd..bed7dd4 100644 ---- a/tests/test_spotter.py -+++ b/tests/test_spotter.py -@@ -1,6 +1,5 @@ - import os - --import angr - import archinfo - - import pyvex -@@ -98,53 +97,28 @@ class CortexSpotter(GymratLifter): - register(CortexSpotter, "ARMEL") - - --def test_full_binary(): -- p = angr.Project( -- os.path.join(test_location, "armel", "RTOSDemo.axf.issue_685"), -- arch="ARMEL", -- auto_load_libs=False, -- ) -- st = p.factory.call_state(0x000013CE + 1) -- b = st.block().vex -- simgr = p.factory.simulation_manager(st) -- simgr.step() -- assert b.jumpkind == "Ijk_Sys_syscall" -- assert simgr.active[0].regs.ip_at_syscall.args[0] == 0x13FB -- -- - def test_tmrs(): -- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) -- p = angr.Project( -- os.path.join(test_location, "armel", "helloworld"), -- arch="ARMEL", -- auto_load_libs=False, -- ) -+ arch = archinfo.arch_from_id("ARMEL") - ins = b"\xef\xf3\x08\x82" -- b = pyvex.block.IRSB(ins, 1, p.arch) -+ b = pyvex.block.IRSB(ins, 1, arch) - assert b.jumpkind == "Ijk_Boring" - assert type(b.statements[1].data) == pyvex.expr.Get -- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "sp" -+ assert arch.register_names.get(b.statements[1].data.offset, "") == "sp" - assert type(b.statements[2]) == pyvex.stmt.Put - - - def test_tmsr(): -- test_location = str(os.path.join(os.path.dirname(os.path.realpath(__file__)), "../../binaries/tests")) -- p = angr.Project( -- os.path.join(test_location, "armel", "helloworld"), -- arch="ARMEL", -- auto_load_libs=False, -- ) -+ arch = archinfo.arch_from_id("ARMEL") - inss = b"\x82\xf3\x08\x88" -- b = pyvex.block.IRSB(inss, 1, p.arch, opt_level=3) -+ b = pyvex.block.IRSB(inss, 1, arch, opt_level=3) - assert b.jumpkind == "Ijk_Boring" - assert type(b.statements[1].data) == pyvex.expr.Get -- assert p.arch.register_names.get(b.statements[1].data.offset, "") == "r2" -+ assert arch.register_names.get(b.statements[1].data.offset, "") == "r2" - assert type(b.statements[2]) == pyvex.stmt.Put - - - if __name__ == "__main__": - test_basic() - test_embedded() -- test_full_binary() - test_tmrs() - test_tmsr() diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 45fcaa63f4..3cf0701e06 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34113,14 +34113,13 @@ (define-public python-pyvex (package (name "python-pyvex") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) - (patches (search-patches "python-pyvex-remove-angr-dependency.patch")) (uri (pypi-uri "pyvex" version)) (sha256 - (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka")))) + (base32 "0z1jiflp7h07mfc26am3v7v5z2n6mw9hkfylbs86qgpm93qcf6i3")))) (build-system pyproject-build-system) (arguments (list From patchwork Fri Sep 27 18:34:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31515 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 159C527BBEA; Fri, 27 Sep 2024 19:37:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D0D1927BBE2 for ; Fri, 27 Sep 2024 19:37:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpm-0005Z9-5C; Fri, 27 Sep 2024 14:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpU-0004Y9-9k for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpS-0001tA-La for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=BnIGZFB05W3zBkkSUR1H7oOV5arzmSpgWilsXnEuVbw=; b=p/938FHNwm47S/05W+fW3MyqIQ7f/cIztTHViv7EJfYhoQjyYa9/7wd2FSE4haMvQQOmLaWMrT4WNCg2qeN8r9Dn7ukH9LVbbaYxEYdyfVC8UnL6EBW1CjLLFHoE3BKedqktjbTaBTuLuMHkRl9TopulptDbTcrebiIwd/+Fk+SQ02smuZcWhWOT5+kJB9makr9hEPo7HjZ6zWhM+QMAhFyGU2TGuRXOufIAcFJ/mNaLUTOxdT+7W7XF6fNKp/mg/D6mDtIYqZzO42ntsYArPS4yIUdU8/1EEQ71aQ1JaUOFo7znFbBGLSEEeIa8hwyK1qCCcKDuGngYIlljjwHJWA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpv-0007aC-2f for guix-patches@gnu.org; Fri, 27 Sep 2024 14:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 03/10] gnu: Add python-backports-strenum. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217028959 (code B ref 72393); Fri, 27 Sep 2024 18:37:03 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:10 +0000 Received: from localhost ([127.0.0.1]:47143 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp4-0007Wr-78 for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:10 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFox-0007VD-Jc; Fri, 27 Sep 2024 14:36:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=BnIGZFB0 5W3zBkkSUR1H7oOV5arzmSpgWilsXnEuVbw=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=nUkEOuh/C9pTMXnFkBKN/lvo2VJ WCUridnkf+NukoSPU84zQxfHtVwNeItwOIkx/A1oNWUoM4Oe3ZTEispdQpasTgtthc9NnT oFYqHNN9mzFY8q4Vh3q/nvV3m7aUP5ulnw8fqRQ/duJovyH2U/y07lTN//z8co33nHEi8p UCfI= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 24cff974 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:28 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:56 +0200 Message-ID: <5e3a845ca12ba21d14e3d687bf148ee5b62d85da.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-backports-strenum): New variable. --- gnu/packages/emulators.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 4dc61bdbff..25391ffaaf 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -96,6 +96,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages qt) #:use-module (gnu packages sdl) #:use-module (gnu packages sphinx) @@ -2649,6 +2650,30 @@ (define-public python-keystone-engine assembly for these architectures.") (license license:gpl2))) +;; can be removed once Guix upgrades to Python 3.11. +(define-public python-backports-strenum + (package + (name "python-backports-strenum") + (version "1.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "backports_strenum" version)) + (sha256 + (base32 "0514yj1391k6pbs2cch6i57hidwb3236wngh2ivlk6186h3j9ibp")))) + (native-inputs (list python-poetry-core)) + (build-system pyproject-build-system) + ;; TODO: Running tests requires a new version of poetry in Guix. + (arguments + (list + #:tests? #f)) + (home-page "https://github.com/clbarnes/backports.strenum") + (synopsis "Backport of additions to the 'strenum' module") + (description + "Provides a backport of Python's @code{StrEnum} class which was introduced in +Python 3.11 for Python >=3.8.6.") + (license license:expat))) + (define-public python-archinfo (package (name "python-archinfo") From patchwork Fri Sep 27 18:34:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31513 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A67A427BBEC; Fri, 27 Sep 2024 19:36:55 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id AB43627BBEA for ; Fri, 27 Sep 2024 19:36:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpc-0004pi-Cb; Fri, 27 Sep 2024 14:36:45 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpU-0004Yl-Ef for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:36 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpS-0001tC-Nd for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:35 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=k/AJoGJu1TqIQ6rQJmOyHE7LJ6DETVwXjNXatiqJgwA=; b=SOGz0dRP8TQlX+Rs6dEklsr89SCt56pj9b/67Gc98XVM+uz+hs3WDntnzYV95s04nffKLUJdAtjN/7PQ5yPUd0fuTlpG2Fx+8yS8c07bWpV/WjBPvoL/qu+Yml/DMPZHa4baKArFHKat9nHQh9CzR2BFVOP+cpljgQ6XdMHazwoLuJG3b6LwqDEIsobl/jBNmT4yET1GhUytZFxBIOmw9cJ7y+0hNdSapiZIGvvKliUrqAeMj5DtbMcATs2BLB1UF7SMYuWSZXLWpQ6utOA+Wf9N7+/Kxhk5GuCJ5yV5dF9fZUv+azRP0mY4JU4EKtMRQVQfVUF+BHW3duWMJtOB0w==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpv-0007aK-Ho for guix-patches@gnu.org; Fri, 27 Sep 2024 14:37:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 04/10] gnu: python-archinfo: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217128968 (code B ref 72393); Fri, 27 Sep 2024 18:37:03 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47145 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp4-0007X7-Q6 for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFoz-0007VD-2V; Fri, 27 Sep 2024 14:36:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=k/AJoGJu 1TqIQ6rQJmOyHE7LJ6DETVwXjNXatiqJgwA=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=BCmGe7QYfjoKIsfLejUWccbdlxz E4v9mtpsmvp4VZfmqZRTwLX7D1CoxLkX8m58EwG2lCA4MUI2WoMpGGiPLdkmj8gDIWS5xU 6Cr/n1LC+gaWnMaAOO1q3vjBAtdwN6WK+yOGAm7E5FtJf6Fix2wPdXeHSTZMOpU/WRL1EP xuLE= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 4ab4a522 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:28 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:57 +0200 Message-ID: <802a649a9d0832604fbe0c6b14dd63219de4cdb8.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/emulators.scm (python-archinfo): Update to 9.2.112. [propagated-inputs]: Add python-backports-strenum. --- gnu/packages/emulators.scm | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 25391ffaaf..0e5b6e6fd5 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2678,17 +2678,26 @@ (define-public python-archinfo (package (name "python-archinfo") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "archinfo" version)) (sha256 - (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (base32 "011n9vrrsbqbnw2i38ls7f0xkd85kxcnn14fm4lhxjpi91p7hshb")))) (build-system pyproject-build-system) - (propagated-inputs (list python-capstone python-keystone-engine)) + (propagated-inputs + (list + python-backports-strenum + python-capstone + python-keystone-engine)) (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda _ + (substitute* "setup.cfg" + (("backports.strenum") + "backports_strenum")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? From patchwork Fri Sep 27 18:34:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31516 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 24A3727BBE9; Fri, 27 Sep 2024 19:37:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A45EF27BBE2 for ; Fri, 27 Sep 2024 19:37:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpe-0005D5-GC; Fri, 27 Sep 2024 14:36:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpY-0004nm-5n for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpX-0001ti-La; Fri, 27 Sep 2024 14:36:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gA7SjaDdNOjUmGkWecF1i/AwBqr08XAQbyWtYj0aM9U=; b=V4WoXwfDwjg3Uf8cgtOxheFkmxvchhueBRJ/ZoUVwhHVi9kAmq2bXT0n0vY3BQTvZAg+yxxHeoF1ngIqlfzk9k3ceBA727CWrViOU33kseYJd2Q6W/nDJ2SvP97WOykXFxIPhjJjzI7s0cHB0wpfCZG0vM719fwGTrg4QtRVQ9bM/HBY8dzUZDztMwnzceuTMqMGkGu8PwFnqR7GJYoUpPI89Bi6wNmZQ29fG0YHWHfgMXRyWe3A0OTLp5xHGwJko/sbCS+qiBUZYadwruORs0xGICY3FkuABWjviQ9BxZoRhgdqtBYQPu13jnwXQqL3G9CeHgNeGMKz63Zmr208uA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpw-0007ai-Ey; Fri, 27 Sep 2024 14:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 05/10] gnu: Add python-cart. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217128982 (code B ref 72393); Fri, 27 Sep 2024 18:37:04 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47149 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XI-DV for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp0-0007VD-1x; Fri, 27 Sep 2024 14:36:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=gA7SjaDd NOjUmGkWecF1i/AwBqr08XAQbyWtYj0aM9U=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=amADfySLuRMWOyz6SoWgUAxZo02 AMmMkf1cOWOr/1mri9UlT5cUQ0DuN0drjhg1CylZx2RwCToSKe7soRktWopQBRV3d6pd4x oAloaSemGvGbk0b+JNPvU1HHNOG1PXvyd9qztAFjLgUQ+h1ABvxdUFfwQq8V+Pnmt8pAIs bfAM= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 6f07f599 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:29 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:58 +0200 Message-ID: <1096050e874a9fe9eb85bd97f03ab4d65a320465.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-cart): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 3cf0701e06..545ef0659f 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34055,6 +34055,36 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-cart + (package + (name "python-cart") + (version "1.2.2") + (source + (origin + ;; No source releases available on pypi, hence fetching from GitHub. + (method git-fetch) + (uri (git-reference + (url "https://github.com/CybercentreCanada/cart") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1zycv620iljrsval5rai1wsn0hr25ddx9xhjsyy6xxrgprfxvlfi")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "-m" "unittest" "discover"))))))) + (propagated-inputs (list python-pycryptodome)) + (home-page "https://github.com/CybercentreCanada/cart") + (synopsis "Library for interacting with the CaRT file format") + (description + "This Python library implements the CaRT file format which is commonly +used to store and transmit information about computer malware and associated +metadata.") + (license license:bsd-2))) + (define-public python-ailment (package (name "python-ailment") From patchwork Fri Sep 27 18:34:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31519 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D774127BBEC; Fri, 27 Sep 2024 19:37:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 61E9F27BBE2 for ; Fri, 27 Sep 2024 19:37:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFph-0005J0-Kc; Fri, 27 Sep 2024 14:36:49 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpa-0004wQ-96 for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:44 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpZ-0001uC-Ve; Fri, 27 Sep 2024 14:36:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OTsYUg3J+8lebvcT3w1rQ69lh7BxKjuqlQV7vN8XawI=; b=Iu8ktXeFlHMcU8BX+ps/a6K58h4DRP1iH+ElHMH5jDItSP9veU3OmOAJOYpWcObYfO6bRk1PcP+nzr9JvRHftKGw26H0nBBitgRorBf2Bf9JPIHal9bfJNsP0J44aCOvueLwse7NihtBnNHYvrbijxr/XmJl7ux2/0uav3GKBOsEVfCsssv+SIQxyxpyEHrtMzpCbJ83B18UBLUgZ5PPZ9F55tO7EXxyOPr8sMf/RaegCHDsmpjqvqTPw1wElfHxomhJP0L9DNZ2NotRcHcGWXzBhPM/zGr8yGNofo//vnb0G3u5Vs0g59O9R2lJxJFAlWk3TMyRAtti+wjxL0Lbhg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpw-0007aU-0j; Fri, 27 Sep 2024 14:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 06/10] gnu: python-cle: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217128975 (code B ref 72393); Fri, 27 Sep 2024 18:37:03 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:11 +0000 Received: from localhost ([127.0.0.1]:47147 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XB-3c for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:11 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp0-0007W9-2x; Fri, 27 Sep 2024 14:36:06 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=OTsYUg3J +8lebvcT3w1rQ69lh7BxKjuqlQV7vN8XawI=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=XIGKJmMyRi//njC46LngGUnCwMt E04G19Zb8tmfCGrGFZFSvY1eHo3otF2PS995tqOWsoPvYbATi13OT0tBQZQNb3XAkIItJn 30Re2dj/x8ILml7+oCBwJBJwFCFTXl7M/5iCWvAfzgGOHhbbsSC7UQj/ibHHYldCMp/JyW igpA= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id bbaf1b4a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:29 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:34:59 +0200 Message-ID: <32189cc7944ab12d02a63c2cb9e2d33c5b2ebe93.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-cle): Update to 9.2.112. [propagated-inputs]: Add python-cart. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 545ef0659f..909aa5f43c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34117,19 +34117,19 @@ (define-public python-cle (package (name "python-cle") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin (method url-fetch) (uri (pypi-uri "cle" version)) (sha256 - (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (base32 "11jbvg12wqxz74iy83ax0q8k156xrw6iqv75dix5cpqgacds3gdj")))) (build-system pyproject-build-system) (arguments (list #:tests? #f)) (propagated-inputs (list python-pefile python-pyelftools python-pyvex - python-sortedcontainers)) + python-sortedcontainers python-cart)) (native-inputs (list python-cffi)) (home-page "https://github.com/angr/cle") (synopsis "Python loader for binaries and their associated libraries") From patchwork Fri Sep 27 18:35:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31518 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5BAF427BBEC; Fri, 27 Sep 2024 19:37:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 19ACD27BBE2 for ; Fri, 27 Sep 2024 19:37:33 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpe-0005EL-QV; Fri, 27 Sep 2024 14:36:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpX-0004kZ-C1 for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpW-0001ta-SJ; Fri, 27 Sep 2024 14:36:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=xVqitDGsVz0nlFRMrHTni2Pv2eYVkBaIvMJhhMZ8FRc=; b=c6pbo7x3hCAk+X00OuS79ge606uQ0Kje5TIbN5p5cnJ5ppV4o972G9oiPdmPldHRrDuVlfYCcv5mNGXhsCqworlhCtiCivGmHN9FUhxMM/CtssK2TiUiPJ4UkmxIMB88ZJ15ntcuT653zLkjPHc5wniEECYfpZaEUMRSsOIL/cXa8YRjxYJKZ+mLNRCVnw0bj2GbINS0MI06Y1b7VQqb5pvqy6MvplDzlMfTI7OKLjv/cz4RZo6SGXYWozC8Uu+9NaaQLFGd/x3j06BdMMKUeEMAT7E1tYH1oZWTsI7Ibb82NbWmMyxE0QVDEnx8HXvpuHcmD2g+wOe5xOEBLCukww==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpx-0007b0-EY; Fri, 27 Sep 2024 14:37:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 07/10] gnu: python-claripy: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217328999 (code B ref 72393); Fri, 27 Sep 2024 18:37:05 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:13 +0000 Received: from localhost ([127.0.0.1]:47153 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp6-0007XY-7Z for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:12 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp1-0007VD-2q; Fri, 27 Sep 2024 14:36:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=xVqitDGs Vz0nlFRMrHTni2Pv2eYVkBaIvMJhhMZ8FRc=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=uA/Lk4dONp0ZDeRUe2CnRs6uwoS 8p9E3MzX1jd8xAiK5ivm/SlkQ+BC47a4c8cqQU+tTcqoCYcl86I19Y70GT+SkB4LyBQ0o1 3WeLPPonZTfRL/+MzbGe/fdsJHLWyg3kjgzraVdxhUtSm2bTU0gThhXpVvuqhVMdMxmpNW ilTU= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ceb52569 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:30 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:35:00 +0200 Message-ID: <325f5909e1f552a540a1d4c4b8ad7bce8a97f32a.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-claripy): Update to 9.2.112. --- gnu/packages/python-xyz.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 909aa5f43c..d34009abc7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34178,7 +34178,7 @@ (define-public python-claripy (package (name "python-claripy") ;; Must be the same version as python-angr. - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. @@ -34188,13 +34188,13 @@ (define-public python-claripy (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (base32 "0c6q6imxjwhxn87d9yz8zvyrszk94r25w8x0g1lr6mrpa9bx7wai")) (modules '((guix build utils))) (snippet '(begin (substitute* "setup.cfg" ;; Relax the z3 version constraint. ;; See https://github.com/angr/claripy/commit/d1fe2df - (("z3-solver==4.10.2.0") + (("z3-solver==4.13.0.0") "")))))) (build-system pyproject-build-system) (arguments From patchwork Fri Sep 27 18:35:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31522 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id C228927BBEA; Fri, 27 Sep 2024 19:37:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 8296027BBE2 for ; Fri, 27 Sep 2024 19:37:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpd-000598-Ta; Fri, 27 Sep 2024 14:36:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpY-0004nj-5o for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpX-0001tg-Bv; Fri, 27 Sep 2024 14:36:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4vlWphdjCDOBkZxw130QjURQI6UjjIZe6oAjlkeVkgI=; b=SJA0PXr+dBw5pF370+EZx2zcMQnSsEb44cPMkT0vIBx/BKZcUHvpuc1HsatNCl+lF+ZfJTW/YtNSaCP9i+ZKT1JuPqgAc1wryTkUQrJvE3KlYyxrw3YGxwJ/F9CcONWl6gDjR3P7e63E1cjFwQO5cNTl0tf3VmyUMzX5fnxnQn6ia5X7sZSag1p2nZhBHbQ+yCrJEuduhflfp10LAOBk7+YC322v0KaOPWHjC3zlYPkG/HY9mOlk7HD/lbcUvXRBhYPN0QbNwJ00lVUF+uvzg8y9oPBdNQPn69FzrcVPn3cstWk10iYNG5zZVbgj9AUQJMGosx7IyUd4B1dMMt/7TA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpw-0007aq-Th; Fri, 27 Sep 2024 14:37:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 08/10] gnu: Add python-pyformlang. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217228991 (code B ref 72393); Fri, 27 Sep 2024 18:37:04 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:12 +0000 Received: from localhost ([127.0.0.1]:47151 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp5-0007XP-PR for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:12 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp1-0007W9-3f; Fri, 27 Sep 2024 14:36:07 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=4vlWphdj CDOBkZxw130QjURQI6UjjIZe6oAjlkeVkgI=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=yhkHUGZd+u5nrzukcEixIuaxE0g VXrSdXM9QYZ/UcS22MJSZmcIXcNPYXqwv3dYeAeTTz28RWqAI4LoztCw0/UpdDICaF0JT5 QZ0bHOEKEXHuTFx4QTQGa1sEA+DBRkesRLH7MeDdtc9K7OinDcBp8m8xi4tHjan7uNDSo3 mzuY= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 34064502 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:31 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:35:01 +0200 Message-ID: <9bb133c6269afe70dbf0e9ef9836c4179a71e126.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-pyformlang): New variable. --- gnu/packages/python-xyz.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d34009abc7..b07cb6c409 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -23859,6 +23859,27 @@ (define-public python-pypeg2 parse many formal languages.") (license license:gpl2))) +(define-public python-pyformlang + (package + (name "python-pyformlang") + (version "1.0.10") + (source + (origin + (method url-fetch) + (uri (pypi-uri "pyformlang" version)) + (sha256 + (base32 "0szgy4pqfixmswjs37qgma4qa3bsadpp3l1xflrpfi10aa8hh2sp")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-networkx python-numpy python-pydot)) + (home-page "https://github.com/Aunsiels/pyformlang") + (synopsis "Framework for interacting with formal grammars") + (description + "This package provides a framework for working with formal +language grammars. The library was originally developed for educational +purposes and therefore implements many textbook algorithms regarding the +manipulation and interaction with formal grammars.") + (license license:expat))) + (define-public python-incremental (package (name "python-incremental") From patchwork Fri Sep 27 18:35:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31517 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id D425827BBEA; Fri, 27 Sep 2024 19:37:29 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 837D727BBE2 for ; Fri, 27 Sep 2024 19:37:29 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpm-0005Zb-5u; Fri, 27 Sep 2024 14:36:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpZ-0004sL-8X for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:42 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpY-0001u4-Vm; Fri, 27 Sep 2024 14:36:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=gqgGZ2DKWIB+hg4WP6vl5tR4Kx4oDQfbmGN0nu+BE5M=; b=uVxxkLFqvIjfyAH0gPg+5k8phMq++dkBpSiazSUzie0RiarOzTP7VGb8rltM48FlG9m/VwP4HJeDPOJF3ak58C9U9lfYIdi6DB96GAZvHETMC1+rZMlGx8sl3DE+t8brRhSUClpu/b7NeyAjmfzrl5/3YGcuxgPC3cW6vQJxXTZyH+37n0L8I0DzQflrJJ7vtKrX/02DqN6K9Q7/Y2+W4CDHO/mDxCz5T+otoY2E2P+HPMymi7gOaCkI514mR0Ql1CiMigAvFi18+1LxzNUdtMWysi3/0NhXy3UartpyrovmK+oS6Tw7Q4OtCBmloLHiSQ2NF44HZ+FAXGt4qxdhvQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpy-0007bM-LH; Fri, 27 Sep 2024 14:37:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 09/10] gnu: Add python-unique-log-filter. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746219829071 (code B ref 72393); Fri, 27 Sep 2024 18:37:06 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:38 +0000 Received: from localhost ([127.0.0.1]:47177 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFpV-0007Yl-4a for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:37 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:18497) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp2-0007VD-G2; Fri, 27 Sep 2024 14:36:10 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=gqgGZ2DK WIB+hg4WP6vl5tR4Kx4oDQfbmGN0nu+BE5M=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=b0DVWczdCIdMAFWLTK4l3Dq3OYO oM2cDFmC1Pw1rKinNXRKDTLr69zxauhWpWzoEphfmZndilylOqw6doNw/05v0iqFr50PNF GdnuJBDsSi1sQ0l2+t5OZeGkfK1Xg9fo9/5ZtT0O59bXyWYC1piOkb+m0Q037PxzsTFUU2 Z+iI= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 6979e5f6 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:31 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:35:02 +0200 Message-ID: <92cd01f98e231ab55ed8018bcba619028e400cd1.1727462103.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-unique-log-filter): New variable. --- gnu/packages/python-xyz.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index b07cb6c409..f56d23f93e 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -31033,6 +31033,36 @@ (define-public python-json-logger we can stop writing custom parsers for syslog-type records.") (license license:bsd-3))) +(define-public python-unique-log-filter + (package + (name "python-unique-log-filter") + (version "0.1.0") + (source + ;; The version on pypi does not include test files. + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/twizmwazin/unique_log_filter") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "036mh6nqskck2fa1q2inasqxb9wcz2p09qcpldnnffzcy1a6kzba")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "test_unique_log_filter.py"))))))) + (native-inputs (list python-flit-core)) + (home-page "https://github.com/twizmwazin/unique_log_filter") + (synopsis "Log filter that removes duplicate log messages") + (description + "This library provides a filter for the @code{logging} module +from the Python standard library which allows removing duplicate log +messages.") + (license license:bsd-2))) + (define-public python-daiquiri (package (name "python-daiquiri") From patchwork Fri Sep 27 18:35:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?S=C3=B6ren_Tempel?= X-Patchwork-Id: 31514 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 998FC27BBEA; Fri, 27 Sep 2024 19:36:56 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A95EE27BBE2 for ; Fri, 27 Sep 2024 19:36:54 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1suFpe-0005EM-Qw; Fri, 27 Sep 2024 14:36:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1suFpY-0004nq-6B for guix-patches@gnu.org; Fri, 27 Sep 2024 14:36:40 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1suFpX-0001th-KR; Fri, 27 Sep 2024 14:36:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=OT5Vamxp/DJyhmQ33XMD4bqub5CZ6hE61qZE7FSOJVY=; b=C8KCWLKugNPLr4SctP1+qCrR4/7ALgg9qbq3lhneVJRdzfftyTWr7rUqfoX6rnUpp6BL93eCvvVSIqjGwq7wfTuhGlWvdAr+EweWwMIIwhL2hZaBfEyboqGJg+zF+BTJR5n+ahThLoiPqVCDBleUxpbQSQ9Pstnr5DIlUWA2iO/3nUNA8B2oxQRTOUcmMaIV/uPo+fXvkVMysVlOUOsNkTka1231qWiSinMNGDyWv9mkNm0WMBMvrqad8F+vUt+gokQGB7Z7vWdUnJjmv+U6sXqLCxzH6ZsvDosx6f4Jg5K7KHF2ydUvfUIkHi5OyWDTo9A50z99Eky2dVnlf1N3Dw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1suFpy-0007bB-0N; Fri, 27 Sep 2024 14:37:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#72393] [PATCH v2 10/10] gnu: python-angr: Update to 9.2.112. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, marius@gnu.org, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, jgart@dismail.de, guix-patches@gnu.org Resent-Date: Fri, 27 Sep 2024 18:37:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 72393 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 72393@debbugs.gnu.org Cc: jgart@dismail.de, Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart X-Debbugs-Original-Xcc: Lars-Dominik Braun , Marius Bakke , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour , jgart Received: via spool by 72393-submit@debbugs.gnu.org id=B72393.172746217429009 (code B ref 72393); Fri, 27 Sep 2024 18:37:05 +0000 Received: (at 72393) by debbugs.gnu.org; 27 Sep 2024 18:36:14 +0000 Received: from localhost ([127.0.0.1]:47157 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp6-0007Xf-PM for submit@debbugs.gnu.org; Fri, 27 Sep 2024 14:36:14 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:19108) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1suFp2-0007W9-G2; Fri, 27 Sep 2024 14:36:09 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=OT5Vamxp /DJyhmQ33XMD4bqub5CZ6hE61qZE7FSOJVY=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=hadur40o9QHX86tAfJHjzI1ZMFP zpq8qQ6d3xfeoEsXxQLqu1XjKR0zpGdFQ5GYzBTbh9QPSVF0kRSCSXP3mR1UsZZ9u7D3qW 9zkxlODKaejOcX/mB5PrBrM7yWyHnxS9I3VQ6uw3teLot6daZ2xritI2z/Im1CdkMDpOM+ Aczo= Received: from localhost (dyn.ipv6.net-htp.de [2a02:560:4d5a:5700:f45d:5adb:48d9:9418]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 66dde5f4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Fri, 27 Sep 2024 20:35:32 +0200 (CEST) From: soeren@soeren-tempel.net Date: Fri, 27 Sep 2024 20:35:03 +0200 Message-ID: X-Mailer: git-send-email 2.46.1 In-Reply-To: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> References: <0dd3ef50a19a67c58a12f06a0b99356b87a31fe8.1727462103.git.soeren@soeren-tempel.net> MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: Sören Tempel * gnu/packages/python-xyz.scm (python-angr): Update to 9.2.112. [propagated-inputs]: Remove python-progressbar2; add python-pyformlang, add python-rich, add python-unique-log-filter. * gnu/packages/patches/python-angr-addition-type-error.patch: Remove patch (merged upstream and included in new release). * gnu/packages/patches/python-angr-check-exec-deps.patch: Rebase for new release. --- gnu/local.mk | 1 - .../python-angr-addition-type-error.patch | 18 ---- .../patches/python-angr-check-exec-deps.patch | 83 +++++++++---------- gnu/packages/python-xyz.scm | 28 +++++-- 4 files changed, 58 insertions(+), 72 deletions(-) delete mode 100644 gnu/packages/patches/python-angr-addition-type-error.patch diff --git a/gnu/local.mk b/gnu/local.mk index 669a65dfd6..adbea45636 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2004,7 +2004,6 @@ dist_patch_DATA = \ %D%/packages/patches/python-3-search-paths.patch \ %D%/packages/patches/python-3-fix-tests.patch \ %D%/packages/patches/python-3-hurd-configure.patch \ - %D%/packages/patches/python-angr-addition-type-error.patch \ %D%/packages/patches/python-angr-check-exec-deps.patch \ %D%/packages/patches/python-3-reproducible-build.patch \ %D%/packages/patches/python-aionotify-0.2.0-py3.8.patch \ diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch deleted file mode 100644 index 7301d8b505..0000000000 --- a/gnu/packages/patches/python-angr-addition-type-error.patch +++ /dev/null @@ -1,18 +0,0 @@ -This fixes failures of the test_ln_gcc_O2 and other related tests -in the angr test suite. The patch has been proposed upstream. - -Taken form: https://github.com/angr/angr/pull/4443 - -diff --git a/angr/analyses/reassembler.py b/angr/analyses/reassembler.py -index 7a2399a60..b09b3a8cb 100644 ---- a/angr/analyses/reassembler.py -+++ b/angr/analyses/reassembler.py -@@ -730,7 +730,7 @@ class Instruction: - elif operand.type == capstone.CS_OP_MEM: - operand_offsets.append(capstone_instr.disp_offset) - else: -- operand_offsets.append(None) -+ operand_offsets.append(0) - - if self.addr is not None: - self._initialize(capstone_instr.operands, operand_offsets) diff --git a/gnu/packages/patches/python-angr-check-exec-deps.patch b/gnu/packages/patches/python-angr-check-exec-deps.patch index 438f8ef183..6001d9c924 100644 --- a/gnu/packages/patches/python-angr-check-exec-deps.patch +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -8,11 +8,11 @@ For Guix, this files as the glibc shared objects cannot be found. Additionally, we don't really want to execute pre-compiled binaries on Guix, hence we disable those tests. -diff --git a/tests/test_ctype_locale.py b/tests/test_ctype_locale.py -index 08cb89836..2b9233558 100644 ---- a/tests/test_ctype_locale.py -+++ b/tests/test_ctype_locale.py -@@ -14,7 +14,7 @@ test_location = os.path.dirname(os.path.abspath(__file__)) +diff --git a/tests/procedures/glibc/test_ctype_locale.py b/tests/procedures/glibc/test_ctype_locale.py +index ac3e1ee16..1fb0fd095 100755 +--- a/tests/procedures/glibc/test_ctype_locale.py ++++ b/tests/procedures/glibc/test_ctype_locale.py +@@ -15,7 +15,7 @@ test_location = os.path.join(bin_location, "tests") class TestCtypeLocale(unittest.TestCase): @@ -21,7 +21,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_b_loc(self): """ test_ctype_locale.test_ctype_b_loc -@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -61,7 +61,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -30,7 +30,7 @@ index 08cb89836..2b9233558 100644 def test_ctype_tolower_loc(self): """ test_ctype_locale.test_ctype_tolower_loc -@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): +@@ -110,7 +110,7 @@ class TestCtypeLocale(unittest.TestCase): output = subprocess.check_output(bin_path, shell=True) assert result == output @@ -39,50 +39,24 @@ index 08cb89836..2b9233558 100644 def test_ctype_toupper_loc(self): """ test_ctype_locale.test_ctype_toupper_loc -diff --git a/tests/test_signed_div.py b/tests/test_signed_div.py -index 59cb9b8d1..994ed9c65 100644 ---- a/tests/test_signed_div.py -+++ b/tests/test_signed_div.py -@@ -1,6 +1,7 @@ - import angr - import subprocess - import sys -+import pytest - - import logging - -@@ -13,7 +14,7 @@ import os - test_location = os.path.dirname(os.path.realpath(__file__)) - - --@skipUnless(sys.platform.startswith("linux"), "linux only") -+@pytest.mark.skip(reason="test executes pre-compiled binaries") - def test_signed_div(): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "test_signed_div") - b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_sscanf.py b/tests/test_sscanf.py -index 29d2c8403..ea799b310 100644 ---- a/tests/test_sscanf.py -+++ b/tests/test_sscanf.py -@@ -1,3 +1,4 @@ -+import pytest - import angr - import subprocess - import sys -@@ -14,7 +15,7 @@ test_location = os.path.dirname(os.path.realpath(__file__)) +diff --git a/tests/procedures/libc/test_sscanf.py b/tests/procedures/libc/test_sscanf.py +index 7c2da6f5e..e20952f54 100755 +--- a/tests/procedures/libc/test_sscanf.py ++++ b/tests/procedures/libc/test_sscanf.py +@@ -14,7 +14,7 @@ test_location = os.path.join(bin_location, "tests") class TestSscanf(unittest.TestCase): - @unittest.skipUnless(sys.platform.startswith("linux"), "linux only") + @unittest.skip("test executes pre-compiled binaries") def test_sscanf(self): - test_bin = os.path.join(test_location, "..", "..", "binaries", "tests", "x86_64", "sscanf_test") + test_bin = os.path.join(test_location, "x86_64", "sscanf_test") b = angr.Project(test_bin, auto_load_libs=False) -diff --git a/tests/test_strtol.py b/tests/test_strtol.py -index 6c29cab22..f36181407 100644 ---- a/tests/test_strtol.py -+++ b/tests/test_strtol.py -@@ -11,7 +11,7 @@ class TestStrtol(unittest.TestCase): +diff --git a/tests/procedures/libc/test_strtol.py b/tests/procedures/libc/test_strtol.py +index 4d7982b86..8818ced3b 100755 +--- a/tests/procedures/libc/test_strtol.py ++++ b/tests/procedures/libc/test_strtol.py +@@ -15,7 +15,7 @@ class TestStrtol(unittest.TestCase): # pylint: disable=no-self-use @slow_test @@ -91,3 +65,24 @@ index 6c29cab22..f36181407 100644 def test_strtol(self, threads=None): test_bin = os.path.join(bin_location, "tests", "x86_64", "strtol_test") # disabling auto_load_libs increases the execution time of the test case. +diff --git a/tests/sim/exec_insn/test_signed_div.py b/tests/sim/exec_insn/test_signed_div.py +index 46581020f..d5acc5370 100755 +--- a/tests/sim/exec_insn/test_signed_div.py ++++ b/tests/sim/exec_insn/test_signed_div.py +@@ -2,6 +2,7 @@ + # pylint: disable=missing-class-docstring,no-self-use,line-too-long + __package__ = __package__ or "tests.sim.exec_insn" # pylint:disable=redefined-builtin + ++import pytest + import os + import subprocess + import sys +@@ -16,7 +17,7 @@ test_location = os.path.join(bin_location, "tests") + + + class TestSignedDiv(TestCase): +- @skipUnless(sys.platform.startswith("linux"), "linux only") ++ @pytest.mark.skip(reason="test executes pre-compiled binaries") + def test_signed_div(self): + test_bin = os.path.join(test_location, "x86_64", "test_signed_div") + b = angr.Project(test_bin, auto_load_libs=False) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index f56d23f93e..45dce3082d 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34417,19 +34417,18 @@ (define-public python-itanium-demangler (define-public python-angr (package (name "python-angr") - (version "9.2.46") + (version "9.2.112") (source (origin ;; Fetching from Git as pypi release doesn't include all test files. (method git-fetch) - (patches (search-patches "python-angr-addition-type-error.patch" - "python-angr-check-exec-deps.patch")) + (patches (search-patches "python-angr-check-exec-deps.patch")) (uri (git-reference (url "https://github.com/angr/angr") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (base32 "1179926xbfh2930laz33p90vj532jk7g2qylzzpw1185yhlf9cis")))) (build-system pyproject-build-system) (arguments (list @@ -34437,9 +34436,18 @@ (define-public python-angr (add-after 'unpack 'patch-tests (lambda* (#:key inputs #:allow-other-keys) (let ((coreutils (assoc-ref inputs "coreutils"))) - (substitute* "tests/test_vault.py" - (("/bin/false") - (which "false"))) + ;; The constraint exists because of a capstone bug for which + ;; we backport a patch, hence we can relax the constraint. + ;; + ;; See https://github.com/angr/angr/issues/4656 + (substitute* "setup.cfg" + (("capstone==5.0.0.post1") + "capstone")) + ;; Relax constraint on python-rich, the constraint is too strict, + ;; angr work well with our packaged version of python-rich. + (substitute* "setup.cfg" + (("rich>=13.1.0") + "rich")) (substitute* "tests/common.py" (("\\[\"cc\"\\]") "[\"gcc\"]"))))) @@ -34478,11 +34486,13 @@ (define-public python-angr python-itanium-demangler python-pycparser python-pyvex - python-progressbar2 + python-pyformlang + python-rich python-rpyc python-sortedcontainers python-sqlalchemy python-sympy + python-unique-log-filter unicorn)) (native-inputs `(("python-pytest" ,python-pytest) ("python-pytest-xdist" ,python-pytest-xdist) @@ -34500,7 +34510,7 @@ (define-public python-angr version)))) (file-name (git-file-name "angr-binaries" version)) (sha256 (base32 - "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + "0bxzf6alkczv9r0151ksvcwyksnw8077acz1wd8drbxw0zl0qnmr")))))) (home-page "https://github.com/angr/angr") (synopsis "Multi-architecture binary analysis toolkit") (description