diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-09-08 12:11:32 +0200 |
| commit | 8ce3104e0e290b603599ec2e1b86bb82497c2665 (patch) | |
| tree | 9b099435ac4d3aa05439be277a32e19337c07c7a /tests/store.scm | |
| parent | 3409bc0188feb4b00cdd5ec7acc357faa6cad698 (diff) | |
| parent | 6bf25b7b0554e8b569bc4938c4833491aedc742f (diff) | |
| download | guix-8ce3104e0e290b603599ec2e1b86bb82497c2665.tar guix-8ce3104e0e290b603599ec2e1b86bb82497c2665.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'tests/store.scm')
| -rw-r--r-- | tests/store.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tests/store.scm b/tests/store.scm index 3d5d59b991..9625a6b308 100644 --- a/tests/store.scm +++ b/tests/store.scm @@ -80,9 +80,9 @@ ;; (b (add-text-to-store %store "link-builder" ;; (format #f "echo ~a > $out" p1) ;; '())) -;; (d1 (derivation %store "link" (%current-system) -;; "/bin/sh" `("-e" ,b) '() -;; `((,b) (,p1)))) +;; (d1 (derivation %store "link" +;; "/bin/sh" `("-e" ,b) +;; #:inputs `((,b) (,p1)))) ;; (p2 (derivation-path->output-path d1))) ;; (and (add-temp-root %store p2) ;; (build-derivations %store (list d1)) @@ -130,9 +130,10 @@ (s (add-to-store %store "bash" #t "sha256" (search-bootstrap-binary "bash" (%current-system)))) - (d (derivation %store "the-thing" (%current-system) - s `("-e" ,b) `(("foo" . ,(random-text))) - `((,b) (,s)))) + (d (derivation %store "the-thing" + s `("-e" ,b) + #:env-vars `(("foo" . ,(random-text))) + #:inputs `((,b) (,s)))) (o (derivation-path->output-path d))) (and (build-derivations %store (list d)) (equal? (query-derivation-outputs %store d) |