* [bug#67570] [PATCH] gnu: kubo: Fix build.
@ 2023-12-01 19:08 Artyom V. Poptsov
2023-12-02 10:04 ` Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Artyom V. Poptsov @ 2023-12-01 19:08 UTC (permalink / raw)
To: 67570
[-- Attachment #1.1: Type: text/plain, Size: 44 bytes --]
Hello,
this patch series fixes Kubo build.
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-kubo-Fix-build.patch --]
[-- Type: text/x-diff, Size: 7132 bytes --]
From 745aa270dcfd400d34eb39f7e719985c34d79788 Mon Sep 17 00:00:00 2001
Message-ID: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Fri, 1 Dec 2023 21:52:19 +0300
Subject: [PATCH 1/2] gnu: kubo: Fix build.
* gnu/packages/ipfs.scm (kubo): Fix build.
[inputs]: Replace "go-golang-org-x-sys" with "go-golang-org-x-sys-0.8" in
inputs.
Change-Id: I0d7659efd71fe723ee411347598914fee68e0875
---
gnu/packages/ipfs.scm | 117 ++++++++++++++++++++++--------------------
1 file changed, 61 insertions(+), 56 deletions(-)
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index a4c0613e40..30d579ed3f 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -299,62 +299,67 @@ (define-public kubo
"ipfs"
#~(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-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
- 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-gorilla-websocket
- go-github-com-jackpal-go-nat-pmp
- go-github-com-klauspost-compress
- go-github-com-klauspost-cpuid
- go-github-com-lucas-clemente-quic-go
- go-github-com-mattn-go-colorable
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
- go-github-com-mgutz-ansi
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-mitchellh-go-homedir
- go-github-com-mr-tron-base58
- go-github-com-opentracing-opentracing-go
- go-github-com-pkg-errors
- go-github-com-pmezard-go-difflib
- go-github-com-prometheus-client-golang
- go-github-com-prometheus-client-model
- go-github-com-prometheus-common
- go-github-com-prometheus-procfs
- 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-lint
- go-golang-org-x-mod
- go-golang-org-x-net
- go-golang-org-x-oauth2
- go-golang-org-x-sync
- go-golang-org-x-sys
- go-golang-org-x-term
- go-golang-org-x-tools
- go-golang-org-x-xerrors
- go-golang-org-x-exp
- go-golang-org-x-text
- go-lukechampine-com-blake3))
+ (inputs
+ (let ((p (package-input-rewriting
+ `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
+ #:deep? #true)))
+ (cons go-golang-org-x-sys-0.8
+ (map p
+ (list go-github-com-alecthomas-units
+ ;; TODO: needs to be updated first
+ ;; go-github-com-blang-semver
+ 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
+ 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-gorilla-websocket
+ go-github-com-jackpal-go-nat-pmp
+ go-github-com-klauspost-compress
+ go-github-com-klauspost-cpuid
+ go-github-com-lucas-clemente-quic-go
+ go-github-com-mattn-go-colorable
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-runewidth
+ go-github-com-mgutz-ansi
+ go-github-com-minio-blake2b-simd
+ go-github-com-minio-sha256-simd
+ go-github-com-mitchellh-go-homedir
+ go-github-com-mr-tron-base58
+ go-github-com-opentracing-opentracing-go
+ go-github-com-pkg-errors
+ go-github-com-pmezard-go-difflib
+ go-github-com-prometheus-client-golang
+ go-github-com-prometheus-client-model
+ go-github-com-prometheus-common
+ go-github-com-prometheus-procfs
+ 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-lint
+ go-golang-org-x-mod
+ go-golang-org-x-net
+ go-golang-org-x-oauth2
+ go-golang-org-x-sync
+ go-golang-org-x-term
+ go-golang-org-x-tools
+ go-golang-org-x-xerrors
+ go-golang-org-x-exp
+ go-golang-org-x-text
+ go-lukechampine-com-blake3)))))
(native-inputs
(append (if (%current-target-system)
(list this-package)
base-commit: 842a11f1caa1bb929c427722ad9d7b7c1ff65727
--
2.41.0
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.3: 0002-gnu-kubo-Fix-the-package-style.patch --]
[-- Type: text/x-diff, Size: 11096 bytes --]
From b59bf490b31798ef88220ddb54a285e14c82f00d Mon Sep 17 00:00:00 2001
Message-ID: <b59bf490b31798ef88220ddb54a285e14c82f00d.1701457354.git.poptsov.artyom@gmail.com>
In-Reply-To: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com>
References: <745aa270dcfd400d34eb39f7e719985c34d79788.1701457354.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Fri, 1 Dec 2023 22:02:11 +0300
Subject: [PATCH 2/2] gnu: kubo: Fix the package style.
* gnu/packages/ipfs.scm (kubo): Fix the package style.
Change-Id: Ifbb4fca12c7e52b9f07fb3c430e0dc61848fd101
---
gnu/packages/ipfs.scm | 166 +++++++++++++++++++++---------------------
1 file changed, 82 insertions(+), 84 deletions(-)
diff --git a/gnu/packages/ipfs.scm b/gnu/packages/ipfs.scm
index 30d579ed3f..5b467f1c8a 100644
--- a/gnu/packages/ipfs.scm
+++ b/gnu/packages/ipfs.scm
@@ -226,9 +226,8 @@ (define-public kubo
(source
(origin
(method url-fetch/tarbomb)
- (uri (string-append
- "https://dist.ipfs.io/kubo/v" version
- "/kubo-source.tar.gz"))
+ (uri (string-append "https://dist.ipfs.io/kubo/v" version
+ "/kubo-source.tar.gz"))
(sha256
(base32 "0ss5k8xnzn9qk977dni5ja89yygcysdw7r3mdk67cac2dpa9hhqs"))
(file-name (string-append name "-" version "-source"))
@@ -285,89 +284,88 @@ (define-public kubo
(list
#:unpack-path "github.com/ipfs/kubo"
#:import-path "github.com/ipfs/kubo/cmd/ipfs"
- #:phases
- #~(modify-phases %standard-phases
- ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
- (add-after 'install 'install-bashcompletion
- (lambda _
- (let ((completiondir (string-append #$output
- "/etc/bash_completion.d")))
- (mkdir-p completiondir)
- (with-output-to-file (string-append completiondir "/ipfs")
- (lambda _
- (invoke #$(if (%current-target-system)
- "ipfs"
- #~(string-append #$output "/bin/ipfs"))
- "commands" "completion" "bash")))))))))
- (inputs
- (let ((p (package-input-rewriting
- `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
- #:deep? #true)))
- (cons go-golang-org-x-sys-0.8
- (map p
- (list go-github-com-alecthomas-units
- ;; TODO: needs to be updated first
- ;; go-github-com-blang-semver
- 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
- 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-gorilla-websocket
- go-github-com-jackpal-go-nat-pmp
- go-github-com-klauspost-compress
- go-github-com-klauspost-cpuid
- go-github-com-lucas-clemente-quic-go
- go-github-com-mattn-go-colorable
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-runewidth
- go-github-com-mgutz-ansi
- go-github-com-minio-blake2b-simd
- go-github-com-minio-sha256-simd
- go-github-com-mitchellh-go-homedir
- go-github-com-mr-tron-base58
- go-github-com-opentracing-opentracing-go
- go-github-com-pkg-errors
- go-github-com-pmezard-go-difflib
- go-github-com-prometheus-client-golang
- go-github-com-prometheus-client-model
- go-github-com-prometheus-common
- go-github-com-prometheus-procfs
- 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-lint
- go-golang-org-x-mod
- go-golang-org-x-net
- go-golang-org-x-oauth2
- go-golang-org-x-sync
- go-golang-org-x-term
- go-golang-org-x-tools
- go-golang-org-x-xerrors
- go-golang-org-x-exp
- go-golang-org-x-text
- go-lukechampine-com-blake3)))))
- (native-inputs
- (append (if (%current-target-system)
- (list this-package)
- '())
- (list python-minimal-wrapper zsh)))
+ #:phases #~(modify-phases %standard-phases
+ ;; https://github.com/ipfs/kubo/blob/master/docs/command-completion.md
+ (add-after 'install 'install-bashcompletion
+ (lambda _
+ (let ((completiondir (string-append #$output
+ "/etc/bash_completion.d")))
+ (mkdir-p completiondir)
+ (with-output-to-file (string-append completiondir
+ "/ipfs")
+ (lambda _
+ (invoke #$(if (%current-target-system) "ipfs"
+ #~(string-append #$output
+ "/bin/ipfs"))
+ "commands" "completion" "bash")))))))))
+ (inputs (let ((p (package-input-rewriting `((,go-golang-org-x-sys unquote
+ go-golang-org-x-sys-0.8))
+ #:deep? #t)))
+ (cons go-golang-org-x-sys-0.8
+ (map p
+ (list go-github-com-alecthomas-units
+ ;; TODO: needs to be updated first
+ ;; go-github-com-blang-semver
+ 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
+ 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-gorilla-websocket
+ go-github-com-jackpal-go-nat-pmp
+ go-github-com-klauspost-compress
+ go-github-com-klauspost-cpuid
+ go-github-com-lucas-clemente-quic-go
+ go-github-com-mattn-go-colorable
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-runewidth
+ go-github-com-mgutz-ansi
+ go-github-com-minio-blake2b-simd
+ go-github-com-minio-sha256-simd
+ go-github-com-mitchellh-go-homedir
+ go-github-com-mr-tron-base58
+ go-github-com-opentracing-opentracing-go
+ go-github-com-pkg-errors
+ go-github-com-pmezard-go-difflib
+ go-github-com-prometheus-client-golang
+ go-github-com-prometheus-client-model
+ go-github-com-prometheus-common
+ go-github-com-prometheus-procfs
+ 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-lint
+ go-golang-org-x-mod
+ go-golang-org-x-net
+ go-golang-org-x-oauth2
+ go-golang-org-x-sync
+ go-golang-org-x-term
+ go-golang-org-x-tools
+ go-golang-org-x-xerrors
+ go-golang-org-x-exp
+ go-golang-org-x-text
+ go-lukechampine-com-blake3)))))
+ (native-inputs (append (if (%current-target-system)
+ (list this-package)
+ '())
+ (list python-minimal-wrapper zsh)))
(home-page "https://ipfs.io")
(synopsis "Go implementation of IPFS, a peer-to-peer hypermedia protocol")
- (description "IPFS is a global, versioned, peer-to-peer file system. It
+ (description
+ "IPFS is a global, versioned, peer-to-peer file system. It
combines good ideas from Git, BitTorrent, Kademlia, SFS, and the Web. It is
like a single bittorrent swarm, exchanging git objects. IPFS provides an
interface as simple as the HTTP web, but with permanence built in. You can
--
2.41.0
[-- Attachment #1.4: Type: text/plain, Size: 216 bytes --]
- avp
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: kubo: Fix build.
2023-12-01 19:08 [bug#67570] [PATCH] gnu: kubo: Fix build Artyom V. Poptsov
@ 2023-12-02 10:04 ` Ludovic Courtès
2023-12-09 8:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.) Artyom V. Poptsov
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2023-12-02 10:04 UTC (permalink / raw)
To: Artyom V. Poptsov; +Cc: 67570
Hi,
I spoke too fast…
"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
> + (let ((p (package-input-rewriting
> + `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
> + #:deep? #true)))
> + (cons go-golang-org-x-sys-0.8
> + (map p
> + (list go-github-com-alecthomas-units
> + ;; TODO: needs to be updated first
> + ;; go-github-com-blang-semver
> + go-github-com-cespare-xxhash
It does fix the build, but it’s a bit heavy-handed: every time we
compute the kubo derivation, we go through that graph rewriting, which
is quite expensive.
Can you think of another way this could be fixed? What if we don’t
replace go-golang-org-x-sys everywhere? Or perhaps there’s a trick that
would allow us to build with go-golang-org-x-sys 0.4?
In parallel perhaps we should work on upgrading go-golang-org-x-sys
altogether?
WDYT?
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.)
2023-12-02 10:04 ` Ludovic Courtès
@ 2023-12-09 8:22 ` Artyom V. Poptsov
2023-12-10 21:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0 Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Artyom V. Poptsov @ 2023-12-09 8:22 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 67570
[-- Attachment #1.1: Type: text/plain, Size: 624 bytes --]
Hello Ludovic!
> It does fix the build, but it’s a bit heavy-handed: every time we
> compute the kubo derivation, we go through that graph rewriting, which
> is quite expensive.
Agreed, I just wanted to make a "quick fix" that works.
> Can you think of another way this could be fixed? What if we don’t
> replace go-golang-org-x-sys everywhere? Or perhaps there’s a trick that
> would allow us to build with go-golang-org-x-sys 0.4?
> In parallel perhaps we should work on upgrading go-golang-org-x-sys
> altogether?
Alright, I tried to update "go-golang-org-x-sys" to 0.8.0, here's the
patch:
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1.2: 0001-gnu-go-golang-org-x-sys-Update-to-0.8.0.patch --]
[-- Type: text/x-diff, Size: 8297 bytes --]
From 6022d28be487d06e9987785db1240355c080f459 Mon Sep 17 00:00:00 2001
Message-ID: <6022d28be487d06e9987785db1240355c080f459.1702109906.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Sat, 9 Dec 2023 11:09:26 +0300
Subject: [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
* gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.8.0.
(go-golang-org-x-sys-0.8): Remove.
(go-github-com-quic-go-quic-go, go-github-com-quic-go-qtls-go1-20):
Use the new version of "go-golang-org-x-sys".
* gnu/packages/networking.scm (yggdrasil): Use the new version of
"go-golang-org-x-sys".
[propagated-inputs]: Don't rewrite inputs; add "go-golang-org-x-sys".
Change-Id: I969dd402427e345550038918f6de607413c44a61
---
gnu/packages/golang.scm | 52 ++++++++++------------------------
gnu/packages/networking.scm | 56 +++++++++++++++++--------------------
2 files changed, 41 insertions(+), 67 deletions(-)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index b5bf9d4b47..b34217d154 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -4079,11 +4079,11 @@ (define-public go-golang-org-x-sync
(license license:bsd-3))))
(define-public go-golang-org-x-sys
- (let ((commit "b60007cc4e6f966b1c542e343d026d06723e5653")
+ (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
(revision "0"))
(package
(name "go-golang-org-x-sys")
- (version (git-version "0.4.0" revision commit))
+ (version (git-version "0.8.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -4092,7 +4092,7 @@ (define-public go-golang-org-x-sys
(file-name (git-file-name name version))
(sha256
(base32
- "0fr2d6fnpbqx6n89sg9lsinqkdaw49y068kqj2g0cxlhbh69hzii"))))
+ "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq"))))
(build-system go-build-system)
(arguments
(list
@@ -4109,24 +4109,6 @@ (define-public go-golang-org-x-sys
(home-page "https://go.googlesource.com/sys")
(license license:bsd-3))))
-;; XXX: This version is required for "go-github-com-quic-go-qtls-go1-20".
-(define-public go-golang-org-x-sys-0.8
- (let ((commit "ca59edaa5a761e1d0ea91d6c07b063f85ef24f78")
- (revision "0"))
- (package
- (inherit go-golang-org-x-sys)
- (name "go-golang-org-x-sys")
- (version (git-version "0.8.0" revision commit))
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://go.googlesource.com/sys")
- (commit commit)))
- (file-name (git-file-name name version))
- (sha256
- (base32
- "1p81niiin8dwyrjl2xsc95136w3vdw4kmj0w3mlh0vh5v134s4xq")))))))
-
(define-public go-golang-org-x-text
(package
(name "go-golang-org-x-text")
@@ -7748,7 +7730,7 @@ (define-public go-github-com-quic-go-qtls-go1-20
#:import-path "github.com/quic-go/qtls-go1-20"
#:go go-1.20))
(propagated-inputs (list go-golang-org-x-crypto
- go-golang-org-x-sys-0.8))
+ go-golang-org-x-sys))
(synopsis "TLS 1.3 for QUIC")
(description
"Go standard library TLS 1.3 implementation, modified for QUIC. For
@@ -7809,21 +7791,17 @@ (define-public go-github-com-quic-go-quic-go
#:tests? #f
#:go go-1.20))
(propagated-inputs
- (let ((p (package-input-rewriting
- `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
- #:deep? #true)))
- (cons go-golang-org-x-sys-0.8
- (map p
- (list go-github-com-quic-go-qtls-go1-20
- go-github-com-quic-go-qpack
- go-golang-org-x-crypto
- go-github-com-cheekybits-genny
- go-github-com-marten-seemann-chacha20
- go-github-com-golang-protobuf-proto
- go-golang-org-x-crypto
- go-golang-org-x-exp
- go-golang-org-x-net
- go-golang-org-x-sync)))))
+ (list go-github-com-quic-go-qtls-go1-20
+ go-github-com-quic-go-qpack
+ go-golang-org-x-crypto
+ go-github-com-cheekybits-genny
+ go-github-com-marten-seemann-chacha20
+ go-github-com-golang-protobuf-proto
+ go-golang-org-x-crypto
+ go-golang-org-x-exp
+ go-golang-org-x-net
+ go-golang-org-x-sys
+ go-golang-org-x-sync))
(synopsis "QUIC in Go")
(description "This package provides a Go language implementation of the QUIC
network protocol.")
diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm
index 6b415076e8..5f4d60e4fd 100644
--- a/gnu/packages/networking.scm
+++ b/gnu/packages/networking.scm
@@ -4447,36 +4447,32 @@ (define-public yggdrasil
"github.com/yggdrasil-network/yggdrasil-go/cmd/yggdrasilctl"
"github.com/yggdrasil-network/yggdrasil-go/cmd/genkeys"))))))))
(propagated-inputs
- (let ((p (package-input-rewriting
- `((,go-golang-org-x-sys . ,go-golang-org-x-sys-0.8))
- #:deep? #true)))
- (cons go-golang-org-x-sys-0.8
- (map p
- (list go-golang-zx2c4-com-wireguard
- go-golang-org-x-text
- go-golang-org-x-net
- go-golang-org-x-crypto
- go-golang-org-x-tools
- go-netns
- go-netlink
- go-github-com-bits-and-blooms-bitset
- go-github-com-bits-and-blooms-bloom
- go-github-com-quic-go-quic-go
- go-github-com-hjson-hjson-go
- go-github-com-olekukonko-tablewriter
- go-github-com-mitchellh-mapstructure
- go-github-com-mattn-go-runewidth
- go-github-com-mattn-go-isatty
- go-github-com-mattn-go-colorable
- go-github-com-kardianos-minwinsvc
- go-github-com-hjson-hjson-go
- go-github-com-hashicorp-go-syslog
- go-github-com-gologme-log
- go-github-com-fatih-color
- go-github-com-cheggaaa-pb-v3
- go-github-com-vividcortex-ewma
- go-github-com-arceliar-phony
- go-github-com-arceliar-ironwood)))))
+ (list go-golang-zx2c4-com-wireguard
+ go-golang-org-x-text
+ go-golang-org-x-net
+ go-golang-org-x-crypto
+ go-golang-org-x-tools
+ go-golang-org-x-sys
+ go-netns
+ go-netlink
+ go-github-com-bits-and-blooms-bitset
+ go-github-com-bits-and-blooms-bloom
+ go-github-com-quic-go-quic-go
+ go-github-com-hjson-hjson-go
+ go-github-com-olekukonko-tablewriter
+ go-github-com-mitchellh-mapstructure
+ go-github-com-mattn-go-runewidth
+ go-github-com-mattn-go-isatty
+ go-github-com-mattn-go-colorable
+ go-github-com-kardianos-minwinsvc
+ go-github-com-hjson-hjson-go
+ go-github-com-hashicorp-go-syslog
+ go-github-com-gologme-log
+ go-github-com-fatih-color
+ go-github-com-cheggaaa-pb-v3
+ go-github-com-vividcortex-ewma
+ go-github-com-arceliar-phony
+ go-github-com-arceliar-ironwood))
(home-page "https://yggdrasil-network.github.io/blog.html")
(synopsis
"Experiment in scalable routing as an encrypted IPv6 overlay network")
base-commit: 06f25a9a85be1bbe7a709e58ce41c1a834e5f1ae
--
2.41.0
[-- Attachment #1.3: Type: text/plain, Size: 235 bytes --]
It seems that the dependent packages are fine with that. I haven't
checked everything but I did some cherry-picking across the dependent
packages and build some of them and found no build errors. Please find
my check-list attached.
[-- Attachment #1.4: go-golang-org-x-sys-0.8.0-upgrade-check.org --]
[-- Type: application/vnd.lotus-organizer, Size: 24241 bytes --]
[-- Attachment #1.5: Type: text/plain, Size: 227 bytes --]
Thanks,
- avp
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2023-12-09 8:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.) Artyom V. Poptsov
@ 2023-12-10 21:22 ` Ludovic Courtès
2023-12-29 9:55 ` Artyom V. Poptsov
0 siblings, 1 reply; 9+ messages in thread
From: Ludovic Courtès @ 2023-12-10 21:22 UTC (permalink / raw)
To: Artyom V. Poptsov; +Cc: 67570
Hi,
"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
>> Can you think of another way this could be fixed? What if we don’t
>> replace go-golang-org-x-sys everywhere? Or perhaps there’s a trick that
>> would allow us to build with go-golang-org-x-sys 0.4?
>
>> In parallel perhaps we should work on upgrading go-golang-org-x-sys
>> altogether?
>
> Alright, I tried to update "go-golang-org-x-sys" to 0.8.0, here's the
> patch:
>
> From 6022d28be487d06e9987785db1240355c080f459 Mon Sep 17 00:00:00 2001
> Message-ID: <6022d28be487d06e9987785db1240355c080f459.1702109906.git.poptsov.artyom@gmail.com>
> From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
> Date: Sat, 9 Dec 2023 11:09:26 +0300
> Subject: [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
>
> * gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.8.0.
> (go-golang-org-x-sys-0.8): Remove.
> (go-github-com-quic-go-quic-go, go-github-com-quic-go-qtls-go1-20):
> Use the new version of "go-golang-org-x-sys".
> * gnu/packages/networking.scm (yggdrasil): Use the new version of
> "go-golang-org-x-sys".
> [propagated-inputs]: Don't rewrite inputs; add "go-golang-org-x-sys".
This is being built:
https://qa.guix.gnu.org/issue/67570
Let’s keep an eye on it and see how it goes.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2023-12-10 21:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0 Ludovic Courtès
@ 2023-12-29 9:55 ` Artyom V. Poptsov
2024-01-07 14:48 ` bug#67570: " Ludovic Courtès
0 siblings, 1 reply; 9+ messages in thread
From: Artyom V. Poptsov @ 2023-12-29 9:55 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 67570
[-- Attachment #1: Type: text/plain, Size: 611 bytes --]
Hello!
> This is being built:
>
> https://qa.guix.gnu.org/issue/67570
So what is the status of this? Last time I checked the link the
information about the build was gone and it's not obvious for me how to
get this info again.
Before I saw that some new packages were failing, I'd like to check if I
can fix them.
Could you provide a new link or the info itself?
Thanks!
- avp
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* bug#67570: [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2023-12-29 9:55 ` Artyom V. Poptsov
@ 2024-01-07 14:48 ` Ludovic Courtès
2024-01-07 15:34 ` [bug#67570] " Christopher Baines
2024-01-08 17:13 ` Artyom V. Poptsov
0 siblings, 2 replies; 9+ messages in thread
From: Ludovic Courtès @ 2024-01-07 14:48 UTC (permalink / raw)
To: Artyom V. Poptsov; +Cc: Christopher Baines, 67570-done
Hi!
"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
>> This is being built:
>>
>> https://qa.guix.gnu.org/issue/67570
>
> So what is the status of this? Last time I checked the link the
> information about the build was gone and it's not obvious for me how to
> get this info again.
>
> Before I saw that some new packages were failing, I'd like to check if I
> can fix them.
>
> Could you provide a new link or the info itself?
Unfortunately I’m not sure why qa.guix is no longer providing any info,
and I don’t know how to get it back. Chris?
Anyhow, I built Kubo with this patch and got substitutes from
bordeaux.guix for all its dependencies; Kubo itself built fine. So I’m
proposing to apply the patch and see from there whether anything needs
fixing. It’s suboptimal, but that’s what we have.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2024-01-07 14:48 ` bug#67570: " Ludovic Courtès
@ 2024-01-07 15:34 ` Christopher Baines
2024-01-08 17:02 ` Ludovic Courtès
2024-01-08 17:13 ` Artyom V. Poptsov
1 sibling, 1 reply; 9+ messages in thread
From: Christopher Baines @ 2024-01-07 15:34 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Artyom V. Poptsov, 67570
[-- Attachment #1: Type: text/plain, Size: 1012 bytes --]
Ludovic Courtès <ludo@gnu.org> writes:
> Hi!
>
> "Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:
>
>>> This is being built:
>>>
>>> https://qa.guix.gnu.org/issue/67570
>>
>> So what is the status of this? Last time I checked the link the
>> information about the build was gone and it's not obvious for me how to
>> get this info again.
>>
>> Before I saw that some new packages were failing, I'd like to check if I
>> can fix them.
>>
>> Could you provide a new link or the info itself?
>
> Unfortunately I’m not sure why qa.guix is no longer providing any info,
> and I don’t know how to get it back. Chris?
Looks like these patches were sent long enough ago that they've dropped
out of the fixed number of recent patches that QA looks at [1].
1: https://git.cbaines.net/guix/qa-frontpage/tree/scripts/guix-qa-frontpage.in#n154
You can resend the series to get QA to pay attention again, but current
QA isn't really working anyway due to a number of issues.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2024-01-07 15:34 ` [bug#67570] " Christopher Baines
@ 2024-01-08 17:02 ` Ludovic Courtès
0 siblings, 0 replies; 9+ messages in thread
From: Ludovic Courtès @ 2024-01-08 17:02 UTC (permalink / raw)
To: Christopher Baines; +Cc: Artyom V. Poptsov, 67570
Hi Chris!
Christopher Baines <mail@cbaines.net> skribis:
> Looks like these patches were sent long enough ago that they've dropped
> out of the fixed number of recent patches that QA looks at [1].
Would it be possible to keep previous build results beyond that number,
only marking them as “archived” or similar? (And then after a longer
period of time, they can be removed altogether.)
It would allow us to get useful info even for old patches.
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 9+ messages in thread
* [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0.
2024-01-07 14:48 ` bug#67570: " Ludovic Courtès
2024-01-07 15:34 ` [bug#67570] " Christopher Baines
@ 2024-01-08 17:13 ` Artyom V. Poptsov
1 sibling, 0 replies; 9+ messages in thread
From: Artyom V. Poptsov @ 2024-01-08 17:13 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: Christopher Baines, 67570-done
[-- Attachment #1: Type: text/plain, Size: 601 bytes --]
Hello,
as far as I remember, one of the packages that was failing is
"go-github-com-charmbracelet-glamour" -- this is not directly related to
"go-golang-org-x-sys" as the package build has started failing before my
patch, but anyways. Yesterday I sent a patch that should fix
"go-github-com-charmbracelet-glamour" build:
https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68311
- avp
--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
Home page: https://memory-heap.org/~avp/
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 869 bytes --]
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2024-01-08 17:16 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-01 19:08 [bug#67570] [PATCH] gnu: kubo: Fix build Artyom V. Poptsov
2023-12-02 10:04 ` Ludovic Courtès
2023-12-09 8:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.) Artyom V. Poptsov
2023-12-10 21:22 ` [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0 Ludovic Courtès
2023-12-29 9:55 ` Artyom V. Poptsov
2024-01-07 14:48 ` bug#67570: " Ludovic Courtès
2024-01-07 15:34 ` [bug#67570] " Christopher Baines
2024-01-08 17:02 ` Ludovic Courtès
2024-01-08 17:13 ` Artyom V. Poptsov
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).