From patchwork Wed Sep 20 10:05:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54067 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 E38FA27BBEC; Wed, 20 Sep 2023 11:06:25 +0100 (BST) 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,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 55ACD27BBE9 for ; Wed, 20 Sep 2023 11:06:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiu5o-0002ma-Jg; Wed, 20 Sep 2023 06:06:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiu5j-0002lu-52 for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiu5h-0004HO-7l for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiu5q-00048b-HE for guix-patches@gnu.org; Wed, 20 Sep 2023 06:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65911] [PATCH v1 1/4] gnu: Add python-smbus. References: <20230913095341.12586-1-jean@foundationdevices.com> In-Reply-To: <20230913095341.12586-1-jean@foundationdevices.com> Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 10:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65911@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 65911-submit@debbugs.gnu.org id=B65911.169520435415864 (code B ref 65911); Wed, 20 Sep 2023 10:06:02 +0000 Received: (at 65911) by debbugs.gnu.org; 20 Sep 2023 10:05:54 +0000 Received: from localhost ([127.0.0.1]:58401 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5h-00047c-Ek for submit@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:61724) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5d-00047C-8n for 65911@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:51 -0400 Received: by mail-wm1-x32a.google.com with SMTP id 5b1f17b1804b1-403004a96a4so73439095e9.3 for <65911@debbugs.gnu.org>; Wed, 20 Sep 2023 03:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695204334; x=1695809134; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=9Jfvo1TKzsRwJ7+NgzFjMYcTvXaabJ6/RaBxPXA3nIY=; b=YClc/389JJGJnoUlLPrVKHexqsZJb10lAcm9ez5VjcEQN94AFGiqB0mcqCEuPfuIvj GEwBFLpsAXF3w0ijAWDBYyEdW+7KrbK7Si7y6nABIn6unDXjKFE16dzp+TtRODTzeLs3 U2dwA+3DeCwFXAVcUrW1ICL4FMKrKCh0xE4nuwjaRmDmobOPlDwidC15KJPYgmMda99t CuCJs1+brKMhb4q7pqAXc0fPSi6JPLkycKpLG2MbuolDzPxHZf3rPpM/TPwCsc2sQOkO Ji7KMwQxUActESg9u7OndwyTIZ7XALC42M8VJsQjxkg52ngyxl1MMzm7iOUC7W3ruKiE 8hJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695204334; x=1695809134; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=9Jfvo1TKzsRwJ7+NgzFjMYcTvXaabJ6/RaBxPXA3nIY=; b=sMbx0qiXkCFzkl4XbROdVna17Im7MoAayGAtxGA0Jdsn6ui/lF9UecZhCqdXpGU2HH 8q8CtdsRs0thkKgFsOkofM/WT9d/3OVVwEWUW/S15lJqy1G8vXl/iJ7xxc8H18IhisFX iQ6pwnawlevOnwFm39nwJhKb6vYYEDTWS/7fRH+WYVm5GIgFVGfWf1FVko+2EHPaWF5P u5oS+1AO7hYrVoPjHJ5wrcCZQ0rcAhTZRABfkrjcKJFo5BWj3nreduh1HtYo1Kl733W3 Wsst49XErmUQVxz3R0B/odP0F7YQ7gRDZWue/yhckFzp2gRLOoLfEWN5UbdopjSH5g0+ VC2w== X-Gm-Message-State: AOJu0YyG+3g7czt4najbXlJDqqWmhmz0rZktzHYaWO6l3Zk5AY/8Wfr0 H55wfHmYw8zpt5ZBnqe7w7i5Vp/E95OqMoMiWDuzJg== X-Google-Smtp-Source: AGHT+IGwvGVnqtsSSuYSRldnPS9FBt8yhpMkgW7fkFUEYssvWiy24K2IMXRzAOqMllDjZu5hwJaaGw== X-Received: by 2002:a05:600c:21a:b0:404:74e3:27ab with SMTP id 26-20020a05600c021a00b0040474e327abmr1966067wmi.41.1695204333137; Wed, 20 Sep 2023 03:05:33 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id y20-20020a05600c20d400b003fefaf299b6sm1496927wmm.38.2023.09.20.03.05.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:05:32 -0700 (PDT) Date: Wed, 20 Sep 2023 12:05:25 +0200 Message-Id: <20230920100528.1217339-1-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (python-smbus): New variable. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/linux.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) base-commit: 6bd17a0806ad32d1493ac51a7443276f719c4224 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index 85e3d9845d..6eb7fb43b8 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -75,6 +75,7 @@ ;;; Copyright © 2023 Yovan Naumovski ;;; Copyright © 2023 Zheng Junjie <873216071@qq.com> ;;; Copyright © 2023 dan +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -188,6 +189,7 @@ (define-module (gnu packages linux) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix build-system trivial) #:use-module (guix build-system linux-module) @@ -4963,6 +4965,29 @@ (define-public i2c-tools-3 #~(list (string-append "prefix=" #$output) (string-append "CC=" #$(cc-for-target)))))))) +(define-public python-smbus + (package + (inherit i2c-tools) + (name "python-smbus") + (build-system pyproject-build-system) + (arguments + (list #:tests? #f ;; No test suite. + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'change-directory + (lambda _ (chdir "py-smbus"))) + (add-after 'change-directory 'set-library-path + (lambda _ + (substitute* "setup.py" + (("-L\\.\\./lib") + (string-append "-L" #$(this-package-input "i2c-tools") + "/lib")))))))) + (inputs (list i2c-tools)) + (synopsis "I2C/SMBus access for Python") + (description "This package provides a Python library to access +@acronym{I2C, Inter-Integrated Circuit} and @acronym{SMBus, System +Management Bus} devices on Linux."))) + (define-public xsensors (package (name "xsensors") From patchwork Wed Sep 20 10:05:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54066 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 1C72327BBEA; Wed, 20 Sep 2023 11:06:24 +0100 (BST) 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,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 21DE827BBE2 for ; Wed, 20 Sep 2023 11:06:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiu5m-0002mY-KQ; Wed, 20 Sep 2023 06:05:58 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiu5j-0002lr-3k for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiu5h-0004HM-54 for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiu5q-00048U-3T for guix-patches@gnu.org; Wed, 20 Sep 2023 06:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65911] [PATCH v1 2/4] gnu: python-pyusb: Use G-Expressions. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 10:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65911@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 65911-submit@debbugs.gnu.org id=B65911.169520435315851 (code B ref 65911); Wed, 20 Sep 2023 10:06:02 +0000 Received: (at 65911) by debbugs.gnu.org; 20 Sep 2023 10:05:53 +0000 Received: from localhost ([127.0.0.1]:58399 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5h-00047a-4x for submit@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:53 -0400 Received: from mail-lf1-x136.google.com ([2a00:1450:4864:20::136]:47104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5e-00047E-A8 for 65911@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:51 -0400 Received: by mail-lf1-x136.google.com with SMTP id 2adb3069b0e04-502b0d23f28so10852094e87.2 for <65911@debbugs.gnu.org>; Wed, 20 Sep 2023 03:05:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695204335; x=1695809135; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Z7vewyNrd3yvpvRhka3hG253wR9i1tRJ2xCbFm1TjOc=; b=hnP3E9DY0UoRsWTdsWHR9VqyjHhl/OmIZkAzmxgSsxMEZ7IfjZwBu8L0ghyo/CMZLt sHAGWYRwyLmaMnciCafEXB8XVAAg/oFsUJZXZWgXjQscwsksHOm/m5iCcDK4+MdAvLKQ EFJSFkt+psp5Bq9AwHcUDGXaQZccRiII3mETuQNOgiJtG+E6BFlacEJlc/BNV6cLmRjw /xqk3HpKNkdcS1b6GIE/g4dAX5WYeNqo5nTpGwYv9BVyPRE5lQhwBFP4Uk1L0kyv9R1z Vsq2GkRHqW36YishMFtdovrmAYq42MllGWQqjdfIB5pp5I5OE199jnrmHRGKW8T85MPn O2ow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695204335; x=1695809135; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Z7vewyNrd3yvpvRhka3hG253wR9i1tRJ2xCbFm1TjOc=; b=QRFcE8Ev28AF/2LVBmM47VBFiV3ttbY550tzFrz1EeJ+Isy5CHVJmGq6lRai1Vizge xwk8blZu9v7FKHlSzEL3XLQDuEsY2Wa8Y3gyEaM4FKDY3DUe9yoaNTJoU0rzIsCodwYf JIjJmbxIjR/LMG/KJe8qz0Os95f3etBpRme6w9CuQrEpngPufWIJ2Y7+L1j+CSEv0KSQ vfJLZKEZP+5eh+ARqkgsOHwUbmVDHxJNszWFL/DM6LPPpt5WhvGFEym182FRrF01Hawg WjrPsf4G4vrX7J3YJJ95bb1/cSaGqrM8Wt8ugCpL7rPtZ8SCz0zldgSk3DsaQB8DXNYz RUlg== X-Gm-Message-State: AOJu0YwQRLkraHrzMUj5jc3x0t4NXlj3bT5JWIBGsDznqrQyvWWmD37J OmbT24apGIiChwbssqLTGNFBp1bGtmCES+nr0GfwwQ== X-Google-Smtp-Source: AGHT+IHBmbEZlUOe8ZJXcLGPuHmPfW9HKrVD5NqtUeoeBaSsil9jRpvHVXdxXCfWlXAbZZftd2nC6Q== X-Received: by 2002:a05:6512:104f:b0:503:364e:96ce with SMTP id c15-20020a056512104f00b00503364e96cemr2152832lfb.29.1695204334639; Wed, 20 Sep 2023 03:05:34 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id y20-20020a05600c20d400b003fefaf299b6sm1496927wmm.38.2023.09.20.03.05.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:05:34 -0700 (PDT) Date: Wed, 20 Sep 2023 12:05:26 +0200 Message-Id: <20230920100528.1217339-2-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920100528.1217339-1-jean@foundationdevices.com> References: <20230920100528.1217339-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/usb.scm (python-pyusb) : Use G-Expressions style instead of quoting. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/libusb.scm | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index e615b81ea3..469882e871 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -288,24 +288,23 @@ (define-public python-pyusb "1fg7knfzybzija2b01pzrzhzsj989scl12sb2ra4f503l8279k54")))) (build-system python-build-system) (arguments - `(#:tests? #f ; no tests - #:modules ((srfi srfi-1) - (srfi srfi-26) - (guix build utils) - (guix build python-build-system)) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-libusb-reference - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "usb/libloader.py" - (("lib = locate_library\\(candidates, find_library\\)") - (string-append - "lib = \"" - (find (negate symbolic-link?) - (find-files (assoc-ref inputs "libusb") - "^libusb-.*\\.so\\..*")) - "\""))) - #t))))) + (list #:tests? #f ; no tests + #:modules '((srfi srfi-1) + (srfi srfi-26) + (guix build utils) + (guix build python-build-system)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-libusb-reference + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "usb/libloader.py" + (("lib = locate_library\\(candidates, find_library\\)") + (string-append + "lib = \"" + (find (negate symbolic-link?) + (find-files (assoc-ref inputs "libusb") + "^libusb-.*\\.so\\..*")) + "\"")))))))) (native-inputs (list python-setuptools-scm)) From patchwork Wed Sep 20 10:05:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54069 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 1FBFD27BBE9; Wed, 20 Sep 2023 11:06:33 +0100 (BST) 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,MAILING_LIST_MULTI,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 6BBB727BBE2 for ; Wed, 20 Sep 2023 11:06:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiu5p-0002mh-9k; Wed, 20 Sep 2023 06:06:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiu5j-0002lt-54 for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiu5h-0004HR-KE for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiu5q-00048j-UG for guix-patches@gnu.org; Wed, 20 Sep 2023 06:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65911] [PATCH v1 3/4] gnu: python-pyusb: Add libusb-compat backend. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 10:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65911@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 65911-submit@debbugs.gnu.org id=B65911.169520436015883 (code B ref 65911); Wed, 20 Sep 2023 10:06:02 +0000 Received: (at 65911) by debbugs.gnu.org; 20 Sep 2023 10:06:00 +0000 Received: from localhost ([127.0.0.1]:58404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5n-000484-Dm for submit@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:59 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:44299) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5f-00047G-Eo for 65911@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:53 -0400 Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40479f8325fso59259385e9.1 for <65911@debbugs.gnu.org>; Wed, 20 Sep 2023 03:05:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695204336; x=1695809136; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3WmwWDNs8CuejHUN7rlzKMqwPQNpS7WuhsiYmPQlJOo=; b=AEY39Nzynfb96WbQrYK1G+3rd70MLBmk3GrA+wuIFqUsS+d1DUZF1/wfqN+BhcL/Xw wc0VDRbmJYsjxEHiC2fAKq04UIlVxfpz5U4NZiM6YXw5TIKHSCCab45WlSoVvvA4UdEY 7t7tGgMVL7JTTvay0NixE46/Bg7MAlCx7wBGT0zcDtLZ2lhHslpo671EAK+yD1DB1V98 3KsbQpxFypEVBDcabl7OnRnmJtw5ldJjEgb2ckJDn+KVEZyzNEy1x4ZhdXTT6HoVPmrp awgsWBaWZTrItR/Bdh0fT7nOyQ1mOOVD2bTkVPAYTo1EaxmcQwbhd/Oy2MSPVELC/e1j gpeA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695204336; x=1695809136; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3WmwWDNs8CuejHUN7rlzKMqwPQNpS7WuhsiYmPQlJOo=; b=R5pO0JEXe7vYbSk7UUSJ5Woz3cfW9Wtrz4FDgPqUZMSEKVWtHPmfePWdJUNS92fktd kr6rOcTz5Ln6r/zeXYwipzkWqfWJ8aOHr2TBlDPZOfwO633ECRmoB4b5HSzL2jiQUbqf uJ9NnG8ywX5/2ohgJ0LunwIJoxQnxkWqTXbABgJ9YvRarKZX8nfs8o59cxdoCas24SDV ebTr6gjj+SyCUi32KWsTpAk91pJJ6kwIKrI4lDiX9qlS4phegTDEgBLrZPUA7DOdersC 0R9k/RNMuzhknN4KxncmFNbbCuBfwMnBjNQ15Qq0qNAkYYNL3Cmsh9IJ96hWPGVm8L4A czhA== X-Gm-Message-State: AOJu0Yz6hMzi3RO3oGRSMtp8MfE1FJUbpM+Ey2UUBAna0EPNLz7ZeYUq MdiMlitkd5onvacP1F0Zas67Su84Rg2mSWoImlHA6g== X-Google-Smtp-Source: AGHT+IH9KhuxHpCdW/rhjkyR2VtP4WNEqJEvwh35J7TZUXRa7cJoqPYuLBqDAsRqIfR+7k7tGDYY9Q== X-Received: by 2002:a7b:cd08:0:b0:3ff:233f:2cfb with SMTP id f8-20020a7bcd08000000b003ff233f2cfbmr1926012wmj.23.1695204335947; Wed, 20 Sep 2023 03:05:35 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id y20-20020a05600c20d400b003fefaf299b6sm1496927wmm.38.2023.09.20.03.05.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:05:35 -0700 (PDT) Date: Wed, 20 Sep 2023 12:05:27 +0200 Message-Id: <20230920100528.1217339-3-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920100528.1217339-1-jean@foundationdevices.com> References: <20230920100528.1217339-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/libusb.scm (python-pyusb) : Do not hard-code libusb1 library for all back-ends, and allow to use libusb0 as a back-end. Also enabled tests as the package does have a test suite. * gnu/packages/libusb.scm (python-pyusb) : Add libusb-compat. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/libusb.scm | 52 +++++++++++++++++++++++++++++++---------- 1 file changed, 40 insertions(+), 12 deletions(-) diff --git a/gnu/packages/libusb.scm b/gnu/packages/libusb.scm index 469882e871..d15e561668 100644 --- a/gnu/packages/libusb.scm +++ b/gnu/packages/libusb.scm @@ -288,28 +288,56 @@ (define-public python-pyusb "1fg7knfzybzija2b01pzrzhzsj989scl12sb2ra4f503l8279k54")))) (build-system python-build-system) (arguments - (list #:tests? #f ; no tests - #:modules '((srfi srfi-1) + (list #:modules '((srfi srfi-1) (srfi srfi-26) (guix build utils) (guix build python-build-system)) #:phases #~(modify-phases %standard-phases + ;; Repurpose the candidates parameter to be the path to the + ;; library, then on each backend we substitute the candidates + ;; with the full path to the .so library or with None if not + ;; supported. + ;; + ;; While most applications could use a single back-end this + ;; library allows to manually select the back-end so it is + ;; appropriate to provide as much back-ends as possible. (add-after 'unpack 'fix-libusb-reference (lambda* (#:key inputs #:allow-other-keys) - (substitute* "usb/libloader.py" - (("lib = locate_library\\(candidates, find_library\\)") - (string-append - "lib = \"" - (find (negate symbolic-link?) - (find-files (assoc-ref inputs "libusb") - "^libusb-.*\\.so\\..*")) - "\"")))))))) - + (let ((libusb0 (find + (negate symbolic-link?) + (find-files (assoc-ref inputs "libusb-compat") + "^libusb-.*\\.so\\..*"))) + (libusb1 (find + (negate symbolic-link?) + (find-files (assoc-ref inputs "libusb") + "^libusb-.*\\.so\\..*")))) + (substitute* "usb/libloader.py" + (("lib = locate_library\\(candidates, find_library\\)") + "lib = candidates")) + (substitute* "usb/backend/libusb0.py" + (("\\('usb-0\\.1', 'usb', 'libusb0'\\)") + (format #f "~s" libusb0))) + (substitute* "usb/backend/libusb1.py" + (("\\('usb-1\\.0', 'libusb-1\\.0', 'usb'\\)") + (format #f "~s" libusb1))) + ;; FIXME: OpenUSB is not packaged for GNU Guix. + (substitute* "usb/backend/openusb.py" + (("\\('openusb',\\)") "None"))))) + ;; Note: tests seems to succeed with libusb-compat as libusb + ;; fails because it doesn't have a usbfs present in the build + ;; environment. + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (with-directory-excursion "tests" + (setenv "PYUSB_DEBUG" "debug") + (setenv "LIBUSB_DEBUG" "4") + (invoke "python" "testall.py")))))))) (native-inputs (list python-setuptools-scm)) (inputs - (list libusb)) + (list libusb libusb-compat)) (home-page "https://pyusb.github.io/pyusb/") (synopsis "Python bindings to the libusb library") (description From patchwork Wed Sep 20 10:05:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Jean-Pierre De Jesus DIAZ X-Patchwork-Id: 54068 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 B9E9C27BBE9; Wed, 20 Sep 2023 11:06:26 +0100 (BST) 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,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham 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 D79A327BBE2 for ; Wed, 20 Sep 2023 11:06:24 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qiu5r-0002nW-Lr; Wed, 20 Sep 2023 06:06:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qiu5j-0002ls-3p for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qiu5i-0004HU-3p for guix-patches@gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qiu5r-00048q-Bl for guix-patches@gnu.org; Wed, 20 Sep 2023 06:06:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65911] [PATCH v1 4/4] gnu: Add liquidctl. Resent-From: Jean-Pierre De Jesus DIAZ Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 20 Sep 2023 10:06:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65911 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65911@debbugs.gnu.org Cc: Jean-Pierre De Jesus DIAZ Received: via spool by 65911-submit@debbugs.gnu.org id=B65911.169520436015890 (code B ref 65911); Wed, 20 Sep 2023 10:06:03 +0000 Received: (at 65911) by debbugs.gnu.org; 20 Sep 2023 10:06:00 +0000 Received: from localhost ([127.0.0.1]:58406 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5o-000488-1U for submit@debbugs.gnu.org; Wed, 20 Sep 2023 06:06:00 -0400 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]:61729) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qiu5h-00047J-Es for 65911@debbugs.gnu.org; Wed, 20 Sep 2023 06:05:54 -0400 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-403004a96a4so73439765e9.3 for <65911@debbugs.gnu.org>; Wed, 20 Sep 2023 03:05:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foundationdevices.com; s=google; t=1695204338; x=1695809138; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=bpxaVPpGNYjBDIY+1Y2RHHHK6OL7c/eQbRvY2k7k+dw=; b=EOBf2wiTJzh6hwTTOCTBll2RimjZQCAvGNlBiysapTqU9GfvPTQSPbVqbsW28djQT5 U1KCqOTiy9kGMKIaQXTmVGjUR5GGvqpQSqy5ZSY4fUBxvVxy8rkb61b93rB+zc2xNZkJ y/FDk/h2NuDssWX45A5h294gv1WYhgkZPWscRB3ZadUB+trI/wUXE2jlu6wTW0sdr9Bt eXuOUL7KpnpCX1kpt3ErivQnsuZevzs1cjYPp/S7NLmH95PfUwKdPKvkgLOQ5h1xQg7R GOXEPxgGibnXmYkTeED/5dVZ8mhb9OOztBkUYhHbTkw6V6WRQdrpgoAgG5X7Z5Ix44E4 /Tag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1695204338; x=1695809138; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bpxaVPpGNYjBDIY+1Y2RHHHK6OL7c/eQbRvY2k7k+dw=; b=HmRdmhbLmcpA291sBV/hxdoTzwTQIUqEnDMf1wL3Ze3HA5E3oFu0VBody23DY7yC7d jw4f0/f/urpjKCLkWvR+UnVr6Z7ScDk5CugH4hEfPa65bPN7YN9N4GJuhfGLXMzbuPMp pgSIACnA+zgLYyrWoBCBJkv93F4iwM8b6O7nWaN4rUbEbyxcnuCIZzbaQmQWoq1cYmuh 0JgBdzwWEqqmXVmCMupoKV3TRcWCA5Z0DQ7eketvYJYXThbmO56rvneNKonSC7SIWbHQ ECecucZqMt00bD/Y5VJ8G0VLrN7uDZJoFqqw7M19L7P8TnipKgpPLkku8AKA6WT2YpR/ HNJQ== X-Gm-Message-State: AOJu0YygPsdZR27eHMzI2JIM7LhBnNra8SCcAjZ+J+RGOTlxsDhSLlhu B8Z54feTGhqtNDpnzksh752L+jwVnDqvb6Qp+WZOZg== X-Google-Smtp-Source: AGHT+IGkpT2U3zFss0JEJTH6VzcMOeCQVtAKV9/haO91Djcj9JhrpQkqgw/SJYP1w97oDzIJwVmPFQ== X-Received: by 2002:a7b:ca5a:0:b0:401:b53e:6c57 with SMTP id m26-20020a7bca5a000000b00401b53e6c57mr2121904wml.9.1695204337351; Wed, 20 Sep 2023 03:05:37 -0700 (PDT) Received: from omen15.home ([89.131.29.87]) by smtp.gmail.com with ESMTPSA id y20-20020a05600c20d400b003fefaf299b6sm1496927wmm.38.2023.09.20.03.05.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Sep 2023 03:05:37 -0700 (PDT) Date: Wed, 20 Sep 2023 12:05:28 +0200 Message-Id: <20230920100528.1217339-4-jean@foundationdevices.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230920100528.1217339-1-jean@foundationdevices.com> References: <20230920100528.1217339-1-jean@foundationdevices.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: , Reply-to: Jean-Pierre De Jesus DIAZ X-ACL-Warn: , Jean-Pierre De Jesus DIAZ via Guix-patches X-Patchwork-Original-From: Jean-Pierre De Jesus DIAZ via Guix-patches via From: Jean-Pierre De Jesus DIAZ Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/hardware.scm (liquidctl): New variable. Signed-off-by: Jean-Pierre De Jesus DIAZ --- gnu/packages/hardware.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm index 5188bb2910..3d8fa833a2 100644 --- a/gnu/packages/hardware.scm +++ b/gnu/packages/hardware.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Efraim Flashner ;;; Copyright © 2023 Spencer Skylar Chan +;;; Copyright © 2023 Foundation Devices, Inc. ;;; ;;; This file is part of GNU Guix. ;;; @@ -80,6 +81,7 @@ (define-module (gnu packages hardware) #:use-module (gnu packages protobuf) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python) + #:use-module (gnu packages python-crypto) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages qt) @@ -99,6 +101,7 @@ (define-module (gnu packages hardware) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix gexp) @@ -798,6 +801,42 @@ (define-public libsmbios (license (list license:osl2.1 license:gpl2+ license:bsd-3 license:boost1.0)))) +(define-public liquidctl + (package + (name "liquidctl") + (version "1.13.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/liquidctl/liquidctl") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0hpxkrfxm9c4v5ld7bh6qs9fmq9imz8s5i9l0l78l47bcm12nkrd")))) + (build-system pyproject-build-system) + (arguments + (list #:phases + #~(modify-phases %standard-phases + (add-before 'check 'set-runtime-dir + (lambda _ + (setenv "XDG_RUNTIME_DIR" "/tmp")))))) + (native-inputs (list python-pytest)) + (propagated-inputs + (list python-colorlog + python-crcmod + python-docopt + python-hidapi + python-pillow + python-pyusb + python-smbus)) + (home-page "https://github.com/liquidctl/liquidctl") + (synopsis "Drivers and tools for liquid cooling equipment") + (description "Liquidctl is a package with tools, drivers and a Python +library to work with liquid cooling equipment such as @acronym{AIO, All-In-One} +coolers, fan controllers and other devices.") + (license license:gpl3+))) + ;; Distinct from memtest86, which is obsolete. (define-public memtest86+ (package