gnu: Add go-github-com-coreos-go-systemd-v22.

The latest version of <github.com/coreos/go-systemd> is now available as
the <github.com/coreos/go-systemd/v22> Golang module, with a single
go.mod file. Each child submodule is included as part of the aggregated
module.

* gnu/packages/golang-xyz.scm (go-github-com-coreos-go-systemd-v22): New variable.
(go-github-com-coreos-go-systemd-daemon,
go-github-com-coreos-go-systemd-dbus,
go-github-com-coreos-go-systemd-journal,
go-github-com-coreos-go-systemd-login1,
go-github-com-coreos-go-systemd-machine1,
go-github-com-coreos-go-systemd-sdjournal,
go-github-com-coreos-go-systemd-unit): Remove variables.

Change-Id: Ib155ed71d9b9cc5c39ad8f32b33b956ec0d3dcba

1 files changed, 80 insertions, 105 deletions

diff --git a/gnu/packages/golang-xyz.scm b/gnu/packages/golang-xyz.scm
index 591fc5b38f..dc2d55ba15 100644
--- a/gnu/packages/golang-xyz.scm
+++ b/gnu/packages/golang-xyz.scm
@@ -877,6 +877,86 @@ objects can be cached in memory without increased latency or degraded
 throughput.")
     (license license:expat)))
 
+(define-public go-github-com-coreos-go-systemd-v22
+  (package
+    (name "go-github-com-coreos-go-systemd-v22")
+    (version "22.5.0")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://github.com/coreos/go-systemd")
+             (commit (string-append "v" version))))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1vhb4cw8nw9nx8mprx829xv8w4jnwhc2lcyjljzlfafsn8nx5nyf"))))
+    (build-system go-build-system)
+    (arguments
+     (list
+      #:import-path "github.com/coreos/go-systemd/v22"
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-sdjournal-header
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (substitute* "sdjournal/journal.go"
+                  (("systemd/sd-journal.h") "elogind/sd-journal.h")
+                  (("systemd/sd-id128.h") "elogind/sd-id128.h")))))
+          ;; XXX: Activate when go-build-system supports submodules.
+          (delete 'build)
+          (add-before 'check 'remove-failing-test-files
+            (lambda* (#:key import-path #:allow-other-keys)
+              (with-directory-excursion (string-append "src/" import-path)
+                (for-each delete-file
+                          (list
+                           ;; dial unix /var/run/dbus/system_bus_socket: connect: no such
+                           ;; file or directory
+                           "dbus/dbus_test.go"
+                           "dbus/methods_test.go"
+                           "dbus/subscription_set_test.go"
+                           "dbus/subscription_test.go"
+                           "import1/dbus_test.go"
+                           "login1/dbus_test.go"
+                           "machine1/dbus_test.go"
+                           ;; journal_test.go:30: journald socket not detected
+                           "journal/journal_test.go"
+                           ;; exec: "systemd-run": executable file not found
+                           ;; in $PATH
+                           "journal/journal_unix_test.go"
+                           ;; Error opening journal: unable to open a handle
+                           ;; to the library
+                           "sdjournal/journal_test.go"
+                           ;; Error getting an existing function: unable to
+                           ;; open a handle to the library
+                           "sdjournal/functions_test.go")))))
+          ;; XXX: Replace when go-build-system supports nested path.
+          (replace 'check
+            (lambda* (#:key import-path tests? #:allow-other-keys)
+              (when tests?
+                (with-directory-excursion (string-append "src/" import-path)
+                  (invoke "go" "test" "-v" "./..."))))))))
+    (inputs
+     (list elogind))
+    (propagated-inputs
+     (list go-github-com-godbus-dbus))
+    (home-page "https://github.com/coreos/go-systemd")
+    (synopsis "Go bindings to systemd")
+    (description
+     "This package implements a various systemd bindings and provides Golang
+submodules:
+
+@itemize
+@item @code{activation} - for writing and using socket activation from Go
+@item @code{daemon} - for notifying systemd of service status changes
+@item @code{dbus} - for starting/stopping/inspecting running services and units
+@item @code{journal} - for writing to systemd's logging service, journald
+@item @code{sdjournal} - for reading from journald by wrapping its C API
+@item @code{login1} - for integration with the systemd logind API
+@item @code{machine1} - for registering machines/containers with systemd
+@item @code{unit} - for (de)serialization and comparison of unit files
+@end itemize")
+    (license license:asl2.0)))
+
 (define-public go-github-com-coreos-go-systemd-activation
   (package
     (name "go-github-com-coreos-go-systemd-activation")
@@ -900,111 +980,6 @@ throughput.")
 using socket activation from Go.")
     (license license:asl2.0)))
 
