diff mbox series

[bug#67570] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.)

Message ID 8734wbbxak.fsf_-_@gmail.com
State New
Headers show
Series [bug#67570] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.) | expand

Commit Message

Artyom V. Poptsov Dec. 9, 2023, 8:22 a.m. UTC 
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:
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.
Thanks,

- avp

Comments

Ludovic Courtès Dec. 10, 2023, 9:22 p.m. UTC | #1 
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’.
Artyom V. Poptsov Dec. 29, 2023, 9:55 a.m. UTC | #2 
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
Ludovic Courtès Jan. 7, 2024, 2:48 p.m. UTC | #3 
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’.
Christopher Baines Jan. 7, 2024, 3:34 p.m. UTC | #4 
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.
Ludovic Courtès Jan. 8, 2024, 5:02 p.m. UTC | #5 
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’.
Artyom V. Poptsov Jan. 8, 2024, 5:13 p.m. UTC | #6 
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
diff mbox series

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

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