From 62fa7ac31e81dcb9429f9377888211e19de5f99c Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Wed, 28 Feb 2024 22:27:01 +0000 Subject: gnu: kubo: Sort inputs alphabetically. * gnu/packages/ipfs.scm (kudo) [inputs]: Sort alphabetically to ease maintenance. Change-Id: Icb95464b5b8cf7d6e26285628198cfcd5c90e695 --- gnu/packages/ipfs.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gnu/packages/ipfs.scm') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 36eed11802..bad65f04a0 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -317,9 +317,9 @@ written in Go.") go-github-com-francoispqt-gojay go-github-com-fsnotify-fsnotify go-github-com-gogo-protobuf - go-github-com-google-uuid go-github-com-golang-groupcache-lru go-github-com-golang-snappy + go-github-com-google-uuid go-github-com-gorilla-mux go-github-com-gorilla-websocket go-github-com-jackpal-go-nat-pmp @@ -344,12 +344,11 @@ written in Go.") go-github-com-spaolacci-murmur3 go-github-com-stretchr-testify go-github-com-syndtr-goleveldb - go-gopkg-in-yaml-v2 - go-gopkg-in-yaml-v3 go-go-uber-org-atomic go-go-uber-org-multierr go-go-uber-org-zap go-golang-org-x-crypto + go-golang-org-x-exp go-golang-org-x-lint go-golang-org-x-mod go-golang-org-x-net @@ -357,10 +356,11 @@ written in Go.") go-golang-org-x-sync go-golang-org-x-sys go-golang-org-x-term + go-golang-org-x-text go-golang-org-x-tools go-golang-org-x-xerrors - go-golang-org-x-exp - go-golang-org-x-text + go-gopkg-in-yaml-v2 + go-gopkg-in-yaml-v3 go-lukechampine-com-blake3)) (native-inputs (append (if (%current-target-system) -- cgit v1.2.3 From 47f2a8c14ba40c825360a6d52d602dbbf4bbff44 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Thu, 7 Mar 2024 11:11:04 +0000 Subject: gnu: kubo: Unbundle more packages. * gnu/packages/ipfs.scm (kubo) [snippet]: Remove more available vendor packages. [inputs]: Add go-github-com-benbjohnson-clock and go-github-com-blang-semver-v4. Remove go-github-com-cheggaaa-pb-v3, fail over to vendor package explicitly as v3 is not required. Change-Id: I8317ea656120b034a98d180278b928f0744f5fbb --- gnu/packages/ipfs.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/ipfs.scm') diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index bad65f04a0..0a1065535b 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -241,10 +241,13 @@ written in Go.") (snippet '(for-each delete-file-recursively ;; TODO: unbundle the rest as well '("vendor/github.com/alecthomas" - ;; "vendor/github.com/blang" + "vendor/github.com/benbjohnson/clock" + "vendor/github.com/beorn7/perks" + "vendor/github.com/blang" "vendor/github.com/cespare" - ;; TODO: Go files not found - ;; "vendor/github.com/cheggaaa" + ;; TODO: kubo depends on v1.0.29 which is way too + ;; hard to back port. + ; "vendor/github.com/cheggaaa/pb" "vendor/github.com/davecgh" "vendor/github.com/dustin" "vendor/github.com/flynn" @@ -261,8 +264,6 @@ written in Go.") ;; "vendor/github.com/ipld" "vendor/github.com/jackpal" "vendor/github.com/klauspost" - ;; TODO: Go files not found - ;; "vendor/github.com/lucas-clemente" "vendor/github.com/mattn" "vendor/github.com/mgutz" "vendor/github.com/minio" @@ -306,11 +307,10 @@ written in Go.") #~(string-append #$output "/bin/ipfs")) "commands" "completion" "bash"))))))))) (inputs (list go-github-com-alecthomas-units - ;; TODO: needs to be updated first - ;; go-github-com-blang-semver + go-github-com-benbjohnson-clock + go-github-com-blang-semver-v4 go-github-com-cespare-xxhash go-github-com-cheekybits-genny - go-github-com-cheggaaa-pb-v3 go-github-com-davecgh-go-spew go-github-com-dustin-go-humanize go-github-com-flynn-noise -- cgit v1.2.3