From patchwork Sat Feb 17 10:50:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 60506 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 AA8C727BBEA; Sun, 18 Feb 2024 18:25:03 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, 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 3ACF827BBE2 for ; Sun, 18 Feb 2024 18:25:03 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rblpW-00012A-Pp; Sun, 18 Feb 2024 13:23:58 -0500 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 1rblpV-0000zZ-Ri for guix-patches@gnu.org; Sun, 18 Feb 2024 13:23:57 -0500 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 1rblpV-00030F-JU for guix-patches@gnu.org; Sun, 18 Feb 2024 13:23:57 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rblpq-0003Mz-5y for guix-patches@gnu.org; Sun, 18 Feb 2024 13:24:18 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1. Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 18 Feb 2024 18:24:17 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 69234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69234@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.170828065512903 (code B ref -1); Sun, 18 Feb 2024 18:24:17 +0000 Received: (at submit) by debbugs.gnu.org; 18 Feb 2024 18:24:15 +0000 Received: from localhost ([127.0.0.1]:37331 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblpm-0003Lp-U3 for submit@debbugs.gnu.org; Sun, 18 Feb 2024 13:24:15 -0500 Received: from lists.gnu.org ([209.51.188.17]:53956) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rblR4-0001mW-0N for submit@debbugs.gnu.org; Sun, 18 Feb 2024 12:58:42 -0500 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 1rbIIR-0000n0-77 for guix-patches@gnu.org; Sat, 17 Feb 2024 05:51:51 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_CHACHA20_POLY1305:256) (Exim 4.90_1) (envelope-from ) id 1rbIIP-0006hT-6y for guix-patches@gnu.org; Sat, 17 Feb 2024 05:51:50 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [10.196.197.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4TcQbP1KDGz9smd for ; Sat, 17 Feb 2024 11:51:45 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1708167105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=t2MVK6laovI58oSAsRr1JkTrI4E8AGZxfoquq3YfwKo=; b=J9573AaZuPsrGCGdCIYX/GC6Ct+cDaBn+bvEsTECVlp/b71beT43ylUtt4I6NnZncG+TV5 w5sa43aA/5RF5L3r5VKDdUHofCuHJXufiuioluSN1O27YjrF7CP8Ql7jL4G97JD8Sgz5PY h5m6EIMjgO0q4UBAa/JN/qLQAJQD4UGpPfVBnpPCLFcHeG7ytxdPICJ/bQMtQOuNAAYZGW ChTgqTmy7hcwTi3w5YixZYGQcTp73Z/pUpP0G91g4+l3J59L39OFKrGePWYymtLuFOamez z5AOcfdOuT1ByB76PnNv6dVfg+eQ7ogvD4cvYHxNeIIiLEGuivgPL7iF32Eq4w== From: Troy Figiel Date: Sat, 17 Feb 2024 11:50:20 +0100 Message-ID: <87cysvbby7.fsf@troyfigiel.com> MIME-Version: 1.0 Received-SPF: pass client-ip=80.241.56.161; envelope-from=troy@troyfigiel.com; helo=mout-p-103.mailbox.org X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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/golang.scm (go-github-com-shirou-gopsutil): Update to 3.24.1. --- gnu/packages/golang.scm | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) base-commit: 91d80460296e2d5a01704d0f34fb966a45a165ae diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 527b63d160..5305137287 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -6309,20 +6309,18 @@ (define-public go-github-com-robfig-cron (license license:expat))) (define-public go-github-com-shirou-gopsutil - (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") - (revision "0")) (package (name "go-github-com-shirou-gopsutil") - (version (git-version "v2.19.7" revision commit)) + (version "3.24.1") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/shirou/gopsutil") - (commit commit))) ; XXX + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 (base32 - "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws")))) + "0mnlxfmssd15la95c64rsfds92fwp5yx4b2kb8madbj21qi813jf")))) (build-system go-build-system) (arguments '(#:import-path "github.com/shirou/gopsutil")) @@ -6331,7 +6329,7 @@ (define-public go-github-com-shirou-gopsutil on running processes and system utilization (CPU, memory, disks, network, sensors).") (home-page "https://github.com/shirou/gopsutil") - (license license:bsd-3)))) + (license license:bsd-3))) (define-public go-github-com-danwakefield-fnmatch (let ((commit "cbb64ac3d964b81592e64f957ad53df015803288") From patchwork Sat Feb 24 08:19:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 60969 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 1EB3727BBE9; Sat, 24 Feb 2024 08:41:53 +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.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 26C9C27BBE2 for ; Sat, 24 Feb 2024 08:41:50 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnbL-0007y8-Ee; Sat, 24 Feb 2024 03:41:43 -0500 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 1rdnbH-0007xL-Kk for guix-patches@gnu.org; Sat, 24 Feb 2024 03:41:39 -0500 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 1rdnbG-0000pi-8T for guix-patches@gnu.org; Sat, 24 Feb 2024 03:41:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnbe-0001lX-7F for guix-patches@gnu.org; Sat, 24 Feb 2024 03:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69234] [PATCH v3 2/5] gnu: go-github-com-shirou-gopsutil: Update to 2.21.11. References: <87cysvbby7.fsf@troyfigiel.com> In-Reply-To: <87cysvbby7.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 08:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69234@debbugs.gnu.org Received: via spool by 69234-submit@debbugs.gnu.org id=B69234.17087640826654 (code B ref 69234); Sat, 24 Feb 2024 08:42:02 +0000 Received: (at 69234) by debbugs.gnu.org; 24 Feb 2024 08:41:22 +0000 Received: from localhost ([127.0.0.1]:39160 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnaz-0001j8-0y for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:41:21 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:42104) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnao-0001h5-73 for 69234@debbugs.gnu.org; Sat, 24 Feb 2024 03:41:11 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:b231:465::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4ThgLJ14Rvz9srJ for <69234@debbugs.gnu.org>; Sat, 24 Feb 2024 09:40:08 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1708764008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=LuXYvvtFzGk1hj/kMMn9pQItJ8N54AtbdDKWr1FYHEU=; b=Vb+DcfDLQ4XGIY801GnWpN64nXQkbp+D221t22p1Zfwb2tyYroTuDoKBDi30sZGwuEAYfE v+5pezYz7uYH7cayBSq6XxxYSCcr69qd3YMFg15d2DTBYq3zzFZZXS0lmLrbvcFWgraHfI UQkqiy+voE/s8LP6bYplDzXgYlZlL2Ptit1oS8l2UguD9mI6myMz8FEqLtkEKMlKX8K1EN A60yHqArABzXwt/mGkTD2SXM/FRzCYIzV4ZQOYbbr0zqRnPuEWKzI8V4wDoyHJ05rveucQ KZIvZ67e+K5o1mG9nM7ySdDYi0n4xJWmkDiZHDsKYwMQ77y7PlpWyzSYmRplIQ== From: Troy Figiel Date: Sat, 24 Feb 2024 09:19:28 +0100 Message-ID: <87r0h29rx4.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4ThgLJ14Rvz9srJ 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/golang-xyz.scm (go-github-com-shirou-gopsutil): Update to 2.21.11. [arguments]: Fix tests. <#:go>: Update to go-1.18. <#:phases>: Add 'remove-v3 and 'remove-failing-tests phases. [propagated-inputs]: Add go-golang-org-x-sys. [native-inputs]: Add go-github-com-stretchr-testify and procps. * gnu/packages/golang-xyz.scm: Add (gnu packages linux) module. --- gnu/packages/golang-xyz.scm | 63 ++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 22 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 401c769da5..bcf46992e0 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -45,7 +45,8 @@ (define-module (gnu packages golang-xyz) #:use-module (gnu packages golang-build) #:use-module (gnu packages golang-check) #:use-module (gnu packages golang-compression) - #:use-module (gnu packages golang-crypto)) + #:use-module (gnu packages golang-crypto) + #:use-module (gnu packages linux)) ;;; Commentary: ;;; @@ -1094,29 +1095,47 @@ (define-public go-github-com-rcrowley-go-metrics (license license:bsd-2)))) (define-public go-github-com-shirou-gopsutil - (let ((commit "47ef3260b6bf6ead847e7c8fc4101b33c365e399") - (revision "0")) - (package - (name "go-github-com-shirou-gopsutil") - (version (git-version "v2.19.7" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/shirou/gopsutil") - (commit commit))) ; XXX - (file-name (git-file-name name version)) - (sha256 - (base32 - "0x1g4r32q4201nr2b754xnrrndmwsrhfr7zg37spya86qrmijnws")))) - (build-system go-build-system) - (arguments - '(#:import-path "github.com/shirou/gopsutil")) - (synopsis "Process and system monitoring in Go") - (description "This package provides a library for retrieving information + (package + (name "go-github-com-shirou-gopsutil") + (version "2.21.11") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shirou/gopsutil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0gpb10xkdwfimn1sp4jhrvzz4p3zgmdb78q8v23nap3yi6v4bff5")))) + (build-system go-build-system) + (arguments + (list + #:go go-1.18 + #:import-path "github.com/shirou/gopsutil" + #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'remove-v3 + (lambda* (#:key import-path #:allow-other-keys) + ;; We remove the separately included v3 module. + (delete-file-recursively (string-append "src/" + import-path + "/v3")))) + (add-before 'check 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + ;; host_test.go tries to access files such as + ;; /var/run/utmp that do not exist in the build + ;; environment. + (string-append "src/" import-path "/host/host_test.go"))))))) + ;; TODO: Add go-github-com-tklauser-go-sysconf to propagated-inputs once + ;; it is packaged. + (propagated-inputs (list go-golang-org-x-sys)) + (native-inputs (list go-github-com-stretchr-testify procps)) + (synopsis "Process and system monitoring in Go") + (description "This package provides a library for retrieving information on running processes and system utilization (CPU, memory, disks, network, sensors).") - (home-page "https://github.com/shirou/gopsutil") - (license license:bsd-3)))) + (home-page "https://github.com/shirou/gopsutil") + (license license:bsd-3))) (define-public go-github-com-skip2-go-qrcode (package From patchwork Sat Feb 24 07:53:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 60971 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 325CD27BBEA; Sat, 24 Feb 2024 08:50:51 +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.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 D99DB27BBE2 for ; Sat, 24 Feb 2024 08:50:49 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnk1-0001nK-0O; Sat, 24 Feb 2024 03:50:41 -0500 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 1rdnjz-0001n3-6T for guix-patches@gnu.org; Sat, 24 Feb 2024 03:50:39 -0500 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 1rdnjy-0002JE-Tq for guix-patches@gnu.org; Sat, 24 Feb 2024 03:50:38 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnkM-00052Y-RH for guix-patches@gnu.org; Sat, 24 Feb 2024 03:51:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69234] [PATCH v3 3/5] gnu: go-github-com-shirou-gopsutil: Reformat with guix style. References: <87cysvbby7.fsf@troyfigiel.com> In-Reply-To: <87cysvbby7.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 08:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69234@debbugs.gnu.org Received: via spool by 69234-submit@debbugs.gnu.org id=B69234.170876462819271 (code B ref 69234); Sat, 24 Feb 2024 08:51:02 +0000 Received: (at 69234) by debbugs.gnu.org; 24 Feb 2024 08:50:28 +0000 Received: from localhost ([127.0.0.1]:39814 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnjn-00050j-L8 for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:50:28 -0500 Received: from mout-p-103.mailbox.org ([80.241.56.161]:40196) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnjk-00050A-UT for 69234@debbugs.gnu.org; Sat, 24 Feb 2024 03:50:25 -0500 Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.102]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-103.mailbox.org (Postfix) with ESMTPS id 4ThgLP0bycz9sSt for <69234@debbugs.gnu.org>; Sat, 24 Feb 2024 09:40:13 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1708764013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=TKenAJnu39SiGZWztaOFLwQPjd85Ya9mMlLyMtaryho=; b=ZKd9G2v44R9EskPu5OkgTdT8RFIPJO4Mk9HnH0uywFGoFVOG+fgu9N8jhXTzwnoRaENx1M e89kCOj/V+546Kl+BVU79nKLqw94tldJjDWoiJ3vFNB6wE7fw3Uuv3y0I4tWyacbx0RDiI Ym44BbRG5ZjSsgsirJ8/CEBTdpk+SKjmGnUuH9NjkbCZ03puTErRdsj85qctX+pGEYEC/4 jv+eHkvBD3J3nr09ji7RwMtPVC9WVBt5da+mKX+Y2106Y3DPJ7XYpA6b4nM8OtElt318f9 xazcqrPVOB69fBoWMwi259kGpr1h59r9TyI3wdXHNiRPQlOnMiKiYvlCTSBOfQ== From: Troy Figiel Date: Sat, 24 Feb 2024 08:53:30 +0100 Message-ID: <87plwm9rwz.fsf@troyfigiel.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: , 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/golang-xyz.scm (go-github-com-shirou-gopsutil): Reformat with guix style. --- gnu/packages/golang-xyz.scm | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index bcf46992e0..d09b837fa9 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1098,15 +1098,15 @@ (define-public go-github-com-shirou-gopsutil (package (name "go-github-com-shirou-gopsutil") (version "2.21.11") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/shirou/gopsutil") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0gpb10xkdwfimn1sp4jhrvzz4p3zgmdb78q8v23nap3yi6v4bff5")))) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shirou/gopsutil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0gpb10xkdwfimn1sp4jhrvzz4p3zgmdb78q8v23nap3yi6v4bff5")))) (build-system go-build-system) (arguments (list @@ -1131,7 +1131,8 @@ (define-public go-github-com-shirou-gopsutil (propagated-inputs (list go-golang-org-x-sys)) (native-inputs (list go-github-com-stretchr-testify procps)) (synopsis "Process and system monitoring in Go") - (description "This package provides a library for retrieving information + (description + "This package provides a library for retrieving information on running processes and system utilization (CPU, memory, disks, network, sensors).") (home-page "https://github.com/shirou/gopsutil") From patchwork Sat Feb 24 07:59:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 60965 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 78EC927BBE9; Sat, 24 Feb 2024 08:40:55 +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.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,TVD_SPACE_RATIO, 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 AED6427BBE2 for ; Sat, 24 Feb 2024 08:40:54 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnaM-0007T9-Jm; Sat, 24 Feb 2024 03:40:42 -0500 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 1rdnaL-0007Sb-Cl for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:41 -0500 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 1rdnaL-0000cU-4F for guix-patches@gnu.org; Sat, 24 Feb 2024 03:40:41 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnai-0001h8-V8 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:41:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69234] [PATCH v3 4/5] gnu: Deprecate go-github-com-shirou-gopsutil. References: <87cysvbby7.fsf@troyfigiel.com> In-Reply-To: <87cysvbby7.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 08:41:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69234@debbugs.gnu.org Received: via spool by 69234-submit@debbugs.gnu.org id=B69234.17087640516385 (code B ref 69234); Sat, 24 Feb 2024 08:41:04 +0000 Received: (at 69234) by debbugs.gnu.org; 24 Feb 2024 08:40:51 +0000 Received: from localhost ([127.0.0.1]:39092 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnaV-0001eu-1u for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:51 -0500 Received: from mout-p-102.mailbox.org ([80.241.56.152]:44426) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnaS-0001eV-P8 for 69234@debbugs.gnu.org; Sat, 24 Feb 2024 03:40:49 -0500 Received: from smtp1.mailbox.org (smtp1.mailbox.org [10.196.197.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-102.mailbox.org (Postfix) with ESMTPS id 4ThgLT1dG5z9scL for <69234@debbugs.gnu.org>; Sat, 24 Feb 2024 09:40:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1708764017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type; bh=UkgVfOpopljx69Zl1lEzeDSBMZ9K3df/bIqFrnJDaUY=; b=H4TpU3Gpw3FV0rFVfjVlfN0ApuIaeYSmynHhdy247lYqRuUs8EOguGM0HQ5dQ6AGpPtMn/ h3gXv5oRmhvoOqwYNONMkVAdzul4xudpgmvIFxx6rQdNBpDikdo1JqV0n1/QVSnXTwmFYx rCdZQYkR1Xkxdb83qEm/xrg4HUGasA/8jm43ZrMJsN9QD3l5mWwQAAZLRLAKvgtRhrxWbR SXH5hZZz/ZQ3xyGPgczBxK5hVod37rz00P4hdxX6KIXPRhbPSoECbR6D+S9DEaN7WUs0tP SPzBfE7+ByNBttf7Rf03FjaZ/2hvXyRyFWM1GEtAwcX7ZKKgFUhJZyqu8UgI/Q== From: Troy Figiel Date: Sat, 24 Feb 2024 08:59:30 +0100 Message-ID: <87o7c69rwv.fsf@troyfigiel.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: , 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/golang-xyz.scm (go-github-com-shirou-gopsutil): Rename to ... (go-github-com-shirou-gopsutil-v2): ... this. (go-github-com-shirou-gopsutil): Define as deprecated. --- gnu/packages/golang-xyz.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index d09b837fa9..6eb5770c0f 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -1094,9 +1094,9 @@ (define-public go-github-com-rcrowley-go-metrics (home-page "https://github.com/rcrowley/go-metrics") (license license:bsd-2)))) -(define-public go-github-com-shirou-gopsutil +(define-public go-github-com-shirou-gopsutil-v2 (package - (name "go-github-com-shirou-gopsutil") + (name "go-github-com-shirou-gopsutil-v2") (version "2.21.11") (source (origin @@ -1138,6 +1138,9 @@ (define-public go-github-com-shirou-gopsutil (home-page "https://github.com/shirou/gopsutil") (license license:bsd-3))) +(define-public go-github-com-shirou-gopsutil + (deprecated-package "go-github-com-shirou-gopsutil" go-github-com-shirou-gopsutil-v2)) + (define-public go-github-com-skip2-go-qrcode (package (name "go-github-com-skip2-go-qrcode") From patchwork Sat Feb 24 08:05:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Troy Figiel X-Patchwork-Id: 60970 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 7443527BBEA; Sat, 24 Feb 2024 08:42:00 +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.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 D190C27BBE2 for ; Sat, 24 Feb 2024 08:41:59 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rdnbL-0007xk-5d; Sat, 24 Feb 2024 03:41:43 -0500 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 1rdnbH-0007xJ-JD for guix-patches@gnu.org; Sat, 24 Feb 2024 03:41:39 -0500 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 1rdnbG-0000pj-Ne for guix-patches@gnu.org; Sat, 24 Feb 2024 03:41:39 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rdnbe-0001lf-M3 for guix-patches@gnu.org; Sat, 24 Feb 2024 03:42:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#69234] [PATCH v3 5/5] gnu: Add go-github-com-shirou-gopsutil-v3. References: <87cysvbby7.fsf@troyfigiel.com> In-Reply-To: <87cysvbby7.fsf@troyfigiel.com> Resent-From: Troy Figiel Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 24 Feb 2024 08:42:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69234 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 69234@debbugs.gnu.org Received: via spool by 69234-submit@debbugs.gnu.org id=B69234.17087640876680 (code B ref 69234); Sat, 24 Feb 2024 08:42:02 +0000 Received: (at 69234) by debbugs.gnu.org; 24 Feb 2024 08:41:27 +0000 Received: from localhost ([127.0.0.1]:39174 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnb4-0001jg-VZ for submit@debbugs.gnu.org; Sat, 24 Feb 2024 03:41:27 -0500 Received: from mout-p-201.mailbox.org ([80.241.56.171]:56710) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rdnb3-0001j6-UT for 69234@debbugs.gnu.org; Sat, 24 Feb 2024 03:41:26 -0500 Received: from smtp202.mailbox.org (smtp202.mailbox.org [IPv6:2001:67c:2050:b231:465::202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mout-p-201.mailbox.org (Postfix) with ESMTPS id 4ThgLc3HnBz9sjD for <69234@debbugs.gnu.org>; Sat, 24 Feb 2024 09:40:24 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=troyfigiel.com; s=MBO0001; t=1708764024; h=from:from: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; bh=/OLuC5PsPATjIVGq4ssiuramu6d0B+o0m+JlTaSPahA=; b=yFk+347R6Nw2vjnjwAwrth8vPqf0GxPUDKVPJBph6t9annRNcFA2HL01Yh5gJG6RBMncKG V9uF3RO2nobFLpfprBcWN5GEt2o3VjR2uxYD0ANEY0vzffupaZjtv1W1LVSrn++TKzQ+wE ZSYxqx8h1czsiFFU5vCjopArhZggel5W2PrwVPoGGuyTbPse2pGuAn4iOq25LVaxfUNZwL jpvrF/F8ClpZ7Hm5umRtzuAcWdXwHkc83qjblJB9oct5jMVLa2vjLUAVC2EOW5PHLBP5aW MIqftSMeDKK/LYS9QozVop3Pc5ndnSDlgM3K6XtZBmWCugoykTHSJ/yq1eBPPg== From: Troy Figiel Date: Sat, 24 Feb 2024 09:05:28 +0100 Message-ID: <87msrq9rwo.fsf@troyfigiel.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 4ThgLc3HnBz9sjD 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/golang-xyz.scm (go-github-com-shirou-gopsutil-v3): New variable. --- gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm index 6eb5770c0f..2c154dd11c 100644 --- a/gnu/packages/golang-xyz.scm +++ b/gnu/packages/golang-xyz.scm @@ -16,6 +16,7 @@ ;;; Copyright © 2023 Timo Wilken ;;; Copyright © 2023, 2024 Sharlatan Hellseher ;;; Copyright © 2024 Artyom V. Poptsov +;;; Copyright © 2024 Troy Figiel ;;; ;;; This file is part of GNU Guix. ;;; @@ -1141,6 +1142,33 @@ (define-public go-github-com-shirou-gopsutil-v2 (define-public go-github-com-shirou-gopsutil (deprecated-package "go-github-com-shirou-gopsutil" go-github-com-shirou-gopsutil-v2)) +(define-public go-github-com-shirou-gopsutil-v3 + (package + (inherit go-github-com-shirou-gopsutil-v2) + (name "go-github-com-shirou-gopsutil-v3") + (version "3.24.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/shirou/gopsutil") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0mnlxfmssd15la95c64rsfds92fwp5yx4b2kb8madbj21qi813jf")))) + (arguments + (list + #:go go-1.18 + #:import-path "github.com/shirou/gopsutil" + #:phases #~(modify-phases %standard-phases + (add-before 'check 'remove-failing-tests + (lambda* (#:key import-path #:allow-other-keys) + (delete-file-recursively + ;; host_test.go tries to access files such as + ;; /var/run/utmp that do not exist in the build + ;; environment. + (string-append "src/" import-path "/host/host_test.go"))))))))) + (define-public go-github-com-skip2-go-qrcode (package (name "go-github-com-skip2-go-qrcode")