From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 0hJBJ3YGD2F6UgAAgWs5BA (envelope-from ) for ; Sun, 08 Aug 2021 00:17:26 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id 4ORjInYGD2HCDQAA1q6Kng (envelope-from ) for ; Sat, 07 Aug 2021 22:17:26 +0000 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 4A3CA9583 for ; Sun, 8 Aug 2021 00:17:26 +0200 (CEST) Received: from localhost ([::1]:43574 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mCUdB-0005xF-9F for larch@yhetil.org; Sat, 07 Aug 2021 18:17:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45692) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mCUQE-0001Dy-UM for guix-patches@gnu.org; Sat, 07 Aug 2021 18:04:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41724) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mCUQE-0001sh-NQ for guix-patches@gnu.org; Sat, 07 Aug 2021 18:04:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mCUQE-0001N8-Il for guix-patches@gnu.org; Sat, 07 Aug 2021 18:04:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49934] Subject: [PATCH 2/3] gnu: Add hwinfo. References: In-Reply-To: Resent-From: phodina Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 07 Aug 2021 22:04:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49934 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: "49934@debbugs.gnu.org" <49934@debbugs.gnu.org> Received: via spool by 49934-submit@debbugs.gnu.org id=B49934.16283738405266 (code B ref 49934); Sat, 07 Aug 2021 22:04:02 +0000 Received: (at 49934) by debbugs.gnu.org; 7 Aug 2021 22:04:00 +0000 Received: from localhost ([127.0.0.1]:53270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCUQC-0001Mr-7T for submit@debbugs.gnu.org; Sat, 07 Aug 2021 18:04:00 -0400 Received: from mail1.protonmail.ch ([185.70.40.18]:35362) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mCUQA-0001Mc-90 for 49934@debbugs.gnu.org; Sat, 07 Aug 2021 18:03:59 -0400 Date: Sat, 07 Aug 2021 22:03:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail; t=1628373831; bh=1YI3W0R/wQ7qlbRGhqTiQgZT4HrpL6Rn2hJFkJXApKQ=; h=Date:To:From:Reply-To:Subject:From; b=rNabqTF1DtLUFQIPkDXHebB3qk3loGI6LndP4S8EkXztF2SaGxXqXWY4tk3qUkwGZ U2NaMmsmLiZzBPiE8UhEXjhMNm4nArESpKp2uedXU1Wz7/sCxuF24IzJnuGbvMo+b2 yZZii7zlCVumQXIzvrmjRQ9OvQh3U4oGZdP5pd8w= Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable 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" Reply-to: phodina X-ACL-Warn: , phodina via Guix-patches From: phodina via Guix-patches via X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1628374646; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to: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=1YI3W0R/wQ7qlbRGhqTiQgZT4HrpL6Rn2hJFkJXApKQ=; b=COzadN/UiQuJqV90XUl7RkR2iknyuBxM9ZhvLE9xED2JWE1BPXau2rYDYjyxaq4itfxheR kEVP4ttJjv0yZK0Oj1wWrxr00xznmZ78Rs0TRWAst7gd0EL8F/5f83L8XHYs+JWQYqNPsy 7/oMj2F0mX7hBPqi4GbuAGu2dk6XE5qavJ0RiiOm6+c3JBh8kRf/Tpjp5lBMwIjLqRe0Dp hSzDD6NHBOPx5nBOEgUE6ePFWjfBKPC/wDEVQfK6Ig8qOGu5l51pcqUa3vkJc6XBL+UsYp c2CDZSesRxPxzyd9qY1m50ciWOWDcBj6Ea1ynDImXYhtLG0kdu6IYERfX8C74Q== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1628374646; a=rsa-sha256; cv=none; b=Fyd1mkXHYf0wNuWtez0LeVzzmeVUgB7A96jdtxE4YbCrPh6mfagi0M4nI2kq+sobUhTs9i /pHwFfCJTQJN6AMx1PdwSlW1HosZOyNTlGt/5yEyEkTs96/2qUlSgTnE29zBEzlX3No52+ UTsTmPUHgKXlOKe7ToVG2/k7SxuZP7ie513amTPFstHYPSAI8Smt4lad0DtmZdMvhKoOgW CUfx1mb0dAbRieV9fCP9+Sy+CMl5oKAUCY7dR6/h/5M5mY7hGIpZgHgEaxe4KmRTCf617v h5rlIo73CTvR4GWOxE2d0V4P1Ayo1h4giSgZq0BqYzJkQcDR3asFJHbk2yPomA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=rNabqTF1; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -2.92 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=protonmail.com header.s=protonmail header.b=rNabqTF1; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 4A3CA9583 X-Spam-Score: -2.92 X-Migadu-Scanner: scn0.migadu.com X-TUID: 1ieew/QGlIpm * gnu/packages/hardware.scm: (hwinfo): New variable. diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 93be54cb18..bcba8bd9e4 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -32,6 +32,7 @@ #:use-module (gnu packages crypto) #:use-module (gnu packages curl) #:use-module (gnu packages documentation) + #:use-module (gnu packages flex) #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -172,6 +173,54 @@ through the Display Data Channel Command Interface (@d= fn{DDC/CI}) protocol.") human-readable format and checks if it conforms to the standards.") (license license:expat)))) +(define-public hwinfo +(package + (name "hwinfo") + (version "21.75") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/openSUSE/hwinfo") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "139bgzwi8iy1dz0g8mqpq9iig8klsmnb5c2sp0v7qgbgh7xxnqn3")))) + (build-system gnu-build-system) + (arguments + `(#:tests? #f ; no tests + ;; disable as there is a bug where the src/hd is not build as depend= ency + #:parallel-build? #f + #:make-flags (list + (string-append "DESTDIR=3D" %output) + (string-append "LDFLAGS=3D-Lsrc -Wl,-rpath=3D" %output= "/lib") + (string-append "CC=3D" ,(cc-for-target)) + (string-append "HWINFO_VERSION=3D" ,version)) + #:phases (modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-sbin-and-flex + (lambda* (#:key inputs #:allow-other-keys) + (delete-file "git2log") + (let* ((file (open-file "VERSION" "a"))) + (display ,version file) + (close-port file)) + (substitute* "Makefile" + (("/sbin") "/bin") + (("/usr/lib.*") "/lib\n") + (("^TARGETS.*") "TARGETS =3D hwinfo hwinfo.pc\n= ") + (("/usr") "/")) + (substitute* "src/isdn/cdb/Makefile" + (("lex isdn_cdb.lex") "flex isdn_cdb.lex")) + (substitute* "hwinfo.pc.in" + (("prefix=3D/usr") (string-append "prefix=3D" %= output)))))))) + (native-inputs `(("flex" ,flex) ("perl" ,perl) ("pkg-config" ,pkg-config= ))) + (inputs `(("libx86emu" ,libx86emu) ("util-linux:lib" ,util-linux "lib"))= ) + (synopsis "Hardware information tool") + (description "Probe for the hardware present in the system. It can be u= sed +to generate a system overview log which can be later used for support.") + (home-page "https://github.com/openSUSE/hwinfo") + (license license:gpl2))) + (define-public i7z (let ((revision "0") (commit "1a41ff13db747e962456ddbb5ccb2b7fc43ca0cb")) -- 2.32.0