unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
@ 2024-02-17 10:50 Troy Figiel
  2024-02-18 22:42 ` Sharlatan Hellseher
                   ` (8 more replies)
  0 siblings, 9 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-17 10:50 UTC (permalink / raw)
  To: 69234

* 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(-)

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

base-commit: 91d80460296e2d5a01704d0f34fb966a45a165ae
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
@ 2024-02-18 22:42 ` Sharlatan Hellseher
  2024-02-19  8:35   ` Troy Figiel
  2024-02-22 23:14 ` [bug#69234] [PATCH v3 1/5] gnu: go-github-com-shirou-gopsutil: Move to golang-xyz Troy Figiel
                   ` (7 subsequent siblings)
  8 siblings, 1 reply; 13+ messages in thread
From: Sharlatan Hellseher @ 2024-02-18 22:42 UTC (permalink / raw)
  To: 69234

[-- Attachment #1: Type: text/plain, Size: 1244 bytes --]


Hi Troy,

The version 3.24.1 of gopsutil introduces new module name
github.com/shirou/gopsutil/v3 and requires some more inputs which are
not available in Guix.

https://github.com/shirou/gopsutil/blob/v3.24.1/go.mod
--8<---------------cut here---------------start------------->8---
module github.com/shirou/gopsutil/v3

go 1.15

require (
	github.com/google/go-cmp v0.6.0
	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0
	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c
	github.com/shoenig/go-m1cpu v0.1.6
	github.com/stretchr/testify v1.8.4
	github.com/tklauser/go-sysconf v0.3.12
	github.com/yusufpapurcu/wmi v1.2.3
	golang.org/x/sys v0.16.0
)

retract v3.22.11
--8<---------------cut here---------------end--------------->8---

Present:
+ golang.org/x/sys
+ github.com/stretchr/testify
+ github.com/google/go-cmp

Missing:
- github.com/yusufpapurcu/wmi
- github.com/tklauser/go-sysconf
- github.com/shoenig/go-m1cpu
- github.com/power-devops/perfstat
- github.com/lufia/plan9stats

I see the package is not in use by any others, but maybe it's planned for
the update you planned. Would like to pack missing inputs for the
v3.24.1 and rename it to go-github-com-shirou-gopsutil-v3?

Status: WAIT

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
  2024-02-18 22:42 ` Sharlatan Hellseher
@ 2024-02-19  8:35   ` Troy Figiel
  2024-02-19 13:13     ` Sharlatan Hellseher
  2024-02-25 11:35     ` Troy Figiel
  0 siblings, 2 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-19  8:35 UTC (permalink / raw)
  To: 69234, Sharlatan Hellseher


[-- Attachment #1.1.1: Type: text/plain, Size: 1552 bytes --]

Hi Oleg,

On 2024-02-18 23:42, Sharlatan Hellseher wrote:
> go 1.15
> 
> require (
> 	github.com/google/go-cmp v0.6.0
> 	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0
> 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c
> 	github.com/shoenig/go-m1cpu v0.1.6
> 	github.com/stretchr/testify v1.8.4
> 	github.com/tklauser/go-sysconf v0.3.12
> 	github.com/yusufpapurcu/wmi v1.2.3
> 	golang.org/x/sys v0.16.0
> )
> 

Currently the following modules are included in the propagated inputs:
- github.com/tklauser/go-sysconf
- golang.org/x/sys

And only one module is included in the native inputs:
- github.com/stretchr/testify

These are in fact all the modules we need, because the others are hidden
behind build tags that are unsupported by Guix:

//go:build plan9
- github.com/google/go-cmp/cmp
- github.com/lufia/plan9stats

//go:build aix && cgo
- github.com/power-devops/perfstat

//go:build darwin
- github.com/shoenig/go-m1cpu

//go:build windows
- github.com/yusufpapurcu/wmi

> I see the package is not in use by any others, but maybe it's planned for
> the update you planned. Would like to pack missing inputs for the
> v3.24.1 and rename it to go-github-com-shirou-gopsutil-v3?
> 

I can rename it to v3 if that would be preferable. I still need to fix
v2 of gopsutil since it failed to build with the "/..." fix. I will
split the fix and the addition of v3 into, and add both of them to this
issue as a second version of the patch series.

Best wishes,

Troy

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 6367 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
  2024-02-19  8:35   ` Troy Figiel
@ 2024-02-19 13:13     ` Sharlatan Hellseher
  2024-02-25 11:35     ` Troy Figiel
  1 sibling, 0 replies; 13+ messages in thread
From: Sharlatan Hellseher @ 2024-02-19 13:13 UTC (permalink / raw)
  To: Troy Figiel; +Cc: 69234

[-- Attachment #1: Type: text/plain, Size: 81 bytes --]

Hi Troy,

Naming to *-v3 would follow rest of the golang packages.

Thanks,
Oleg

[-- Attachment #2: Type: text/html, Size: 216 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 1/5] gnu: go-github-com-shirou-gopsutil: Move to golang-xyz.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
  2024-02-18 22:42 ` Sharlatan Hellseher
@ 2024-02-22 23:14 ` Troy Figiel
  2024-02-24  7:53 ` [bug#69234] [PATCH v3 3/5] gnu: go-github-com-shirou-gopsutil: Reformat with guix style Troy Figiel
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-22 23:14 UTC (permalink / raw)
  To: 69234

* gnu/packages/golang.scm (go-github-com-shirou-gopsutil): Move from here ...
* gnu/packages/golang-xyz.scm: ... to here.
---
 gnu/packages/golang-xyz.scm | 28 +++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 25 -------------------------
 2 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index e68948e495..401c769da5 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -2,7 +2,8 @@
 ;;; Copyright © 2017, 2018, 2019 Leo Famulari <leo@famulari.name>
 ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
 ;;; Copyright © 2019 Brian Leung <bkleung89@gmail.com>
-;;; Copyright © 2020 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2019 Leo Famulari <leo@famulari.name>
+;;; Copyright © 2019, 2020 Efraim Flashner <efraim@flashner.co.il>
 ;;; Copyright © 2020 Joseph LaFreniere <joseph@lafreniere.xyz>
 ;;; Copyright © 2020 Oleg Pykhalov <go.wigust@gmail.com>
 ;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
@@ -1092,6 +1093,31 @@ (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
+  (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
+on running processes and system utilization (CPU, memory, disks, network,
+sensors).")
+      (home-page "https://github.com/shirou/gopsutil")
+      (license license:bsd-3))))
+
 (define-public go-github-com-skip2-go-qrcode
   (package
     (name "go-github-com-skip2-go-qrcode")
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index e8abaffb56..15613efbb9 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6331,31 +6331,6 @@ (define-public go-github-com-robfig-cron
 a cron spec parser and job runner.")
     (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))
-      (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
-on running processes and system utilization (CPU, memory, disks, network,
-sensors).")
-      (home-page "https://github.com/shirou/gopsutil")
-      (license license:bsd-3))))
-
 (define-public go-github-com-danwakefield-fnmatch
   (let ((commit "cbb64ac3d964b81592e64f957ad53df015803288")
         (revision "0"))
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 3/5] gnu: go-github-com-shirou-gopsutil: Reformat with guix style.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
  2024-02-18 22:42 ` Sharlatan Hellseher
  2024-02-22 23:14 ` [bug#69234] [PATCH v3 1/5] gnu: go-github-com-shirou-gopsutil: Move to golang-xyz Troy Figiel
@ 2024-02-24  7:53 ` Troy Figiel
  2024-02-24  7:59 ` [bug#69234] [PATCH v3 4/5] gnu: Deprecate go-github-com-shirou-gopsutil Troy Figiel
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  7:53 UTC (permalink / raw)
  To: 69234

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





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 4/5] gnu: Deprecate go-github-com-shirou-gopsutil.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (2 preceding siblings ...)
  2024-02-24  7:53 ` [bug#69234] [PATCH v3 3/5] gnu: go-github-com-shirou-gopsutil: Reformat with guix style Troy Figiel
@ 2024-02-24  7:59 ` Troy Figiel
  2024-02-24  8:05 ` [bug#69234] [PATCH v3 5/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
                   ` (4 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  7:59 UTC (permalink / raw)
  To: 69234

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





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 5/5] gnu: Add go-github-com-shirou-gopsutil-v3.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (3 preceding siblings ...)
  2024-02-24  7:59 ` [bug#69234] [PATCH v3 4/5] gnu: Deprecate go-github-com-shirou-gopsutil Troy Figiel
@ 2024-02-24  8:05 ` Troy Figiel
  2024-02-24  8:10 ` [bug#69234] [PATCH v2 0/5] " Troy Figiel
                   ` (3 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  8:05 UTC (permalink / raw)
  To: 69234

* 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 <guix@twilken.net>
 ;;; Copyright © 2023, 2024 Sharlatan Hellseher <sharlatanus@gmail.com>
 ;;; Copyright © 2024 Artyom V. Poptsov <poptsov.artyom@gmail.com>
+;;; Copyright © 2024 Troy Figiel <troy@troyfigiel.com>
 ;;;
 ;;; 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")
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v2 0/5] gnu: Add go-github-com-shirou-gopsutil-v3.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (4 preceding siblings ...)
  2024-02-24  8:05 ` [bug#69234] [PATCH v3 5/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
@ 2024-02-24  8:10 ` Troy Figiel
  2024-02-24  8:19 ` [bug#69234] [PATCH v3 2/5] gnu: go-github-com-shirou-gopsutil: Update to 2.21.11 Troy Figiel
                   ` (2 subsequent siblings)
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  8:10 UTC (permalink / raw)
  To: 69234

This updated patch series moves and updates go-github-com-shirou-gopsutil, renames it to go-github-com-shirou-gopsutil-v2 and adds go-github-com-shirou-gopsutil-v3.

Troy Figiel (5):
  gnu: go-github-com-shirou-gopsutil: Move to golang-xyz.
  gnu: go-github-com-shirou-gopsutil: Update to 2.21.11.
  gnu: go-github-com-shirou-gopsutil: Reformat with guix style.
  gnu: Deprecate go-github-com-shirou-gopsutil.
  gnu: Add go-github-com-shirou-gopsutil-v3.

 gnu/packages/golang-xyz.scm | 77 ++++++++++++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 25 ------------
 2 files changed, 76 insertions(+), 26 deletions(-)


base-commit: c0f88cd18649c31c75bcddf8247b14ef3e3a66a5
-- 
2.42.0





^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 2/5] gnu: go-github-com-shirou-gopsutil: Update to 2.21.11.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (5 preceding siblings ...)
  2024-02-24  8:10 ` [bug#69234] [PATCH v2 0/5] " Troy Figiel
@ 2024-02-24  8:19 ` Troy Figiel
  2024-02-24  8:25 ` [bug#69234] [PATCH v3 0/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
  2024-03-06 23:56 ` bug#69234: [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Sharlatan Hellseher
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  8:19 UTC (permalink / raw)
  To: 69234

* 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
-- 
2.42.0





^ permalink raw reply related	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH v3 0/5] gnu: Add go-github-com-shirou-gopsutil-v3.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (6 preceding siblings ...)
  2024-02-24  8:19 ` [bug#69234] [PATCH v3 2/5] gnu: go-github-com-shirou-gopsutil: Update to 2.21.11 Troy Figiel
@ 2024-02-24  8:25 ` Troy Figiel
  2024-03-06 23:56 ` bug#69234: [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Sharlatan Hellseher
  8 siblings, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-24  8:25 UTC (permalink / raw)
  To: 69234

I accidentally sent the incorrect cover letter previously.

This updated patch series moves and updates go-github-com-shirou-gopsutil, renames it to go-github-com-shirou-gopsutil-v2 and adds go-github-com-shirou-gopsutil-v3.

Troy Figiel (5):
  gnu: go-github-com-shirou-gopsutil: Move to golang-xyz.
  gnu: go-github-com-shirou-gopsutil: Update to 2.21.11.
  gnu: go-github-com-shirou-gopsutil: Reformat with guix style.
  gnu: Deprecate go-github-com-shirou-gopsutil.
  gnu: Add go-github-com-shirou-gopsutil-v3.

 gnu/packages/golang-xyz.scm | 79 ++++++++++++++++++++++++++++++++++++-
 gnu/packages/golang.scm     | 25 ------------
 2 files changed, 78 insertions(+), 26 deletions(-)


base-commit: c0f88cd18649c31c75bcddf8247b14ef3e3a66a5
-- 
2.42.0





^ permalink raw reply	[flat|nested] 13+ messages in thread

* [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
  2024-02-19  8:35   ` Troy Figiel
  2024-02-19 13:13     ` Sharlatan Hellseher
@ 2024-02-25 11:35     ` Troy Figiel
  1 sibling, 0 replies; 13+ messages in thread
From: Troy Figiel @ 2024-02-25 11:35 UTC (permalink / raw)
  To: 69234


[-- Attachment #1.1.1: Type: text/plain, Size: 687 bytes --]

Hi Oleg,

When I first created this issue, I wrongly assumed
go-github-com-tklauser-go-sysconf was already part of master. It turns
out I had already written a half-finished local package definition,
which is why I needed to add go-github-com-tklauser-go-sysconf as a TODO
in the propagated-inputs of go-github-com-shirou-gopsutil-v2 in patch
series v3.

However, I just sent a patch series for
go-github-com-tklauser-go-sysconf (see issue #69379), so we could also
wait to commit that series first and then I can immediately resolve the
TODO in another patch series. It would reduce the number of unnecessary
commits on master.

What do you think?

Best wishes,

Troy

[-- Attachment #1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 6367 bytes --]

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

* bug#69234: [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.
  2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
                   ` (7 preceding siblings ...)
  2024-02-24  8:25 ` [bug#69234] [PATCH v3 0/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
@ 2024-03-06 23:56 ` Sharlatan Hellseher
  8 siblings, 0 replies; 13+ messages in thread
From: Sharlatan Hellseher @ 2024-03-06 23:56 UTC (permalink / raw)
  To: 69234-done

[-- Attachment #1: Type: text/plain, Size: 303 bytes --]


Hi Troy,

I've kept name of 2.21.11 on go-github-com-shirou-gopsutil as there is
no such module for "github.com/shirou/gopsutil/v2" like for v3
https://github.com/shirou/gopsutil/blob/v3.24.2/go.mod
https://pkg.go.dev/github.com/shirou/gopsutil/v3

Pushed as 8468c55565..12b8b129b3 to master.

--
Oleg

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]

^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2024-03-06 23:57 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-17 10:50 [bug#69234] [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Troy Figiel
2024-02-18 22:42 ` Sharlatan Hellseher
2024-02-19  8:35   ` Troy Figiel
2024-02-19 13:13     ` Sharlatan Hellseher
2024-02-25 11:35     ` Troy Figiel
2024-02-22 23:14 ` [bug#69234] [PATCH v3 1/5] gnu: go-github-com-shirou-gopsutil: Move to golang-xyz Troy Figiel
2024-02-24  7:53 ` [bug#69234] [PATCH v3 3/5] gnu: go-github-com-shirou-gopsutil: Reformat with guix style Troy Figiel
2024-02-24  7:59 ` [bug#69234] [PATCH v3 4/5] gnu: Deprecate go-github-com-shirou-gopsutil Troy Figiel
2024-02-24  8:05 ` [bug#69234] [PATCH v3 5/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
2024-02-24  8:10 ` [bug#69234] [PATCH v2 0/5] " Troy Figiel
2024-02-24  8:19 ` [bug#69234] [PATCH v3 2/5] gnu: go-github-com-shirou-gopsutil: Update to 2.21.11 Troy Figiel
2024-02-24  8:25 ` [bug#69234] [PATCH v3 0/5] gnu: Add go-github-com-shirou-gopsutil-v3 Troy Figiel
2024-03-06 23:56 ` bug#69234: [PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1 Sharlatan Hellseher

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).