Skip to content

Commit

Permalink
fix: mac os build error (#1829)
Browse files Browse the repository at this point in the history
* Replace xxxserxxx/gotop/v4 with ersonp/gotop/v4

* Update description
  • Loading branch information
ersonp committed Jun 7, 2024
1 parent 5ebb1e7 commit 2a6f001
Show file tree
Hide file tree
Showing 383 changed files with 29,948 additions and 7,407 deletions.
2 changes: 2 additions & 0 deletions cmd/skywire-cli/commands/visor/description.txt
Original file line number Diff line number Diff line change
Expand Up @@ -94,3 +94,5 @@ Config files, layouts, and color schemes are searched for (in order):
More information and detailed documentation can found at
https://github.com/xxxserxxx/gotop`

Note:
On MacOS Disk info https://github.com/xxxserxxx/gotop/issues/244 and Temp https://github.com/xxxserxxx/gotop/issues/240 do not work.
18 changes: 13 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ require (
github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8
github.com/spf13/cobra v1.7.0
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.8.4
github.com/stretchr/testify v1.9.0
github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635
github.com/tidwall/pretty v1.2.1
github.com/toqueteos/webbrowser v1.2.0
Expand All @@ -53,7 +53,7 @@ require (
go.etcd.io/bbolt v1.3.7
golang.org/x/net v0.21.0
golang.org/x/sync v0.3.0
golang.org/x/sys v0.17.0
golang.org/x/sys v0.20.0
golang.zx2c4.com/wireguard v0.0.0-20230223181233-21636207a675
gopkg.in/telebot.v3 v3.2.1
)
Expand All @@ -68,7 +68,7 @@ require (
github.com/Microsoft/go-winio v0.6.1 // indirect
github.com/StackExchange/wmi v1.2.1 // indirect
github.com/VividCortex/ewma v1.2.0 // indirect
github.com/anatol/smart.go v0.0.0-20220917195147-c0b00d90f8cc // indirect
github.com/anatol/smart.go v0.0.0-20240606135530-b987830bbb40 // indirect
github.com/bytedance/sonic v1.10.0 // indirect
github.com/cespare/xxhash v1.1.0 // indirect
github.com/cespare/xxhash/v2 v2.1.2 // indirect
Expand Down Expand Up @@ -128,6 +128,7 @@ require (
github.com/klauspost/reedsolomon v1.11.8 // indirect
github.com/leodido/go-urn v1.2.4 // indirect
github.com/lithammer/fuzzysearch v1.1.8 // indirect
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.19 // indirect
github.com/mattn/go-runewidth v0.0.15 // indirect
Expand All @@ -142,21 +143,26 @@ require (
github.com/pires/go-proxyproto v0.6.2 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
github.com/quic-go/quic-go v0.42.0 // indirect
github.com/rivo/uniseg v0.4.4 // indirect
github.com/rs/cors v1.8.2 // indirect
github.com/shirou/gopsutil v3.20.12+incompatible // indirect
github.com/shirou/gopsutil/v3 v3.24.5 // indirect
github.com/shoenig/go-m1cpu v0.1.6 // indirect
github.com/skycoin/noise v0.0.0-20180327030543-2492fe189ae6 // indirect
github.com/stretchr/objx v0.5.1 // indirect
github.com/stretchr/objx v0.5.2 // indirect
github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 // indirect
github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b // indirect
github.com/tjfoc/gmsm v1.4.1 // indirect
github.com/tklauser/go-sysconf v0.3.12 // indirect
github.com/tklauser/numcpus v0.6.1 // indirect
github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
github.com/ugorji/go/codec v1.2.11 // indirect
github.com/valyala/fastrand v1.1.0 // indirect
github.com/valyala/histogram v1.2.0 // indirect
github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 // indirect
github.com/yusufpapurcu/wmi v1.2.4 // indirect
go.opencensus.io v0.23.0 // indirect
go.uber.org/mock v0.4.0 // indirect
golang.org/x/arch v0.4.0 // indirect
Expand All @@ -178,6 +184,8 @@ require (
nhooyr.io/websocket v1.8.7 // indirect
)

replace github.com/xxxserxxx/gotop/v4 => github.com/ersonp/gotop/v4 v4.2.1

// Uncomment for tests with local sources of other skywire repos
// replace github.com/skycoin/dmsg => ../dmsg
// replace github.com/skycoin/skywire-services => ../skywire-services
Expand Down
68 changes: 30 additions & 38 deletions go.sum

Large diffs are not rendered by default.

19 changes: 11 additions & 8 deletions vendor/github.com/anatol/smart.go/ata_device_database.go

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion vendor/github.com/anatol/smart.go/ioctl_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions vendor/github.com/anatol/smart.go/nvme_darwin.cpp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

60 changes: 56 additions & 4 deletions vendor/github.com/anatol/smart.go/nvme_linux.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 2a6f001

Please sign in to comment.