From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id eEcjCfCWsmU7MwAAe85BDQ:P1 (envelope-from ) for ; Thu, 25 Jan 2024 18:14:24 +0100 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2.migadu.com with LMTPS id eEcjCfCWsmU7MwAAe85BDQ (envelope-from ) for ; Thu, 25 Jan 2024 18:14:24 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=ffamfST5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1706202864; a=rsa-sha256; cv=none; b=qcSLdbU1ifkMzcWpUDQt6VHERPif0VY0x5jIMsy7GJblq1b6bjKuBN6HL/eJkfVjZpiyPh vonckGDPzQmOJRcnuWtEx+Rff3T18uyEhKkYlB2mVEkHTfkIGaA8935QbsVepeba9SR8XH 7XpRz4KjDgcCVOjtbVUTAyEkNPuafVs0YprMZyLIC7/Wr8VpJHsZIL2p9AqtFC0BIzCAfI l+c72/nI5ZPNihrDP0gBLyY+vxcJLy3/zNnLNaOMrW8D+LMAmn/88I5Gx0k9yx5w0qRLwU vJaNNXu3Ff8FWxmkwps3AIE1OkU7ddI06tZdkzbR2BA8G91sNrpACuRiM6XU0Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=ffamfST5; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1706202864; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=fjdr3HpSEXcALnf5RxI53g5VO/XQUtwEb55p4bTJRaA=; b=j5UmzqebYmiuRSqPLvk0f145savHUhZpdtPN4Aca3958BTHquaxduILpSVvP/kHUbpliB2 sh2sWSkoR5i0Ffd4DCZfr25KQf9Ok6I1MV9Ton+BCubyKM6Kejpf+YSLRT30YvmslA1DWy WtkPth00ZVc03GG7RAuyPhEvtBYlBC7lLdi8+jJ0uMth5eXLJqfU9J0jobOxsVwq0GmJpL Dx8W3eOBiikMLOqRi+DXqDmIjmVfXQ6odbMaEfRnJ58PlFenC3oBn3kNa2xIZ35OV687xF qUufiS80O2IVz387uUzy8kxvbntL6A8jxhBTrP++6o+fAdRJG2lb+Bl/hq3iAw== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 9C9A39F60 for ; Thu, 25 Jan 2024 18:14:23 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rT3Iw-00068B-UN; Thu, 25 Jan 2024 12:14:18 -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 1rT3It-000652-GI for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:17 -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 1rT3Ib-0002x6-3Q for guix-patches@gnu.org; Thu, 25 Jan 2024 12:14:10 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rT3Ig-0003S2-UB; Thu, 25 Jan 2024 12:14:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH v3 core-updates 3/3] gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Thu, 25 Jan 2024 17:14:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65034 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 65034@debbugs.gnu.org Cc: Hilton Chain , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.170620283813233 (code B ref 65034); Thu, 25 Jan 2024 17:14:02 +0000 Received: (at 65034) by debbugs.gnu.org; 25 Jan 2024 17:13:58 +0000 Received: from localhost ([127.0.0.1]:49106 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3Ib-0003RK-CK for submit@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:57 -0500 Received: from mail.boiledscript.com ([144.168.59.46]:39654) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rT3IX-0003R5-9o for 65034@debbugs.gnu.org; Thu, 25 Jan 2024 12:13:53 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1706202790; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fjdr3HpSEXcALnf5RxI53g5VO/XQUtwEb55p4bTJRaA=; b=ffamfST5v0u4B1AeZABmJWh+MkGxC/Z84RDlQZOOejueoun2jrYLnQySmvfGLp/tiGypfS BV/IFQmgN78I8qwy402DT8exZL2yhf67BL2v7pWBHA+8sSgEgkut08wt/Ic+0+iipBPj54 qDX/vYwfCjZxh/SoCv/uK+lwgSi69kCOST1DAx1m67hs3GAKBlr1yJUMBUWDX7Q0kU4Fvw iX7l+6bVM+aga7oigVwxrgoqKL3haWUh/yLimkVgmVYrmw26MMy3t33TQ6ypwQW+SaF7E2 9DSc04dIq/yMK14dzfLxp4jc3FS3oSlpTOnOls/77LRE3ttM+NvZO9cPyQAcFw== Date: Fri, 26 Jan 2024 01:13:19 +0800 Message-ID: <6d1b2746c4dcf2646cedbea047071b731de0f0c6.1706202176.git.hako@ultrarare.space> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spamd-Bar: -- 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: , Reply-to: Hilton Chain X-ACL-Warn: , Hilton Chain via Guix-patches From: Hilton Chain via Guix-patches via Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Scanner: mx10.migadu.com X-Spam-Score: -6.67 X-Migadu-Queue-Id: 9C9A39F60 X-Migadu-Spam-Score: -6.67 X-TUID: 5nbjl8/4B/wL * gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to... (go-github-com-golang-protobuf): ... this. [arguments]<#:import-path>: Set to "github.com/golang/protobuf". <#:unpack-path>: Remove argument. <#:phases>: Build all Go packages and run tests for them. (go-github-com-quic-go-quic-go,go-github-com-prometheus-common) (go-github-com-prometheus-client-golang,go-github-com-onsi-gomega) [propagated-inputs]: Adjust accordingly. * gnu/packages/syncthing.scm (go-github-com-prometheus-client-model) (go-github-com-matttproud-golang-protobuf-extensions-pbutil) [propagated-inputs]: Likewise. Change-Id: I0efa2deaac2cb2bcd2c11f8791bdf320a56cf729 --- gnu/packages/golang.scm | 46 +++++++++++++++++++++++++++++++------- gnu/packages/syncthing.scm | 4 ++-- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index eaa2b7d305..b90b31e7ac 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7477,7 +7477,7 @@ (define-public go-github-com-quic-go-quic-go go-golang-org-x-crypto go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-golang-org-x-crypto go-golang-org-x-exp go-golang-org-x-net @@ -8232,9 +8232,9 @@ (define-public gotestsum (home-page "https://github.com/gotestyourself/gotestsum") (license license:asl2.0))) -(define-public go-github-com-golang-protobuf-proto +(define-public go-github-com-golang-protobuf (package - (name "go-github-com-golang-protobuf-proto") + (name "go-github-com-golang-protobuf") (version "1.5.3") (source (origin (method git-fetch) @@ -8247,8 +8247,38 @@ (define-public go-github-com-golang-protobuf-proto "03f1w2cd4s8a3xhl61x7yjx81kbzlrjpvnnwmbhqnz814yi7h43i")))) (build-system go-build-system) (arguments - '(#:import-path "github.com/golang/protobuf/proto" - #:unpack-path "github.com/golang/protobuf")) + (list #:import-path "github.com/golang/protobuf" + ;; XXX: Workaround for go-build-system's lack of Go modules support + #:phases + #~(let ((go-packages '("proto" + "jsonpb" + "ptypes" + "ptypes/any" + "ptypes/empty" + "ptypes/timestamp" + "ptypes/duration" + "ptypes/wrappers" + "ptypes/struct" + "protoc-gen-go/descriptor" + "protoc-gen-go/plugin" + "protoc-gen-go"))) + (modify-phases %standard-phases + (replace 'build + (lambda* (#:key import-path build-flags #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'build) + #:import-path (format #f "~a/~a" import-path pkg) + #:build-flags build-flags)) + go-packages))) + (replace 'check + (lambda* (#:key tests? import-path #:allow-other-keys) + (for-each + (lambda (pkg) + ((assoc-ref %standard-phases 'check) + #:tests? tests? + #:import-path (format #f "~a/~a" import-path pkg))) + go-packages))))))) (propagated-inputs (list go-google-golang-org-protobuf)) (synopsis "Go support for Protocol Buffers") @@ -9893,7 +9923,7 @@ (define-public go-github-com-prometheus-common ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto + (list go-github-com-golang-protobuf go-github-com-matttproud-golang-protobuf-extensions-pbutil go-github-com-prometheus-client-model)) (synopsis "Prometheus metrics") @@ -9950,7 +9980,7 @@ (define-public go-github-com-prometheus-client-golang (delete 'build)))) (propagated-inputs (list go-github-com-beorn7-perks-quantile - go-github-com-golang-protobuf-proto + go-github-com-golang-protobuf go-github-com-prometheus-client-model go-github-com-prometheus-common go-github-com-prometheus-procfs @@ -12679,7 +12709,7 @@ (define-public go-github-com-onsi-gomega ;; Unless we disable the tests, we have a circular dependency on ;; ginkgo/v2. #:tests? #f)) - (propagated-inputs (list go-github-com-golang-protobuf-proto + (propagated-inputs (list go-github-com-golang-protobuf go-golang-org-x-net go-golang-org-x-sys go-golang-org-x-text diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index c18b70eb4b..bc0960d379 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -831,7 +831,7 @@ (define-public go-github-com-prometheus-client-model ;; Source-only package (delete 'build)))) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Data model artifacts for Prometheus") (description "This package provides data model artifacts for Prometheus.") (home-page "https://github.com/prometheus/client_model") @@ -859,7 +859,7 @@ (define-public go-github-com-matttproud-golang-protobuf-extensions-pbutil '(#:import-path "github.com/matttproud/golang_protobuf_extensions/pbutil" #:unpack-path "github.com/matttproud/golang_protobuf_extensions")) (propagated-inputs - (list go-github-com-golang-protobuf-proto)) + (list go-github-com-golang-protobuf)) (synopsis "Streaming Protocol Buffers in Go") (description "This package provides various Protocol Buffer extensions for the Go language, namely support for record length-delimited -- 2.41.0