Subject: [bug#50035] [PATCH 2/3] gnu: Rename go-github-com-godbus-dbus to go-github-com-godbus-dbus-v5.

From: Sarah Morgensen <[email-masked]>
Date: Thu, 12 Aug 2021 20:12:58 -0700

The proper module name now includes "-v5" (see project's go.mod).  Change
the variable/package name to help the Go importer find it.

* gnu/packages/golang.scm (go-github-com-godbus-dbus): Rename to...
(go-github-com-godbus-dbus-v5): ...this.
(go-github-com-zalando-go-keyring)[native-inputs]: Adjust accordingly.
* gnu/packages/configuration-management.scm (chezmoi): Likewise.
---
 gnu/packages/configuration-management.scm | 2 +-
 gnu/packages/golang.scm                   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/configuration-management.scm b/gnu/packages/configuration-management.scm
index 9aee13a172..8b4ba2b71e 100644
--- a/gnu/packages/configuration-management.scm
+++ b/gnu/packages/configuration-management.scm
@@ -91,7 +91,7 @@
        ("go-github-com-twpayne-go-xdg" ,go-github-com-twpayne-go-xdg)
        ("go-github-com-yuin-goldmark" ,go-github-com-yuin-goldmark)
        ("go-github-com-zalando-go-keyring" ,go-github-com-zalando-go-keyring)
-       ("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus)
+       ("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5)
        ("go-etcd-io-bbolt" ,go-etcd-io-bbolt)
        ("go-golang-org-x-crypto" ,go-golang-org-x-crypto)
        ("go-golang-org-x-net" ,go-golang-org-x-net)
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index 15826514bc..359c5a987d 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -7421,9 +7421,9 @@ and @code{ioutil} packages that is easy to test.")
 @uref{freedesktop.org}.")
     (license license:expat)))
 
-(define-public go-github-com-godbus-dbus
+(define-public go-github-com-godbus-dbus-v5
   (package
-    (name "go-github-com-godbus-dbus")
+    (name "go-github-com-godbus-dbus-v5")
     (version "5.0.4")
     (source (origin
               (method git-fetch)
@@ -7464,7 +7464,7 @@ bindings for the D-Bus message bus system.")
      `(#:tests? #f ;XXX: Fix dbus tests
        #:import-path "github.com/zalando/go-keyring"))
     (native-inputs
-     `(("go-github-com-godbus-dbus" ,go-github-com-godbus-dbus)
+     `(("go-github-com-godbus-dbus-v5" ,go-github-com-godbus-dbus-v5)
        ("dbus" ,dbus)))
     (home-page "https://github.com/zalando/go-keyring/")
     (synopsis "Library for working with system keyring")
-- 
2.31.1