gnu: Add go-github-com-godbus-dbus-v5.

These changes resolve issues with golang import paths for
<github.com/godbus/dbus> and <github.com/godbus/dbus/v5> by adding a new
variable with downgrading existing one to the latest version where
import path is still <github.com/godbus/dbus>.  It addresses the cases
with unit tests failures and help importer to resolve dependencies.

* gnu/packages/golang.scm (go-github-com-godbus-dbus): Downgrade to
0.0.0-20190726142602-4481cbc300e2.
(go-github-com-godbus-dbus-v5): New variable, preserver version of
go-github-com-godbus-dbus.
(go-github-com-delthas-go-libnp) [propagated-inputs]: Remove
go-github-com-godbus-dbus, add go-github-com-godbus-dbus-v5.

* gnu/packages/golang-xyz.scm (go-github-com-coreos-go-systemd-v22)
[propagated-inputs]: Remove go-github-com-godbus-dbus, add
go-github-com-godbus-dbus-v5.

Change-Id: Idbeb3c625da55bdd4620afab31b024ef0a0b79ec
Co-authored-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>

2 files changed, 25 insertions, 5 deletions

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 796341a66b..5e66c9e082 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -1611,7 +1611,7 @@ throughput.")
     (inputs
      (list elogind))
     (propagated-inputs
-     (list go-github-com-godbus-dbus))
+     (list go-github-com-godbus-dbus-v5))
     (home-page "https://github.com/coreos/go-systemd")
     (synopsis "Go bindings to systemd")
     (description
diff --git a/gnu/packages/golang.scm b/gnu/packages/golang.scm
index f5cb8a6ab8..381acd0853 100644
--- a/gnu/packages/golang.scm
+++ b/gnu/packages/golang.scm
@@ -6654,16 +6654,16 @@ RFC-5802 and RFC-7677.")
 (define-public go-github-com-godbus-dbus
   (package
     (name "go-github-com-godbus-dbus")
-    (version "5.1.0")
+    (version "0.0.0-20190726142602-4481cbc300e2")
     (source (origin
               (method git-fetch)
               (uri (git-reference
                     (url "https://github.com/godbus/dbus")
-                    (commit (string-append "v" version))))
+                    (commit (go-version->git-ref version))))
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "1kayd4x7idrhi06ahh5kqkgwzgh9icvv71mjar2d0jl486dfs8r5"))))
+                "0h0cl1r136g0kxbw3i7ggb9mhavpi1yr7d7312iwhkxm93dxkphg"))))
     (build-system go-build-system)
     (arguments
      `(#:tests? #f ;no /var/run/dbus/system_bus_socket
@@ -6676,6 +6676,26 @@ RFC-5802 and RFC-7677.")
 bindings for the D-Bus message bus system.")
     (license license:bsd-2)))
 
+(define-public go-github-com-godbus-dbus-v5
+  (package
+    (inherit go-github-com-godbus-dbus)
+    (name "go-github-com-godbus-dbus-v5")
+    (version "5.1.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/godbus/dbus")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1kayd4x7idrhi06ahh5kqkgwzgh9icvv71mjar2d0jl486dfs8r5"))))
+    (arguments
+     (substitute-keyword-arguments
+         (package-arguments go-github-com-godbus-dbus)
+       ((#:import-path _ "github.com/godbus/dbus")
+        "github.com/godbus/dbus/v5")))))
+
 (define-public go-github-com-delthas-go-libnp
   (let ((commit "0e45ece1f878f202fee2c74801e287804668f677"))
     (package
@@ -6692,7 +6712,7 @@ bindings for the D-Bus message bus system.")
                     "1hylpvwz3kb8wr00knba6mggjacak2vmqafwysansj0ns038lp8w"))))
       (build-system go-build-system)
       (arguments `(#:import-path "github.com/delthas/go-libnp"))
-      (propagated-inputs (list go-github-com-godbus-dbus))
+      (propagated-inputs (list go-github-com-godbus-dbus-v5))
       (home-page "https://github.com/delthas/go-libnp")
       (synopsis "Tiny library providing information about now-playing media")
       (description "@code{go-libnp} is a tiny cross-platform library for