WIP: bees service

[jackhill/guix/guix.git] / guix / modules.scm

diff --git a/guix/modules.scm b/guix/modules.scm
index 24b5903..61bc8e1 100644 (file)
--- a/guix/modules.scm
+++ b/guix/modules.scm
@@ -1,5 +1,5 @@
 ;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2016, 2017, 2018, 2019, 2021 Ludovic Courtès <ludo@gnu.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -20,8 +20,18 @@
   #:use-module (guix memoization)
   #:use-module (guix sets)
   #:use-module (srfi srfi-26)
+  #:use-module (srfi srfi-34)
+  #:use-module (srfi srfi-35)
   #:use-module (ice-9 match)
-  #:export (source-module-closure
+  #:export (missing-dependency-error?
+            missing-dependency-module
+            missing-dependency-search-path
+
+            file-name->module-name
+            module-name->file-name
+
+            source-module-dependencies
+            source-module-closure
             live-module-closure
             guix-module-name?))
 
@@ -35,6 +45,12 @@
 ;;;
 ;;; Code:
 
+;; The error corresponding to a missing module.
+(define-condition-type &missing-dependency-error &error
+  missing-dependency-error?
+  (module      missing-dependency-module)
+  (search-path missing-dependency-search-path))
+
 (define (colon-symbol? obj)
   "Return true if OBJ is a symbol that starts with a colon."
   (and (symbol? obj)
@@ -61,7 +77,7 @@ CLAUSES."
       ((#:autoload module _ rest ...)
        (loop rest (cons module result)))
       (((or #:export #:re-export #:export-syntax #:re-export-syntax
-            #:replace #:version)
+            #:re-export-and-replace #:replace #:version)
         _ rest ...)
        (loop rest result))
       (((or #:pure #:no-backtrace) rest ...)
@@ -83,13 +99,20 @@ depends on."
           (_
            '()))))))
 
+(define file-name->module-name
+  (let ((not-slash (char-set-complement (char-set #\/))))
+    (lambda (file)
+      "Return the module name (a list of symbols) corresponding to FILE."
+      (map string->symbol
+           (string-tokenize (string-drop-right file 4) not-slash)))))
+
 (define (module-name->file-name module)
   "Return the file name for MODULE."
   (string-append (string-join (map symbol->string module) "/")
                  ".scm"))
 
 (define (guix-module-name? name)
-  "Return true if NAME (a list of symbols) denotes a Guix or GuixSD module."
+  "Return true if NAME (a list of symbols) denotes a Guix module."
   (match name
     (('guix _ ...) #t)
     (('gnu _ ...) #t)
@@ -106,9 +129,13 @@ depends on."
   "Return the modules used by MODULE by looking at its source code."
   (if (member module %source-less-modules)
       '()
-      (module-file-dependencies
-       (search-path load-path
-                    (module-name->file-name module)))))
+      (match (search-path load-path (module-name->file-name module))
+        ((? string? file)
+         (module-file-dependencies file))
+        (#f
+         (raise (condition (&missing-dependency-error
+                            (module module)
+                            (search-path load-path))))))))
 
 (define* (module-closure modules
                          #:key