From patchwork Thu Jul 11 21:27:12 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: 66155 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 E3C2F27BBE9; Thu, 11 Jul 2024 22:28:30 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 EDF3127BBE2 for ; Thu, 11 Jul 2024 22:28:27 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Ke-00072U-C4; Thu, 11 Jul 2024 17:28:04 -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 1sS1Kd-00072E-7L for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:03 -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 1sS1Kc-0003ZZ-VV for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kb-0003zV-PI for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 01/11] gnu: Add python-keystone-engine. References: In-Reply-To: Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2024 21:28:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@debbugs.gnu.org Cc: jgart@dismail.de Received: via spool by 69074-submit@debbugs.gnu.org id=B69074.172073327015251 (code B ref 69074); Thu, 11 Jul 2024 21:28:01 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:50 +0000 Received: from localhost ([127.0.0.1]:52691 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KE-0003ws-N0 for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:50 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KC-0003wh-E8; Thu, 11 Jul 2024 17:27:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=JnXe4xOV B0WxS2bHQxUhfWNuukELQZ3UUiWE1HTSzK0=; h=date:subject:cc:to:from; d=soeren-tempel.net; b=VOERZSKisVFgGi+8Us26awkrfJf7Ushz8P4FWGmTlO/yK/A yA8pBz5KK7i7QJDyyTEFze6VVpGIQqQJXdSyXSuvf6dbrCOPg5DkKEP3qp5oBVKG4S5piv lZdH5IQuy8WfoHUWlnkLIe+WTWDZ6bjVwoEP39BXYhcKbuGb+5ViCk= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id c5ba03e4 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:34 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:12 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 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-keystone-engine): New variable. --- gnu/packages/emulators.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) base-commit: eeb24a50d2f1f78095bdb16b40ddb93bb51474bc prerequisite-patch-id: ee2a9b6687430c128ae37013d0cabf78965c97b1 prerequisite-patch-id: 138a1596bdb469002dca48d090b3c1600fd76fe3 prerequisite-patch-id: be3c2bd6aeda961b25ee63b73fb3fd8c07c0edf9 prerequisite-patch-id: 061d0cdfd9efb74fccd55e2a30e427385a6a982f prerequisite-patch-id: e0c8dd359305affa867e537d444f0cf688b5e342 prerequisite-patch-id: c3c2c5dd54341be192b3e29ced43d91db7747a13 prerequisite-patch-id: 17a62f3de0eeeb2cfdcddd1c02acbd36f9d19b6c prerequisite-patch-id: ee3c5dd8dfe405e38b940b24bf3b58627d1fa612 prerequisite-patch-id: fd89a91e88e4814b0f7e2e09aa55354a8ad0c120 prerequisite-patch-id: eca98c7f708c5fc13b9cae1feefab139bf78aa2e prerequisite-patch-id: ab8c3f10a0cd324b842682b562a4030063027b8d prerequisite-patch-id: c3a135b6c179a25a56cb5b7f0158d1907b2d1105 prerequisite-patch-id: e6cf480f56b860681b0b0f802beac67deafe6452 prerequisite-patch-id: 94ca864f10447787f81847557be750c7b20d18f7 prerequisite-patch-id: ec9b1772c7e723bf56dc7e55e94a9b68c22814d7 prerequisite-patch-id: cfc1254a999cacdb45980c36dd5e65920df1b89b prerequisite-patch-id: 1ab9eda560e3de9fa6c93c9f7e2b54df1af3885c prerequisite-patch-id: 5673937acc787fa0cd0f7b2c19b5008f50d18192 prerequisite-patch-id: 2896487a69c866bc0384671f38804aec09718fb8 prerequisite-patch-id: 19fee3925913d427510f10efe8e3e84a9fc7c39d prerequisite-patch-id: 9fde04d4b1031d5b0c761817482ea50518806317 prerequisite-patch-id: 1de5295e2929eae0b45a1259f7d85a8b6dd27bd3 prerequisite-patch-id: 19288643faed672174a7c8f2397989ec99909cc6 prerequisite-patch-id: 1f7ea830b18e7bdd313982dc2b9953c8637e7c6a prerequisite-patch-id: a90142a9e9166ccc5842af5c39e46b5ab135bb60 prerequisite-patch-id: d156d4761f70108268b7e7436a1b71e2d77051a1 prerequisite-patch-id: 1366b1b8446f870e6bd094f5f0e7d90c4ae52211 prerequisite-patch-id: 51b10a06e7f8b68addda26d09963acc037606c5c prerequisite-patch-id: 16be4fd9482c923a5b24713ad77e6d677bf4c225 prerequisite-patch-id: 1f98a03c4f43ffb5837c559459ec029451d7650d prerequisite-patch-id: 56e9505321e0685920470198d0f0f86c7f41ff37 prerequisite-patch-id: c9f80b814007a2239da588836629a4f50c1a1ca6 prerequisite-patch-id: f6afa2e319d2ba8b4eb81d38de53ddf61cc4f21c prerequisite-patch-id: 53b8bbcb6ded77c3e42d8b127d04aca73878aa59 prerequisite-patch-id: afc7e0fc337dbd8166b32297c73efc767a2c2a9d prerequisite-patch-id: cede852fd458d339f3b69ba81ceb7c84430aca11 prerequisite-patch-id: b531f235c82c61593d427d21f3b0af204f7eb99f prerequisite-patch-id: 85d9203714f534be6ca76958f1b954dfdf4d333c prerequisite-patch-id: b5a3fdea1b5207839dc9ec762fe2c5650b905e8a prerequisite-patch-id: 51d2c8a901e4c994e12043e67e30f02f150d20e8 prerequisite-patch-id: 2e758f8e75d266792a277a998eae19d12710d9d4 prerequisite-patch-id: 43df7a9621736fc82b0a6d360b1374080e0e5930 prerequisite-patch-id: f6c4adbef94c3035a2c5d772f8d33ba563e43163 prerequisite-patch-id: 195523867e21de90d11bdda7d6c12f10214cc5df prerequisite-patch-id: 9e2487f4759b2da3a0d00fc308c6a5c08fbd4ddb prerequisite-patch-id: 4c7af60712af6e188a4a067386093fe0af12c512 prerequisite-patch-id: af5d9d932b9485e2a4257a983f6a3b1a19d5e251 prerequisite-patch-id: 623116ba5a8ff752dfe0936090247a94c2fb3d44 prerequisite-patch-id: d920223ad4dd8c4e1b3e2e95b047ace057eeddf8 prerequisite-patch-id: f124d556ef42048680e42355c111f0696d9ced07 prerequisite-patch-id: a0a1bf5290e018b70edfbb5563d137733c84e84a prerequisite-patch-id: cddea9eb650801dad93c64ac5ce9428b71ae5a49 prerequisite-patch-id: ffcfad1a27d77037fb8557aafd3cf7e87cdd18e4 prerequisite-patch-id: 9c1bcec9ae21688933c037236a53c7425c5fceea prerequisite-patch-id: 90278399df23105fe2c95a7411b65e9f7b694715 prerequisite-patch-id: 83e7f0f584612d90aee26439b041260c687abe57 prerequisite-patch-id: 07d49663d4b40bfd68ddc3b11f20d9202287cc9d prerequisite-patch-id: e215f35e710fa97323c05f2bc99f4c601f952d53 prerequisite-patch-id: e3963527bafe11f97e3ae8fb364c42c2a6561bcd prerequisite-patch-id: 3c36669d6f54a4a08145a915e5eac834332eec2f prerequisite-patch-id: b02c68976af2b96fcf28ed5aa29db07627ef11b7 prerequisite-patch-id: 784e11d7de3b1c571171fc09ff90d391ad483718 prerequisite-patch-id: a849f7e9ac2b52f560238c9613a85cb7fd4b98aa prerequisite-patch-id: e6156c5eb23a8241dc5992867972bd0f07983856 prerequisite-patch-id: 9fc78ae5ab7b06c7ec58e9fdca80227ff918fd31 prerequisite-patch-id: fb62bda29d3876fd6ee9a0bf5aaf9eb762219622 prerequisite-patch-id: 21bf49815ae3aa66d1d5fef03655d326ac9d0adb prerequisite-patch-id: fe6d3db81178f5e072fd340b5d27328daea63f34 prerequisite-patch-id: 74a98f931bc5d8788557486c93a72aa688fa36d3 prerequisite-patch-id: da69b335229478fdedf53a939c4752eded87b73a prerequisite-patch-id: be5bb4b6176b5be6299763079370706283ce13c9 prerequisite-patch-id: dc97b52c8bacfbfb294b77ea2dabe5ba9a8985e2 prerequisite-patch-id: b3168981390c63a0cef9d6fe0ca7707485160404 prerequisite-patch-id: c016251bd2844e7690d9b7c0291e55eb92cb00ac prerequisite-patch-id: 18c437112e77e4d14c5c59e9ac83f7ef3c0b12ba prerequisite-patch-id: e878d9dcb07c107cfc8aa83dfa292d61721a5e0c prerequisite-patch-id: 5f4a3da0fc7f31001d9b13a341a82eb2cfe682e7 prerequisite-patch-id: 2ce101315a4201cdf98b03fae404e6d9c831cf6b prerequisite-patch-id: 52655961a6850fa337d669ac9dcaf3ba1d162542 prerequisite-patch-id: fef620a490a2e023270deaf963fc581c04bc7e4d prerequisite-patch-id: d33430877bd2b369d4e2256bab25c8b83975eb84 prerequisite-patch-id: 5b2c36cde3b9a00a66c47457852891463c38bc3c prerequisite-patch-id: 4ebd7039ea8b9b4bb8ade5e71b0d8b019ea765f2 prerequisite-patch-id: 274c63ac97f70daa65df867b924ea0a24171c1c6 prerequisite-patch-id: b382e7ecea1b2dfbba7c338f2b8af486bb35e9f3 prerequisite-patch-id: 2704b2b8d8a02b9a2279edd961e59ed9eed6256b prerequisite-patch-id: 54e1300814b7cfca8ebb499afa1ee89479b87710 prerequisite-patch-id: 8b6ce0b84817352801b14ab96a450a6ad9356ec8 prerequisite-patch-id: f9bc677c3905468c474bed4132f05aa36f5382bf prerequisite-patch-id: 537fa3126a0a9b1af03261dae6ae688c16ca48da prerequisite-patch-id: 7f583c8db492c317ab2147c983d5ba22753d257e prerequisite-patch-id: 35780a02172eae74567f5aadba9408f39d0a8492 prerequisite-patch-id: 65cc902b6de99b9b02437ea1cd6f2b2a523dc498 prerequisite-patch-id: 617a7d93ef8af7a17ae40cafb7d9976a11b86163 prerequisite-patch-id: 68175767ffa72be5c643cca9f0036382d20dc101 prerequisite-patch-id: 6cf4afd487cc5f32498341530784827c1726ebef prerequisite-patch-id: ca605c020137a25b96c9bd71884e1a86ba210e95 prerequisite-patch-id: bb2250935248a0299948c7e591cab8a82dba44b1 prerequisite-patch-id: 81db931ccf1748cff5fcfe4af1f90159f3f02cab prerequisite-patch-id: 9c9d9859db152cb21ab1c37de087ff93490b0b64 prerequisite-patch-id: 3cd623a611d607371646f9383e1d6a1bc46ddedd prerequisite-patch-id: 056e1be56770469dfb476bc72d46227f7abe79c4 prerequisite-patch-id: 188b79a11a0f0eceb557575f46997738c7227a86 prerequisite-patch-id: 658cb16a15d6a2c14ba66aa64a1dcd900a75f18d prerequisite-patch-id: b677a11ef8e9967a7bc426f169f5b5e2af73487b prerequisite-patch-id: b9fa59346caab93c190ee1c6e47870b9659cb24c prerequisite-patch-id: cd3fe0c0101c6ac89b3bc400409a75a2629e854d prerequisite-patch-id: b941ff72681258c6c0a1708c40e6e31a2af2e191 prerequisite-patch-id: 86fe9322ab23299e4e87f997000f3f1d64963faf prerequisite-patch-id: 97a875f39fab4032358aa8d885fd5e0fc0787209 prerequisite-patch-id: 863f9364ba949e0450508a59d74f133a06ba7ead prerequisite-patch-id: 5161a414b806e2acd0e5fea99cc3a1703467e6cb prerequisite-patch-id: 696650d9fb7c28c4bb25a5712b74cbfbdd09fe6f prerequisite-patch-id: 38d4941b88dcff499679693b7398d6d22083c1bd prerequisite-patch-id: b8494b8f1310b48706c150087fb65083c9eeede9 prerequisite-patch-id: 8e7864232e3d94950c9d96773b8f80a0506b6eb9 prerequisite-patch-id: eaf60cdd22d393e23abea667f67255a0db4b0762 prerequisite-patch-id: c7699bbb2f614934c243e7fe25dfd911093db8ea prerequisite-patch-id: 3ce91d33cab9bdb27e7476bd009a8eca298e2e08 prerequisite-patch-id: 1d230e7e6050526d1593784b73f7e16caa18801e prerequisite-patch-id: 2ff7b34709e0639a35ec3a91fbba522beb94279a prerequisite-patch-id: 8d2c1a269f7dc0626347cd2286d7ae5032394dd2 prerequisite-patch-id: eb421be1145eac0296e3cb0fe93238f108718757 prerequisite-patch-id: c0afc5206ffb8b8288c76c658874c9bffd09c3d9 prerequisite-patch-id: f5bae70da8b680d16e79495064c9b8e304fab800 prerequisite-patch-id: fff9a6b6c9304cdfe4ccca45adb58fb57cb90afb prerequisite-patch-id: 3378924b569afad71f1592b60b99b55e894597db prerequisite-patch-id: 8db8877e10300781457258e4b4bbbeadf17948ba prerequisite-patch-id: f70dd4c37be36c1b4b760b5d926ebc26d2523240 prerequisite-patch-id: c483136940a6721d5c361bce1890f283e0878a03 prerequisite-patch-id: 7cb82188f58a9948b235ef6db0fc7d42762ba634 prerequisite-patch-id: 3456d25e4cfb669dd74f76938b248e244ea2a91e prerequisite-patch-id: ecdb27047aeea5490e287e01f570f4fc1a259694 prerequisite-patch-id: 6050146a29e503df76feebd8c076eb58245ccbff prerequisite-patch-id: 0817d7b1196dc4c898627bd174df85dabb331adf prerequisite-patch-id: 5c275f0fc5e2a0e26e5989cdecc017535cadb135 prerequisite-patch-id: 113e3bd8199b850cda55628cb93974ead7e3224f prerequisite-patch-id: 19ad15c33500bcd7552d0c0acd95b036d4dc8c86 prerequisite-patch-id: 27d7db3a4d253d3bd095bdf6a800ee311f70f847 prerequisite-patch-id: ae43fa4cce7cb6d30cd2e5100a12c88a1e024b37 prerequisite-patch-id: d43f846502d8e7d5bea10c7356a09e414a28b576 prerequisite-patch-id: 8bc091c42c2c833b071099d391f90fbb5d6dc59a prerequisite-patch-id: e455414a1d6628662f75f1c79d166876b4398fba prerequisite-patch-id: 7d6bf43f518c7bfcbfde7532f2f5a278af748c77 prerequisite-patch-id: fcc6571143067b1670fd14d65efbea629a024f94 prerequisite-patch-id: 386e61da3f3163371e78a0ad3c6ed88145ce03af prerequisite-patch-id: e8887c5fca8d035d3127324ee25c77a6383ae022 prerequisite-patch-id: b6150b1895040c35d2649d8431bf68b66b35937e prerequisite-patch-id: c5a0c4f9d1c91f2ea9977e6738629d585b396f13 prerequisite-patch-id: f6d0a83c3871eb8c1c39bd0204f1190cc7b712b0 prerequisite-patch-id: bc6383e94c91879a2c152e39785a297618d19b22 prerequisite-patch-id: 13d64eed62d69eeb659389a9954ffd2b304664fa prerequisite-patch-id: 50d722489630d05615ed6e1b4e3f5558445eb9ac prerequisite-patch-id: d0081ac95e4277af5f712be84e76d0cdb44e0a56 diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 5979294ef2..486610f1f0 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -2622,6 +2622,28 @@ (define-public uxn stack-machine, written in ANSI C. Graphical output is implemented using SDL2.") (license license:expat)))) +(define-public python-keystone-engine + (package + (name "python-keystone-engine") + (version "0.9.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "keystone-engine" version)) + (sha256 + (base32 "1xahdr6bh3dw5swrc2r8kqa8ljhqlb7k2kxv5mrw5rhcmcnzcyig")))) + (native-inputs (list cmake)) + (build-system pyproject-build-system) + (home-page "https://www.keystone-engine.org") + (synopsis + "Lightweight multi-platform, multi-architecture assembler framework") + (description + "Keystone is a lightweight multi-platform, multi-architecture +assembler framework. It supports a wide-range of different architectures +and offers an intuitive architecture-neutral API for interacting with +assembly for these architectures.") + (license license:gpl2))) + (define-public emu8051 (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8") (revision "1")) From patchwork Thu Jul 11 21:27:13 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: 66163 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 D004527BBEA; Thu, 11 Jul 2024 22:29:05 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 618D427BBE2 for ; Thu, 11 Jul 2024 22:29:05 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Km-00075B-DA; Thu, 11 Jul 2024 17:28:12 -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 1sS1Kh-00073e-Tc for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:07 -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 1sS1Kh-0003aT-Ko; Thu, 11 Jul 2024 17:28:07 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kc-0003zd-5c; Thu, 11 Jul 2024 17:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 02/11] gnu: Add python-mulpyplexer. 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: Thu, 11 Jul 2024 21:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327115259 (code B ref 69074); Thu, 11 Jul 2024 21:28:02 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:51 +0000 Received: from localhost ([127.0.0.1]:52703 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KQ-0003y1-Rf for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:51 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KE-0003wh-CE; Thu, 11 Jul 2024 17:27:39 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=Z1b1pY1v BitJ1ukQXi3b7+vCZHK4EmOJt1feiB8puw0=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=JWsRvIFIcZjTX+9Y4QiAljCzxWX fkRO25yt4UgnwT0ShB6bYcRzSuvh/mpIdqrPmnSmfWsQHgAu+FtrXgTXU+POH52YO8Z+BI KWIbq1Z7J/hnOstYVOWMPGp56L6QVWQO9GMSUK4TtcZh02hiYD9OuqZEgp+obMq6sbG/So a8Qc= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 1cb5c86f (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:34 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:13 +0200 Message-ID: <1978ab2ef0f93e9f95f47ce289db2624a7791554.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-mulpyplexer): New variable. --- gnu/packages/python-xyz.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2618c2078d..2a00bed697 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33787,6 +33787,29 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-mulpyplexer + (package + (name "python-mulpyplexer") + (version "0.09") + (source + (origin + (method url-fetch) + (uri (pypi-uri "mulpyplexer" version)) + (sha256 + (base32 "0c5xzci1djy1yi9hxxh8g67l6ms8r7ad7ja20pv8hfbdysdrwkhl")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "python" "mulpyplexer.py"))))))) + (home-page "https://github.com/zardus/mulpyplexer/") + (synopsis "Multiplexes interactions with lists of Python objects") + (description "This module provides utilities for multiplexing +interactions with lists of Python objects.") + (license license:bsd-2))) + (define-public python-itanium-demangler (package (name "python-itanium-demangler") From patchwork Thu Jul 11 21:27:14 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: 66154 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 9BC9C27BBEA; Thu, 11 Jul 2024 22:28:28 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 068FD27BBEA for ; Thu, 11 Jul 2024 22:28:28 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Ki-000740-Sr; Thu, 11 Jul 2024 17:28:08 -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 1sS1Kg-000733-Ck for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:06 -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 1sS1Kg-0003aC-4H; Thu, 11 Jul 2024 17:28:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kc-0003zj-JK; Thu, 11 Jul 2024 17:28:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 03/11] gnu: Add python-nampa. 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: Thu, 11 Jul 2024 21:28:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327115266 (code B ref 69074); Thu, 11 Jul 2024 21:28:02 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:51 +0000 Received: from localhost ([127.0.0.1]:52705 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KR-0003y5-BM for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:51 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KF-0003wh-LE; Thu, 11 Jul 2024 17:27:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=JzaoSO+3 0t6/xbi8QbMInkzhGKSZQe4rCoMN0sqlgGw=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=FhOX8wcGxwEoCuzrlpt4cvuevNC 7c746EoIsyXUsmWdpEQBczxrQrwx6qnn1ZXA+BZqMUnL4d/K6GkWvg5RQ5u8PfHiXhwtQI FSZmaXdOinf/UBm2aawcO96zv2odjUxkKrMkhZp2ikmj3Q2Q5tETVNePTMQGmfVD+utXZ8 jsr4= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id db8bd54b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:35 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:14 +0200 Message-ID: <996e39c5fb47f1d38117ec33907b1c9bd899bedc.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-nampa): New variable. --- gnu/packages/python-xyz.scm | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 2a00bed697..1a80de7818 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33787,6 +33787,26 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-nampa + (package + (name "python-nampa") + (version "0.1.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "nampa" version)) + (sha256 + (base32 "0k6cq2gflpkm40qhgqbbcjmq5lq589c15bmk567qyh3d08062hvd")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-future)) + (home-page "https://github.com/thebabush/nampa") + (synopsis "Python implementation of IDA Pro's FLIRT technology") + (description + "This Python module implements the @acronym{FLIRT, Fast Library Identification +and Recognition Technology}. This technology is useful for identifying +common library subroutines in disassembled binaries.") + (license license:lgpl3))) + (define-public python-mulpyplexer (package (name "python-mulpyplexer") From patchwork Thu Jul 11 21:27:15 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: 66160 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 1262427BBEA; Thu, 11 Jul 2024 22:28:57 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 8A71427BBE2 for ; Thu, 11 Jul 2024 22:28:56 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Ko-00076j-OP; Thu, 11 Jul 2024 17:28:14 -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 1sS1Kk-00074Z-Sl for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:10 -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 1sS1Kk-0003aq-F9; Thu, 11 Jul 2024 17:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kd-0003zq-1Y; Thu, 11 Jul 2024 17:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 04/11] gnu: Add python-rpyc. 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: Thu, 11 Jul 2024 21:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327315277 (code B ref 69074); Thu, 11 Jul 2024 21:28:03 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:53 +0000 Received: from localhost ([127.0.0.1]:52707 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KS-0003yB-O3 for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:53 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KG-0003wh-Ck; Thu, 11 Jul 2024 17:27:41 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=k81RxPyZ +yK0mWHpa+QJB5WMwaZO3emOoNckyG5NFws=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=U18cbL1WzJuLjGVxV0hbLYpCyYl G56uI1MDK/6qQDROivL14a3MP7ci9Grd4o5Tgm0TSWKGS4W7nnxSsHoYcA0UfGk5BlhhLq 0mj8U9BFiMgFssxbtN69rw3yXTIfHSMwyCcpUiAHl7bsALN1lNWmh0UXFCDUQSc2uMzEvM biII= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id ee8055f1 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:36 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:15 +0200 Message-ID: <07159c4fa0c0a4a51c8f3c643f3f9964455e0501.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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-rpyc): New variable. --- gnu/packages/python-xyz.scm | 41 +++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 1a80de7818..6f80ff9d83 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33787,6 +33787,47 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-rpyc + (package + (name "python-rpyc") + (version "5.3.1") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/tomerfiliba-org/rpyc") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "15mnp9qkyw3mmxmr5y4kf3xkvxyp00n892vqaqwznr7al35apgnr")) + (snippet '(begin + ;; Disable deploy tests, these rely on OpenSSH and require + ;; configuring the SSH client manually to accept the host key. + (delete-file "tests/test_deploy.py") + ;; Disable tests requiring network access. These tests + ;; presently fail with the error "Network is unreachable". + (delete-file "tests/test_registry.py"))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-hatchling python-plumbum)) + (home-page "https://github.com/tomerfiliba-org/rpyc") + (synopsis + "Remote Python Call (RPyC) is a symmetric distributed computing library") + (description + "This Python module enables remote procedure calls, clustering, and +distributed-computing. For this purpose, it makes use of object-proxying, a technique +that employs python's dynamic nature, to overcome the physical boundaries between +processes and computers, so that remote objects can be manipulated as if they +were local.") + (license license:expat))) + (define-public python-nampa (package (name "python-nampa") From patchwork Thu Jul 11 21:27:16 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: 66161 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 A07C427BBE9; Thu, 11 Jul 2024 22:29:00 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 8509327BBE2 for ; Thu, 11 Jul 2024 22:28:57 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Kh-00073N-KK; Thu, 11 Jul 2024 17:28:07 -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 1sS1Ke-00072m-RJ for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:04 -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 1sS1Ke-0003Zn-IJ; Thu, 11 Jul 2024 17:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kd-0003zw-ED; Thu, 11 Jul 2024 17:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 05/11] gnu: Add python-pysmt. 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: Thu, 11 Jul 2024 21:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327415285 (code B ref 69074); Thu, 11 Jul 2024 21:28:03 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:54 +0000 Received: from localhost ([127.0.0.1]:52709 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KT-0003yM-6F for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:54 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KH-0003wh-JZ; Thu, 11 Jul 2024 17:27:42 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=WYa92QuA 5Y38u9mLXu9Y0x1GR1dl1znCtG5BK3gbTAM=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=wTHWXnNRO2d/nLjViDAyGDqUdLp xdjrXacIs/JzBhuqEomkD47Ybf/r83+Pc4ZzdFhAxBQGTosQGV1rpgb15zUE/fQVn0y2Sz E2HGK18TCQDB4QMhKNozuEeaxx6mLWvtSd9fQHE79IjjWEyxZXIbyKK0s2F9KQ4kbYrYxt PUSo= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 95d10653 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:37 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:16 +0200 Message-ID: <5c7c609f7ae022524529df3e9806c95a35fdb6af.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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/patches/python-pysmt-fix-pow-return-type.patch: New patch. * gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/python-xyz.scm (python-pysmt): New variable. --- gnu/local.mk | 2 + .../python-pysmt-fix-pow-return-type.patch | 258 ++++++++++++++++++ ...-pysmt-fix-smtlib-serialization-test.patch | 86 ++++++ gnu/packages/python-xyz.scm | 33 +++ 4 files changed, 379 insertions(+) create mode 100644 gnu/packages/patches/python-pysmt-fix-pow-return-type.patch create mode 100644 gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index ea4cc251ae..73b445f1fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1975,6 +1975,8 @@ dist_patch_DATA = \ %D%/packages/patches/python-pyan3-fix-absolute-path-bug.patch \ %D%/packages/patches/python-pyan3-fix-positional-arguments.patch \ %D%/packages/patches/python-pygpgme-fix-pinentry-tests.patch \ + %D%/packages/patches/python-pysmt-fix-pow-return-type.patch \ + %D%/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch \ %D%/packages/patches/python-pytorch-fix-codegen.patch \ %D%/packages/patches/python-pytorch-runpath.patch \ %D%/packages/patches/python-pytorch-system-libraries.patch \ diff --git a/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch new file mode 100644 index 0000000000..0ec2d41b3c --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-pow-return-type.patch @@ -0,0 +1,258 @@ +Backport of an upstream patch which fixes a test failure with our +packaged version of the Z3 SMT solver. + +Taken from: https://github.com/pysmt/pysmt/commit/f522e8cd8f3e75ff85f5eae29b427e18a6701859 + +diff --git a/pysmt/formula.py b/pysmt/formula.py +index ea4b46c..6cb9cbf 100644 +--- a/pysmt/formula.py ++++ b/pysmt/formula.py +@@ -252,11 +252,7 @@ class FormulaManager(object): + + if base.is_constant(): + val = base.constant_value() ** exponent.constant_value() +- if base.is_constant(types.REAL): +- return self.Real(val) +- else: +- assert base.is_constant(types.INT) +- return self.Int(val) ++ return self.Real(val) + return self.create_node(node_type=op.POW, args=(base, exponent)) + + def Div(self, left, right): +diff --git a/pysmt/logics.py b/pysmt/logics.py +index ef88dd6..9dc45b1 100644 +--- a/pysmt/logics.py ++++ b/pysmt/logics.py +@@ -495,6 +495,12 @@ QF_NRA = Logic(name="QF_NRA", + real_arithmetic=True, + linear=False) + ++QF_NIRA = Logic(name="QF_NIRA", ++ description="""Quantifier-free integer and real arithmetic.""", ++ quantifier_free=True, ++ integer_arithmetic=True, ++ real_arithmetic=True, ++ linear=False) + + QF_RDL = Logic(name="QF_RDL", + description=\ +@@ -619,41 +625,41 @@ QF_AUFBVLIRA = Logic(name="QF_AUFBVLIRA", + AUTO = Logic(name="Auto", + description="Special logic used to indicate that the logic to be used depends on the formula.") + +-SMTLIB2_LOGICS = frozenset([ AUFLIA, +- AUFLIRA, +- AUFNIRA, +- ALIA, +- LRA, +- LIA, +- NIA, +- NRA, +- UFLRA, +- UFNIA, +- UFLIRA, +- QF_ABV, +- QF_AUFBV, +- QF_AUFLIA, +- QF_ALIA, +- QF_AX, +- QF_BV, +- QF_IDL, +- QF_LIA, +- QF_LRA, +- QF_NIA, +- QF_NRA, +- QF_RDL, +- QF_UF, +- QF_UFBV , +- QF_UFIDL, +- QF_UFLIA, +- QF_UFLRA, +- QF_UFNRA, +- QF_UFNIA, +- QF_UFLIRA, +- QF_SLIA +- ]) +- +-LOGICS = SMTLIB2_LOGICS | frozenset([ QF_BOOL, BOOL, QF_AUFBVLIRA]) ++SMTLIB2_LOGICS = frozenset([AUFLIA, ++ AUFLIRA, ++ AUFNIRA, ++ ALIA, ++ LRA, ++ LIA, ++ NIA, ++ NRA, ++ UFLRA, ++ UFNIA, ++ UFLIRA, ++ QF_ABV, ++ QF_AUFBV, ++ QF_AUFLIA, ++ QF_ALIA, ++ QF_AX, ++ QF_BV, ++ QF_IDL, ++ QF_LIA, ++ QF_LRA, ++ QF_NIA, ++ QF_NRA, ++ QF_RDL, ++ QF_UF, ++ QF_UFBV, ++ QF_UFIDL, ++ QF_UFLIA, ++ QF_UFLRA, ++ QF_UFNRA, ++ QF_UFNIA, ++ QF_UFLIRA, ++ QF_SLIA ++ ]) ++ ++LOGICS = SMTLIB2_LOGICS | frozenset([QF_BOOL, BOOL, QF_AUFBVLIRA, QF_NIRA]) + + QF_LOGICS = frozenset(_l for _l in LOGICS if _l.quantifier_free) + +@@ -668,8 +674,8 @@ PYSMT_LOGICS = frozenset([QF_BOOL, QF_IDL, QF_LIA, QF_LRA, QF_RDL, QF_UF, QF_UFI + QF_BV, QF_UFBV, + QF_ABV, QF_AUFBV, QF_AUFLIA, QF_ALIA, QF_AX, + QF_AUFBVLIRA, +- QF_NRA, QF_NIA, UFBV, BV, +- ]) ++ QF_NRA, QF_NIA, QF_NIRA, UFBV, BV, ++ ]) + + # PySMT Logics includes additional features: + # - constant arrays: QF_AUFBV becomes QF_AUFBV* +@@ -697,7 +703,6 @@ for l in PYSMT_LOGICS: + ext_logics.add(nl) + + +- + LOGICS = LOGICS | frozenset(ext_logics) + PYSMT_LOGICS = PYSMT_LOGICS | frozenset(ext_logics) + +diff --git a/pysmt/solvers/z3.py b/pysmt/solvers/z3.py +index 3fb42b9..210b771 100644 +--- a/pysmt/solvers/z3.py ++++ b/pysmt/solvers/z3.py +@@ -595,6 +595,8 @@ class Z3Converter(Converter, DagWalker): + None, None, + 0, None, + expr.ast) ++ print("Z3: SMTLIB") ++ print(s) + stream_in = StringIO(s) + r = parser.get_script(stream_in).get_last_formula(self.mgr) + key = (askey(expr), None) +diff --git a/pysmt/test/examples.py b/pysmt/test/examples.py +index 73455ee..b653185 100644 +--- a/pysmt/test/examples.py ++++ b/pysmt/test/examples.py +@@ -898,12 +898,12 @@ def get_full_example_formulae(environment=None): + logic=pysmt.logics.QF_NRA + ), + +- Example(hr="((p ^ 2) = 0)", +- expr=Equals(Pow(p, Int(2)), Int(0)), ++ Example(hr="((p ^ 2) = 0.0)", ++ expr=Equals(Pow(p, Int(2)), Real(0)), + is_valid=False, + is_sat=True, +- logic=pysmt.logics.QF_NIA +- ), ++ logic=pysmt.logics.QF_NIRA ++ ), + + Example(hr="((r ^ 2.0) = 0.0)", + expr=Equals(Pow(r, Real(2)), Real(0)), +diff --git a/pysmt/test/test_back.py b/pysmt/test/test_back.py +index bceb45b..7a0ad63 100644 +--- a/pysmt/test/test_back.py ++++ b/pysmt/test/test_back.py +@@ -55,10 +55,10 @@ class TestBasic(TestCase): + res = msat.converter.back(term) + self.assertFalse(f == res) + +- def do_back(self, solver_name, z3_string_buffer=False): ++ def do_back(self, solver_name, via_smtlib=False): + for formula, _, _, logic in get_example_formulae(): + if logic.quantifier_free: +- if logic.theory.custom_type and z3_string_buffer: ++ if logic.theory.custom_type and via_smtlib: + # Printing of declare-sort from Z3 is not conformant + # with the SMT-LIB. We might consider extending our + # parser. +@@ -67,7 +67,7 @@ class TestBasic(TestCase): + s = Solver(name=solver_name, logic=logic) + term = s.converter.convert(formula) + if solver_name == "z3": +- if z3_string_buffer: ++ if via_smtlib: + res = s.converter.back_via_smtlib(term) + else: + res = s.converter.back(term) +@@ -84,8 +84,8 @@ class TestBasic(TestCase): + + @skipIfSolverNotAvailable("z3") + def test_z3_back_formulae(self): +- self.do_back("z3", z3_string_buffer=False) +- self.do_back("z3", z3_string_buffer=True) ++ self.do_back("z3", via_smtlib=True) ++ self.do_back("z3", via_smtlib=False) + + + if __name__ == '__main__': +diff --git a/pysmt/type_checker.py b/pysmt/type_checker.py +index b700fcf..7ce05aa 100644 +--- a/pysmt/type_checker.py ++++ b/pysmt/type_checker.py +@@ -33,6 +33,8 @@ class SimpleTypeChecker(walkers.DagWalker): + + def __init__(self, env=None): + walkers.DagWalker.__init__(self, env=env) ++ # Return None if the type cannot be computed rather than ++ # raising an exception. + self.be_nice = False + + def _get_key(self, formula, **kwargs): +@@ -42,7 +44,7 @@ class SimpleTypeChecker(walkers.DagWalker): + """ Returns the pysmt.types type of the formula """ + res = self.walk(formula) + if not self.be_nice and res is None: +- raise PysmtTypeError("The formula '%s' is not well-formed" \ ++ raise PysmtTypeError("The formula '%s' is not well-formed" + % str(formula)) + return res + +@@ -114,7 +116,7 @@ class SimpleTypeChecker(walkers.DagWalker): + + def walk_bv_comp(self, formula, args, **kwargs): + # We check that all children are BV and the same size +- a,b = args ++ a, b = args + if a != b or (not a.is_bv_type()): + return None + return BVType(1) +@@ -187,7 +189,7 @@ class SimpleTypeChecker(walkers.DagWalker): + if args[0].is_bool_type(): + raise PysmtTypeError("The formula '%s' is not well-formed." + "Equality operator is not supported for Boolean" +- " terms. Use Iff instead." \ ++ " terms. Use Iff instead." + % str(formula)) + elif args[0].is_bv_type(): + return self.walk_bv_to_bool(formula, args) +@@ -324,10 +326,7 @@ class SimpleTypeChecker(walkers.DagWalker): + def walk_pow(self, formula, args, **kwargs): + if args[0] != args[1]: + return None +- # Exponent must be positive for INT +- if args[0].is_int_type() and formula.arg(1).constant_value() < 0 : +- return None +- return args[0] ++ return REAL + + # EOC SimpleTypeChecker + diff --git a/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch new file mode 100644 index 0000000000..eee555f807 --- /dev/null +++ b/gnu/packages/patches/python-pysmt-fix-smtlib-serialization-test.patch @@ -0,0 +1,86 @@ +Backport of an upstream patch fixing a test suite failure. + +Taken from: https://github.com/pysmt/pysmt/commit/a246669a487aff69f5da34570ef867841d18508a + +diff --git a/pysmt/test/smtlib/test_parser_examples.py b/pysmt/test/smtlib/test_parser_examples.py +index cca4194..c0852be 100644 +--- a/pysmt/test/smtlib/test_parser_examples.py ++++ b/pysmt/test/smtlib/test_parser_examples.py +@@ -29,6 +29,7 @@ from pysmt.shortcuts import Iff + from pysmt.shortcuts import read_smtlib, write_smtlib, get_env + from pysmt.exceptions import PysmtSyntaxError + ++ + class TestSMTParseExamples(TestCase): + + def test_parse_examples(self): +@@ -41,7 +42,6 @@ class TestSMTParseExamples(TestCase): + buf = StringIO() + script_out = smtlibscript_from_formula(f_out) + script_out.serialize(outstream=buf) +- #print(buf) + + buf.seek(0) + parser = SmtLibParser() +@@ -49,7 +49,6 @@ class TestSMTParseExamples(TestCase): + f_in = script_in.get_last_formula() + self.assertEqual(f_in.simplify(), f_out.simplify()) + +- + @skipIfNoSolverForLogic(logics.QF_BV) + def test_parse_examples_bv(self): + """For BV we represent a superset of the operators defined in SMT-LIB. +@@ -108,7 +107,18 @@ class TestSMTParseExamples(TestCase): + self.assertValid(Iff(f_in, f_out), f_in.serialize()) + + def test_dumped_logic(self): +- # Dumped logic matches the logic in the example ++ # Dumped logic matches the logic in the example. ++ # ++ # There are a few cases where we use a logic ++ # that does not exist in SMT-LIB, and the SMT-LIB ++ # serialization logic will find a logic that ++ # is more expressive. We need to adjust the test ++ # for those cases (see rewrite dict below). ++ rewrite = { ++ logics.QF_BOOL: logics.QF_UF, ++ logics.BOOL: logics.LRA, ++ logics.QF_NIRA: logics.AUFNIRA, ++ } + fs = get_example_formulae() + + for (f_out, _, _, logic) in fs: +@@ -121,14 +131,9 @@ class TestSMTParseExamples(TestCase): + for cmd in script_in: + if cmd.name == "set-logic": + logic_in = cmd.args[0] +- if logic == logics.QF_BOOL: +- self.assertEqual(logic_in, logics.QF_UF) +- elif logic == logics.BOOL: +- self.assertEqual(logic_in, logics.LRA) +- else: +- self.assertEqual(logic_in, logic, script_in) ++ self.assertEqual(logic_in, rewrite.get(logic, logic)) + break +- else: # Loops exited normally ++ else: # Loops exited normally + print("-"*40) + print(script_in) + +@@ -136,7 +141,7 @@ class TestSMTParseExamples(TestCase): + fs = get_example_formulae() + + fdi, tmp_fname = mkstemp() +- os.close(fdi) # Close initial file descriptor ++ os.close(fdi) # Close initial file descriptor + for (f_out, _, _, _) in fs: + write_smtlib(f_out, tmp_fname) + # with open(tmp_fname) as fin: +@@ -197,7 +202,6 @@ class TestSMTParseExamples(TestCase): + f_in = script.get_last_formula() + self.assertSat(f_in) + +- + def test_int_promotion_define_fun(self): + script = """ + (define-fun x () Int 8) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6f80ff9d83..df9f5d742c 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33787,6 +33787,39 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-pysmt + (package + (name "python-pysmt") + (version "0.9.5") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (patches (search-patches "python-pysmt-fix-pow-return-type.patch" + "python-pysmt-fix-smtlib-serialization-test.patch")) + (uri (git-reference + (url "https://github.com/pysmt/pysmt") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0hrxv23y5ip4ijfx5pvbwc2fq4zg9jz42wc9zqgqm0g0mjc9ckvh")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'set-pysmt-solver + (lambda _ + (setenv "PYSMT_SOLVER" "z3")))))) + (native-inputs (list python-pytest)) + (propagated-inputs (list z3)) + (home-page "https://github.com/pysmt/pysmt") + (synopsis + "Solver-agnostic library for SMT formula manipulation and solving") + (description + "This Python module provides a solver-agnostic abstraction for +working with @acronym{SMT, Satisfiability Modulo Theory} formulas. For example, +it allows manipulation and solving such formulas.") + (license license:asl2.0))) + (define-public python-rpyc (package (name "python-rpyc") From patchwork Thu Jul 11 21:27:17 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: 66157 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 582B227BBEA; Thu, 11 Jul 2024 22:28: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 D020327BBE2 for ; Thu, 11 Jul 2024 22:28:35 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Ko-00076k-V7; Thu, 11 Jul 2024 17:28:14 -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 1sS1Kl-00074e-13 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:11 -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 1sS1Kk-0003aw-Od; Thu, 11 Jul 2024 17:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kd-000402-S2; Thu, 11 Jul 2024 17:28:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 06/11] gnu: Add python-claripy. 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: Thu, 11 Jul 2024 21:28:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327415292 (code B ref 69074); Thu, 11 Jul 2024 21:28:03 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:54 +0000 Received: from localhost ([127.0.0.1]:52711 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KU-0003yU-69 for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:54 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KJ-0003wh-6O; Thu, 11 Jul 2024 17:27:43 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=wFSGJxsT VVdBgvN1aVK9lennaNiX749AjNtd+we0+HM=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=ApvkcqUdm+AhYVc39/v3Pwi5AV9 /Z5bSoXdVQt7ypeWt34iUJ49E2aUE6UVm1MXmFvj+SdXyDzlFbivdyA9CHqLnObHsu7cuS etPs+mFeg+ANAqO0xhmDlqFVYLPvpO+cpbpzrp5+W6iOKkMzP8i6yr9VQRyIQdNnscQbFI eeMU= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 0760922e (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:37 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:17 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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): New variable. --- gnu/packages/python-xyz.scm | 40 +++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index df9f5d742c..dc92d4db08 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33787,6 +33787,46 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-claripy + (package + (name "python-claripy") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + ;; Fetching from Git as pypi release doesn't include all test files. + (method git-fetch) + (uri (git-reference + (url "https://github.com/angr/claripy") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0nmawpi1596d9plafrp2db36cjsidy2fagkzkja51jwlx2m1ngai")) + (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") + "")))))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (propagated-inputs (list python-cachetools python-decorator python-pysmt + z3)) + (home-page "https://github.com/angr/claripy") + (synopsis "Abstraction layer for constraint solvers") + (description + "This Python module provides an abstraction layer for interacting +with constraint solvers. Specifically, it is intended to be used with +SMT solvers and is built on top of the Z3 solver.") + (license license:bsd-2))) + (define-public python-pysmt (package (name "python-pysmt") From patchwork Thu Jul 11 21:27:18 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: 66162 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 4680127BBEA; Thu, 11 Jul 2024 22:29:03 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 AACB727BBE2 for ; Thu, 11 Jul 2024 22:29:02 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Kh-00073E-KR; Thu, 11 Jul 2024 17:28:07 -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 1sS1Ke-00072j-M6 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:04 -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 1sS1Ke-0003Zj-Dq for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Ke-00040F-8D for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 07/11] gnu: Add python-archinfo. Resent-From: soeren@soeren-tempel.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 11 Jul 2024 21:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@debbugs.gnu.org Cc: jgart@dismail.de Received: via spool by 69074-submit@debbugs.gnu.org id=B69074.172073327515300 (code B ref 69074); Thu, 11 Jul 2024 21:28:04 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:55 +0000 Received: from localhost ([127.0.0.1]:52713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KU-0003yb-HJ for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:54 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:34222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KJ-0003xJ-Pa; Thu, 11 Jul 2024 17:27:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=ignGIqBP ziIwyZHPgQOz2QYiz1PBnll1V5Mjs2ZnclA=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=fP3jlATNbwxVxh7btcMcAQCKZU/ l69qmxN1ftyHSCU7yfuwrrM3Ye+SH+HTWXIRxlrFuNg/p58sAQnPKV0Ba+tNiio4j09qeY 5IoegWNTJtDuALssQGtT8sMHJvwELiz3VVYWSoFSjK8Pm7vlir8DzKpNEznJXvWxcbXHNd Jvgk= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 3aa983f8 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:38 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:18 +0200 Message-ID: <9f8ca51725fa4cec56c5b170d038e111b9376a81.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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): New variable. --- gnu/packages/emulators.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 486610f1f0..f2b93666b1 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -67,6 +67,7 @@ (define-module (gnu packages emulators) #:use-module (gnu packages cross-base) #:use-module (gnu packages curl) #:use-module (gnu packages digest) + #:use-module (gnu packages engineering) #:use-module (gnu packages elf) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) @@ -2644,6 +2645,33 @@ (define-public python-keystone-engine assembly for these architectures.") (license license:gpl2))) +(define-public python-archinfo + (package + (name "python-archinfo") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "archinfo" version)) + (sha256 + (base32 "037xfq3wcf8ngayxz9623l4646m780v2102mfbygpzbkkjha1966")))) + (build-system pyproject-build-system) + (propagated-inputs (list python-capstone python-keystone-engine)) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/archinfo") + (synopsis "Extract architecture-specific information from binaries") + (description + "Collection of classes that contain architecture-specific information +information. Useful for cross-architecture tools (such as @code{python-pyvex}).") + (license license:bsd-2))) + (define-public emu8051 (let ((commit "5dc681275151c4a5d7b85ec9ff4ceb1b25abd5a8") (revision "1")) From patchwork Thu Jul 11 21:27:19 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: 66164 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 897C827BBE2; Thu, 11 Jul 2024 22:29:08 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0416327BBE9 for ; Thu, 11 Jul 2024 22:29:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Km-00075C-DC; Thu, 11 Jul 2024 17:28:12 -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 1sS1Ki-00073z-C8 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:08 -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 1sS1Ki-0003aa-2A; Thu, 11 Jul 2024 17:28:08 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Ke-00040R-L9; Thu, 11 Jul 2024 17:28:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 08/11] gnu: Add python-pyvex. 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: Thu, 11 Jul 2024 21:28:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327615310 (code B ref 69074); Thu, 11 Jul 2024 21:28:04 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:56 +0000 Received: from localhost ([127.0.0.1]:52715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KU-0003yj-Ts for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:56 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KK-0003wh-2C; Thu, 11 Jul 2024 17:27:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=Y3YXCIdA C/O8x6Ydu6xEbl7t4E+QE0SDHBphCW0yopQ=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=nq+fkyA9A7untiXrBkrEjMY2VIW kOt4mwanZ0L1eC2GR1hfYFrfGH4KrH0UtG/DQltymj7z9B9V+blyLSmvLg33Q4n4zL8VRl gDgteXYJ7fD0McgSPHTyH5t8r3F0wKlDpQEbXuAHyx9kU0Uv/ud7+S1sbt4RS/JAhdxMkC vnts= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id 0812bf2a (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:39 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:19 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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/patches/python-pyvex-remove-angr-dependency.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add it. * gnu/packages/python-xyz.scm (python-pyvex): New variable. --- gnu/local.mk | 1 + .../python-pyvex-remove-angr-dependency.patch | 80 +++++++++++++++++++ gnu/packages/python-xyz.scm | 37 +++++++++ 3 files changed, 118 insertions(+) create mode 100644 gnu/packages/patches/python-pyvex-remove-angr-dependency.patch diff --git a/gnu/local.mk b/gnu/local.mk index 73b445f1fc..020f85337a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1981,6 +1981,7 @@ 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 new file mode 100644 index 0000000000..dccf22bbc6 --- /dev/null +++ b/gnu/packages/patches/python-pyvex-remove-angr-dependency.patch @@ -0,0 +1,80 @@ +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 dc92d4db08..6abeac61e6 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -200,6 +200,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages docker) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) + #:use-module (gnu packages emulators) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -33787,6 +33788,42 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-pyvex + (package + (name "python-pyvex") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (patches (search-patches "python-pyvex-remove-angr-dependency.patch")) + (uri (pypi-uri "pyvex" version)) + (sha256 + (base32 "1v64rn7gxy6fg065bgsy38z6r494k5ri5r6sn4g08hjj32ihx1ka")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest"))))) + + (add-before 'build 'set-cc-native + (lambda _ + (setenv "CC" #$(cc-for-target)) + (setenv "CC_NATIVE" "gcc")))))) + (propagated-inputs (list python-archinfo python-bitstring python-cffi)) + (home-page "https://github.com/angr/pyvex") + (synopsis "Python interface to libVEX and VEX IR") + (description + "This package provides a Python interface the libVEX and VEX IR. +VEX is the intermediate representation (also known as intermediate +language) used by the Valgrind analysis tool. As such, VEX is designed +to enable all kinds of binary analysis tasks.") + (license license:bsd-2))) + (define-public python-claripy (package (name "python-claripy") From patchwork Thu Jul 11 21:27:20 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: 66158 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 8A2D427BBEA; Thu, 11 Jul 2024 22:28:39 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 0F46327BBE2 for ; Thu, 11 Jul 2024 22:28:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Kv-00078a-6u; Thu, 11 Jul 2024 17:28:21 -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 1sS1Kl-00074q-8Z for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:11 -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 1sS1Kk-0003az-Pl; Thu, 11 Jul 2024 17:28:10 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kf-00040a-36; Thu, 11 Jul 2024 17:28:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 09/11] gnu: Add python-cle. 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: Thu, 11 Jul 2024 21:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327715317 (code B ref 69074); Thu, 11 Jul 2024 21:28:05 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:57 +0000 Received: from localhost ([127.0.0.1]:52717 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KW-0003yu-GV for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:56 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:34222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KK-0003xJ-Is; Thu, 11 Jul 2024 17:27:45 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=xi94HUHw U9ElrBtgrVqx0icNJt5ROEG62VDi95CV+PA=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=y8setJUKNFPAv2HntUFQZJAc0/L zZbKFhf31Kc0mKvBJvaJqXsYfb75RJLH4K3BrQT6AjIPk64Zu3Q7lhGFiM2XFXBpyrHaAM I0Lj2c6xkXW3WzMDkjXKmjBhS4oNcYl7SdUg4adnJsh91uQ0VpMf/JT9OdBtmeEdb0z+Ai 0+Tk= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id a1b692ef (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:40 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:20 +0200 Message-ID: <8377ffdc36c8022548e348815af56ee40558f08d.1720733241.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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): New variable. --- gnu/packages/python-xyz.scm | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 6abeac61e6..a5b36fda81 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33788,6 +33788,32 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-cle + (package + (name "python-cle") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "cle" version)) + (sha256 + (base32 "0mswv9gd2p2ws7zfsshqv5ybbj27wkdwakdcknq4vsrx9ry9k4yc")))) + (build-system pyproject-build-system) + (arguments + (list + #:tests? #f)) + (propagated-inputs (list python-pefile python-pyelftools python-pyvex + python-sortedcontainers)) + (native-inputs (list python-cffi)) + (home-page "https://github.com/angr/cle") + (synopsis "Python loader for binaries and their associated libraries") + (description + "CLE loads binaries and their associated libraries, resolves +imports and provides an abstraction of process memory the same way as if +it was loader by the operating system's loader.") + (license license:bsd-2))) + (define-public python-pyvex (package (name "python-pyvex") @@ -33810,7 +33836,7 @@ (define-public python-pyvex (with-directory-excursion "tests" (invoke "python" "-m" "unittest"))))) - (add-before 'build 'set-cc-native + (add-before 'build 'set-cc (lambda _ (setenv "CC" #$(cc-for-target)) (setenv "CC_NATIVE" "gcc")))))) From patchwork Thu Jul 11 21:27:21 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: 66156 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 323CF27BBEA; Thu, 11 Jul 2024 22:28:32 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 A8B0B27BBE2 for ; Thu, 11 Jul 2024 22:28:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Kk-00074K-Sl; Thu, 11 Jul 2024 17:28:10 -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 1sS1Kg-00073A-LJ for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:06 -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 1sS1Kg-0003aI-CV; Thu, 11 Jul 2024 17:28:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kf-00040n-JB; Thu, 11 Jul 2024 17:28:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 10/11] gnu: Add python-ailment. 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: Thu, 11 Jul 2024 21:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327715324 (code B ref 69074); Thu, 11 Jul 2024 21:28:05 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:57 +0000 Received: from localhost ([127.0.0.1]:52719 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KW-0003z0-SN for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:57 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:29360) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KL-0003wh-Dt; Thu, 11 Jul 2024 17:27:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=1Vf6n2KE 1mHeCIBoQ/fsB7OfkJlLLVFFGfxEbNND6/Q=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=ZL5rDJqpbyG6jFAGKp/VyuG6eop Jd/aPzhi1FRrTe/Kz6TVQrhOP3m2jeYiBHmYTNzi8ANPeF2dUcmNZ85ahdHTopJk8dx/E6 ri9AXean04fbmnPkuneMAdXaBLAJ58hrexeV2jtFpxa1DxQmeHrCfWMC/Cgf2lKa0ez7dr DIvc= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id f12f7aaf (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:41 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:21 +0200 Message-ID: X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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): New variable. --- gnu/packages/python-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index a5b36fda81..190333b178 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -33788,6 +33788,34 @@ (define-public python-opcodes and BMI2).") (license license:bsd-2)))) +(define-public python-ailment + (package + (name "python-ailment") + ;; Must be the same version as python-angr. + (version "9.2.46") + (source + (origin + (method url-fetch) + (uri (pypi-uri "ailment" version)) + (sha256 + (base32 "073fcssbjis1ckwv2w0dcz2dfl6715bj4d4qdhspajj911mvng2f")))) + (build-system pyproject-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (replace 'check + ;; Many tests are skipped due to cyclic dependencies. + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (invoke "python" "-m" "unittest")))))))) + (home-page "https://github.com/angr/ailment") + (synopsis "The angr intermediate language") + (description + "This Python module implements an @acronym{IL, Intermediate Language}, +also known as @acronym{IR, Intermediate Representation}, used by the angr +binary analysis platform.") + (license license:bsd-2))) + (define-public python-cle (package (name "python-cle") From patchwork Thu Jul 11 21:27:22 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: 66159 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 AA02B27BBE9; Thu, 11 Jul 2024 22:28:50 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 CB1C327BBE2 for ; Thu, 11 Jul 2024 22:28:47 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sS1Kr-00077V-CG; Thu, 11 Jul 2024 17:28:18 -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 1sS1Kn-00076A-59 for guix-patches@gnu.org; Thu, 11 Jul 2024 17:28:13 -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 1sS1Kl-0003bI-Li; Thu, 11 Jul 2024 17:28:12 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sS1Kg-00040w-04; Thu, 11 Jul 2024 17:28:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#69074] [PATCH 11/11] gnu: Add python-angr. 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: Thu, 11 Jul 2024 21:28:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69074 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69074@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 69074-submit@debbugs.gnu.org id=B69074.172073327815331 (code B ref 69074); Thu, 11 Jul 2024 21:28:05 +0000 Received: (at 69074) by debbugs.gnu.org; 11 Jul 2024 21:27:58 +0000 Received: from localhost ([127.0.0.1]:52721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KX-0003z7-98 for submit@debbugs.gnu.org; Thu, 11 Jul 2024 17:27:58 -0400 Received: from magnesium.8pit.net ([45.76.88.171]:34222) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sS1KL-0003xJ-IW; Thu, 11 Jul 2024 17:27:46 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=opensmtpd; bh=n+2CXaCg edMu3m4fcbOBYzOZqkasA3XoGmgvO1vIjik=; h=references:in-reply-to:date: subject:cc:to:from; d=soeren-tempel.net; b=ery/vbchj9BwjE+LWW/wZ8VQpey r41QkIn4NFSrNldXcpfjFrgNHXrArVCC6sqOI+vloIBv/bOtbypap7kOKVY2Md5eDeHRuo rUUjJxTsfUSZ7SDV7oM1Qkids/10sL5jR9rejzBwo6OXqdUkMtQNQxIkQnwMbkKcSMjs6R XPWM= Received: from localhost (dynamic-2a02-3102-49da-001b-5547-c145-a90a-e426.310.pool.telefonica.de [2a02:3102:49da:1b:5547:c145:a90a:e426]) by magnesium.8pit.net (OpenSMTPD) with ESMTPSA id c7e3d3f0 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:YES); Thu, 11 Jul 2024 23:27:42 +0200 (CEST) From: soeren@soeren-tempel.net Date: Thu, 11 Jul 2024 23:27:22 +0200 Message-ID: <73739f70ff51aa943dabaad3fa8b7b01bb7925a0.1720733242.git.soeren@soeren-tempel.net> X-Mailer: git-send-email 2.45.2 In-Reply-To: References: 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/patches/python-angr-addition-type-error.patch: New patch. * gnu/packages/patches/python-angr-check-exec-deps.patch: New patch. * gnu/local.mk (dist_patch_DATA): Add them. * gnu/packages/python-xyz.scm (python-angr): New variable. --- gnu/local.mk | 2 + .../python-angr-addition-type-error.patch | 18 ++++ .../patches/python-angr-check-exec-deps.patch | 93 ++++++++++++++++++ gnu/packages/python-xyz.scm | 97 +++++++++++++++++++ 4 files changed, 210 insertions(+) create mode 100644 gnu/packages/patches/python-angr-addition-type-error.patch create mode 100644 gnu/packages/patches/python-angr-check-exec-deps.patch diff --git a/gnu/local.mk b/gnu/local.mk index 020f85337a..e584e426d0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1948,6 +1948,8 @@ 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-aionotify-0.2.0-py3.8.patch \ %D%/packages/patches/python-argcomplete-1.11.1-fish31.patch \ %D%/packages/patches/python-cross-compile.patch \ diff --git a/gnu/packages/patches/python-angr-addition-type-error.patch b/gnu/packages/patches/python-angr-addition-type-error.patch new file mode 100644 index 0000000000..7301d8b505 --- /dev/null +++ b/gnu/packages/patches/python-angr-addition-type-error.patch @@ -0,0 +1,18 @@ +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 new file mode 100644 index 0000000000..438f8ef183 --- /dev/null +++ b/gnu/packages/patches/python-angr-check-exec-deps.patch @@ -0,0 +1,93 @@ +The angr test suite performs analysis on several pre-compiled binaries +to ensure its binary analysis capabilities are working as intended. +Some of these binaries are also executed as part of the test suite to +test if the simulation engine provided by angr results in the same +output as native execution of the binary. + +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__)) + + + class TestCtypeLocale(unittest.TestCase): +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_b_loc(self): + """ + test_ctype_locale.test_ctype_b_loc +@@ -60,7 +60,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + def test_ctype_tolower_loc(self): + """ + test_ctype_locale.test_ctype_tolower_loc +@@ -109,7 +109,7 @@ class TestCtypeLocale(unittest.TestCase): + output = subprocess.check_output(bin_path, shell=True) + assert result == output + +- @skip_if_not_linux ++ @unittest.skip("test executes pre-compiled binaries") + 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__)) + + + 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") + 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): + # pylint: disable=no-self-use + + @slow_test +- @unittest.skipUnless(sys.platform.startswith("linux"), "linux-only") ++ @unittest.skip("test executes pre-compiled binaries") + 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/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 190333b178..318325f624 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -34067,6 +34067,103 @@ (define-public python-itanium-demangler mangled symbols, which can be used for directly extracting type information.") (license license:bsd-0))) +(define-public python-angr + (package + (name "python-angr") + (version "9.2.46") + (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")) + (uri (git-reference + (url "https://github.com/angr/angr") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "18y9wyf7va7gvp9zd6lhw82j9a2x2ajsvbawh96xnxzml0jwlwjm")))) + (build-system pyproject-build-system) + (arguments + (list + #:phases #~(modify-phases %standard-phases + (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"))) + (substitute* "tests/common.py" + (("\\[\"cc\"\\]") + "[\"gcc\"]"))))) + (replace 'check + (lambda* (#:key inputs tests? #:allow-other-keys) + (when tests? + (copy-recursively #$(this-package-native-input "binaries") + "../binaries") + (with-directory-excursion "tests" + ;; test_mips32_missing_offset_in_instructions fails + ;; with capstone 5 and passes with capstone 4. Might + ;; be a capstone regressions, needs investigation. + ;; + ;; test_concrete_memset is a non-deterministic benchmark. + (invoke "pytest" "-vv" "-x" "--dist" "loadfile" + "-k" "not test_mips32_missing_offset_in_instructions and not test_concrete_memset" + "-n" (number->string (parallel-job-count))))))) + (add-before 'build 'set-cc + (lambda _ + (setenv "CC" "gcc")))))) + (propagated-inputs (list python-ailment + python-archinfo + python-cachetools + python-cffi + python-claripy + python-cle + python-colorama + python-cppheaderparser + python-dpkt + python-gitpython + python-mulpyplexer + python-nampa + python-networkx + python-protobuf + python-psutil + python-itanium-demangler + python-pycparser + python-pyvex + python-progressbar2 + python-rpyc + python-sortedcontainers + python-sqlalchemy + python-sympy + unicorn)) + (native-inputs `(("python-pytest" ,python-pytest) + ("python-pytest-xdist" ,python-pytest-xdist) + ("binaries" + ;; This repository ships several binaries used only for testing + ;; purpose. The binaries are not executed and not part of the + ;; angr distribution, they are only used to test angr's binary + ;; analysis capabilities. In the context of the GNU FSDG, these + ;; files should be considered non-functional data. + ,(origin + (method git-fetch) + (uri (git-reference (url + "https://github.com/angr/binaries") + (commit (string-append "v" + version)))) + (file-name (git-file-name "angr-binaries" version)) + (sha256 (base32 + "1f286b2239zavxzwg1184hj1zs380cr9qr549mvy3vywvm8bsmgr")))))) + (home-page "https://github.com/angr/angr") + (synopsis "Multi-architecture binary analysis toolkit") + (description + "This package provides a versatile binary analysis platform with the +ability to perform dynamic symbolic execution as well as various +static analyses directly on binaries. As such, it can be used for all +kinds of reverse engineering, vulnerability discovery, exploit +generation, and software testing purposes.") + (license license:bsd-2))) + (define-public python-peachpy ;; There is no tag in this repo. (let ((commit "913d74c35a6b1d330e90bfc055208ce5b06b35a0")