nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

derivations: Fix 'fixed-output-derivation?'. 

Reported by Nikita Karetnikov <nikita@karetnikov.org>.

* guix/derivations.scm (fixed-output-derivation?): Fix pattern.
* tests/derivations.scm ("fixed-output-derivation?"): Add test.
This commit is contained in:
Ludovic Courtès 2014-04-13 00:42:07 +02:00
parent c5cd288bc7
commit 99e17dc927
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/derivations.scm
View File

@ -121,7 +121,7 @@
download with a fixed hash (aka. `fetchurl')." download with a fixed hash (aka. `fetchurl')."
(match drv (match drv
(($ <derivation> (($ <derivation>
(($ <derivation-output> _ (? symbol?) (? string?)))) (("out" . ($ <derivation-output> _ (? symbol?) (? bytevector?)))))
#t) #t)
(_ #f))) (_ #f)))

10
tests/derivations.scm
View File

@ -159,6 +159,16 @@
;; the contents. ;; the contents.
(valid-path? %store (derivation->output-path drv))))) (valid-path? %store (derivation->output-path drv)))))
(test-assert "fixed-output-derivation?"
(let* ((builder (add-text-to-store %store "my-fixed-builder.sh"
"echo -n hello > $out" '()))
(hash (sha256 (string->utf8 "hello")))
(drv (derivation %store "fixed"
%bash `(,builder)
#:inputs `((,builder))
#:hash hash #:hash-algo 'sha256)))
(fixed-output-derivation? drv)))
(test-assert "fixed-output derivation" (test-assert "fixed-output derivation"
(let* ((builder (add-text-to-store %store "my-fixed-builder.sh" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh"
"echo -n hello > $out" '())) "echo -n hello > $out" '()))