[PATCH] gnu: go-github-com-shirou-gopsutil: Update to 3.24.1.

---

gnu/packages/golang.scm | 10 ++++------

1 file changed, 4 insertions(+), 6 deletions(-)

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.

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

Hi Oleg,

On 2024-02-18 23:42, Sharlatan Hellseher wrote:

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

Hi Troy,

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

Thanks,

Oleg

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

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

---

gnu/packages/golang-xyz.scm | 28 +++++++++++++++++++++++++++-

gnu/packages/golang.scm | 25 -------------------------

2 files changed, 27 insertions(+), 26 deletions(-)

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

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 | 63 ++++++++++++++++++++++++-------------

1 file changed, 41 insertions(+), 22 deletions(-)

---

gnu/packages/golang-xyz.scm | 28 ++++++++++++++++++++++++++++

1 file changed, 28 insertions(+)

guix style.

---

gnu/packages/golang-xyz.scm | 21 +++++++++++----------

1 file changed, 11 insertions(+), 10 deletions(-)

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

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

Pushed as 8468c55565..12b8b129b3 to master.

--

Oleg