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")