diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-16 18:15:28 +0200 |
| commit | 5d904d63f4d43e3f0e4be38c5f5404e029c00a22 (patch) | |
| tree | b2893eceae99c967e0f49cdbfe084f6c7d4767c4 /guix/modules.scm | |
| parent | bab5f3a7f62150ae009e78d03c4b1f5b1646104c (diff) | |
| parent | d0ee11b2f000c3c027fd8370bc2195266398444f (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'guix/modules.scm')
| -rw-r--r-- | guix/modules.scm | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/guix/modules.scm b/guix/modules.scm index 6c602eda48..65928f67f2 100644 --- 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 Ludovic Courtès <ludo@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -25,10 +25,12 @@ #:use-module (ice-9 match) #: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?)) @@ -46,7 +48,8 @@ ;; The error corresponding to a missing module. (define-condition-type &missing-dependency-error &error missing-dependency-error? - (module missing-dependency-module)) + (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." @@ -131,7 +134,8 @@ depends on." (module-file-dependencies file)) (#f (raise (condition (&missing-dependency-error - (module module)))))))) + (module module) + (search-path load-path)))))))) (define* (module-closure modules #:key |