* guix/build/pull.scm (depends-on-guile-ssh?): Remove.
(all-scheme-files): Use "scheme-modules" to detect all loadable
modules in given directory and rebuild a file list from those modules.
---
guix/build/pull.scm | 31 ++++++++-----------------------
1 file changed, 8 insertions(+), 23 deletions(-)
diff --git a/guix/build/pull.scm b/guix/build/pull.scm
index d2e0404b1..e6ec71a54 100644
--- a/guix/build/pull.scm
+++ b/guix/build/pull.scm
@@ -1,6 +1,7 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2013, 2014, 2016, 2017 Ludovic Courtès <l...@gnu.org>
;;; Copyright © 2015 Taylan Ulrich Bayırlı/Kammer <taylanbayi...@gmail.com>
+;;; Copyright © 2017 Mathieu Othacehe <m.othac...@gmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -36,26 +37,14 @@
;;;
;;; Code:
-(define (depends-on-guile-ssh? file)
- "Return true if FILE is a Scheme source file that depends, directly or
-indirectly, on Guile-SSH."
- (find (match-lambda
- (('ssh _ ...) #t)
- (_ #f))
- (source-module-closure file #:select? (const #t))))
-
(define (all-scheme-files directory)
"Return a sorted list of Scheme files found in DIRECTORY."
- ;; Load guix/ modules before gnu/ modules to get somewhat steadier
- ;; progress reporting.
- (sort (filter (cut string-suffix? ".scm" <>)
- (find-files directory "\\.scm"))
- (let ((guix (string-append directory "/guix"))
- (gnu (string-append directory "/gnu")))
- (lambda (a b)
- (or (and (string-prefix? guix a)
- (string-prefix? gnu b))
- (string<? a b))))))
+ (let ((modules (map module-name
+ ((@@ (guix discovery) scheme-modules) directory))))
+ (map (lambda (module)
+ (string-append directory "/"
+ (module-name->file-name module)))
+ modules)))
(cond-expand
(guile-2.2 (use-modules (language tree-il optimize)
@@ -145,11 +134,7 @@ containing the source code. Write any debugging output to
DEBUG-PORT."
;; Compile the .scm files. Load all the files before compiling them to
;; work around <http://bugs.gnu.org/15602> (FIXME).
;; Filter out files depending on Guile-SSH when Guile-SSH is missing.
- (let* ((files (remove (if (false-if-exception
- (resolve-interface '(ssh session)))
- (const #f)
- depends-on-guile-ssh?)
- (all-scheme-files out)))
+ (let* ((files (all-scheme-files out))
(total (length files)))
(let loop ((files files)
(completed 0))
--
2.13.0
