From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id MM47DP+hD2UiSQEAG6o9tA:P1 (envelope-from ) for ; Sun, 24 Sep 2023 04:42:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id MM47DP+hD2UiSQEAG6o9tA (envelope-from ) for ; Sun, 24 Sep 2023 04:42:07 +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 B389532222 for ; Sun, 24 Sep 2023 04:42:06 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=kfILdVvo; 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=1695523327; 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=Aso1cUkw3AX27mtNvDTK2rl9pSisTioUVnSZ6w3upg0=; b=iM7zZGHEo5O1wHmiomyw0qHHFcnbGqFb/XERarZhzjWvERI14p7dTkxxYjSl5cTGsd3ifc EsaEbEAfirvchjBPwq/sxjq1DpMyWZQwKQTpqSBhfh62nT4NXNQPzZIccGJ5MOP1/CHH+A zcsW/QMjKwu21iX9HfjaFbZ0KCoxPQH1paExfOKBz72dV5REmH3UwDV4yoQ5JVn4L/WKZe 8Gl6aG4LPy+kYXhLYl6mJJZ910ubEuGBt9sgGtWgKvwGkhg2qxvezgT1hKBFZmNJpHPie9 IwaFJSedjIDUUw5tSsafCq3/dGsrgfBy14/XArjiN3CzlLTlGNgRZeYe33wqeA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=ultrarare.space header.s=dkim header.b=kfILdVvo; 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=1695523327; a=rsa-sha256; cv=none; b=Y1QEoHzg46Wk/b+afgBD8bPhG1iRGj6aJTmj4Py3fZMXre081D+PWSVkeiCJs4RZrm3jAV jAuOYVZ9p4dmow8Pm89mYyORv9AE7RdA8UOgqNVHxXEPBjzO47+gvOjMP30NhThDpjtzz+ Hix/G+nW+tUp1u+mAzwpr/bSwyUTg8HErnsnyaSn9RKIi7nse8I+UamyAKtXK0rNfoyr3E 6gC98hUY70lTekOcZzBYwtY+AAHf6jvLwl+T4puiutiYga8+yXSIOYWAQB3c9UDBzyriPw 9KV4UHLBA3USdFmnppiDnU8J6JBg6KszAwtTOYFrlfEthUH+nIw1ogrbqehmBg== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qkF4D-00084f-DH; Sat, 23 Sep 2023 22:41:53 -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 1qkF4C-000845-Eg for guix-patches@gnu.org; Sat, 23 Sep 2023 22:41:52 -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 1qkF4B-00041K-08 for guix-patches@gnu.org; Sat, 23 Sep 2023 22:41:51 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qkF4M-0006HT-AI; Sat, 23 Sep 2023 22:42:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65034] [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0. Resent-From: Hilton Chain Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 24 Sep 2023 02:42: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.169552328524065 (code B ref 65034); Sun, 24 Sep 2023 02:42:02 +0000 Received: (at 65034) by debbugs.gnu.org; 24 Sep 2023 02:41:25 +0000 Received: from localhost ([127.0.0.1]:40794 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkF3k-0006G2-Nr for submit@debbugs.gnu.org; Sat, 23 Sep 2023 22:41:25 -0400 Received: from mail.boiledscript.com ([144.168.59.46]:47172) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qkF3i-0006Fj-0N for 65034@debbugs.gnu.org; Sat, 23 Sep 2023 22:41:23 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ultrarare.space; s=dkim; t=1695523173; 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=Aso1cUkw3AX27mtNvDTK2rl9pSisTioUVnSZ6w3upg0=; b=kfILdVvoiu0fwEvAxOPvaZqHtsdUD6WTsNYRQbPH0PiN/bLuy4jtre2m7wxGWd19JNm44n qTprczrawy34hUqxcXTulnsIXldJBv79kTQ6U6eNwdm9Vwfc6hn7HUnnJmAYcMcs6p8vXJ ocDDEFDcGXjUZ82FI2fu6SJH/13sDgCwCda/prRPWlwh8XKFjBKMRRk2TL3EaoBqurIovn gwHziXyIeJJMW8+36Tk4wv8LtHr3H9Xp3ImbXlGDEvMMvtNMOSMWnVZl/0H94NFSxiwpkN 43uM7RVB03AkIR1N0mVgFX/wwFEZoVIE4TL4dM0jEbqjSrd9iMib+L+5mKRkUA== Date: Sun, 24 Sep 2023 10:39:54 +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-Spam-Score: -6.20 X-Migadu-Scanner: mx2.migadu.com X-Migadu-Queue-Id: B389532222 X-Spam-Score: -6.20 X-TUID: S+oxkbjz0qSA V1 -> V2: - Add comment for #:phases change. Hilton Chain (3): gnu: go-google-golang-org-protobuf: Update to 1.31.0. gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. gnu/packages/golang.scm | 112 ++++++++++++++++++++++++++++++------- gnu/packages/syncthing.scm | 4 +- 2 files changed, 93 insertions(+), 23 deletions(-) $ git range-diff origin/master v1 v2 1: 67e75293d5 ! 1: 5f6b22ea40 gnu: go-google-golang-org-protobuf: Update to 1.31.0. @@ gnu/packages/golang.scm: (define-public go-google-golang-org-protobuf - (delete 'build)))) - (propagated-inputs (list go-github-com-google-go-cmp-cmp - go-github-com-golang-protobuf-proto)) ++ ;; XXX: Workaround for go-build-system's lack of Go modules support + #:phases + #~(let ((go-packages '("proto" + "encoding/protojson" 2: 665d5761cb = 2: 177b76f359 gnu: go-github-com-golang-protobuf-proto: Update to 1.5.3. 3: 47a5b62621 ! 3: fb3bff6d7f gnu: go-github-com-golang-protobuf-proto: Rename to go-github-com-golang-protobuf. @@ Commit message * 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. + [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-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. + [propagated-inputs]: Likewise. ## gnu/packages/golang.scm ## @@ gnu/packages/golang.scm: (define-public go-github-com-lucas-clemente-quic-go @@ gnu/packages/golang.scm: (define-public go-github-com-golang-protobuf-proto - '(#: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" base-commit: 4f35ff1275e05be31f5d41464ccf147e9dbfd016 -- 2.41.0