From patchwork Thu May 15 03:43:22 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 42615 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 149CD27BC4A; Thu, 15 May 2025 04:45:14 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 6506527BC49 for ; Thu, 15 May 2025 04:45:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFPWs-00048q-5Q; Wed, 14 May 2025 23:45:06 -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 1uFPWq-00047w-3r for guix-patches@gnu.org; Wed, 14 May 2025 23:45: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 1uFPWp-0003ED-O6 for guix-patches@gnu.org; Wed, 14 May 2025 23:45:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=PoIb/SvBYvjg8/gI+scsft83SE8Js25IQsReBJEfqvs=; b=poIrEuJw+/AxNpuXSb6u6lb+POyEzdYnOXHX37BISMxV0RwTdBkridBLtBHeKsdjP1dfNDqpbiGgUy3nvtTo5v1W06bN8UZ7/u/B6UWiR2+7wIzLv9FJhR+875B85CfWiQhNYmirbUEXkt3ngqt9uU1t41boaisfpaQP/hYl8X82eqmgF+pwbZ/RLTOh9moyysxZsOosy8UwibY5/OISrv+uYDTJkvYxLrgtZ3+727XaPhztBkBZ6vscuK/B+8JORTRFQ0St1MXT2VOo9Hd1+OlT1yMiCO4pyA+9tMBnma+cq9th2IbdfUossVSFLWa8M2ZF5dBS3WQ7xIXv3NIpZg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFPWo-00020R-R8; Wed, 14 May 2025 23:45:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78434] [PATCH 1/3] gnu: python-lief: Update to 0.14.1 Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Thu, 15 May 2025 03:45:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78434@debbugs.gnu.org Cc: Raven Hallsby , Lars-Dominik Braun , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour X-Debbugs-Original-Xcc: Lars-Dominik Braun , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour Received: via spool by 78434-submit@debbugs.gnu.org id=B78434.17472806557496 (code B ref 78434); Thu, 15 May 2025 03:45:02 +0000 Received: (at 78434) by debbugs.gnu.org; 15 May 2025 03:44:15 +0000 Received: from localhost ([127.0.0.1]:48752 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFPW2-0001wm-N7 for submit@debbugs.gnu.org; Wed, 14 May 2025 23:44:15 -0400 Received: from mail-io1-xd2f.google.com ([2607:f8b0:4864:20::d2f]:57456) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFPVz-0001wT-Ub for 78434@debbugs.gnu.org; Wed, 14 May 2025 23:44:12 -0400 Received: by mail-io1-xd2f.google.com with SMTP id ca18e2360f4ac-85b3f92c8dfso13468339f.2 for <78434@debbugs.gnu.org>; Wed, 14 May 2025 20:44:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1747280645; x=1747885445; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PoIb/SvBYvjg8/gI+scsft83SE8Js25IQsReBJEfqvs=; b=anmlMvbvvsommPElDuMIkU0qd3+o+/1UCZvKbtE3nYY4fbdKSSWZdY8bi7DSi9l00n /yaeWZfkTKK85ZZEkCj004S8biDBNWEyJaSAwaeC1dyYT0VMlC2O73j3zl+fBn9lh/eR ObEczTasJJTVgY0WT87lv/ZlDWsSD9P+9erLitzVsN5/k5yElbrNrmtOr2hmU4rUZRPC EcegelIWBhZPeP69Vr8cNmKZO0btr2eVR7xqarX5aPWPOtnlVzFRfatFLmzvQ1KhfaOU 0qcSvi0U1eHKy5D9kOlNSQO54cdLh/ikfxv6RMRflcvJ0cu2cP1+7SLEZ8QzNSCfg9r/ 1hpA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747280645; x=1747885445; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PoIb/SvBYvjg8/gI+scsft83SE8Js25IQsReBJEfqvs=; b=rlpGzjOQd1Ho6faHsYPuoRSeODA0B0xsFIpWbioSz6DK3LlLVbuD+lFYTifRtPaBgb WZf8HjS0msGcNk/JF2Mq/zR2jWh6u9of+U/RPQgFZh0ZLKBCCG2GVsrffZ02zZhCnw8t fBSJI9lN025PX2qoTdYDS9igYemw522laavzrq5yI7ZneSfSEAKvR3lxfSGaE2wroIfh MFXTVUum33A20oq+eMrV2/s8NFFE7j1vvaXH4w6EcE9vTJlRjQHkgDNS0ZEmnp8fUqo7 qJBmaUv025SGptkvdD4lW3l/63r862coRQ9BmMmy1kRRoxoWVllkD0XHc1pLoo6PVh2I SUiA== X-Gm-Message-State: AOJu0Yw4NUinFy1IW36w/4WkrDlfXG1kXO7JOCZcbiHlVxFORnIOEfpZ CGpFv1WUoBBsCN+m6kYe61jkL7c1LuUo2+q0We3JoTHNN4XcojuGj0cuV5Vhfso0ws42WQE/3qE = X-Gm-Gg: ASbGncuu0oZzfxrmrnLZRDNMFoqXK6uEAOqpxPxNS3MuPh9wTHtsxvzdu4UW301/lHl 7vJOUNKoTA8P5zUcZxq7VWHUqCl/kfxn59tyeagF73HnIL8y5lxYLWh+QdobjvRB7DLapFsVGVR nY4KRoJXIyPegWgvhipq2UC4ZzpT5NEdIj9a+1Nm+B6FE/dYz31+i+Ki9p0Ajm/RwfHROaNEygU gBtvVS9irfjqSOBvzWO6vCyC7rYxhIWZ00w4h+hYsxVCOszndY5PMsO9VuQqD9awpq+dfgtuges hw9J/SexIqR7H2Y2cYiEQcZMljObmNTDrXog/seB7C/gVTxYRKDCivp7 X-Google-Smtp-Source: AGHT+IEGJ/p/2UDVXgjNUeqJRpl4DyRF1xOw7ndHuCqin4yBHoEeslzqc/JnWVHE54zVYdJQ6nLx8g== X-Received: by 2002:a05:6e02:4914:b0:3db:6cc1:36f9 with SMTP id e9e14a558f8ab-3db6f7acf70mr59634375ab.8.1747280645444; Wed, 14 May 2025 20:44:05 -0700 (PDT) Received: from Karl-Desktop.raven ([207.237.222.72]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3da7e158a0esm37148415ab.53.2025.05.14.20.44.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 20:44:04 -0700 (PDT) Date: Wed, 14 May 2025 22:43:22 -0500 Message-ID: X-Mailer: git-send-email 2.49.0 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: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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: Raven Hallsby * gnu/packages/python-xyz.scm (python-lief): Update to 0.14.1. Change-Id: I047d5250497148c3a78a61305a9bdc1c8a0b9b29 --- gnu/packages/python-xyz.scm | 59 +++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 5d0ac818398..66786466ba0 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -39496,7 +39496,7 @@ (define-public python-misskey (define-public python-lief (package (name "python-lief") - (version "0.12.3") + (version "0.14.1") (source (origin (method git-fetch) (uri (git-reference @@ -39505,19 +39505,54 @@ (define-public python-lief (file-name (git-file-name name version)) (sha256 (base32 - "11i6hqmcjh56y554kqhl61698n9v66j2qk1c1g63mv2w07h2z661")))) - (build-system python-build-system) - (native-inputs (list cmake)) + "0v8kqylm1f3cv750jjjla7qlpsw6jz1fc9qax0jqbpfjvym8xf3f")))) + (build-system cmake-build-system) (arguments (list - #:tests? #f ;needs network - #:phases #~(modify-phases %standard-phases - (replace 'build - (lambda _ - (invoke - "python" "setup.py" "--sdk" "build" - (string-append - "-j" (number->string (parallel-job-count))))))))) + #:imported-modules `(,@%cmake-build-system-modules + ,@%pyproject-build-system-modules) + #:modules '((guix build cmake-build-system) + ((guix build pyproject-build-system) #:prefix py:) + (guix build utils)) + ;; All tests are written in Python and use Python's testing infra rather + ;; than a combination of CMake and Python. Must be done AFTER lief is + ;; installed to PYTHONPATH. + ;; Lief requires test inputs to be downloaded as a separate tarball from + ;; S3, which cannot have fixed-output derivations that track Lief's source. + #:tests? #f + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-env-vars + (lambda _ + (setenv "LIEF_VERSION_ENV" #$(package-version this-package)))) + (add-after 'build 'build-python-module + ;; (assoc-ref py:%standard-phases 'build)) + (lambda _ + (with-directory-excursion "../source/api/python" + ((assoc-ref py:%standard-phases 'build))))) + ;; Remove cmake-build-system's check phase so we can replace it with + ;; one that works with Python later. + (delete 'check) + (add-after 'install 'install-python-module + (lambda* (#:key inputs outputs (configure-flags '()) use-setuptools? + #:allow-other-keys) + (with-directory-excursion "../source/api/python" + (format #t "Python is at: ~a~%" (assoc-ref inputs "python")) + ((assoc-ref py:%standard-phases 'install) + #:inputs inputs + #:outputs outputs + #:configure-flags configure-flags + #:use-setuptools? use-setuptools?)))) + (add-after 'install-python-module 'add-install-to-pythonpath + (assoc-ref py:%standard-phases 'add-install-to-pythonpath))))) + (native-inputs + (list ninja python-pytest)) + (inputs + (list python-scikit-build-core + python-pathspec + python-pip + python-pydantic-2 python-pydantic-core + python-wrapper)) (home-page "https://github.com/lief-project/LIEF") (synopsis "Library to instrument executable formats") (description From patchwork Thu May 15 03:43:24 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 42617 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 1CEE527BC49; Thu, 15 May 2025 04:45:33 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 7DE8627BC49 for ; Thu, 15 May 2025 04:45:32 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFPWx-0004Cf-2R; Wed, 14 May 2025 23:45:11 -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 1uFPWr-00048p-JR for guix-patches@gnu.org; Wed, 14 May 2025 23:45:05 -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 1uFPWr-0003Ej-AC for guix-patches@gnu.org; Wed, 14 May 2025 23:45:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=g/d447GO3vDCKtFHQm8Bv/u9TGAIpzqVLtg8kk7tTF8=; b=n0ogM+Q1mQhId7u6tIBenlJ6dCMjqFaQ9htYflDvAB7LgmoJXFdf2ngYNOlSDsEgVCcs3kSXmIWaGt9ZwvziVDe/6g9OgbF9oIhlcexxO+tVissCbzwKLekHVKA0X6MiNg3Uch0UgCPr4jBsxO6SDZZNkNZ44AcyFdVJJx2wlC6yubUKRe7uNmYwzyfxi1G3vtHM3s+4nSl0F6pxWsgZP4LaqTENPEDTk2M1GB5HFb0YDlPg6jg6VdERO/Jc6QKhqKASFL8/gGIjmsOsuNbFUcxTsUQd6u0lxAVczvNEzKM000OGRa8yZd6WAA/lUU/IMjcq7+aUYxISyeUuZLPGuA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFPWp-00020l-TG; Wed, 14 May 2025 23:45:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78434] [PATCH 2/3] gnu: python-sh: Update to 2.0.6 Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: lars@6xq.net, me@bonfacemunyoki.com, sharlatanus@gmail.com, tanguy@bioneland.org, guix-patches@gnu.org Resent-Date: Thu, 15 May 2025 03:45:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78434@debbugs.gnu.org Cc: Raven Hallsby , Lars-Dominik Braun , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour X-Debbugs-Original-Xcc: Lars-Dominik Braun , Munyoki Kilyungi , Sharlatan Hellseher , Tanguy Le Carrour Received: via spool by 78434-submit@debbugs.gnu.org id=B78434.17472806677541 (code B ref 78434); Thu, 15 May 2025 03:45:03 +0000 Received: (at 78434) by debbugs.gnu.org; 15 May 2025 03:44:27 +0000 Received: from localhost ([127.0.0.1]:48756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFPWF-0001xZ-Cn for submit@debbugs.gnu.org; Wed, 14 May 2025 23:44:27 -0400 Received: from mail-io1-xd32.google.com ([2607:f8b0:4864:20::d32]:51395) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFPWD-0001xB-5W for 78434@debbugs.gnu.org; Wed, 14 May 2025 23:44:25 -0400 Received: by mail-io1-xd32.google.com with SMTP id ca18e2360f4ac-861d7a09c88so9714539f.2 for <78434@debbugs.gnu.org>; Wed, 14 May 2025 20:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1747280659; x=1747885459; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=g/d447GO3vDCKtFHQm8Bv/u9TGAIpzqVLtg8kk7tTF8=; b=gfCpOdbsxmQP2Sg+TUR9WDDaer2WmMrQRcaLYOXtciIHSjk9JbjhmVPt0HYO6Fdg1K O6qIHoaOICpYPKvuiLnleR4KxdqxG9MBYa6JnbPMT/ZlOouZFylqUNuWEVSL+J1lipu/ LHQ3X6ntaVZvqamqvlJUvqbbtkuP3KzWB2RtJvCaLeCoyd1OQWA6bEo+/zX5gGG6RzNu 882QlZL0mgCFtD0yvFGrlNkR4lxR4l9YtTNF/FPCgKMZKVw56jS8CyCLJiowSNbvX37o kWb+miCiyLVYlnj+IPkVplEDBc58PBJWAJN248zC3ohpyVp77SyRmAGm+YueVxWPFd67 4kng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747280659; x=1747885459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=g/d447GO3vDCKtFHQm8Bv/u9TGAIpzqVLtg8kk7tTF8=; b=PNmkahNEeeR98scLt7XD8p7CFVojOThptOwKHADp0kAq5mtFLkRK2jw5NqAVbAxLYZ vRbfifuNCF1WCvvA6KAqZviOVxiT+QFRxzWWodNQH7sdNqBwMfqrL2/6cKYZUzqFjS52 FDVbx48PL0ne1LJWdCJci2d0AmSH35OxE/GsF3yLhFtuO5MFNhm5Az30FzBXhK3pSYdI DrcbTHERQKYDcHIU5UWtFVzqOACh5zXuAqM0SMr151buFu21ZhE/RnSM9SzPhRgQCp8Q tkv7CMMY7SnC7RfDhCJsilPZsCYVxPAowVajEij06eUS9i5E7wH20bt4fr6eqQlQX0xM KPMA== X-Gm-Message-State: AOJu0YxYP8BfDKjjAt+ZKEvbUdqR9MuuK2sYmmIXYf8Qx93tYkwKsK/m bZkMo82rx6IRIvJ1vUpMLwznad0/PGbnil7Rtt5OAesdk8h4dJ14Yaxd0YAi5gTn1P2n5TeObWA = X-Gm-Gg: ASbGncvfmwyQ/wtCoJvHKnTdGGoV7NQFmOrwx0qh2Qy0UZH2lzPcBOpFqiDVG6fp5I0 RCR6gjvCzWiUXVT74BncBBxhrSfpMhmHEvqdvWFXUMDfjiMB62SO8ooXycQ/IPdS+rQQe5m2OG7 hB9vFz5ZOOWRnj8UA1vAGcVO0c01uexEo5D7pYvE+eyAxvF419klRiC8SV6DBjnsChoLEzZK7Ga Ut3+egfa6gFxVlquAiOTYRndYjDhrtC7edWOk8EqrQuTF5jtcOnOE0EgXc7dwfzGfde+qcVr19v h72zqneoTXNrf/swApjvtOgFRUGlk2GYqC8vM2/rYZLd1bHeGeZLv/LY X-Google-Smtp-Source: AGHT+IE3W0Tcu+p5CMgN/4nK1YWrbbhHjc1mDiqTBXqdKaHprN4L+5xZ6xvtXXCLarvfOSQ4uFxRsg== X-Received: by 2002:a05:6e02:3711:b0:3db:7007:2982 with SMTP id e9e14a558f8ab-3db7958ec49mr8684985ab.8.1747280658877; Wed, 14 May 2025 20:44:18 -0700 (PDT) Received: from Karl-Desktop.raven ([207.237.222.72]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3da7e158a0esm37148415ab.53.2025.05.14.20.44.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 20:44:18 -0700 (PDT) Date: Wed, 14 May 2025 22:43:24 -0500 Message-ID: <8d75f27f24f95a69b82af4854fc921dbe72f60ef.1747280060.git.karl@hallsby.com> X-Mailer: git-send-email 2.49.0 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: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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: Raven Hallsby gnu/packages/python-xyz.scm (python-sh): Update to 2.0.6. Change-Id: I0407fe9bbfef5b98ff6f7198e7fdd41e09fa94e1 --- gnu/packages/python-xyz.scm | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 66786466ba0..19b77c39d15 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -4099,25 +4099,21 @@ (define-public python-pylsp-mypy (define-public python-sh (package (name "python-sh") - (version "1.14.2") + (version "2.0.6") (source (origin (method url-fetch) (uri (pypi-uri "sh" version)) (sha256 (base32 - "03gyss1rhj4in7pgysg4q0hxp3230whinlpy1532ljs99lrx0ywx")))) - (build-system python-build-system) + "18bvpw02lzhlpsaqaf0kxybp0jb72c5iy1n0w9vwf0gj2grrhacv")))) + (build-system pyproject-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda _ - ;; XXX: A Python 2 test fails when HOME=/homeless-shelter. - (setenv "HOME" "/tmp") - (invoke "python" "sh.py" "test")))))) + ;; Tests rely on python-tox, which introduces a cyclic dependency problem + ;; here. + '(#:tests? #f)) (native-inputs - (list python-coverage)) + (list python-coverage python-poetry-core)) (home-page "https://github.com/amoffat/sh") (synopsis "Python subprocess replacement") (description "This package provides a replacement for Python's From patchwork Thu May 15 03:43:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Karl Hallsby X-Patchwork-Id: 42616 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 E64B327BC4B; Thu, 15 May 2025 04:45:23 +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=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 3721627BC49 for ; Thu, 15 May 2025 04:45:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uFPWu-0004BL-Bc; Wed, 14 May 2025 23:45: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 1uFPWq-00048R-Sz for guix-patches@gnu.org; Wed, 14 May 2025 23:45: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 1uFPWq-0003EQ-Jt for guix-patches@gnu.org; Wed, 14 May 2025 23:45:04 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=VkWinkevUQGDoc1eCmWmlTgzw5EBn8EBMPkyv8lOmb7GghO/4tTjJT5DpLQxydW/9sd1t42Q3U55l65akbUfEUO/DK/AoJpj6TTHCeaaN56CRAyufqzudxkJAU+mEquUr75M7750fMk/0drCwZhpX3xVnay5MyB2JJb3U5i8tQidKFV7nAMg1iNRmnsA4scm32fCC5bHbiiJu7AP68XAEwEdy6CIbzJqTCjWGjdN6GxNbI5G168NBMB3RHs9Ii9ealtues38GIxgjwKTK6TAPDybalZuIOVO1jkk6HGsW2OhKR2EqTpoThaOdnldOaU0s6HZtyaJ7af0POQvo94OMg==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1uFPWq-00020x-FY for guix-patches@gnu.org; Wed, 14 May 2025 23:45:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78434] [PATCH 3/3] gnu: Init sqlelf Resent-From: Karl Hallsby Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 May 2025 03:45:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78434 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78434@debbugs.gnu.org Cc: Raven Hallsby Received: via spool by 78434-submit@debbugs.gnu.org id=B78434.17472806877625 (code B ref 78434); Thu, 15 May 2025 03:45:04 +0000 Received: (at 78434) by debbugs.gnu.org; 15 May 2025 03:44:47 +0000 Received: from localhost ([127.0.0.1]:48760 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1uFPWU-0001yf-1h for submit@debbugs.gnu.org; Wed, 14 May 2025 23:44:47 -0400 Received: from mail-il1-x131.google.com ([2607:f8b0:4864:20::131]:43414) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1uFPWQ-0001xp-VH for 78434@debbugs.gnu.org; Wed, 14 May 2025 23:44:40 -0400 Received: by mail-il1-x131.google.com with SMTP id e9e14a558f8ab-3db6cda65efso5976565ab.1 for <78434@debbugs.gnu.org>; Wed, 14 May 2025 20:44:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hallsby.com; s=google; t=1747280673; x=1747885473; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=QnQc6qs9uRjJ6B0rvDyGeMhl+9Wsf40CTFZsFz+a8uXb3aARdLIX8jCuSfmF46+N/M GscvC8I89j0JmBKJWWme2PxarQdwqpxtN3bzeT2h3Z0GqS9j3RNMUA4RI0lkfPd1UhvW KJ2if12CjGinO58614nTcKLwLvb7ai5omxdube1mXx6oCCIqkZ+q0pxNwRllyazxUfCz A0k2dlk053/xf7iUXX0rL5VENgZT1gWqL/4U0TNGlqJih2c5cI+9WoV5a3jJGJjAeA1A L8oye7fHqjZkryKk5K5hsJHJJS2yRrbp3qkWHlqi7XcyAfwnXKMu+tjE7OVqNYbXe7Ti v+Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747280673; x=1747885473; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TXoqxxtPRvAcyE21NPAxanXh2COgBSb0PIO0kV87U18=; b=OuOy2DrTWSE9iHroJ9UScIN6IhEVx82QYG2eVBOcuhJk7Xf2h67DKvhqchGfZk/roo CgFNTiRs+TnkDTMpYcB1YKh7hD4DMEnZnsZgSWzjFaD40mxeszV/w2bNEYtUqhB7U0/D B2VBzUEBNE5HPb6wQ+qPNi8GBkisw3Gk76wGzDNciU3I3xErK8ib3gzbmr7XJFf2m8zp 0qm+jEB42Sy1XsOwn8Cgh+qew9BRomCg5tm5w01GiV3VAepvIT8Wi6pFN9tz6yhD0FLi wI9biok3pHqo9fkASl2pcS3MtuyNpVVy7Va7d1OXYnwMHsU4J+NlzkA/OuTSlbTXQCxS pStw== X-Gm-Message-State: AOJu0YywqHUSF8QyVW75VfDC/CSmwI8F1pVnIh6dFlssdEBz/uVUJ8pc aLQtbcqN0AogGNAL9QBwVEFuPFOQN4o2VIwXaJcxnYZ+yTBQj8duNhIr/9f5fUTlhlBm3T7LIeC 0RYg= X-Gm-Gg: ASbGnctuCgJ8sA3XSumdEnMCi+7DdUAyUAL8EKqQ4qpko4ZxKev03W84pIpSuvLHDVc w+G18fGJzDKOcDKF+/h35PTaEQKOyqpj16NYYsIvjQJhbS+pHPTLQEFrPnI48uvuOJLxpUXAML3 SuhAcIbfFVA0iVpWyfrxhZesFGTuzihoNIOUPM4pwMVly5qujyrVrvB/MeEOQoQj4wniHHQ84jX HLBkL/euujm7DGBCoOn0agsll+8/9n1wrhQ3DPUJtQ9kvHTIplXY7YnqTdEqQmfu1lz0TLbFAOW xO5WO32li76/iDk2jJWY+FuUeWfRpfnp3UQN9wJetSxyww3ZZMgKa1pXWXJ7+VyUbrM= X-Google-Smtp-Source: AGHT+IGSikTJwmpHGF22NIhwXKZ2urq+sii6rw3ECDO10skgbvQvXFzpjYajXJFmTGdrBxPkyuRA3Q== X-Received: by 2002:a05:6e02:1a6e:b0:3d4:346e:8d49 with SMTP id e9e14a558f8ab-3db778fd61amr25584325ab.9.1747280672582; Wed, 14 May 2025 20:44:32 -0700 (PDT) Received: from Karl-Desktop.raven ([207.237.222.72]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3da7e158a0esm37148415ab.53.2025.05.14.20.44.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 May 2025 20:44:31 -0700 (PDT) Date: Wed, 14 May 2025 22:43:26 -0500 Message-ID: <983934a84e58d4a8c7407c9253f46c6c637aff14.1747280060.git.karl@hallsby.com> X-Mailer: git-send-email 2.49.0 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: , Reply-to: Karl Hallsby X-ACL-Warn: , Karl Hallsby via Guix-patches X-Patchwork-Original-From: Karl Hallsby via Guix-patches via From: Karl Hallsby 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: Raven Hallsby Change-Id: I45bfb48e4f4c11dc97ec642a5248420b9ec8d75d --- gnu/packages/elf.scm | 76 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 75 insertions(+), 1 deletion(-) diff --git a/gnu/packages/elf.scm b/gnu/packages/elf.scm index 7b769770f83..2745f8cb124 100644 --- a/gnu/packages/elf.scm +++ b/gnu/packages/elf.scm @@ -13,6 +13,7 @@ ;;; Copyright © 2022 Daniel Maksymow ;;; Copyright © 2023, 2024 Janneke Nieuwenhuizen ;;; Copyright © 2024 Zheng Junjie <873216071@qq.com> +;;; Copyright © 2025, Raven Hallsby ;;; ;;; This file is part of GNU Guix. ;;; @@ -36,16 +37,25 @@ (define-module (gnu packages elf) #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix build-system gnu) - #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2)) + #:use-module (guix build-system pyproject) + #:use-module ((guix licenses) #:select (gpl2+ gpl3+ lgpl3+ lgpl2.0+ lgpl2.1 gpl2 bsd-2 expat)) #:use-module (gnu packages) #:use-module (gnu packages autotools) + #:use-module (gnu packages bash) #:use-module (gnu packages compression) + #:use-module (gnu packages check) + #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages engineering) #:use-module (gnu packages gcc) #:use-module (gnu packages m4) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) + #:use-module (gnu packages python-check) + #:use-module (gnu packages python-xyz) #:use-module (gnu packages sphinx) + #:use-module (gnu packages sqlite) #:use-module (gnu packages texinfo) #:use-module (gnu packages xml) #:use-module (srfi srfi-1) @@ -424,3 +434,67 @@ (define-public libdwarf debugging information format.") ;; See https://www.prevanders.net/dwarflicense.html: (license (list lgpl2.1 gpl2 bsd-2)))) + +(define-public sqlelf + ;; Some fixes since last tagged release + (let ((commit "a87e97c17550a0415a961fde0164352f171e7f52") + (revision "0")) + (package + (name "sqlelf") + (version (git-version "0.5" revision commit)) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/fzakaria/sqlelf") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0f5d1dgnphqigy03lw6wjrgmij77y146whglxbixqm67wm7w8a43")) + (modules '((guix build utils))) + (snippet + #~(begin + ;; Remove vendored version of elftools + (delete-file-recursively "sqlelf/_vendor") + (substitute* "sqlelf/elf.py" + (("sqlelf\\._vendor\\.elftools") "elftools")) + ;; Fix slighly incorrect pyproject.toml so that setuptools + ;; installs a source submodule into the wheel. + (substitute* "pyproject.toml" + (("packages = \\[\\\"sqlelf\\\"\\]") + "packages = [\"sqlelf\", \"sqlelf.tools\"]")))))) + (build-system pyproject-build-system) + (arguments + '(#:tests? #t + #:phases + (modify-phases %standard-phases + (add-before 'check 'set-test-bins + (lambda* (#:key inputs #:allow-other-keys) + (let ((ls (string-append (assoc-ref inputs "coreutils") "/bin/ls")) + (sh (string-append (assoc-ref inputs "bash") "/bin/sh"))) + ;; Replace hard-coded /bin/sh with one from the Store. + (format #t "Replace /bin/sh with ~a~%" sh) + (substitute* "tests/test_cli.py" + (("/bin/sh") sh)) + ;; Tell check phase where to find 'ls' in the store for tests. + (format #t "Set $TEST_BINARY to ~a~%" ls) + (setenv "TEST_BINARY" ls))))))) + (native-inputs + (list python-apsw + bash-minimal ; Needed for /bin/sh replacement in tests + capstone + python-capstone + python-lief ; MUST use python-lief 0.14.1 + python-pyelftools + python-pytest + python-setuptools + python-sh + python-wheel)) + (inputs + (list sqlite)) + (home-page "https://github.com/fzakaria/sqlelf") + (synopsis "Explore ELF objects through the power of SQL") + (description + "A tool that utilizes SQLite's virtual table functionality to allow you to explore Linux ELF objects through SQL.") + (license expat))))