Merge branch 'master' into staging

1 files changed, 46 insertions, 35 deletions

diff --git a/gnu/packages/hardware.scm b/gnu/packages/hardware.scm
index a93db0be3f..a3ce90f75e 100644
--- a/gnu/packages/hardware.scm
+++ b/gnu/packages/hardware.scm
@@ -11,6 +11,7 @@
 ;;; Copyright © 2021, 2022 John Kehayias <[email protected]>
 ;;; Copyright © 2022 Zhu Zihao <[email protected]>
 ;;; Copyright © 2022 Maxime Devos <[email protected]>
+;;; Copyright © 2022 Marius Bakke <[email protected]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -182,20 +183,22 @@ support.")
 (define-public ddcutil
   (package
     (name "ddcutil")
-    (version "1.1.0")
+    (version "1.2.1")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://www.ddcutil.com/tarballs/"
                            "ddcutil-" version ".tar.gz"))
        (sha256
-        (base32 "19kkwb9ijzn6ya3mvjanggh1c96fcc0lkbk7xnyi2qp6wsr4nhxp"))))
+        (base32 "0fp7ffjn21p0bsc5b1ipf3dbpzwn9g6j5dpnwdnca052ifzk2w7i"))))
     (build-system gnu-build-system)
     (native-inputs
      (list pkg-config))
     (inputs
      (list eudev
            glib
+           kmod
+           i2c-tools
            libdrm ; enhanced diagnostics
            libusb ; support USB monitors
            libx11 ; enhanced diagnostics
@@ -823,36 +826,42 @@ applications.")
 (define-public usbguard
   (package
     (name "usbguard")
-    (version "0.7.8")
+    ;; Note: Use a recent snapshot to get compatibility with newer system
+    ;; libraries.
+    (version "1.0.0-55-g466f1f0")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
-                    "https://github.com/USBGuard/usbguard/releases/download/usbguard-"
-                    version "/usbguard-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/USBGuard/usbguard")
+                    (commit (string-append "usbguard-" version))))
               (file-name (git-file-name name version))
               (sha256
-               (base32 "1il5immqfxh2cj8wn1bfk7l42inflzgjf07yqprpz7r3lalbxc25"))))
+               (base32 "0rc0213qsfap3sgx9m3m1kppxbjl2fdwmzlbn5rbmn1i33125dfi"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:phases
+     '(#:phases
        (modify-phases %standard-phases
-         (add-after 'unpack 'patch-build-scripts
+         (add-after 'unpack 'patch-bootstrap-script
+           (lambda _
+             ;; Don't attempt to fetch git submodules.
+             (substitute* "autogen.sh"
+               (("^git submodule.*")
+                ""))))
+         (add-after 'bootstrap 'patch-build-scripts
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "configure"
                (("/usr/include/catch")
-                (string-append (assoc-ref inputs "catch") "/include")))
+                (dirname (search-input-file inputs "include/catch.hpp"))))
              ;; Do not create log directory.
              (substitute* "Makefile.in" ((".*/log/usbguard.*") ""))
              ;; Disable LDAP tests: they use 'sudo'.
              (substitute* "src/Tests/Makefile.in"
-               (("\\$\\(am__append_2\\)") ""))
-             #t))
+               (("\\$\\(am__append_2\\)") ""))))
          (add-after 'install 'delete-static-library
            (lambda* (#:key outputs #:allow-other-keys)
              ;; It can't be direclty disabled since it's needed for the tests.
              (delete-file (string-append (assoc-ref outputs "out")
-                                         "/lib/libusbguard.a"))
-             #t))
+                                         "/lib/libusbguard.a"))))
          (add-after 'install 'install-zsh-completion
            (lambda* (#:key outputs #:allow-other-keys)
              (let* ((out (assoc-ref outputs "out"))
@@ -860,8 +869,7 @@ applications.")
                      (string-append out "/share/zsh/site-functions")))
                (mkdir-p site-functions)
                (copy-file "scripts/usbguard-zsh-completion"
-                          (string-append site-functions "/_usbguard"))
-               #t))))
+                          (string-append site-functions "/_usbguard"))))))
        #:make-flags
        (list (string-append "BASH_COMPLETION_DIR="
                             (assoc-ref %outputs "out")
@@ -874,25 +882,28 @@ applications.")
         "--with-dbus"
         "--with-polkit")))
     (inputs
-     `(("audit" ,audit)
-       ("catch" ,catch-framework)
-       ("dbus-glib" ,dbus-glib)
-       ("ldap" ,openldap)
-       ("libcap-ng" ,libcap-ng)
-       ("libseccomp" ,libseccomp)
-       ("libsodium" ,libsodium)
-       ("pegtl" ,pegtl)
-       ("polkit" ,polkit)
-       ("protobuf" ,protobuf)
-       ("libqb" ,libqb)))
+     (list audit
+           catch-framework
+           dbus-glib
+           openldap
+           libcap-ng
+           libseccomp
+           libsodium
+           pegtl
+           polkit
+           protobuf
+           libqb))
     (native-inputs
-     `(("asciidoc" ,asciidoc)
-       ("bash-completion" ,bash-completion)
-       ("gdbus-codegen" ,glib "bin")
-       ("umockdev" ,umockdev)
-       ("xmllint" ,libxml2)
-       ("xsltproc" ,libxslt)
-       ("pkg-config" ,pkg-config)))
+     (list asciidoc
+           autoconf
+           automake
+           libtool
+           bash-completion
+           `(,glib "bin")
+           umockdev
+           libxml2
+           libxslt
+           pkg-config))
     (home-page "https://usbguard.github.io")
     (synopsis "Helps to protect your computer against rogue USB devices (a.k.a. BadUSB)")
     (description "USBGuard is a software framework for implementing USB device