From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qPMJMhVqy2QXZQEASxT56A (envelope-from ) for ; Thu, 03 Aug 2023 10:49:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id eKrYMRVqy2R/+wAAauVa8A (envelope-from ) for ; Thu, 03 Aug 2023 10:49:25 +0200 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 8B4ED59991 for ; Thu, 3 Aug 2023 10:49:25 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=182ucWhj; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1691052565; 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=0JVE76j+o7VE+jneKkg3yz/l1fKqetnKymShuhn+0w4=; b=ZrcaXXC7Gye+q8W6h5GETLaaEfoVw7MNrxeotZKLCN8alqvcBIGhU19qzjMGYiKTaMTKq/ 4tVi6//OW3IWWkQ1nO/VSSmXb21NO4+rMTwYw3iAmp5rsL9G8IC6cbnDJU66DVdbOF4fTc TTpI7U4DOfgAY4ZlRCsKqzI5OeqnYQRZrvwBsjuXtwmH4UEYREQA0IQz6hIN0ndcJDYNiQ Q0JHnNj3RAq2th5pF9OGC/Wpdy+93pfKcGs4Ut6pD7VAHKS9V0TZDnJclcaq9/Y4aa7lXD bk7EKC2Txywb5dp2btbKipEz21ULlyi8EhkpHzo4LtE42ZopqT+IWnp1sl95eA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=182ucWhj; 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"; dmarc=pass (policy=none) header.from=gnu.org ARC-Seal: i=1; s=key1; d=yhetil.org; t=1691052565; a=rsa-sha256; cv=none; b=VEn+KzmQZu+LAu9Hu1vGHgpG4JlYJmVRcQJ8VUMSAvYV881b0YChUXizWq0cva+I+9KCBu uO8c8z6kJwY+dwBNTcjcgEz92bFcN4ink75O7hah3iROUIaJlV9yoK0eJo16o8y8U8jqkD P5Ma1pM+s7WoGh0XroDIIcx3HWo3jpRk9HvV+MqBran5YHHGzb5sv+L2WFBccD/n6U7+XH efvNu8XEDrGb9h+4jqbK2/dNK3KweETuQ4iaGSHjQwwUX5NSLjMusXAntiv5fNFFKZPZsb hJ9kA7g+9yfsItfnllo7FVJl4+QeK+CScY9l0aIhGLZ0QysqT1qgAcLdO+vJyg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qRU13-0006ei-8f; Thu, 03 Aug 2023 04:49:05 -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 ) id 1qRU10-0006bz-TH for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 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 1qRU10-000457-LH for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qRU10-00038o-I1 for guix-patches@gnu.org; Thu, 03 Aug 2023 04:49:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH 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: guix-patches@gnu.org Resent-Date: Thu, 03 Aug 2023 08:49: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 To: 65034@debbugs.gnu.org Cc: Hilton Chain Received: via spool by 65034-submit@debbugs.gnu.org id=B65034.169105249411857 (code B ref 65034); Thu, 03 Aug 2023 08:49:02 +0000 Received: (at 65034) by debbugs.gnu.org; 3 Aug 2023 08:48:14 +0000 Received: from localhost ([127.0.0.1]:50834 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU0E-000358-82 for submit@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:14 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:52186) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qRU0B-00034j-KZ for 65034@debbugs.gnu.org; Thu, 03 Aug 2023 04:48:12 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1691052488; 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=0JVE76j+o7VE+jneKkg3yz/l1fKqetnKymShuhn+0w4=; b=182ucWhjBKMmP2vZmDPt1SLYa0VhObRYr95ihXk++JfFCn09T29NbvWLDmCz80Ak22SrzG EeOzZ2vG4b45snGrxZziLpc2ZqQVHZcJzlC6pto9eWqXn9xGcGt8DN+UipOg9KnETYDyoL 1sAP0mu+RO5+eFECZbF48uLgPz/aEgx75C5SGxHWYH6vy2KLU/sLgVP/NzXjvkCpR8Dtpo w++W/DWzXWBlRPI6xyB3hPL1wKaAXYHo67Yb9LEbeDd9B5rlLjkg1A3od2uIUFaPEBXixY KnQJmby+O3C6/drIHzzyg+LuInZvL1bsjzE7CVln8DGY0l8ctgmquPmAbQa5tQ== Date: Thu, 3 Aug 2023 16:47:37 +0800 Message-ID: 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-Queue-Id: 8B4ED59991 X-Migadu-Scanner: mx1.migadu.com X-Spam-Score: -6.14 X-Migadu-Spam-Score: -6.14 X-TUID: b9VjyO4Y+1pI * gnu/packages/golang.scm (go-github-com-golang-protobuf-proto): Rename to... (go-github-com-golang-protobuf): ... this. [import-path]: Use github.com/golang/protobuf. [phases]: Build and check all packages. (go-github-com-lucas-clemente-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]: Adjust accordingly. --- gnu/packages/golang.scm | 46 ++++++++++++++++++++++++++++++-------- gnu/packages/syncthing.scm | 4 ++-- 2 files changed, 39 insertions(+), 11 deletions(-) diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm index 25690f6665..dcbc780f31 100644 --- a/gnu/packages/golang.scm +++ b/gnu/packages/golang.scm @@ -7608,7 +7608,7 @@ (define-public go-github-com-lucas-clemente-quic-go (list go-golang-org-x-crypto go-github-com-cheekybits-genny go-github-com-marten-seemann-chacha20 go-github-com-marten-seemann-qtls - go-github-com-golang-protobuf-proto)) + go-github-com-golang-protobuf)) (synopsis "QUIC in Go") (description "This package provides a Go language implementation of the QUIC network protocol.") @@ -8405,9 +8405,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) @@ -8420,8 +8420,37 @@ (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" + #: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") @@ -10212,7 +10241,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") @@ -10269,7 +10298,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 @@ -13452,11 +13481,10 @@ (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 - go-google-golang-org-protobuf go-gopkg-in-yaml-v2)) (home-page "https://github.com/onsi/gomega") (synopsis "Matcher library for Ginkgo") diff --git a/gnu/packages/syncthing.scm b/gnu/packages/syncthing.scm index dd54100ce6..99cb3acdc8 100644 --- a/gnu/packages/syncthing.scm +++ b/gnu/packages/syncthing.scm @@ -841,7 +841,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") @@ -869,7 +869,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