-(define-public go-github-com-coreos-go-systemd-daemon
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-daemon")
-    (arguments
-     '(#:import-path "github.com/coreos/go-systemd/daemon"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for notifications")
-    (description "Go bindings to systemd for notifying the daemon of service
-status changes")))
-
-(define-public go-github-com-coreos-go-systemd-dbus
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-dbus")
-    (arguments
-     '(#:tests? #f ;Tests require D-Bus daemon running.
-       #:import-path "github.com/coreos/go-systemd/dbus"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (native-inputs (list go-github-com-godbus-dbus))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for managing services")
-    (description "Go bindings to systemd for starting/stopping/inspecting
-running services and units.")))
-
-(define-public go-github-com-coreos-go-systemd-journal
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-journal")
-    (arguments
-     '(#:tests? #f ;Tests require access to journald socket.
-       #:import-path "github.com/coreos/go-systemd/journal"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for writing journald")
-    (description "Go bindings to systemd for writing to systemd's logging
-service, journald.")))
-
-(define-public go-github-com-coreos-go-systemd-login1
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-login1")
-    (arguments
-     '(#:tests? #f ;Tests require D-Bus daemon running.
-       #:import-path "github.com/coreos/go-systemd/login1"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (native-inputs (list go-github-com-godbus-dbus))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for integration with logind API")
-    (description "Go bindings to systemd for integration with the systemd
-logind API.")))
-
-(define-public go-github-com-coreos-go-systemd-machine1
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-machine1")
-    (arguments
-     '(#:tests? #f ;Tests require D-Bus daemon running.
-       #:import-path "github.com/coreos/go-systemd/machine1"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (native-inputs (list go-github-com-godbus-dbus))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for registering machines/containers")
-    (description "Go bindings to systemd for registering
-machines/containers.")))
-
-(define-public go-github-com-coreos-go-systemd-sdjournal
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-sdjournal")
-    (arguments
-     '(#:tests? #f ;Tests require D-Bus daemon running.
-       #:import-path "github.com/coreos/go-systemd/sdjournal"
-       #:unpack-path "github.com/coreos/go-systemd"
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'fix-sdjournal-header
-           (lambda* (#:key import-path #:allow-other-keys)
-             (substitute* (format #f
-                                  "src/~a/journal.go"
-                                  import-path)
-               (("systemd/sd-journal.h")
-                "elogind/sd-journal.h")
-               (("systemd/sd-id128.h")
-                "elogind/sd-id128.h")))))))
-    (inputs (list elogind))
-    (synopsis "Go bindings to systemd for journald")
-    (description "Go bindings to systemd for reading from journald by wrapping
-its C API.")))
-
-(define-public go-github-com-coreos-go-systemd-unit
-  (package
-    (inherit go-github-com-coreos-go-systemd-activation)
-    (name "go-github-com-coreos-go-systemd-unit")
-    (arguments
-     '(#:tests? #f ;Tests require D-Bus daemon running.
-       #:import-path "github.com/coreos/go-systemd/unit"
-       #:unpack-path "github.com/coreos/go-systemd"))
-    (native-inputs (list go-github-com-godbus-dbus))
-    (home-page "https://github.com/coreos/go-systemd")
-    (synopsis "Go bindings to systemd for working with unit files")
-    (description "Go bindings to systemd for (de)serialization and comparison
-of unit files.")))
-
 (define-public go-github-com-cskr-pubsub
   (package
     (name "go-github-com-cskr-pubsub")