Maxim Cournoyer <maxim.cournoyer@HIDDEN>
to control <at> debbugs.gnu.org.
Full text available.
Received: (at submit) by debbugs.gnu.org; 15 Aug 2023 23:29:53 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 15 19:29:53 2023
Received: from localhost ([127.0.0.1]:37075 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qW3U1-0001Fc-Cu
for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 19:29:53 -0400
Received: from lists.gnu.org ([2001:470:142::17]:32966)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <gcggp-guix-patches@HIDDEN>)
id 1qW3Ty-0001FN-Mh
for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 19:29:52 -0400
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 <gcggp-guix-patches@HIDDEN>)
id 1qW3Tt-0002ds-CY
for guix-patches@HIDDEN; Tue, 15 Aug 2023 19:29:45 -0400
Received: from ciao.gmane.io ([116.202.254.214])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <gcggp-guix-patches@HIDDEN>)
id 1qW3Tr-0007H0-8B
for guix-patches@HIDDEN; Tue, 15 Aug 2023 19:29:45 -0400
Received: from list by ciao.gmane.io with local (Exim 4.92)
(envelope-from <gcggp-guix-patches@HIDDEN>)
id 1qW3Tn-0003bI-6c
for guix-patches@HIDDEN; Wed, 16 Aug 2023 01:29:39 +0200
X-Injected-Via-Gmane: http://gmane.org/
To: guix-patches@HIDDEN
From: Katherine Cox-Buday <cox.katherine.e@HIDDEN>
Subject: Re: [bug#65317] [PATCH v2 1/1] gnu: Add go-1.21.
Date: Tue, 15 Aug 2023 17:29:29 -0600
Message-ID: <ubh1op$ges$1@HIDDEN>
References: <20230815195313.46418-1-cox.katherine.e@HIDDEN>
<20230815232142.79498-1-cox.katherine.e@HIDDEN>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
Thunderbird/102.13.0
Content-Language: en-US
In-Reply-To: <20230815232142.79498-1-cox.katherine.e@HIDDEN>
Received-SPF: pass client-ip=116.202.254.214;
envelope-from=gcggp-guix-patches@HIDDEN; helo=ciao.gmane.io
X-Spam_score_int: 18
X-Spam_score: 1.8
X-Spam_bar: +
X-Spam_report: (1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_ADSP_CUSTOM_MED=0.001,
FORGED_GMAIL_RCVD=1, FORGED_MUA_MOZILLA=2.309, FREEMAIL_FORGED_FROMDOMAIN=0.25,
FREEMAIL_FROM=0.001, HEADER_FROM_DIFFERENT_DOMAINS=0.25, NICE_REPLY_A=-1.045,
NML_ADSP_CUSTOM_MED=0.9, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=no autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 2.1 (++)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: This version solves the problem by reversing the symlinking
done during install as suggested in https://github.com/golang/go/issues/61921.
Instead of: - mv bin $out/bin - ln -s ../../bin $out/lib/go/bin
Content analysis details: (2.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (cox.katherine.e[at]gmail.com)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
1.0 FORGED_GMAIL_RCVD 'From' gmail.com does not match 'Received'
headers
0.0 T_SPF_PERMERROR SPF: test of record failed (permerror)
0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are different
-1.0 NICE_REPLY_A Looks like a legit reply (A)
1.6 FORGED_MUA_MOZILLA Forged mail pretending to be from Mozilla
X-Debbugs-Envelope-To: submit
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: 1.1 (+)
X-Spam-Report: Spam detection software, running on the system "debbugs.gnu.org",
has NOT identified this incoming email as spam. The original
message has been attached to this so you can view it or label
similar future email. If you have any questions, see
the administrator of that system for details.
Content preview: This version solves the problem by reversing the symlinking
done during install as suggested in https://github.com/golang/go/issues/61921.
Instead of: - mv bin $out/bin - ln -s ../../bin $out/lib/go/bin
Content analysis details: (1.1 points, 10.0 required)
pts rule name description
---- ---------------------- --------------------------------------------------
0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level
mail domains are different
0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail
provider (cox.katherine.e[at]gmail.com)
-0.0 SPF_HELO_PASS SPF: HELO matches SPF record
1.0 FORGED_GMAIL_RCVD 'From' gmail.com does not match 'Received'
headers
0.0 T_SPF_PERMERROR SPF: test of record failed (permerror)
0.2 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and
EnvelopeFrom freemail headers are
different
-1.0 NICE_REPLY_A Looks like a legit reply (A)
-1.0 MAILING_LIST_MULTI Multiple indicators imply a widely-seen list
manager
1.6 FORGED_MUA_MOZILLA Forged mail pretending to be from Mozilla
This version solves the problem by reversing the symlinking done during
install as suggested in https://github.com/golang/go/issues/61921.
Instead of:
- mv bin $out/bin
- ln -s ../../bin $out/lib/go/bin
we need to do:
- mv bin $out/lib/go/
- ln -s lib/go/bin $out/bin
This is because GOROOT_FINAL no longer has the intended effect and the
binaries are expecting binaries to be run from GOROOT which is $out/lib/go.
guix-patches@HIDDEN:bug#65317; Package guix-patches.
Full text available.
Received: (at 65317) by debbugs.gnu.org; 15 Aug 2023 23:21:54 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 15 19:21:54 2023
Received: from localhost ([127.0.0.1]:37061 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qW3MH-00012i-Cc
for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 19:21:53 -0400
Received: from mail-ot1-x333.google.com ([2607:f8b0:4864:20::333]:46301)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <cox.katherine.e@HIDDEN>) id 1qW3ME-00012U-4V
for 65317 <at> debbugs.gnu.org; Tue, 15 Aug 2023 19:21:52 -0400
Received: by mail-ot1-x333.google.com with SMTP id
46e09a7af769-6bcade59b24so4888654a34.0
for <65317 <at> debbugs.gnu.org>; Tue, 15 Aug 2023 16:21:50 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692141704; x=1692746504;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=VHXZM0iJu03BUTFaoGAWKS4SKttxXqC1gdbrxXmojng=;
b=mlOYG1SbsCdu4ICOM/MLxzpaQC6rlM6WovzwquoyNEc8X0g7MI9vkpn9+SFuX0JQLo
D8dxV3w/47JXRmoP+U8KhSwiNUrh4n8UCrHb0w5JLVIu3N0NbQpmGfDmF0jaqEfhd4QH
K/O9jlAVLC+0/No3Ru1dPIa5mapMtWwDnrpyUeiU4Ep6VnHsLijHHo+IqpZJqbDbnqKX
KosaNpdCjXlOq0NiBUKSbYQF8wFSzvBG2CWkzGy6zJisuNajtON5qM6Ph38Gsqi8BlQd
/ZCPg4sU4A12PdUHRlwInO6e/GwduRLzafU0Y4y+3jpWh68CAB2pvSmUMFUBMUP/F+Tp
dcrw==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692141704; x=1692746504;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=VHXZM0iJu03BUTFaoGAWKS4SKttxXqC1gdbrxXmojng=;
b=BUT7jN9pmBtgseccoB/nAnyFRLOITXbpQlqKpNoWiNm0gSeZ/3GYOhhTOweq+S6kkF
WS63nZoQK8ImtLhD2CYZ9LzJioXdsgT5srphJA6zy1cRmPMbrzk9Sy+99htQsZfl5hjr
v7RMAIpToPPTD2RQP72v9Nd/5mKojNoslg7ZAhUa2lv2jHlVACrk7ZWzC9AkujMx5owB
cT8P6wfT0Jq4wGKBrUOU6DHbtRnAd5IbSpqj5fJ9S4qFm0437/xwi0oTZVIyudZHlHb0
7KUp47J9hbHK4Dki1P4Z+/svib57GWvM2QDGjlf3+QQluApq14vtWLhzc34OqfkWisYQ
DesQ==
X-Gm-Message-State: AOJu0YzMkvvq/lNW977Qs2XT/WI8836qdZI20aKePefDHvw0WuAv1urw
yx5crS3TQzPvdMBAHYffm/RTEZBqucU=
X-Google-Smtp-Source: AGHT+IGWEJ2pubyITxRZ6QP01xuJmO2AaH+Ol/Yk4tSzRlRWR6Kh0dnRyUyAdn5Rmgarpi5T/uDv2w==
X-Received: by 2002:a05:6870:56a9:b0:1bc:f15:c9ef with SMTP id
p41-20020a05687056a900b001bc0f15c9efmr131460oao.19.1692141704233;
Tue, 15 Aug 2023 16:21:44 -0700 (PDT)
Received: from washu-v4.home.cox-buday.com
(c-174-51-218-141.hsd1.co.comcast.net. [174.51.218.141])
by smtp.gmail.com with ESMTPSA id
g6-20020a02b706000000b0041d73d0a412sm3942043jam.19.2023.08.15.16.21.43
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 15 Aug 2023 16:21:43 -0700 (PDT)
From: Katherine Cox-Buday <cox.katherine.e@HIDDEN>
To: 65317 <at> debbugs.gnu.org
Subject: [PATCH v2 1/1] gnu: Add go-1.21.
Date: Tue, 15 Aug 2023 17:20:40 -0600
Message-ID: <20230815232142.79498-1-cox.katherine.e@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Score: 0.0 (/)
X-Debbugs-Envelope-To: 65317
Cc: Katherine Cox-Buday <cox.katherine.e@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
* gnu/packages/golang.scm (go-1.21): New variable.
---
gnu/packages/golang.scm | 132 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 132 insertions(+)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5a53838435..26022ea211 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -967,6 +967,138 @@ (define-public go-1.20
;; https://go.dev/issue/44505
(alist-replace "go" (list go-1.17) (package-native-inputs go-1.17)))))
+(define-public go-1.21
+ (package
+ (inherit go-1.20)
+ (name "go")
+ (version "1.21.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/go")
+ (commit (string-append "go" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "04cpahl10i1sncymdfm0vzcj3czv6lv0axwa1sisl9cz3rdrp7hj"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments go-1.20)
+ ;; Source patching phases are broken up into discrete steps to allow
+ ;; future versions to discard individual phases without having to
+ ;; discard all source patching.
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'skip-TestGoPathShlibGccgo-tests)
+ (delete 'patch-source)
+ (add-after 'unpack 'patch-os-tests
+ (lambda _
+ (substitute* "src/os/os_test.go"
+ (("/usr/bin") (getcwd))
+ (("/bin/sh") (which "sh")))))
+
+ (add-after 'unpack 'apply-patches
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Having the patch in the 'patches' field of <origin> breaks
+ ;; the 'TestServeContent' test due to the fact that
+ ;; timestamps are reset. Thus, apply it from here.
+ (invoke "patch" "-p1" "--force" "-i"
+ (assoc-ref inputs "go-fix-script-tests.patch"))))
+
+ (add-after 'unpack 'patch-src/net
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((net-base (assoc-ref inputs "net-base")))
+ (substitute* "src/net/lookup_unix.go"
+ (("/etc/protocols")
+ (string-append net-base "/etc/protocols")))
+ (substitute* "src/net/port_unix.go"
+ (("/etc/services")
+ (string-append net-base "/etc/services"))))))
+
+ (add-after 'unpack 'patch-zoneinfo
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Add the path to this specific version of tzdata's zoneinfo
+ ;; file to the top of the list to search. We don't want to
+ ;; replace any sources because it will affect how binaries
+ ;; compiled with this Go toolchain behave on non-guix
+ ;; platforms.
+ (substitute* "src/time/zoneinfo_unix.go"
+ (("var platformZoneSources.+" all)
+ (format #f "~a~%\"~a/share/zoneinfo\",~%"
+ all
+ (assoc-ref inputs "tzdata"))))))
+
+ (add-after 'unpack 'patch-cmd/go/testdata/script
+ (lambda _
+ (substitute* "src/cmd/go/testdata/script/cgo_path_space.txt"
+ (("/bin/sh") (which "sh")))))
+
+ (add-after 'enable-external-linking 'enable-external-linking-1.21
+ (lambda _
+ ;; Invoke GCC to link any archives created with GCC (that is, any
+ ;; packages built using 'cgo'), because Go doesn't know how to
+ ;; handle the runpaths but GCC does. Use substitute* rather than
+ ;; a patch since these files are liable to change often.
+ ;;
+ ;; XXX: Replace with GO_EXTLINK_ENABLED=1 or similar when
+ ;; <https://github.com/golang/go/issues/31544> and/or
+ ;; <https://github.com/golang/go/issues/43525> are resolved.
+ (substitute* "src/cmd/link/internal/ld/config.go"
+ (("\\(iscgo && \\(.+\\)") "iscgo"))
+ (substitute* "src/internal/testenv/testenv.go"
+ (("!CanInternalLink.+") "true {\n"))
+ (substitute* "src/syscall/exec_linux_test.go"
+ (("testenv.MustHaveExecPath\\(t, \"whoami\"\\)")
+ "t.Skipf(\"no passwd file present\")"))))
+
+ (replace 'install
+ (lambda* (#:key outputs #:allow-other-keys)
+ ;; Notably, we do not install archives (180M), which Go will
+ ;; happily recompile quickly (and cache) if needed, almost
+ ;; surely faster than they could be substituted.
+ ;;
+ ;; The main motivation for pre-compiled archives is to use
+ ;; libc-linked `net' or `os' packages without a C compiler,
+ ;; but on Guix a C compiler is necessary to properly link the
+ ;; final binaries anyway. Many build flags also invalidate
+ ;; these pre-compiled archives, so in practice Go often
+ ;; recompiles them anyway.
+ ;;
+ ;; Upstream is also planning to no longer install these
+ ;; archives: <https://github.com/golang/go/issues/47257>
+ ;;
+ ;; When necessary, a custom pre-compiled library package can
+ ;; be created with `#:import-path "std"' and used with
+ ;; `-pkgdir'.
+ ;;
+ ;; When moving files into place, any files that come from
+ ;; GOROOT should remain in GOROOT to continue functioning. If
+ ;; they need to be referenced from some other directory, they
+ ;; need to be symlinked from GOROOT. For more information,
+ ;; please see https://github.com/golang/go/issues/61921
+ (let* ((out (assoc-ref outputs "out"))
+ (tests (assoc-ref outputs "tests")))
+ (for-each
+ (lambda (file)
+ (copy-recursively file (string-append out "/lib/go/" file)))
+ '("bin" "lib" "VERSION" "pkg/include" "pkg/tool"))
+
+ (symlink "lib/go/bin" (string-append out "/bin"))
+
+ (for-each
+ (match-lambda
+ ((file dest output)
+ ;; Copy to output/dest and symlink from output/lib/go/file.
+ (let ((file* (string-append output "/lib/go/" file))
+ (dest* (string-append output "/" dest)))
+ (copy-recursively file dest*)
+ (mkdir-p (dirname file*))
+ (symlink (string-append "../../" dest) file*))))
+ `(("src" "share/go/src" ,out)
+ ("misc" "share/go/misc" ,out)
+ ("doc" "share/doc/go/doc" ,out)
+ ("api" "share/go/api" ,tests)
+ ("test" "share/go/test" ,tests))))))))))))
+
(define-public go go-1.17)
(define make-go-std
base-commit: a4bed14c438dc0cbc1c1885a38f8409c7fef7957
--
2.41.0
guix-patches@HIDDEN:bug#65317; Package guix-patches.
Full text available.Received: (at 65317) by debbugs.gnu.org; 15 Aug 2023 22:03:26 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 15 18:03:26 2023 Received: from localhost ([127.0.0.1]:37016 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1qW28M-0007Ql-Cj for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 18:03:26 -0400 Received: from mail-io1-xd34.google.com ([2607:f8b0:4864:20::d34]:57573) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <cox.katherine.e@HIDDEN>) id 1qW28G-0007QS-UK for 65317 <at> debbugs.gnu.org; Tue, 15 Aug 2023 18:03:24 -0400 Received: by mail-io1-xd34.google.com with SMTP id ca18e2360f4ac-7910b9bb891so190776239f.2 for <65317 <at> debbugs.gnu.org>; Tue, 15 Aug 2023 15:03:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692136995; x=1692741795; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=Qy4ZYC5HvIhsaCaFm4KMLYmu1Fjl2J9JeOIyWMPqwpI=; b=n0HF7t0s5S/8mEIpRCzvfyMokHEM8bpWlzbWigSSphwptPikhOgWEdebbErSt8p9xI D40iRH2Sh2VUBbEN7/hMOXt+PPDeWStzOzwZeUSEIK0wXA1XbzmwxaMxChHxr1rcR87T 1FIP8a093oP3wEGQhdQ/inW4R1opr5RWA8rxUVa76sfqfHjCb8hEAfkW1LNYUq0+I0f+ 0Kff7LluJ5jlQip5gqsHl8oVOOq0YJc0q1HElxxAXCRCZDArkHdxa/4Eqa2q7OZOyvM+ WY6/Ul11hm9ha5nI5MQ0X3Myxf6PjbW4SMLezoZogR4frmjeWJt0m1oFlPbZfX+XPji3 f3TQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692136995; x=1692741795; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Qy4ZYC5HvIhsaCaFm4KMLYmu1Fjl2J9JeOIyWMPqwpI=; b=TQEP6HySBZLeW7xjXFX3F2VVitC9yN3tEc+xnCBQnWRJMX6ZLuwjonvG8L57jZwION 1qEJYcb+yqYD4DIecHYDocHuGZoJnsZ0UAYhddIiT1rbqTLR01qtMo0UF9dwBj1cAKGO Hm2kyWCFG28BMZHK6I3mgO71GMDkfOYyHtXefto5MTxxY402Y3G7cNffQzHcs7Q/Zc6R nzn2GtHLX4RxzgTx6LMhxqT5xQByj93MBD5zRHKiXrxrC6r4mEaq9Yt6LLLXv1Rg7coW x0reKyg73tbWlBBW9Lff26DN7ENjrr0qjfhb+wJAbfPZbYVlUa2IGWR26GxaAxVtbHtM ntaA== X-Gm-Message-State: AOJu0Yz8N5+McKwqIfqxUtjA42LjnF88rW4iUQL8yj9IpQ3pRzfA2jgb nb6cVWZwmWDxAtIPDWKkaEFErR2/VhE= X-Google-Smtp-Source: AGHT+IEEUZXfBKAv4VXxoo1om8B1PTZ2K7BfAAOqtuMkx0fMeb4BMsAyjlQ9gsmRjRCy5U05LRJw/Q== X-Received: by 2002:a05:6602:2202:b0:790:d813:2d38 with SMTP id n2-20020a056602220200b00790d8132d38mr20407635ion.11.1692136995215; Tue, 15 Aug 2023 15:03:15 -0700 (PDT) Received: from [10.0.2.153] (c-174-51-218-141.hsd1.co.comcast.net. [174.51.218.141]) by smtp.gmail.com with ESMTPSA id c24-20020a05660221d800b00783737db8ebsm4013593ioc.38.2023.08.15.15.03.14 for <65317 <at> debbugs.gnu.org> (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 15 Aug 2023 15:03:14 -0700 (PDT) Message-ID: <975cccf4-62bf-7036-3ecf-77270f3db717@HIDDEN> Date: Tue, 15 Aug 2023 16:03:13 -0600 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: bug#65317: Acknowledgement ([PATCH 1/1] gnu: Add go-1.21.) Content-Language: en-US To: 65317 <at> debbugs.gnu.org References: <20230815195313.46418-1-cox.katherine.e@HIDDEN> <handler.65317.B.16921292097969.ack <at> debbugs.gnu.org> From: Katherine Cox-Buday <cox.katherine.e@HIDDEN> In-Reply-To: <handler.65317.B.16921292097969.ack <at> debbugs.gnu.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Score: -1.0 (-) X-Debbugs-Envelope-To: 65317 X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.0 (--) It looks like as written this suffers from https://github.com/golang/go/issues/61921 (relevant code here: https://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/golang.scm?h=master#n671). I'm trying to figure out what the correct course of action is for Guix.
guix-patches@HIDDEN:bug#65317; Package guix-patches.
Full text available.
Received: (at submit) by debbugs.gnu.org; 15 Aug 2023 19:53:29 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Tue Aug 15 15:53:28 2023
Received: from localhost ([127.0.0.1]:36716 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1qW06a-00024S-DF
for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 15:53:28 -0400
Received: from lists.gnu.org ([2001:470:142::17]:60854)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <cox.katherine.e@HIDDEN>) id 1qW06X-00024D-HT
for submit <at> debbugs.gnu.org; Tue, 15 Aug 2023 15:53:26 -0400
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 <cox.katherine.e@HIDDEN>)
id 1qW06R-0004G4-4b
for guix-patches@HIDDEN; Tue, 15 Aug 2023 15:53:19 -0400
Received: from mail-io1-xd2e.google.com ([2607:f8b0:4864:20::d2e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <cox.katherine.e@HIDDEN>)
id 1qW06O-0000Eu-H7
for guix-patches@HIDDEN; Tue, 15 Aug 2023 15:53:18 -0400
Received: by mail-io1-xd2e.google.com with SMTP id
ca18e2360f4ac-790bed44880so247615939f.0
for <guix-patches@HIDDEN>; Tue, 15 Aug 2023 12:53:16 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=gmail.com; s=20221208; t=1692129195; x=1692733995;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:from:to:cc:subject:date:message-id:reply-to;
bh=aaB9R3VN6VEGmBL1qHI5l4E826XFuiJmlz7kVEUq7IM=;
b=AhGGofpcrENRl7NdbIhn9KWyrr6lz/adOaMNYEAJJnvTTZCZclRoW3nW2JKsmP9NbJ
flzwgub+fMdg7gmnkP2A7+mFC+XOIEdAzHrreOaFrgksGqvoBhXMDgzK2RGLhrH1Me35
auJf6TysYEnbVcs5qaw4teYQ1MPuyFOoH2+t7o6FJb0gonCnUjZY/aN3t02UiGHpT/Hl
0YDlFCXOcqMSMEhGzo8x2GcAh4aMEzG6cmJQnA/w61VPw9FiZowfpbIrr4tOIcBI+C+1
5inijbU7xQXLGQUG++su4H2hAmUc1gYqtMqtGmBXb8mNbe4x8ggzpccMBJfuzb8Shh5H
0h6w==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20221208; t=1692129195; x=1692733995;
h=content-transfer-encoding:mime-version:message-id:date:subject:cc
:to:from:x-gm-message-state:from:to:cc:subject:date:message-id
:reply-to;
bh=aaB9R3VN6VEGmBL1qHI5l4E826XFuiJmlz7kVEUq7IM=;
b=CnFmsnoJZcumB5POWPuHz8UTkgqEb8sUchz5HJjIaxFNAZVn8LmghbqFW6P9E0Wv5+
kZ06IO35KxdXiRJ+qvJGpQU9XrmA45/HOPTTkVyl5Vqgdn0V6knhrwcZkVtJ3EmI3D3A
1KH/wfwzbvmWbAkx0X9Re8pcjFkxdlP2Iy8EsWpAmOm7sYU6Hs1nb7o0AY8GBVCmO4Mm
zFlLc/7rVMi2RL31FoyIc+FeYQmACBb3+Wn0lV9xCwC+8iOi+IlEHKcDvFZUEWC+D3mD
9U5eEy5aYfXQ7qdKyd7qcVSsctiqXHbf01kFUvLmDWe/KA8wFcaPzyezmBq1OrBVe3Jt
hxiA==
X-Gm-Message-State: AOJu0YxwIy7cQq8ajotPbM0HdeSXLzSIN8y2d+KosGZv0beF3lpy4ri0
H78ryLqiosbPG1G0lU6lG3ZIGmKdOig=
X-Google-Smtp-Source: AGHT+IEsroVo67nn5HI7VnJJ+vk0Ro8x4mw3ApTvWW/mwE4D2Ek+M/7pteiggrT1WW5GXG7O8HxHlA==
X-Received: by 2002:a6b:3108:0:b0:785:cfa1:fcac with SMTP id
j8-20020a6b3108000000b00785cfa1fcacmr15227954ioa.20.1692129194982;
Tue, 15 Aug 2023 12:53:14 -0700 (PDT)
Received: from washu-v4.home.cox-buday.com
(c-174-51-218-141.hsd1.co.comcast.net. [174.51.218.141])
by smtp.gmail.com with ESMTPSA id
a5-20020a6b6605000000b0078335414ddesm4011872ioc.26.2023.08.15.12.53.14
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 15 Aug 2023 12:53:14 -0700 (PDT)
From: Katherine Cox-Buday <cox.katherine.e@HIDDEN>
To: guix-patches@HIDDEN
Subject: [PATCH 1/1] gnu: Add go-1.21.
Date: Tue, 15 Aug 2023 13:53:04 -0600
Message-ID: <20230815195313.46418-1-cox.katherine.e@HIDDEN>
X-Mailer: git-send-email 2.41.0
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Received-SPF: pass client-ip=2607:f8b0:4864:20::d2e;
envelope-from=cox.katherine.e@HIDDEN; helo=mail-io1-xd2e.google.com
X-Spam_score_int: -20
X-Spam_score: -2.1
X-Spam_bar: --
X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,
DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001,
RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: 1.0 (+)
X-Debbugs-Envelope-To: submit
Cc: Katherine Cox-Buday <cox.katherine.e@HIDDEN>
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -0.0 (/)
* gnu/packages/golang.scm (go-1.21): New variable.
---
gnu/packages/golang.scm | 83 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 5a53838435..bd2fc4d5d5 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -967,6 +967,89 @@ (define-public go-1.20
;; https://go.dev/issue/44505
(alist-replace "go" (list go-1.17) (package-native-inputs go-1.17)))))
+(define-public go-1.21
+ (package
+ (inherit go-1.20)
+ (name "go")
+ (version "1.21.0")
+ (source (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/golang/go")
+ (commit (string-append "go" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32
+ "04cpahl10i1sncymdfm0vzcj3czv6lv0axwa1sisl9cz3rdrp7hj"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments go-1.20)
+ ;; Source patching phases are broken up into discrete steps to allow
+ ;; future versions to discard individual phases without having to
+ ;; discard all source patching.
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (delete 'skip-TestGoPathShlibGccgo-tests)
+ (delete 'patch-source)
+ (add-after 'unpack 'patch-os-tests
+ (lambda _
+ (substitute* "src/os/os_test.go"
+ (("/usr/bin") (getcwd))
+ (("/bin/sh") (which "sh")))))
+
+ (add-after 'unpack 'apply-patches
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Having the patch in the 'patches' field of <origin> breaks
+ ;; the 'TestServeContent' test due to the fact that
+ ;; timestamps are reset. Thus, apply it from here.
+ (invoke "patch" "-p1" "--force" "-i"
+ (assoc-ref inputs "go-fix-script-tests.patch"))))
+
+ (add-after 'unpack 'patch-src/net
+ (lambda* (#:key inputs #:allow-other-keys)
+ (let ((net-base (assoc-ref inputs "net-base")))
+ (substitute* "src/net/lookup_unix.go"
+ (("/etc/protocols")
+ (string-append net-base "/etc/protocols")))
+ (substitute* "src/net/port_unix.go"
+ (("/etc/services")
+ (string-append net-base "/etc/services"))))))
+
+ (add-after 'unpack 'patch-zoneinfo
+ (lambda* (#:key inputs #:allow-other-keys)
+ ;; Add the path to this specific version of tzdata's zoneinfo
+ ;; file to the top of the list to search. We don't want to
+ ;; replace any sources because it will affect how binaries
+ ;; compiled with this Go toolchain behave on non-guix
+ ;; platforms.
+ (substitute* "src/time/zoneinfo_unix.go"
+ (("var platformZoneSources.+" all)
+ (format #f "~a~%\"~a/share/zoneinfo\",~%"
+ all
+ (assoc-ref inputs "tzdata"))))))
+
+ (add-after 'unpack 'patch-cmd/go/testdata/script
+ (lambda _
+ (substitute* "src/cmd/go/testdata/script/cgo_path_space.txt"
+ (("/bin/sh") (which "sh")))))
+
+ (add-after 'enable-external-linking 'enable-external-linking-1.21
+ (lambda _
+ ;; Invoke GCC to link any archives created with GCC (that is, any
+ ;; packages built using 'cgo'), because Go doesn't know how to
+ ;; handle the runpaths but GCC does. Use substitute* rather than
+ ;; a patch since these files are liable to change often.
+ ;;
+ ;; XXX: Replace with GO_EXTLINK_ENABLED=1 or similar when
+ ;; <https://github.com/golang/go/issues/31544> and/or
+ ;; <https://github.com/golang/go/issues/43525> are resolved.
+ (substitute* "src/cmd/link/internal/ld/config.go"
+ (("\\(iscgo && \\(.+\\)") "iscgo"))
+ (substitute* "src/internal/testenv/testenv.go"
+ (("!CanInternalLink.+") "true {\n"))
+ (substitute* "src/syscall/exec_linux_test.go"
+ (("testenv.MustHaveExecPath\\(t, \"whoami\"\\)")
+ "t.Skipf(\"no passwd file present\")"))))))))))
+
(define-public go go-1.17)
(define make-go-std
base-commit: a4bed14c438dc0cbc1c1885a38f8409c7fef7957
--
2.41.0
Katherine Cox-Buday <cox.katherine.e@HIDDEN>:guix-patches@HIDDEN.
Full text available.guix-patches@HIDDEN:bug#65317; Package guix-patches.
Full text available.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.