From patchwork Thu Mar 10 09:31:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37716 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 2FB9B27BBEA; Thu, 10 Mar 2022 09:33:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 EDC6B27BBE9 for ; Thu, 10 Mar 2022 09:33:19 +0000 (GMT) Received: from localhost ([::1]:46764 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFAd-0001HY-4h for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:33:19 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50120) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAM-0001Gk-OM for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39314) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAM-0005P9-Eg for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAM-0002WQ-BR for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 1/7] gnu: hwdata: Set #:target #f. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047549581 (code B ref 54069); Thu, 10 Mar 2022 09:33:02 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:34 +0000 Received: from localhost ([127.0.0.1]:33186 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9t-0002UT-UH for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:34 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39864) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9r-0002Ty-N6 for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:32 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KDkP552dTz9sZJ; Thu, 10 Mar 2022 10:32:25 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904743; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=lekshpj3YDQ+8IJOkNyDpJIUcb4fW6PjUz8T82Vlqvg=; b=fNTG4YQXqToSuo39yJyq7pjOPu3n9j+2FpiZ0OeO5aLd7ho5IYHG26k8CaXD6e1g57jZ6/ DMlSd6cU8kcWc7o0uWEayuOTQS9bRME77Su6gk2aCQ4xp7/NIkk4N9fCOD3ZNXJ25fUjjF LGn2uBLUjDOlNwsLlnrgBKKItARH7mMS+zfdwzLTkTZ6d5CXnXGV/1vHFYWDTC9ETQsURf lmDx7RpEUB61Ti/FVfoOpTYF6AnHa+fhxPRhPDNoMXlzifXhrmBekgYbBtkznuSkjpfk0x wu3TU+hN7KohokQf/IhModnJEZy7K/SV8bAWCkeQAZQssQVtcZSQOJYCA7MQkA== Date: Thu, 10 Mar 2022 20:31:39 +1100 Message-Id: <20220310093145.31649-2-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pciutils.scm (hwdata): Set #:target #f to make cross-compiling free, as explained by Maxime in bug#54069. --- gnu/packages/pciutils.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 34abfb3c2d..5c25e78ac9 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -56,6 +56,7 @@ (define-public hwdata ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. (list #:tests? #f + #:target #f ; Make the derivation the same when cross-compiling, since it's just data. #:configure-flags #~(list (string-append "--datadir=" #$output "/share")) #:phases #~(modify-phases %standard-phases From patchwork Thu Mar 10 09:31:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37719 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 CCFFE27BBEA; Thu, 10 Mar 2022 09:34:03 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 A0EF727BBE9 for ; Thu, 10 Mar 2022 09:34:03 +0000 (GMT) Received: from localhost ([::1]:47670 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFBK-0001uI-PT for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:34:02 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50124) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0001H3-4D for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39315) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAM-0005PI-Ri for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAM-0002Wd-OZ for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 2/7] gnu: hwdata: Remove unused gzip native-input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047569593 (code B ref 54069); Thu, 10 Mar 2022 09:33:02 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:36 +0000 Received: from localhost ([127.0.0.1]:33190 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9w-0002Uf-5d for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:36 -0500 Received: from mout-p-202.mailbox.org ([80.241.56.172]:39888) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9u-0002U9-Q9 for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:35 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-202.mailbox.org (Postfix) with ESMTPS id 4KDkP85YsDz9sl1; Thu, 10 Mar 2022 10:32:28 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904746; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RlR6nk5JYK0yc4wjR0zmhmWGn0Tw1yDlwqQDLXH7xXo=; b=jeoalwyXFomUxkH9ihzq4KgV68v2EHrLFspnhJnCY09NRkRWIO8QqDixCrr8JuMQCj4u6Y z1tUje/jI6rQKyfn3sEEyv6sihVLINjBp/StH9ozJogElGrffkpNe8r01/XYr2jQ16E+qh Z0NtYgk8WsXZ+2UJiuSnTIJKO1TSiEmkSol7ek3gcZaGKZWjME2IajNYpvOJMFcptDRgHP 7pjeFXuh3566fhcTpEkyNs0QXqmh26zozv7V+/CkRCFioBTJJkrimMLoAQ2drq2iuXvNMW TUwGQn33cSf37B1aS6+3wJQ5Auu+tmaiMzMO7eOk3sEqKR7CVFuG3/IbYfBemg== Date: Thu, 10 Mar 2022 20:31:40 +1100 Message-Id: <20220310093145.31649-3-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pciutils.scm (hwdata): I accidently left this gzip input here which is unused. Remove it. --- gnu/packages/pciutils.scm | 1 - 1 file changed, 1 deletion(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 5c25e78ac9..bad42e238d 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -51,7 +51,6 @@ (define-public hwdata "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) (build-system gnu-build-system) (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) - (native-inputs (list gzip)) (arguments ;; Tests require pciutils, python, podman. Disable to avoid recursive dep. (list From patchwork Thu Mar 10 09:31:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37718 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 5977F27BBEA; Thu, 10 Mar 2022 09:33:24 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 2E1A627BBE9 for ; Thu, 10 Mar 2022 09:33:24 +0000 (GMT) Received: from localhost ([::1]:46894 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFAh-0001NL-8t for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:33:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50134) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0001HK-H4 for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39316) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0005PS-88 for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAN-0002Wk-4T for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 3/7] gnu: hwdata: Update to 0.357. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047599608 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:39 +0000 Received: from localhost ([127.0.0.1]:33194 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9z-0002Uu-C3 for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:39 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:34842) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSF9y-0002UQ-EK for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:38 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:105:465:1:4:0]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KDkPD23Kmz9sjD; Thu, 10 Mar 2022 10:32:32 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904750; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=r+t4uAZXSKy4GheYaQfOxpvA4gqrq9egbDuH1klNpO4=; b=Lyxvc6REf3OYnCBSvcodX0eoq/mhDFQ6I+K4BYxtRm4KoLCmeJnW3D4zc1lnyYFARbvld+ ymC90Fz7eg4wP7HmK2tuNu+B5I8NkAkOl5jZKC273Bu2/pM7i0JRwyoNdZgy/oZopoAorC p4dv79kvkHX425RLNXvgLBfEI6vg/Jriyf+nfVbrzh5kfkH0mCcrlWHPU0QqdE5an8KHHl aA7ZdfUezyK2ziHcxNUGdF1NwmwQFWPWwJGcwb0w7vVAv7H9+bH1PYMBm/MkFc2Q5uSQLU SIe32vVvMacGOB8CR9UWCVwzwIbkAFHwswWP2zGsMiytuSzL/OezKUC/w+x3AQ== Date: Thu, 10 Mar 2022 20:31:41 +1100 Message-Id: <20220310093145.31649-4-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pciutils.scm (hwdata): Update to 0.357. --- gnu/packages/pciutils.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index bad42e238d..41ba10f1e1 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -39,7 +39,7 @@ (define-module (gnu packages pciutils) (define-public hwdata (package (name "hwdata") - (version "0.356") + (version "0.357") ;hwdata is updated monthly (source (origin (method git-fetch) (uri (git-reference @@ -48,7 +48,7 @@ (define-public hwdata (file-name (git-file-name name version)) (sha256 (base32 - "0m04d93dwiplwp9v74nhnc0hyi2n007mylkg8f0frb46z5qjrpl3")))) + "0kvxpdx14w2myqm3dikjvr2mr4j6767y4v5j8v7kffwvcv0ga9gv")))) (build-system gnu-build-system) (outputs '("out" "iab" "oui" "pci" "pnp" "usb")) (arguments From patchwork Thu Mar 10 09:31:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37717 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 D3D8F27BBEA; Thu, 10 Mar 2022 09:33:21 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 95F0127BBE9 for ; Thu, 10 Mar 2022 09:33:21 +0000 (GMT) Received: from localhost ([::1]:46814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFAe-0001K3-NN for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:33:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50142) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0001Hd-Sr for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39317) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAN-0005Pb-Jj for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAN-0002Wr-GR for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 4/7] gnu: pciutils: Unbundle pci.ids and use latest. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047679633 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:47 +0000 Received: from localhost ([127.0.0.1]:33198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA7-0002VJ-J5 for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:47 -0500 Received: from mout-p-101.mailbox.org ([80.241.56.151]:34882) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA5-0002V2-HR for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:46 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-101.mailbox.org (Postfix) with ESMTPS id 4KDkPM4ppGz9sks; Thu, 10 Mar 2022 10:32:39 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mIdm/DZN9elqrSdPNkI6GwtW3ryHQx5St81iJ8XjCyA=; b=XWDQ+BuK9ck+6S/Jrb0yew+sogpMKWcA6BH2qZfANNruXHDnJkWaqliAeTOuPHkJkd9ioZ +v1/tTxIhTnFAjLr9ReR/oEOXyNf9LDMe0cpOcyqlmBbwADteDQHZdYh09IFAjDwjm9m89 gvuJkrh3NqA1IF9lkj9sA3Pnh3gdGXPoH2r7jibf9xGMXXOXCMnRgdy4JAjMwInA5f8pKa TqXCCJcM/ve8hpFBZkYVGzCo3mQjW8+0jk9LWtaf6/j9sg3Vy7GpQP9f/6RVFV/n3zfd5w fBThdftFGhZZ/9ieLvpuOOHpf98Qyq1mRALiEVt22HHeDktOM1zpbglZ1ionGA== Date: Thu, 10 Mar 2022 20:31:42 +1100 Message-Id: <20220310093145.31649-5-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/pciutils.scm (pciutils): [inputs]: Add hwdata:pci for latest pci.ids file. [arguments]: Don't install update-pciids script or it's man page. Don't install bundled old pci.ids file, use hwdata instead. Copy the pci.ids over so it can be gzipped. --- gnu/packages/pciutils.scm | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 41ba10f1e1..648d1385e4 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -93,8 +93,13 @@ (define-public pciutils (arguments `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'unbundle-pci.ids + (lambda* (#:key inputs outputs #:allow-other-keys) + (copy-file (string-append (assoc-ref inputs "hwdata:pci") + "/share/hwdata/pci.ids") + "pci.ids"))) (replace 'configure - (lambda* (#:key outputs #:allow-other-keys) + (lambda* (#:key inputs outputs #:allow-other-keys) ;; There's no 'configure' script, just a raw makefile. (substitute* "Makefile" ,@(if (%current-target-system) @@ -124,13 +129,19 @@ (define-public pciutils (("^SHARED=.*$") ;; Build libpciutils.so. "SHARED := yes\n") + (("^ZLIB=.*$") ;; Ask for zlib support, for 'pci.ids.gz' decompression. "ZLIB := yes\n") (("^IDSDIR=.*$") ;; Installation directory of 'pci.ids.gz'. - "IDSDIR = $(SHAREDIR)/hwdata\n")))) + "IDSDIR = $(SHAREDIR)/hwdata\n") + ;; Don't install update script or its man page, + ((".*INSTALL.*update-pciids .*") "") + (("update-pciids update-pciids.8 ") "") + (("(.*INSTALL.*)(update-pciids.8)(.*)" _ a _ b) + (string-append a b))))) (replace 'install (lambda* (#:key outputs #:allow-other-keys) ;; Install the commands, library, and .pc files. @@ -159,7 +170,8 @@ (define-public pciutils ,@(if (hurd-target?) `(("hurd-patch" ,(search-patch "pciutils-hurd-fix.patch"))) '()) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("hwdata:pci" ,hwdata "pci"))) (home-page "https://mj.ucw.cz/sw/pciutils/") (synopsis "Programs for inspecting and manipulating PCI devices") (description From patchwork Thu Mar 10 09:31:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37722 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 ED7D727BBEA; Thu, 10 Mar 2022 09:34:35 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 6B01627BBE9 for ; Thu, 10 Mar 2022 09:34:35 +0000 (GMT) Received: from localhost ([::1]:48476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFBq-0002WK-Ij for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:34:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50170) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAP-0001Ju-Nw for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAP-0005Q3-Dn for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAO-0002X6-9s for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 5/7] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047759667 (code B ref 54069); Thu, 10 Mar 2022 09:33:04 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:55 +0000 Received: from localhost ([127.0.0.1]:33206 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAC-0002Vh-4b for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:55 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:42770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA9-0002VA-WA for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:50 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4KDkPR41w1z9sc3; Thu, 10 Mar 2022 10:32:43 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1LxrSGoVBoCBpdsu7xexlcD8+MCaI9sy4XGFnBiqsJY=; b=2KJz6X17r3UdXlxsmOGCu3wkHFDG+HBPAfZCer5BXXTvsCFpMMUE5mbL/YW4EeNWmoZfI7 oCLAEODiiBvFSd+JRBODXoQ5E2ltu3GiNVRvFPBhVBsZw0ZFkbz+0fAGBrr9bpgclMhZ7w i2fFcoyLwZzXgiLvfANtwM71BmnJYqJHJl32UIQGuEjyPUHYKVPXLutw2JNrdY0xBEJEan Q7FRBVeq8b6OqvZkpx7RGnV8Uo9ckxrGKmGrpetNflCLdTkR5nUT7x5Ts6wii5CvxQVsbR epWavWaaNNA6gY8UZJvI1O1u7WTb5m8dqaB5ypDDQNo8SYQ6rhkL5GOmaqCLvw== Date: Thu, 10 Mar 2022 20:31:43 +1100 Message-Id: <20220310093145.31649-6-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (libosinfo): [arguments]: Use Gexp style. Use hwdata package for latest usb.ids and pci.ids. [inputs]: Add hwdata:pci, hwdata:usb. remove pci.ids, usb.ids origins. Use new input style. --- gnu/packages/virtualization.scm | 68 +++++++++++++++------------------ 1 file changed, 30 insertions(+), 38 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 8098a0aec3..5756c49b07 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -25,6 +25,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Raghav Gururajan ;;; Copyright © 2022 Oleg Pykhalov +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -98,6 +99,7 @@ (define-module (gnu packages virtualization) #:use-module (gnu packages onc-rpc) #:use-module (gnu packages package-management) #:use-module (gnu packages perl) + #:use-module (gnu packages pciutils) #:use-module (gnu packages pcre) #:use-module (gnu packages pkg-config) #:use-module (gnu packages polkit) @@ -1031,46 +1033,36 @@ (define-public libosinfo "0nd360c9ampw8hb6xh5g45q858df2r4jj9q88bcl6gzgaj0l3wxl")))) (build-system meson-build-system) (arguments - `(#:configure-flags - (list (string-append "-Dwith-usb-ids-path=" - (assoc-ref %build-inputs "usb.ids")) - (string-append "-Dwith-pci-ids-path=" - (assoc-ref %build-inputs "pci.ids"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-osinfo-path - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "osinfo/osinfo_loader.c" - (("path = DATA_DIR.*") - (string-append "path = \"" (assoc-ref inputs "osinfo-db") - "/share/osinfo\";")))))))) + (list + #:configure-flags + #~(list + (string-append "-Dwith-usb-ids-path=" + (ungexp (this-package-input "hwdata") "usb") + "/share/hwdata/usb.ids") + (string-append "-Dwith-pci-ids-path=" + (ungexp (this-package-input "hwdata") "pci") + "/share/hwdata/pci.ids")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-osinfo-path + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "osinfo/osinfo_loader.c" + (("path = DATA_DIR.*") + (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) (inputs - `(("libsoup" ,libsoup-minimal-2) - ("libxml2" ,libxml2) - ("libxslt" ,libxslt) - ("osinfo-db" ,osinfo-db))) + (list libsoup-minimal-2 + libxml2 + libxslt + osinfo-db + `(,hwdata "pci") + `(,hwdata "usb"))) (native-inputs - `(("glib" ,glib "bin") ; glib-mkenums, etc. - ("gobject-introspection" ,gobject-introspection) - ("gtk-doc" ,gtk-doc/stable) - ("vala" ,vala) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("pci.ids" - ,(origin - (method url-fetch) - (uri "https://github.com/pciutils/pciids/raw/ad02084f0bc143e3c15e31a6152a3dfb1d7a3156/pci.ids") - (sha256 - (base32 - "0kfhpj5rnh24hz2714qhfmxk281vwc2w50sm73ggw5d15af7zfsw")))) - ("usb.ids" - ,(origin - (method url-fetch) - (uri "https://svn.code.sf.net/p/linux-usb/repo/trunk/htdocs/usb.ids?r=2681") - (file-name "usb.ids") - (sha256 - (base32 - "1m6yhvz5k8aqzxgk7xj3jkk8frl1hbv0h3vgj4wbnvnx79qnvz3r")))))) + (list `(,glib "bin") ; glib-mkenums, etc. + gobject-introspection + gtk-doc/stable + vala + intltool + pkg-config)) (home-page "https://libosinfo.org/") (synopsis "Operating system information database") (description "libosinfo is a GObject based library API for managing From patchwork Thu Mar 10 09:31:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37721 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 26C8527BBE9; Thu, 10 Mar 2022 09:34:22 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 87EDC27BBED for ; Thu, 10 Mar 2022 09:34:21 +0000 (GMT) Received: from localhost ([::1]:48204 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFBc-0002Hm-Nl for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:34:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAP-0001Hs-DF for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39318) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAO-0005Po-2c for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAN-0002Wz-TS for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 6/7] gnu: libosinfo: Use this-package-input. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047729656 (code B ref 54069); Thu, 10 Mar 2022 09:33:03 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:32:52 +0000 Received: from localhost ([127.0.0.1]:33204 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAB-0002Ve-TX for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:52 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:37704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFA9-0002V9-OB for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:50 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KDkPR4vCgz9sV0; Thu, 10 Mar 2022 10:32:43 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904761; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5aKdLWqFvV+Nzh+g25gtPls2qK3HWauJNwyV/5fn3+w=; b=lpmZXs7QNjK9bXmcabImdwByju2vMTa+k1T/6V4bqKIaolUgkjX8z3ZUPmRPDci9MmsTBN X5eEgcjjLRRzaSnWFnqKtllNppg7FhaH+uRq6HaGMRaMCqhsTQgaEyppBrqiCC3poVR5Qo Rs0wJb73yGuWQyOC2Z0jkPG1T509xR/MlJr+0pBXyL/Ojc9gSN9Tg7I2MZOkm+U9dW9RGF 3Qc6NkVII8ObYj1SfzSX8l8UmlJuhUif9wdCR67bkDV0r3zsyYIm5GAniY/+ShRGnRiRb2 PaFy8tjaSQhjLiwDnXuOP0qtJfcKIHnIq1rrvAb7IbGGtlPBmcTkZ6HcCu4ESQ== Date: Thu, 10 Mar 2022 20:31:44 +1100 Message-Id: <20220310093145.31649-7-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/virtualization.scm (libosinfo): [arguments]: Use this-package-input for osinfo-db to support package-transformations. --- gnu/packages/virtualization.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 5756c49b07..10d9bd0de9 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -1048,7 +1048,9 @@ (define-public libosinfo (lambda* (#:key inputs #:allow-other-keys) (substitute* "osinfo/osinfo_loader.c" (("path = DATA_DIR.*") - (string-append "path = \"" #$osinfo-db "/share/osinfo\";")))))))) + (string-append "path = \"" + #$(this-package-input "osinfo-db") + "/share/osinfo\";")))))))) (inputs (list libsoup-minimal-2 libxml2 From patchwork Thu Mar 10 09:31:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Brendan Tildesley X-Patchwork-Id: 37720 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 4434027BBEA; Thu, 10 Mar 2022 09:34:04 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H5,RCVD_IN_MSPIKE_WL, 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 05B3027BBE9 for ; Thu, 10 Mar 2022 09:34:04 +0000 (GMT) Received: from localhost ([::1]:47702 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nSFBL-0001vp-5Q for patchwork@mira.cbaines.net; Thu, 10 Mar 2022 04:34:03 -0500 Received: from eggs.gnu.org ([209.51.188.92]:50158) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nSFAP-0001If-25 for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:39320) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nSFAO-0005Q7-PJ for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nSFAO-0002XE-Lk for guix-patches@gnu.org; Thu, 10 Mar 2022 04:33:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v3 7/7] gnu: libpciaccess: Use hwdata for pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 10 Mar 2022 09:33:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54069 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54069@debbugs.gnu.org Cc: John Kehayias , Ludovic =?utf-8?q?Court?= =?utf-8?q?=C3=A8s?= , Maxime Devos , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.16469047829702 (code B ref 54069); Thu, 10 Mar 2022 09:33:04 +0000 Received: (at 54069) by debbugs.gnu.org; 10 Mar 2022 09:33:02 +0000 Received: from localhost ([127.0.0.1]:33210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAI-0002W7-KQ for submit@debbugs.gnu.org; Thu, 10 Mar 2022 04:33:02 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:37734) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nSFAH-0002Vf-8B for 54069@debbugs.gnu.org; Thu, 10 Mar 2022 04:32:57 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [80.241.60.245]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4KDkPb37pBz9sjC; Thu, 10 Mar 2022 10:32:51 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1646904769; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=u8Kg3uuPdBugYsQQ5Ljw6DkS1qEYck3mLEl779Nw2yA=; b=nnRqsEhnQQmfB/ktNQ3aZvPrCc1INJgLISiYY+WV76RK9w+bRx6cUzKnJoGPKN4jP4sfo7 em17nRsFAxwwYq9zvK3bTm2BYNunRgKbV+1capxfXjNRzbv/wwuUsNLHdrq9tVXdWnFDJu FZJhPAMVGj+z0rLu2LjB3GRzAqan9eQR8hV3/KrsxicRw0APDozFS52RNdbTE8aeC8zibt mW6O4ZGWyn91O9YT1j82D7wnoH46ZTWF7nl7OLcDyg0i4wPjHHpZBf6Ynn5DAc0esz1Glr F8oDNXj0t13lgrGKXHbHyDXgkpbIfU77WoXJHOXzalsgIEONxXkFztIx8+cXzw== Date: Thu, 10 Mar 2022 20:31:45 +1100 Message-Id: <20220310093145.31649-8-mail@brendan.scot> In-Reply-To: <20220310093145.31649-1-mail@brendan.scot> References: <20220310093145.31649-1-mail@brendan.scot> 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/xorg.scm (libpciaccess): [arguments]: Remove zlib support since pci.ids isn't gzipped. Use Gexp. [inputs]: Add hwdata:pci, remove zlib, pciutils. [native-inputs]: Remove pkg-config since zlib isn't used. --- gnu/packages/xorg.scm | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14cd3bc789..67ce0c9980 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2021 Maxime Devos ;;; Copyright © 2021 qblade ;;; Copyright © 2021 Lu Hui +;;; Copyright © 2022 Brendan Tildesley ;;; ;;; This file is part of GNU Guix. ;;; @@ -1150,36 +1151,19 @@ (define-public libpciaccess (method url-fetch) (uri (string-append "mirror://xorg/individual/lib/libpciaccess-" - version - ".tar.bz2")) + version ".tar.bz2")) (sha256 (base32 "12glp4w1kgvmqn89lk19cgr6jccd3awxra4dxisp7pagi06rsk11")))) (build-system gnu-build-system) (arguments - '(;; Make sure libpciaccess can read compressed 'pci.ids' files as - ;; provided by pciutils. - #:configure-flags - (list "--with-zlib" - (string-append "--with-pciids-path=" - (assoc-ref %build-inputs "pciutils") - "/share/hwdata")) - - #:phases - (modify-phases %standard-phases - (add-after 'install 'add-L-zlib - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Provide '-LZLIB/lib' next to '-lz' in the .la file. - (let ((zlib (assoc-ref inputs "zlib")) - (out (assoc-ref outputs "out"))) - (substitute* (string-append out "/lib/libpciaccess.la") - (("-lz") - (string-append "-L" zlib "/lib -lz"))) - #t)))))) - (inputs - (list zlib pciutils)) ;for 'pci.ids.gz' - (native-inputs - (list pkg-config)) + (list + #:configure-flags + #~(list (string-append + "--with-pciids-path=" + (ungexp (this-package-input "hwdata") "pci") + "/share/hwdata/pci.ids")))) + (inputs (list `(,hwdata "pci"))) (home-page "https://www.x.org/wiki/") (synopsis "Xorg PCI access library") (description "Xorg Generic PCI access library.")