From patchwork Tue Mar 21 16:05:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 48511 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 38D2316F73; Tue, 21 Mar 2023 16:06:19 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 B0E2A16F49 for ; Tue, 21 Mar 2023 16:06:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peeUx-0000OV-FZ; Tue, 21 Mar 2023 12:06:07 -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 1peeUv-0000Ns-Ek for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peeUs-0000T7-7u for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peeUs-0006wb-43 for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62347] [PATCH 1/2] gnu: usbutils: Make package description different from synopsis. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 16:06:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62347@debbugs.gnu.org Cc: mikadoZero Received: via spool by 62347-submit@debbugs.gnu.org id=B62347.167941473526650 (code B ref 62347); Tue, 21 Mar 2023 16:06:02 +0000 Received: (at 62347) by debbugs.gnu.org; 21 Mar 2023 16:05:35 +0000 Received: from localhost ([127.0.0.1]:60344 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeUQ-0006vk-Ib for submit@debbugs.gnu.org; Tue, 21 Mar 2023 12:05:34 -0400 Received: from smtpmciv4.myservices.hosting ([185.26.107.240]:40542) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeUN-0006vM-23 for 62347@debbugs.gnu.org; Tue, 21 Mar 2023 12:05:32 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv4.myservices.hosting (Postfix) with ESMTP id CC1572088B; Tue, 21 Mar 2023 17:05:29 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 664F480097; Tue, 21 Mar 2023 17:05:26 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id mxCPFpEGDeWg; Tue, 21 Mar 2023 17:05:25 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 30EAA80079; Tue, 21 Mar 2023 17:05:25 +0100 (CET) From: Bruno Victal Date: Tue, 21 Mar 2023 16:05:22 +0000 Message-Id: <184fdda5f2b71b7f7643d394713af788ecf11656.1679414688.git.mirai@makinata.eu> X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches From: mikadoZero * gnu/packages/linux.scm (usbutils)[description]: Change package description. --- gnu/packages/linux.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) base-commit: d377cfbd11a96b98fd07a7ceb7e79590e1cee336 diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index ef05e77ec8..f0a590104b 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2018, 2019 Pierre Langlois ;;; Copyright © 2018 Vasile Dumitrascu ;;; Copyright © 2019 Tim Gesthuizen +;;; Copyright © 2019 mikadoZero ;;; Copyright © 2019, 2020, 2021, 2022 Maxim Cournoyer ;;; Copyright © 2019 Stefan Stefanović ;;; Copyright © 2019-2022 Brice Waegeneire @@ -2399,9 +2400,10 @@ (define-public usbutils (list autoconf automake libtool pkg-config)) (home-page "http://www.linux-usb.org/") (synopsis - "Tools for working with USB devices, such as lsusb") + "Tools for working with USB devices") (description - "Tools for working with USB devices, such as lsusb.") + "Collection of tools to query what type of USB devices are connected to the +system, including @command{lsusb}.") (license license:gpl2+))) (define-public usbip-utils From patchwork Tue Mar 21 16:05:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 48512 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 01F8A16F73; Tue, 21 Mar 2023 16:06:26 +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.0 required=5.0 tests=MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H2,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 73B7216F49 for ; Tue, 21 Mar 2023 16:06:25 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1peeUx-0000OQ-Cn; Tue, 21 Mar 2023 12:06:07 -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 1peeUv-0000Nr-ET for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1peeUr-0000T6-Qa for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1peeUr-0006wU-MZ for guix-patches@gnu.org; Tue, 21 Mar 2023 12:06:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62347] [PATCH 2/2] gnu: usbutils: Use G-Expressions. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Mar 2023 16:06:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62347 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62347@debbugs.gnu.org Cc: Bruno Victal Received: via spool by 62347-submit@debbugs.gnu.org id=B62347.167941473126630 (code B ref 62347); Tue, 21 Mar 2023 16:06:01 +0000 Received: (at 62347) by debbugs.gnu.org; 21 Mar 2023 16:05:31 +0000 Received: from localhost ([127.0.0.1]:60339 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeUM-0006vS-Jp for submit@debbugs.gnu.org; Tue, 21 Mar 2023 12:05:30 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:60260) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1peeUL-0006vD-8q for 62347@debbugs.gnu.org; Tue, 21 Mar 2023 12:05:29 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 938F520CE1 for <62347@debbugs.gnu.org>; Tue, 21 Mar 2023 17:05:28 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 341AD8009D; Tue, 21 Mar 2023 17:05:28 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id LxJR0kFqWZP7; Tue, 21 Mar 2023 17:05:27 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 959B980079; Tue, 21 Mar 2023 17:05:27 +0100 (CET) From: Bruno Victal Date: Tue, 21 Mar 2023 16:05:23 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 In-Reply-To: References: 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/linux.scm (usbutils): Use G-Expressions. --- gnu/packages/linux.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index f0a590104b..240c62bb14 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -2377,23 +2377,22 @@ (define-public usbutils (build-system gnu-build-system) (outputs (list "out" "python")) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'bootstrap 'patch-bootstrap-scripts - (lambda _ - (substitute* "usbhid-dump/bootstrap" - (("/bin/sh") (which "sh"))))) - (add-after 'install 'separate-python-output - ;; Separating one Python script shaves more than 106 MiB from :out. - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (out:python (assoc-ref outputs "python"))) - (for-each (lambda (file) - (let ((old (string-append out "/" file)) - (new (string-append out:python "/" file))) - (mkdir-p (dirname new)) - (rename-file old new))) - (list "bin/lsusb.py")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'bootstrap 'patch-bootstrap-scripts + (lambda _ + (substitute* "usbhid-dump/bootstrap" + (("/bin/sh") (which "sh"))))) + (add-after 'install 'separate-python-output + ;; Separating one Python script shaves more than 106 MiB from :out. + (lambda _ + (for-each (lambda (file) + (let ((old (string-append #$output "/" file)) + (new (string-append #$output:python "/" file))) + (mkdir-p (dirname new)) + (rename-file old new))) + (list "bin/lsusb.py"))))))) (inputs (list eudev libusb python)) (native-inputs