01/02: gnu: kmod: Modernize.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 2871e562ebfe00c1c1f92982f954b3146186d791
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Mon Mar 11 10:48:26 2024 -0400

    gnu: kmod: Modernize.
    
    * gnu/packages/linux.scm (kmod) [native-inputs, inputs]: Remove labels.
    [arguments]: Use gexps, remove trailing #t.
    
    Change-Id: If40e25d38c5b4ac3cb192a76d688834069278c9d
---
 gnu/packages/linux.scm | 50 ++++++++++++++++++++------------------------------
 1 file changed, 20 insertions(+), 30 deletions(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index c51841540d..bd2bdec5e9 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -4223,37 +4223,27 @@ to use Linux' inotify mechanism, which allows file 
accesses to be monitored.")
                 "0am54mi5rk72g5q7k6l6f36gw3r9vwgjmyna43ywcjhqmakyx00b"))
               (patches (search-patches "kmod-module-directory.patch"))))
     (build-system gnu-build-system)
-    (native-inputs
-     (list pkg-config
-           ;; For tests.
-           zstd))
-    (inputs
-     `(("xz" ,xz)
-       ("zlib" ,zlib)
-       ("zstd-lib" ,zstd "lib")))
     (arguments
-     `(#:configure-flags '("--with-xz" "--with-zlib" "--with-zstd"
-                           "--disable-test-modules")
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'disable-tests
-           (lambda _
-             ;; XXX: These tests need '--sysconfdir=/etc' to pass.
-             (substitute* "Makefile.in"
-               (("testsuite/test-modprobe") "")
-               (("testsuite/test-depmod") "")
-               (("testsuite/test-blacklist") ""))
-             #t))
-         (add-after 'install 'install-modprobe&co
-           (lambda* (#:key outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (bin (string-append out "/bin")))
-               (for-each (lambda (tool)
-                           (symlink "kmod"
-                                    (string-append bin "/" tool)))
-                         '("insmod" "rmmod" "lsmod" "modprobe"
-                           "modinfo" "depmod"))
-               #t))))))
+     (list #:configure-flags #~(list "--with-xz" "--with-zlib" "--with-zstd"
+                                     "--disable-test-modules")
+           #:phases
+           #~(modify-phases %standard-phases
+               (add-after 'unpack 'disable-tests
+                 (lambda _
+                   ;; XXX: These tests need '--sysconfdir=/etc' to pass.
+                   (substitute* "Makefile.in"
+                     (("testsuite/test-modprobe") "")
+                     (("testsuite/test-depmod") "")
+                     (("testsuite/test-blacklist") ""))))
+               (add-after 'install 'install-modprobe&co
+                 (lambda _
+                   (for-each (lambda (tool)
+                               (symlink "kmod"
+                                        (string-append #$output "/bin/" tool)))
+                             '("insmod" "rmmod" "lsmod" "modprobe"
+                               "modinfo" "depmod")))))))
+    (native-inputs (list pkg-config zstd)) ;zstd needed for tests
+    (inputs (list xz zlib `(,zstd "lib")))
     (supported-systems (delete "i586-gnu" %supported-systems))
     (home-page "https://www.kernel.org/";)
     (synopsis "Kernel module tools")