~ruther/guix-local

020f3e41568d4f76544e3e1c10e1d8dd4effc424 — Ludovic Courtès 10 years ago b22755b
gexp: 'local-file' now defaults to non-recursive.

Reported by Alex Kost <alezost@gmail.com>
at <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00235.html>.

* guix/gexp.scm (local-file): Change #:recursive? to default to #f.
* tests/gexp.scm ("one local file", "gexp->derivation, local-file"): Adjust
  calls to 'add-to-store' and 'interned-file' accordingly.
2 files changed, 3 insertions(+), 3 deletions(-)

M guix/gexp.scm
M tests/gexp.scm
M guix/gexp.scm => guix/gexp.scm +1 -1
@@ 157,7 157,7 @@ cross-compiling.)"
  (recursive? local-file-recursive?))             ;Boolean

(define* (local-file file #:optional (name (basename file))
                     #:key (recursive? #t))
                     #:key recursive?)
  "Return an object representing local file FILE to add to the store; this
object can be used in a gexp.  FILE will be added to the store under NAME--by
default the base name of FILE.

M tests/gexp.scm => tests/gexp.scm +2 -2
@@ 101,7 101,7 @@
  (let* ((file  (search-path %load-path "guix.scm"))
         (local (local-file file))
         (exp   (gexp (display (ungexp local))))
         (intd  (add-to-store %store (basename file) #t
         (intd  (add-to-store %store (basename file) #f
                              "sha256" file)))
    (and (gexp? exp)
         (match (gexp-inputs exp)


@@ 360,7 360,7 @@

(test-assertm "gexp->derivation, local-file"
  (mlet* %store-monad ((file ->  (search-path %load-path "guix.scm"))
                       (intd     (interned-file file))
                       (intd     (interned-file file #:recursive? #f))
                       (local -> (local-file file))
                       (exp ->   (gexp (begin
                                         (stat (ungexp local))