[PATCH staging] gnu: go-golang-org-x-net: Update to 0.5.0.

  • Open
  • quality assurance status badge
Details
2 participants
  • Felix Lechner
  • Christopher Baines
Owner
unassigned
Submitted by
Felix Lechner
Severity
normal
F
F
Felix Lechner wrote on 20 Oct 2022 14:47
[PATCH] go-golang-org-x-net: Update to 0.1.0.
(address . guix-patches@gnu.org)
CAFHYt54A9Bh5-cYz8ywhsdk2h0NMxC-=CnEMmwjLh7vbU_e0hA@mail.gmail.com
Control: tags -1 + patch

Hi,

Our version was dated and too old for the upcoming packaging of
Gocryptfs in Guix.

Rebuilds 23 packages. Thanks!

Kind regards
Felix Lechner
From c612245236aa7d2eb6c9b7d44701b394ead7f4ca Mon Sep 17 00:00:00 2001
From: Felix Lechner <felix.lechner@lease-up.com>
Date: Thu, 20 Oct 2022 05:40:37 -0700
Subject: [PATCH] gnu: go-golang-org-x-net: Update to 0.1.0.

* gnu/packages/golang.scm (go-golang-org-x-net): Update to 0.1.0.
(go-golang-org-x-net): Switch to gexp.
---
gnu/packages/golang.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Toggle diff (48 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index ecef5e275e..c0f539ead0 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2751,11 +2751,11 @@ (define-public go-golang-org-x-crypto
(license license:bsd-3))))
(define-public go-golang-org-x-net
- (let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3")
- (revision "4"))
+ (let ((commit "1568cf9b43eddada579c44f99d04fe42a1f58dac")
+ (revision "0"))
(package
(name "go-golang-org-x-net")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2764,15 +2764,17 @@ (define-public go-golang-org-x-net
(file-name (git-file-name name version))
(sha256
(base32
- "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"))))
+ "1wh3021id07rbjci8hm4nb2ljaaafmvi6x93lsca3cis30af3d2a"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/net"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
+ (list
+ #:import-path "golang.org/x/net"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
(synopsis "Go supplemental networking libraries")
(description "This package provides supplemental Go networking libraries.")
(home-page "https://go.googlesource.com/net")

base-commit: 16d4ded6302c0650978203d0df83614896c453e8
--
2.38.0
F
F
Felix Lechner wrote on 20 Oct 2022 16:01
Add gnu: prefix
(address . control@debbugs.gnu.org)
CAFHYt57Q2XK4URLdsgGkDe=6MVhrWCfvqHtj1O47aZBwxfaJRQ@mail.gmail.com
retitle 58658 [PATCH] gnu: go-golang-org-x-net: Update to 0.1.0.
thanks
F
F
Felix Lechner wrote on 25 Oct 2022 03:57
(address . control@debbugs.gnu.org)
CAFHYt57S+b9WKPq+WJjVt=M54TwhqC9yNObb_7W1001twUj7jg@mail.gmail.com
tags 58768 + patch
block 58768 by 58658 58659
thanks
C
C
Christopher Baines wrote on 20 Nov 2022 12:22
(name . Felix Lechner)(address . felix.lechner@lease-up.com)
87y1s5x41m.fsf@cbaines.net
Felix Lechner via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (9 lines)
> Control: tags -1 + patch
>
> Hi,
>
> Our version was dated and too old for the upcoming packaging of
> Gocryptfs in Guix.
>
> Rebuilds 23 packages. Thanks!

Looking at https://qa.guix.gnu.org/issue/58658I think this change
breaks the go-golang-zx2c4-com-wireguard and go-ipfs packages. Do you
see those fail to build locally?

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmN6DkVfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XfS8w//Ta8VAbs9eOGd1WwW0kuLnhDbwzI4AnSM
L8XENoWdXyt/jZqTthP1YwcIfPdGLUEXLLgGfpU7+3ikAKdGZSWogLpeG5eWDN6P
FQPM3VHolY6PGS9VU61DbejraHocMjb94nTGrWJbAdsdOCMoFartnEtDjRDiS7ii
2BSsan4KWROQRxAwBjp7fBWC6k/p7RrJqKk+ViRnA61ZVd4Ank30H/ocUeOxKLhx
XcsuVb6wCvVFmqjh8i4HStGhzzHKx0X35sV7PuJOwOEK4maPW2MGvEoF74MZEFqM
K1m865IvcFOpUg+sJqEV9fnJfpMCyiOVmkIvbhoJ/u0VhuPlaosk6pabDAr6Bcw3
D9PMHimlmFIUQI6zSeHV+ZADeTuY6+Z5qIPLcDcVqO/pwqprdS5P18Cd8tkMOrAE
PA7RQ80tioeTpOCbBk9ln5KThZ4ZUyZpyi2jE73WAEOEJV8HD9b3GzSTAUvbXY3n
MZvg6bZSGeRy7ZZfFcupEiANMW+staw4lL00jevOxUpZ62RlwHMY27IvvfPgUvrN
glakRPmkaMDkuCbpnZsLL6SrEzZ58P5X7RWIB2Qpr58buDPGQuYI28hfHOpG1wjl
tCXvLzK3EFq+aCr87Q/iQIiExqCMrAvLb9FnkiqwmHI1Hz/u/7UzGEc0tl/imiK4
qYFIvgkOAIk=
=Ohge
-----END PGP SIGNATURE-----

F
F
Felix Lechner wrote on 20 Nov 2022 14:20
(name . Christopher Baines)(address . mail@cbaines.net)(address . 58658@debbugs.gnu.org)
CAFHYt56aZ+2GRgAqPcXiPzKqGEnVTf=2YPg7-gn5nXxKuWmxUg@mail.gmail.com
Hi Chris,

On Sun, Nov 20, 2022 at 3:23 AM Christopher Baines <mail@cbaines.net> wrote:
Toggle quote (5 lines)
>
> this change
> breaks the go-golang-zx2c4-com-wireguard and go-ipfs packages. Do you
> see those fail to build locally?

Yes, I see both of them failing.

I experimented with various newer versions of
go-golang-zx2c4-com-wireguard but could not get them to build. One
ominous error I saw was:

src/golang.org/x/net/internal/socket/sys_unix.go:35:38: undefined:
unix.RecvmsgBuffers
src/golang.org/x/net/internal/socket/sys_unix.go:47:9: undefined:
unix.SendmsgBuffers

Is it possible that the golang-1.17 used in our Golang build system is
too old? [1][2]

Thanks for looking!

Kind regards
Felix

F
F
Felix Lechner wrote on 19 Dec 2022 20:40
[PATCH v2] gnu: go-golang-org-x-net: Update to 0.1.0.
(address . 58658@debbugs.gnu.org)(name . Christopher Baines)(address . mail@cbaines.net)
20221219194053.29656-1-felix.lechner@lease-up.com
Hi Chris,

The issue with go-ipfs and go-golang-zx2c4-com-wireguard was fixed
with the update of go-golang-org-x-sys that now preceeds the original
patch in this series.

As a bonus, I also updated go-golang-zx2c4-com-wireguard herein but
acceptance is not necessary. Please feel free to ignore that
particular patch.

Otherwise, the acceptance of this patch series will allow Gocryptfs to
become part of Guix. [1] Thanks!

Kind regards
Felix Lechner

F
F
Felix Lechner wrote on 19 Dec 2022 20:40
[PATCH v2 1/3] gnu: go-golang-org-x-sys: Update to 0.3.0.
(address . 58658@debbugs.gnu.org)
20221219194053.29656-2-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.3.0.
---
gnu/packages/golang.scm | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

Toggle diff (30 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70ddef52f1..a3377e1d4e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3051,11 +3051,11 @@ (define-public go-golang-org-x-sync
(license license:bsd-3))))
(define-public go-golang-org-x-sys
- (let ((commit "ed5796bab16455f104b6a384d51b7f9990cb9806")
- (revision "8"))
+ (let ((commit "72f772c4d7a84045aa1c4e95a12677b639088144")
+ (revision "0"))
(package
(name "go-golang-org-x-sys")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "0.3.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3064,7 +3064,7 @@ (define-public go-golang-org-x-sys
(file-name (git-file-name name version))
(sha256
(base32
- "081vs5bg91mwg5bdmlcvy2qyrvg766aicj47smcwfk4bbh0nc0qa"))))
+ "0mpjn8r54djmcimz0r5zrgasfgpcpjm1xn8iak9i0f6mdpc6kamn"))))
(build-system go-build-system)
(arguments
`(#:import-path "golang.org/x/sys"
--
2.38.1
F
F
Felix Lechner wrote on 19 Dec 2022 20:40
[PATCH v2 2/3] gnu: go-golang-org-x-net: Update to 0.1.0.
(address . 58658@debbugs.gnu.org)
20221219194053.29656-3-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-org-x-net): Update to 0.1.0.
(go-golang-org-x-net): Switch to gexp.
---
gnu/packages/golang.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index a3377e1d4e..108ac6d97e 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2951,11 +2951,11 @@ (define-public go-github-com-protonmail-go-crypto
(license license:bsd-3)))
(define-public go-golang-org-x-net
- (let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3")
- (revision "4"))
+ (let ((commit "1568cf9b43eddada579c44f99d04fe42a1f58dac")
+ (revision "0"))
(package
(name "go-golang-org-x-net")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "0.1.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2964,15 +2964,17 @@ (define-public go-golang-org-x-net
(file-name (git-file-name name version))
(sha256
(base32
- "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"))))
+ "1wh3021id07rbjci8hm4nb2ljaaafmvi6x93lsca3cis30af3d2a"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/net"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
+ (list
+ #:import-path "golang.org/x/net"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
(synopsis "Go supplemental networking libraries")
(description "This package provides supplemental Go networking libraries.")
(home-page "https://go.googlesource.com/net")
--
2.38.1
F
F
Felix Lechner wrote on 19 Dec 2022 20:40
[PATCH v2 3/3] gnu: go-golang-zx2c4-com-wireguard: Update to 0.0.20211016.
(address . 58658@debbugs.gnu.org)
20221219194053.29656-4-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-zx2c4-com-wireguard): Update to 0.0.20211016.
---
gnu/packages/golang.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 108ac6d97e..c1ae490714 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9323,7 +9323,7 @@ (define-public go-github-com-hjson-hjson-go
(define-public go-golang-zx2c4-com-wireguard
(package
(name "go-golang-zx2c4-com-wireguard")
- (version "0.0.20200320")
+ (version "0.0.20211016")
(source
(origin
(method git-fetch)
@@ -9336,7 +9336,7 @@ (define-public go-golang-zx2c4-com-wireguard
(file-name (git-file-name name version))
(sha256
(base32
- "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"))))
+ "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0"))))
(build-system go-build-system)
(arguments
'(#:import-path "golang.zx2c4.com/wireguard"))
--
2.38.1
F
F
Felix Lechner wrote on 21 Dec 2022 21:15
belongs into staging
(address . control@debbugs.gnu.org)
CAFHYt55_ZKZMhF359TqGRXZmEQ5jgEd6G9ax6D6v=Q_upKpFLA@mail.gmail.com
retitle 58658 [PATCH staging] gnu: go-golang-org-x-net: Update to 0.1.0.
thanks
F
F
Felix Lechner wrote on 21 Dec 2022 23:41
Now needs to go into staging
(address . 58658@debbugs.gnu.org)(name . Christopher Baines)(address . mail@cbaines.net)
CAFHYt54MqnWAt3Y+ZhFWs7pH7DZqAE3FRPEZaJcr+NVy742r9g@mail.gmail.com
Hi,

The newly proposed changes trigger the rebuilding of 919 packages. I
already retitled the bug. This patch now belongs into 'staging'.

Kind regards
Felix Lechner
F
F
Felix Lechner wrote on 5 Jan 15:40 +0100
[PATCH staging] gnu: go-golang-org-x-net: Update to 0.5.0.
(address . 58658@debbugs.gnu.org)(address . mail@cbaines.net)
20230105144046.2994-1-felix.lechner@lease-up.com
Hi,

This updates the Golang modules to their latest available versions,
and rebases the patch series onto staging.

Kind regards
Felix Lechner
F
F
Felix Lechner wrote on 5 Jan 15:40 +0100
[PATCH v3 1/3] gnu: go-golang-org-x-sys: Update to 0.4.0.
(address . 58658@debbugs.gnu.org)
20230105144046.2994-2-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-org-x-sys): Update to 0.4.0.
(go-golang-org-x-sys): Switch to gexp.
---
gnu/packages/golang.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 70ddef52f1..f55e708e82 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -3051,11 +3051,11 @@ (define-public go-golang-org-x-sync
(license license:bsd-3))))
(define-public go-golang-org-x-sys
- (let ((commit "ed5796bab16455f104b6a384d51b7f9990cb9806")
- (revision "8"))
+ (let ((commit "b60007cc4e6f966b1c542e343d026d06723e5653")
+ (revision "0"))
(package
(name "go-golang-org-x-sys")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "0.4.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -3064,15 +3064,17 @@ (define-public go-golang-org-x-sys
(file-name (git-file-name name version))
(sha256
(base32
- "081vs5bg91mwg5bdmlcvy2qyrvg766aicj47smcwfk4bbh0nc0qa"))))
+ "0fr2d6fnpbqx6n89sg9lsinqkdaw49y068kqj2g0cxlhbh69hzii"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/sys"
- ;; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
+ (list
+ #:import-path "golang.org/x/sys"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
(synopsis "Go support for low-level system interaction")
(description "This package provides supplemental libraries offering Go
support for low-level interaction with the operating system.")
--
2.38.1
F
F
Felix Lechner wrote on 5 Jan 15:40 +0100
[PATCH v3 2/3] gnu: go-golang-org-x-net: Update to 0.5.0.
(address . 58658@debbugs.gnu.org)
20230105144046.2994-3-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-org-x-net): Update to 0.5.0.
(go-golang-org-x-net): Switch to gexp.
---
gnu/packages/golang.scm | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)

Toggle diff (46 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f55e708e82..1cbd9358c4 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -2951,11 +2951,11 @@ (define-public go-github-com-protonmail-go-crypto
(license license:bsd-3)))
(define-public go-golang-org-x-net
- (let ((commit "ba9fcec4b297b415637633c5a6e8fa592e4a16c3")
- (revision "4"))
+ (let ((commit "8e0e7d8d38f2b6d21d742845570dde2902d06a1d")
+ (revision "0"))
(package
(name "go-golang-org-x-net")
- (version (git-version "0.0.0" revision commit))
+ (version (git-version "0.5.0" revision commit))
(source (origin
(method git-fetch)
(uri (git-reference
@@ -2964,15 +2964,17 @@ (define-public go-golang-org-x-net
(file-name (git-file-name name version))
(sha256
(base32
- "1hbqvy6r0s5h0dpdqw8fynl3cq0acin3iyqki9xvl5r8h33yb9bx"))))
+ "1fidlcn3vcz42v2lc0rpmqh3bz08bcklj6jvnmz2vvgc481ci5hy"))))
(build-system go-build-system)
(arguments
- `(#:import-path "golang.org/x/net"
- ; Source-only package
- #:tests? #f
- #:phases
- (modify-phases %standard-phases
- (delete 'build))))
+ (list
+ #:import-path "golang.org/x/net"
+ ;; Source-only package
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ ;; Source-only package
+ (delete 'build))))
(synopsis "Go supplemental networking libraries")
(description "This package provides supplemental Go networking libraries.")
(home-page "https://go.googlesource.com/net")
--
2.38.1
F
F
Felix Lechner wrote on 5 Jan 15:40 +0100
[PATCH v3 3/3] gnu: go-golang-zx2c4-com-wireguard: Update to 0.0.20211016.
(address . 58658@debbugs.gnu.org)
20230105144046.2994-4-felix.lechner@lease-up.com
* gnu/packages/golang.scm (go-golang-zx2c4-com-wireguard): Update to 0.0.20211016.
---
gnu/packages/golang.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 1cbd9358c4..234b1df210 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -9325,7 +9325,7 @@ (define-public go-github-com-hjson-hjson-go
(define-public go-golang-zx2c4-com-wireguard
(package
(name "go-golang-zx2c4-com-wireguard")
- (version "0.0.20200320")
+ (version "0.0.20211016")
(source
(origin
(method git-fetch)
@@ -9338,7 +9338,7 @@ (define-public go-golang-zx2c4-com-wireguard
(file-name (git-file-name name version))
(sha256
(base32
- "0fy4qsss3i3pkq1rpgjds4aipbwlh1dr9hbbf7jn2a1c63kfks0r"))))
+ "09a4gsh75a8bj71wr042afrma9frriqp60cm0cx6c9a8lv5yzzi0"))))
(build-system go-build-system)
(arguments
'(#:import-path "golang.zx2c4.com/wireguard"))
--
2.38.1
F
F
Felix Lechner wrote on 5 Jan 15:46 +0100
(no subject)
(address . control@debbugs.gnu.org)
87zgaxning.fsf@lease-up.com
retitle 58658 [PATCH staging] gnu: go-golang-org-x-net: Update to 0.5.0.
thanks
?