diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2016-06-27 09:30:01 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2016-06-27 09:30:01 +0200 |
| commit | 01497dfe6c0a2ce69287d0fd0008747965a000df (patch) | |
| tree | f7f6f53baf6e81a8bce26144c550da3bf4b9df5c /gnu/packages.scm | |
| parent | 74c8b174e8015de753ba5cab44f76f944e6fd4ba (diff) | |
| download | guix-01497dfe6c0a2ce69287d0fd0008747965a000df.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages.scm')
| -rw-r--r-- | gnu/packages.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/packages.scm b/gnu/packages.scm index 7130f58fdd..9496a270eb 100644 --- a/gnu/packages.scm +++ b/gnu/packages.scm @@ -45,6 +45,7 @@ %package-module-path fold-packages + scheme-modules ;XXX: for lack of a better place find-packages-by-name find-best-packages-by-name @@ -158,8 +159,8 @@ returned list is sorted in alphabetical order." (map string->symbol (string-tokenize (string-drop-right file 4) not-slash))))) -(define* (package-modules directory #:optional sub-directory) - "Return the list of modules that provide packages for the distribution. +(define* (scheme-modules directory #:optional sub-directory) + "Return the list of Scheme modules available under DIRECTORY. Optionally, narrow the search to SUB-DIRECTORY." (define prefix-len (string-length directory)) @@ -184,9 +185,9 @@ search." (fold-right (lambda (spec result) (match spec ((? string? directory) - (append (package-modules directory) result)) + (append (scheme-modules directory) result)) ((directory . sub-directory) - (append (package-modules directory sub-directory) + (append (scheme-modules directory sub-directory) result)))) '() path)) |