Subject: [PATCH v2 0/3] gnu: go-google-golang-org-protobuf: Update to 1.31.0.

From: Hilton Chain <[email-masked]>
Date: Sun, 24 Sep 2023 10:39:54 +0800

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