From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 6MH+AdStGWIhwwAAgWs5BA (envelope-from ) for ; Sat, 26 Feb 2022 05:34:28 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 6OpLNtOtGWJgQQEAG6o9tA (envelope-from ) for ; Sat, 26 Feb 2022 05:34:27 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 4CD3C3292D for ; Sat, 26 Feb 2022 05:34:27 +0100 (CET) Received: from localhost ([::1]:36390 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nNomo-0002Ad-GO for larch@yhetil.org; Fri, 25 Feb 2022 23:34:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:40884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nNomR-00027Q-In for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:60177) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nNomR-00083u-Ag for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nNomR-0005XS-0c for guix-patches@gnu.org; Fri, 25 Feb 2022 23:34:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#54069] [PATCH v2 3/4] gnu: libosinfo: Unbundle usb.ids, pci.ids. Resent-From: Brendan Tildesley Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 26 Feb 2022 04:34: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 , Maxim Cournoyer Received: via spool by 54069-submit@debbugs.gnu.org id=B54069.164584999621195 (code B ref 54069); Sat, 26 Feb 2022 04:34:02 +0000 Received: (at 54069) by debbugs.gnu.org; 26 Feb 2022 04:33:16 +0000 Received: from localhost ([127.0.0.1]:54068 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNolg-0005Vn-66 for submit@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:16 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:59218) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nNold-0005V2-3o for 54069@debbugs.gnu.org; Fri, 25 Feb 2022 23:33:13 -0500 Received: from smtp2.mailbox.org (smtp2.mailbox.org [IPv6:2001:67c:2050:105:465:1:2: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-201.mailbox.org (Postfix) with ESMTPS id 4K5DKH21l5z9sTd; Sat, 26 Feb 2022 05:33:07 +0100 (CET) From: Brendan Tildesley DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=brendan.scot; s=MBO0001; t=1645849984; 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=ZaHH8ZFC2m2Bu8t8vk5GLp+Ge/HgyY0OL217zp99/ok=; b=m8/cOV8sKkkJvX9Gij6m8wBmXyyEqVRm9zzXBPoEoRaTsYfwBhluya3NT/p5a30jEG9P10 J6x6fSuKdTPEPqEKo9mcPFPbjpWY1+rYXvwm1dB2amgl1AcQ2+6CLw8eu/UJJwsp7v1lP9 3yr5LrcosXeGFZ4NQQNAcQ3xMVHEaO2xUWM5MZma6Eg8fqXMuzdRoriE1O4h+FDI86MvcI seS91SGvRbMtNMUrfK86xKafFppmryg/KMrin7wMyFj9KWM1Gpb4ux/vJsInkTdmWJBjS6 v/tRHWnaxOZgBQiOgrIJJ7EgdT12Bjj4hyNpnLUrIQ0wY1rhw5SVmp2upSioQQ== Date: Sat, 26 Feb 2022 15:32:37 +1100 Message-Id: <20220226043238.2657-3-mail@brendan.scot> In-Reply-To: <20220226043238.2657-1-mail@brendan.scot> References: <20220226043238.2657-1-mail@brendan.scot> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1645850067; h=from:from:sender:sender: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:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ZaHH8ZFC2m2Bu8t8vk5GLp+Ge/HgyY0OL217zp99/ok=; b=n2Y9EN0Tc6p3d6GRfN6o1ktZzZJ8cwPpcjaplRjD46w4HxhrNjfIQhX74Y/L8faZErklt4 F6MaWtlKuSBku1HAg/a8WDY08KHfgQRF1nG5lYMWV29ZJ9lb0Rj0d2/VH0CoTWtVOTAroO 0XBMQEArVlMRrnrY+X5XBg0RYz3ERejUPBvdBn2ervr2yg+oZ1ShJsL6WVYwRuhtRlGbk9 RQwmjrODM+72RCkgau4ay3oqBBnj0NJrWtDGTcfKqtQCvgyjjBQrcEcfbCgKZMdIyqC9NX 1ICW80g63x9IiISmZFGfH2F72Y6LjNxF+aBZaHJI5OMTkzYK8g3cgmubGLQEjQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1645850067; a=rsa-sha256; cv=none; b=WyQJH7ud167j67rJaRUDkwPyop45xkBxCuDSqQo89r3pWpE1CJpzdi9eMzRTJ0Hwm7GjJc RWHUWt9amf/djBhtalsSKRbzbjjuvgVuZS0ZF1U60gRUrcQKDsdELBRkTfQcqHlysQqypB SciUKvrdhSTJHNJwCOYwgwT0QX0IHjcB59wkmutGDusV4RwmTu9CYi+CGFKhGdIWVPseiM VrxP+JJTZSzOBZ4P/AV/LBsj32m/5gq75UuzGgXy/Nfvl6IfLmBL/gwa01skaDrq7TThIX NmDyvBKFbNkuMS3p+wn8a4wmERuPjV3fVy33CkS1NGV+C2hWcml/XBvaj5FLJQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="m8/cOV8s"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 0.98 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=brendan.scot header.s=MBO0001 header.b="m8/cOV8s"; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 4CD3C3292D X-Spam-Score: 0.98 X-Migadu-Scanner: scn0.migadu.com X-TUID: u/yW6y6wTnjM * 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 | 64 ++++++++++++++------------------- 1 file changed, 26 insertions(+), 38 deletions(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 506ebe4bc2..c890b43a3e 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) @@ -1027,46 +1029,32 @@ (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=" #$hwdata:usb "/share/hwdata/usb.ids") + (string-append "-Dwith-pci-ids-path=" #$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)) (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 + `(,hwdata "pci") + `(,hwdata "usb"))) (home-page "https://libosinfo.org/") (synopsis "Operating system information database") (description "libosinfo is a GObject based library API for managing -- 2.34.0