05/15: guix home: import: Delete duplicate modules when importing.

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 256bd712648f404451f820eaedab3985df819556
Author: Xinglu Chen <public@yoctocell.xyz>
AuthorDate: Sat Oct 30 12:42:37 2021 +0200

    guix home: import: Delete duplicate modules when importing.
    
    Two different services might require the same module(s), so delete 
duplicates
    when generating the ‘use-modules’ form.
    
    * import.scm (manifest->code): Delete duplicate modules.
    
    Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 guix/scripts/home/import.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/guix/scripts/home/import.scm b/guix/scripts/home/import.scm
index 0e7c454..f0ae233 100644
--- a/guix/scripts/home/import.scm
+++ b/guix/scripts/home/import.scm
@@ -145,7 +145,8 @@ available."
                  (use-modules (gnu home)
                               (gnu packages)
                               (gnu services)
-                              ,@(concatenate (map cdr configurations+modules)))
+                              ,@((compose delete-duplicates concatenate)
+                                 (map cdr configurations+modules)))
                  ,(home-environment-template
                    #:specs specs
                    #:services (map first configurations+modules))))
@@ -190,7 +191,8 @@ available."
                               (gnu home)
                               (gnu packages)
                               (gnu services)
-                              ,@(concatenate (map cdr configurations+modules)))
+                              ,@((compose delete-duplicates concatenate)
+                                 (map cdr configurations+modules)))
 
                  ,@transformations