From 3ab2aa3fe50b53cf28b07f1b239212e291cc1b97 Mon Sep 17 00:00:00 2001 From: Sharlatan Hellseher Date: Tue, 27 Aug 2024 00:31:44 +0100 Subject: [PATCH] gnu: kubo: Unbandle more inputs. * gnu/packages/ipfs.scm (kubo): Unbandle more inputs. [arguments] <#:phases>: Add 'copy-input-to-vendor-directory phase. [inputs]: Add go-github-com-libp2p-go-cidranger, go-github-com-libp2p-go-libp2p-asn-util, go-github-com-libp2p-go-reuseport, and go-github-com-libp2p-go-yamux-v4. Change-Id: I55c7c9cfed58f20a435fbc0a5905a2834fe67675 --- gnu/packages/ipfs.scm | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm index 1a7a126ae3..d9866a8d9a 100644 --- a/gnu/packages/ipfs.scm +++ b/gnu/packages/ipfs.scm @@ -864,11 +864,15 @@ types.") "vendor/github.com/klauspost" "vendor/github.com/koron" "vendor/github.com/libp2p/go-buffer-pool" + "vendor/github.com/libp2p/go-cidranger" "vendor/github.com/libp2p/go-flow-metrics" + "vendor/github.com/libp2p/go-libp2p-asn-util" "vendor/github.com/libp2p/go-msgio" "vendor/github.com/libp2p/go-nat" "vendor/github.com/libp2p/go-netroute" + "vendor/github.com/libp2p/go-reuseport" "vendor/github.com/libp2p/go-socket-activation" + "vendor/github.com/libp2p/go-yamux" "vendor/github.com/mattn" "vendor/github.com/mgutz" "vendor/github.com/miekg" @@ -902,6 +906,26 @@ types.") #:import-path "github.com/ipfs/kubo/cmd/ipfs" #:phases #~(modify-phases %standard-phases + ;; FIXME: src/github.com/libp2p/go-libp2p-asn-util/asn.go:12:12: + ;; pattern sorted-network-list.bin: cannot embed irregular file + ;; sorted-network-list.bin + ;; + ;; This happens due to Golang can't determine the valid directory of + ;; the module which is sourced during setup environment phase, but + ;; easy resolved after coping to expected directory "vendor" within + ;; the current package, see details in Golang source: + ;; + ;; - URL: + ;; - commit: 82c14346d89ec0eeca114f9ca0e88516b2cda454 + ;; - file: src/cmd/go/internal/load/pkg.go#L2059 + (add-before 'build 'copy-input-to-vendor-directory + (lambda* (#:key unpack-path #:allow-other-keys) + (with-directory-excursion (string-append "src/" unpack-path) + (copy-recursively + (string-append + #$(this-package-input "go-github-com-libp2p-go-libp2p-asn-util") + "/src/github.com") + "vendor/github.com")))) ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md (add-after 'install 'install-bashcompletion (lambda _ @@ -1031,9 +1055,13 @@ types.") go-github-com-ipfs-go-verifcid ; github.com/ipfs/go-blockservice go-github-com-klauspost-compress ; github.com/libp2p/go-libp2p go-github-com-libp2p-go-buffer-pool ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-cidranger ; github.com/libp2p/go-libp2p-kbucket go-github-com-libp2p-go-flow-metrics ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-libp2p-asn-util ; github.com/libp2p/go-libp2p-kbucket go-github-com-libp2p-go-msgio ; github.com/libp2p/go-libp2p-kad-dht go-github-com-libp2p-go-nat ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-reuseport ; github.com/libp2p/go-libp2p + go-github-com-libp2p-go-yamux-v4 ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multiaddr-fmt ; github.com/libp2p/go-libp2p go-github-com-multiformats-go-multistream ; github.com/libp2p/go-libp2p go-github-com-prometheus-statsd-exporter ; contrib.go.opencensus.io/exporter/prometheus