From patchwork Tue Jan 4 22:23:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: John Kehayias X-Patchwork-Id: 35954 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 3075D27BBEA; Tue, 4 Jan 2022 22:24: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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3, 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 EB1F327BBE9 for ; Tue, 4 Jan 2022 22:24:20 +0000 (GMT) Received: from localhost ([::1]:60608 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1n4sE8-0007nt-1o for patchwork@mira.cbaines.net; Tue, 04 Jan 2022 17:24:20 -0500 Received: from eggs.gnu.org ([209.51.188.92]:39024) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1n4sDr-0007mq-1P for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:55660) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1n4sDq-0001yJ-Nn for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1n4sDq-00036y-Fl for guix-patches@gnu.org; Tue, 04 Jan 2022 17:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#53015] [PATCH 1/4] gnu: Add pciutils-no-zlib. References: In-Reply-To: Resent-From: John Kehayias Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 04 Jan 2022 22:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 53015 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "53015@debbugs.gnu.org" <53015@debbugs.gnu.org> Received: via spool by 53015-submit@debbugs.gnu.org id=B53015.164133503711933 (code B ref 53015); Tue, 04 Jan 2022 22:24:02 +0000 Received: (at 53015) by debbugs.gnu.org; 4 Jan 2022 22:23:57 +0000 Received: from localhost ([127.0.0.1]:38971 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDl-00036P-4X for submit@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:57 -0500 Received: from mail-40131.protonmail.ch ([185.70.40.131]:62664) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1n4sDj-00036C-FJ for 53015@debbugs.gnu.org; Tue, 04 Jan 2022 17:23:56 -0500 Date: Tue, 04 Jan 2022 22:23:48 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail2; t=1641335028; bh=rqd1lJa5ZLzzJM9yWhNET4hMERT8sHtV4EzUZ/v3L7I=; h=Date:To:From:Reply-To:Subject:Message-ID:From:To:Cc; b=k3YWAHDfc93itrpiYjgWipzc0cVncFryaxGJKbJPTQHVPzL12+UJ8AaY7lVKN9nc8 LeuaL6A0hYTqL7LQ9AejA/P9qrJKdsjTJ024ceKrn5j3IvvG+D9Wpd/5nB2InTX1BB CQn+a0SofcmyHgVcHV3oHu4GQsWyGUE7RrezFrGO4hjCzXgPGtDs2DTI4DRtNkDKXc GMnHJcCYdlnINFh6N3tEvdVkTY8wsZayPRjp1b4Ew8XoEI8FmIC3rORPZotSq1xnd6 K5tQP50fcAYWV9/eJONzb1TXHjRt7oNSUBAuDFJzv2Mu2UffLt7mpOs7xagvtosP58 wFCWls87A9kNQ== Message-ID: <5P1tW8O5FTcp3WD4j3xIl-XLhBKkPhcqkNzoSzxFaihpC7qgFsz5y6o9KTXZaMz0dsMPT65dYa8FWU7CUAOXUE_iysyNYtfqzxHjVzGWsT0=@protonmail.com> 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" Reply-to: John Kehayias X-ACL-Warn: , John Kehayias via Guix-patches X-Patchwork-Original-From: John Kehayias via Guix-patches via From: John Kehayias X-getmail-retrieved-from-mailbox: Patches Empty Message From 0e8b852e0ff58a34141d804747b13b55088993b4 Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Tue, 4 Jan 2022 16:40:14 -0500 Subject: [PATCH 1/4] gnu: Add pciutils-no-zlib. * gnu/packages/pciutils.scm (pciutils-no-zlib): New variable. A hidden package to provide pciutils with uncompressed pci.ids. --- gnu/packages/pciutils.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/gnu/packages/pciutils.scm b/gnu/packages/pciutils.scm index 47275a8ff0..a8c46528d0 100644 --- a/gnu/packages/pciutils.scm +++ b/gnu/packages/pciutils.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; Copyright © 2019 Mathieu Othacehe ;;; Copyright © 2020 Jan (janneke) Nieuwenhuizen +;;; Copyright © 2022 John Kehayias ;;; ;;; This file is part of GNU Guix. ;;; @@ -129,3 +130,23 @@ (define-public pciutils of operating systems. This includes the @command{lspci} and @command{setpci} commands.") (license license:gpl2+))) + +;; This is a version of pciutils without zlib, so that the hardware pci.ids is +;; uncompressed. This is useful for packages that try to read pci.ids +;; directly. Alternatively, the uncompressed file could also be present in +;; pciutils or the direct source of pci.ids could be made available +;; separately, see: https://pci-ids.ucw.cz/ +(define-public pciutils-no-zlib + (hidden-package + (package + (inherit pciutils) + (arguments + (substitute-keyword-arguments (package-arguments pciutils) + ((#:phases phases) + `(modify-phases ,phases + (add-after 'configure 'disable-zlib + ;; remove zlib from Makefile to have uncompressed pci.ids + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "Makefile" + (("^ZLIB := .*$") + "ZLIB := no\n"))))))))))) -- 2.34.0