From patchwork Wed Mar 23 18:48:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: M X-Patchwork-Id: 38026 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 8208727BBEB; Wed, 23 Mar 2022 18:50:42 +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,FREEMAIL_FROM,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 6243127BBEA for ; Wed, 23 Mar 2022 18:50:41 +0000 (GMT) Received: from localhost ([::1]:56274 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nX648-0005Vr-En for patchwork@mira.cbaines.net; Wed, 23 Mar 2022 14:50:40 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43966) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nX63X-0005Ul-Dy for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nX63W-00031q-5c for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1nX63W-0001Ff-2q for guix-patches@gnu.org; Wed, 23 Mar 2022 14:50:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54539] [PATCH 2/6] gnu: xsensors: Move to (gnu packages xorg) to break cycles. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Mar 2022 18:50:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54539 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54539@debbugs.gnu.org Cc: Maxime Devos Received: via spool by 54539-submit@debbugs.gnu.org id=B54539.16480613524687 (code B ref 54539); Wed, 23 Mar 2022 18:50:02 +0000 Received: (at 54539) by debbugs.gnu.org; 23 Mar 2022 18:49:12 +0000 Received: from localhost ([127.0.0.1]:46004 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nX62c-0001DK-Gi for submit@debbugs.gnu.org; Wed, 23 Mar 2022 14:49:12 -0400 Received: from baptiste.telenet-ops.be ([195.130.132.51]:33950) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1nX62Z-0001Ci-Hs for 54539@debbugs.gnu.org; Wed, 23 Mar 2022 14:49:04 -0400 Received: from localhost.localdomain ([IPv6:2a02:1811:8c09:9d00:3c5f:2eff:feb0:ba5a]) by baptiste.telenet-ops.be with bizsmtp id 9up12700i4UW6Th01up2o7; Wed, 23 Mar 2022 19:49:02 +0100 From: Maxime Devos Date: Wed, 23 Mar 2022 18:48:51 +0000 Message-Id: <20220323184855.25241-2-maximedevos@telenet.be> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220323184855.25241-1-maximedevos@telenet.be> References: <20220323184855.25241-1-maximedevos@telenet.be> MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r22; t=1648061342; bh=4f4R0oYMus6qnBnpKBPLIZPl+aNwzxDiZ0MW4WFy9rA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FCzxaXiY4snMR/yhyM9Ol60ClNzT8veF3k8d/ifliEXuXYRO3gxygzPtymo694x5G 2wKJMaT5pryQnINrgoGlgazBvGWJeH7lr+nqW0yyaoi2z6s6d/4cBNl6JGm6HbiQDZ MrYYNqoadFtofmjyIJMWUp171EFLrGBHxz6kpuk/ym1gkiK4F2BnlqR2OBoBcJnaY6 BJY8E6EMAxIA5dhAdBCwKiy8ZQQNTBCYlD+jq0cLxYoXih4cUpYkZPr1NN2TmR4IQU fckhyAW+V6rqzTXhDegnrkiBzXZ75JzB8A7VNEW8fgX1xIDLTxO6M5BIfcgt9ebKzU GixlSgj/19Sbg== 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 This partially breaks a cycle between (gnu packages linux) and (gnu packages gtk). It is not sufficient though, see next patch. * gnu/packages/linux.scm (xensors): Move to ... * gnu/packages/xorg.scm: ... this module. --- gnu/packages/linux.scm | 38 -------------------------------------- gnu/packages/xorg.scm | 41 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 38 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 8d9dc01839..dc4f91d48f 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4502,44 +4502,6 @@ SMBus access.") #~(list (string-append "prefix=" #$output) (string-append "CC=" #$(cc-for-target)))))))) -(define-public xsensors - (package - (name "xsensors") - (version "0.70") - (source (origin - (method url-fetch) - (uri (string-append - "http://www.linuxhardware.org/xsensors/xsensors-" - version ".tar.gz")) - (sha256 - (base32 - "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh")))) - (build-system gnu-build-system) - (inputs `(("lm-sensors" ,lm-sensors "lib") - ("gtk" ,gtk+-2))) - (native-inputs (list pkg-config)) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'enable-deprecated - (lambda _ - (substitute* "src/Makefile.in" - (("-DGDK_DISABLE_DEPRECATED") "") - (("-DGTK_DISABLE_DEPRECATED") "")) - #t)) - (add-before 'configure 'remove-Werror - (lambda _ - (substitute* '("configure" "src/Makefile.in") - (("-Werror") "")) - #t))))) - (home-page "http://www.linuxhardware.org/xsensors/") - (synopsis "Hardware health information viewer") - (description - "Xsensors reads data from the libsensors library regarding hardware -health such as temperature, voltage and fan speed and displays the information -in a digital read-out.") - (license license:gpl2+))) - (define-public perf (package (name "perf") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 14cd3bc789..7e905842be 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -10,6 +10,7 @@ ;;; Copyright © 2016 Nikita ;;; Copyright © 2016 Alex Kost ;;; Copyright © 2016 David Craven +;;; Copyright © 2017 Dave Love ;;; Copyright © 2016, 2017 John Darrington ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Marius Bakke ;;; Copyright © 2017, 2018, 2019 Rutger Helling @@ -6131,6 +6132,46 @@ on a button to dismiss it or can select one of several buttons to answer a question. Xmessage can also exit after a specified time.") (license license:x11))) +;; Don't put this in (gnu packages linux) because that would create a +;; cycle between (gnu packages linux) and (gnu packages gtk). +(define-public xsensors + (package + (name "xsensors") + (version "0.70") + (source (origin + (method url-fetch) + (uri (string-append + "http://www.linuxhardware.org/xsensors/xsensors-" + version ".tar.gz")) + (sha256 + (base32 + "1siplsfgvcxamyqf44h71jx6jdfmvhfm7mh0y1q8ps4zs6pj2zwh")))) + (build-system gnu-build-system) + (inputs `(("lm-sensors" ,lm-sensors "lib") + ("gtk" ,gtk+-2))) + (native-inputs (list pkg-config)) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'enable-deprecated + (lambda _ + (substitute* "src/Makefile.in" + (("-DGDK_DISABLE_DEPRECATED") "") + (("-DGTK_DISABLE_DEPRECATED") "")) + #t)) + (add-before 'configure 'remove-Werror + (lambda _ + (substitute* '("configure" "src/Makefile.in") + (("-Werror") "")) + #t))))) + (home-page "http://www.linuxhardware.org/xsensors/") + (synopsis "Hardware health information viewer") + (description + "Xsensors reads data from the libsensors library regarding hardware +health such as temperature, voltage and fan speed and displays the information +in a digital read-out.") + (license license:gpl2+))) + (define-public xterm (package (name "xterm")