Follow upstream rename of go-github-com-golang-protobuf-proto

1 files changed, 9 insertions, 9 deletions

diff --git a/tw/packages/monitoring.scm b/tw/packages/monitoring.scm
index 63819b08..4ab22b02 100644
--- a/tw/packages/monitoring.scm
+++ b/tw/packages/monitoring.scm
@@ -146,19 +146,19 @@ buffer developer guide} for more information about protocol buffers
 themselves.")
     (license license:bsd-3)))
 
-(define-public go-github-com-golang-protobuf-proto-latest
+(define-public go-github-com-golang-protobuf-latest
   (package
-    (inherit go-github-com-golang-protobuf-proto)
+    (inherit go-github-com-golang-protobuf)
     (version "1.5.2")
     (source
      (origin
        (method git-fetch)
        (uri (git-reference
              (url (package-home-page
-                   go-github-com-golang-protobuf-proto))
+                   go-github-com-golang-protobuf))
              (commit (string-append "v" version))))
        (file-name (git-file-name
-                   (package-name go-github-com-golang-protobuf-proto) version))
+                   (package-name go-github-com-golang-protobuf) version))
        (sha256 (base32 "1mh5fyim42dn821nsd3afnmgscrzzhn3h8rag635d2jnr23r1zhk"))))
     (arguments '(#:import-path "github.com/golang/protobuf/proto"
                  #:unpack-path "github.com/golang/protobuf"))
@@ -203,7 +203,7 @@ themselves.")
 ;; still required by github.com/prometheus/exporter-toolkit/web.
 (define-public go-github-com-golang-protobuf-ptypes-timestamp
   (package
-    (inherit go-github-com-golang-protobuf-proto-latest)
+    (inherit go-github-com-golang-protobuf-latest)
     (name "go-github-com-golang-protobuf-ptypes-timestamp")
     (arguments '(#:import-path "github.com/golang/protobuf/ptypes/timestamp"
                  #:unpack-path "github.com/golang/protobuf"))
@@ -252,8 +252,8 @@ themselves.")
        (sha256 (base32 "199qx1hz28gjva9sx0zhfs7hq43fzz687bnp3daax87cjy4adzxw"))))
     (propagated-inputs
      (modify-inputs (package-propagated-inputs go-github-com-prometheus-client-model)
-       (replace "go-github-com-golang-protobuf-proto"
-         go-github-com-golang-protobuf-proto-latest)))))
+       (replace "go-github-com-golang-protobuf"
+         go-github-com-golang-protobuf-latest)))))
 
 (define-public go-github-com-prometheus-common-latest
   (package
@@ -278,7 +278,7 @@ themselves.")
        (append go-golang-org-x-oauth2)
        (append go-golang-org-x-text)))))
 
-;; TODO: Build errors; possibly from depending on go-github-com-golang-protobuf-proto-latest + go-github-com-golang-protobuf-ptypes-timestamp?
+;; TODO: Build errors; possibly from depending on go-github-com-golang-protobuf-latest + go-github-com-golang-protobuf-ptypes-timestamp?
 ;; # github.com/golang/protobuf/proto
 ;; src/github.com/golang/protobuf/proto/decode.go:57:6: DecodeVarint redeclared in this block
 ;; /tmp/guix-build-go-github-com-prometheus-exporter-toolkit-web-0.8.2.drv-0/src/github.com/golang/protobuf/proto/buffer.go:39:38: previous declaration
@@ -324,7 +324,7 @@ themselves.")
                              go-github-com-mwitkow-go-conntrack
                              ;; The version from (gnu packages syncthing) is much too old, so update.
                              go-github-com-prometheus-common-latest
-                             go-github-com-golang-protobuf-proto-latest
+                             go-github-com-golang-protobuf-latest
                              go-github-com-golang-protobuf-ptypes-timestamp))
     (synopsis "Utility package to build Prometheus exporters")
     (description "This is a Go library for