[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
06/09: profiles: Reindent 'linux-module-database'.
From: |
guix-commits |
Subject: |
06/09: profiles: Reindent 'linux-module-database'. |
Date: |
Thu, 18 Jun 2020 08:49:37 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit fea072d7275958a67fe24ab7bd9b661b2f3f8972
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Thu Jun 18 14:33:55 2020 +0200
profiles: Reindent 'linux-module-database'.
* guix/profiles.scm (linux-module-database): Reindent.
---
guix/profiles.scm | 29 +++++++++++++++--------------
1 file changed, 15 insertions(+), 14 deletions(-)
diff --git a/guix/profiles.scm b/guix/profiles.scm
index 9df63c9..f7af01b 100644
--- a/guix/profiles.scm
+++ b/guix/profiles.scm
@@ -1202,17 +1202,18 @@ for both major versions of GTK+."
and creates the dependency graph of all these kernel modules.
This is meant to be used as a profile hook."
- (define kmod ; lazy reference
+ (define kmod ; lazy reference
(module-ref (resolve-interface '(gnu packages linux)) 'kmod))
(define build
- (with-imported-modules
- (source-module-closure '((guix build utils)
+ (with-imported-modules (source-module-closure
+ '((guix build utils)
(gnu build linux-modules)))
#~(begin
(use-modules (ice-9 ftw)
(ice-9 match)
- (srfi srfi-1) ; append-map
+ (srfi srfi-1) ; append-map
(gnu build linux-modules))
+
(let* ((inputs '#$(manifest-inputs manifest))
(module-directories
(map (lambda (directory)
@@ -1220,20 +1221,20 @@ This is meant to be used as a profile hook."
inputs))
(directory-entries
(lambda (directory)
- (scandir directory (lambda (basename)
- (not
- (string-prefix? "." basename))))))
+ (scandir directory
+ (lambda (basename)
+ (not (string-prefix? "." basename))))))
;; Note: Should usually result in one entry.
(versions (delete-duplicates
(append-map directory-entries
module-directories))))
- (match versions
- ((version)
- (let ((old-path (getenv "PATH")))
- (setenv "PATH" #+(file-append kmod "/bin"))
- (make-linux-module-directory inputs version #$output)
- (setenv "PATH" old-path)))
- (_ (error "Specified Linux kernel and Linux kernel modules
+ (match versions
+ ((version)
+ (let ((old-path (getenv "PATH")))
+ (setenv "PATH" #+(file-append kmod "/bin"))
+ (make-linux-module-directory inputs version #$output)
+ (setenv "PATH" old-path)))
+ (_ (error "Specified Linux kernel and Linux kernel modules
are not all of the same version")))))))
(gexp->derivation "linux-module-database" build
#:local-build? #t
- branch master updated (e418c3d -> 69288a8), guix-commits, 2020/06/18
- 01/09: repl: Fix typo that would lead ~/.guile to be used when running scripts., guix-commits, 2020/06/18
- 03/09: database: 'register-items' takes an open database., guix-commits, 2020/06/18
- 04/09: nar: Avoid opening the database an additional time., guix-commits, 2020/06/18
- 05/09: nar: Use (guix i18n)., guix-commits, 2020/06/18
- 06/09: profiles: Reindent 'linux-module-database'.,
guix-commits <=
- 08/09: doc: Delete description of a nonexistent option., guix-commits, 2020/06/18
- 02/09: build-system/gnu: Fix 'install' phase of 'gnu-dist'., guix-commits, 2020/06/18
- 07/09: profiles: 'linux-module-database' hooks gracefully handles module-less kernels., guix-commits, 2020/06/18
- 09/09: gnu: go-ipfs: Update to 0.5.1., guix-commits, 2020/06/18