From patchwork Sat Dec 9 08:22:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Artyom V. Poptsov" X-Patchwork-Id: 57441 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 65EC927BBE9; Sat, 9 Dec 2023 08:23:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id BD51327BBE2 for ; Sat, 9 Dec 2023 08:23:08 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rBsbq-00053A-N3; Sat, 09 Dec 2023 03:22:50 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rBsbo-00052z-JV for guix-patches@gnu.org; Sat, 09 Dec 2023 03:22:48 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rBsbo-0005Hq-B5 for guix-patches@gnu.org; Sat, 09 Dec 2023 03:22:48 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rBsc1-0002Fe-NP for guix-patches@gnu.org; Sat, 09 Dec 2023 03:23:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#67570] [PATCH] gnu: go-golang-org-x-sys: Update to 0.8.0. (was: [PATCH] gnu: kubo: Fix build.) Resent-From: "Artyom V. Poptsov" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 09 Dec 2023 08:23:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 67570 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: Ludovic =?utf-8?q?Court=C3=A8s?= Cc: 67570@debbugs.gnu.org Received: via spool by 67570-submit@debbugs.gnu.org id=B67570.17021101588582 (code B ref 67570); Sat, 09 Dec 2023 08:23:01 +0000 Received: (at 67570) by debbugs.gnu.org; 9 Dec 2023 08:22:38 +0000 Received: from localhost ([127.0.0.1]:46756 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBsbd-0002EI-N4 for submit@debbugs.gnu.org; Sat, 09 Dec 2023 03:22:38 -0500 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]:55517) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rBsba-0002Do-Bk for 67570@debbugs.gnu.org; Sat, 09 Dec 2023 03:22:35 -0500 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2c9c18e7990so38173241fa.2 for <67570@debbugs.gnu.org>; Sat, 09 Dec 2023 00:22:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702110134; x=1702714934; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=butOeEvS+oti2r7ICiZ3qUR/9WhuvAeyjNCcZb+lfos=; b=dGj85vU15LhM0caJXtU0Ua6T6U47JydY2mTpIj/4Hf2AcV+kx2s6SzNe/wU+r1JYDl XGhpiRHuYkGbielnVeC5frmcHr9DlW/zdfluwf2hBCX87sPP4FeCkCIq36uNFDsuf+Pu D/f6tzk+91vuhMJxhjb7trRS/qRYpXr7242JKcV47dEccgsuJrsxpDFDnI7PkBy9gSBG jKc3geiZyes/I9Xhm3MhfhiHqq+6u5Pna/kyNalWLIBKCN6fBd1nubgr+0j6pDsNa7p2 +dvhkRERelPs+tAniDGaJ8dP89G2goAcV5IkiapaiqqNB3KaX8OqnP62rpTmrf7W7/nU Qizw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702110134; x=1702714934; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=butOeEvS+oti2r7ICiZ3qUR/9WhuvAeyjNCcZb+lfos=; b=jnuXKemKWX5b1rni8S+y/cjmlUDV1J52JqQHS0AnmpGsPTx/e554Yvp19tPlnEInQ9 zO6VUbR9cAM27VBGdiDtQXEyFpCQOgCGxoPqhKm8YNUOi8saGxhG44zo8GVntrOb40sP mmcjWUZNS8ObfwDFBkXZb3+QV+lZuPi+R4YOTE70vFmh+gH0KTFGbIzyKNAWIPVGs9Dm u2eBEh5He9I3rAlqmgRwAncyevauohwXPOlLUPboYlfFPJGG2pth44cZhvSf5bmwkEyM RFPujqlDPEGM4O+vEdwIoNX2433iZUCWmNFbifJnOATD+1mSD2FjsHns0a9s9fP5v4FY s48w== X-Gm-Message-State: AOJu0YwpYsssUDHLSm+5LaZY10fx40dg5GZflrZfNpwr3QvIr8jqsh3f zdOD4hJwg12emEhu/cMpC82dJopL7o4= X-Google-Smtp-Source: AGHT+IHhcv7UFjLvb0vtIhfZ3Ic4CDsO64pqHqP0KBxm/Da9ZixgVd+Bpdz1J0B37IYO6vdxFLYTfg== X-Received: by 2002:a05:6512:408:b0:50c:1bc5:6a6a with SMTP id u8-20020a056512040800b0050c1bc56a6amr497178lfk.10.1702110133937; Sat, 09 Dec 2023 00:22:13 -0800 (PST) Received: from elephant ([5.166.207.17]) by smtp.gmail.com with ESMTPSA id t28-20020ac2549c000000b0050bcb5b443dsm446638lfk.171.2023.12.09.00.22.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Dec 2023 00:22:13 -0800 (PST) From: "Artyom V. Poptsov" In-Reply-To: <87leacj4xj.fsf@gnu.org> ("Ludovic =?utf-8?q?Court=C3=A8s?= "'s message of "Sat, 02 Dec 2023 11:04:56 +0100") References: <878r6deo5c.fsf@gmail.com> <87leacj4xj.fsf@gnu.org> Date: Sat, 09 Dec 2023 11:22:11 +0300 Message-ID: <8734wbbxak.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches 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 From 6022d28be487d06e9987785db1240355c080f459 Mon Sep 17 00:00:00 2001 Message-ID: <6022d28be487d06e9987785db1240355c080f459.1702109906.git.poptsov.artyom@gmail.com> From: "Artyom V. Poptsov" 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