me
/
guix
Archived
1
0
Fork 0
Code

store: Add `query-path-hash'. 

* guix/store.scm (write-arg, read-arg): Add `base16' literal and
  corresponding rule.
  (query-path-hash): New operation.

* tests/derivations.scm ("fixed-output derivation"): Check whether
  `query-path-hash' returns a bytevector.
master
Ludovic Courtès 2012-10-24 17:03:45 +02:00
parent e6cc3d8654
commit 82058eff59
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
guix/store.scm
View File

@ -17,6 +17,7 @@
;;; along with Guix. If not, see <http://www.gnu.org/licenses/>. ;;; along with Guix. If not, see <http://www.gnu.org/licenses/>.
(define-module (guix store) (define-module (guix store)
#:use-module (guix utils)
#:use-module (rnrs bytevectors) #:use-module (rnrs bytevectors)
#:use-module (rnrs io ports) #:use-module (rnrs io ports)
#:use-module (srfi srfi-1) #:use-module (srfi srfi-1)
@ -44,6 +45,7 @@
close-connection close-connection
set-build-options set-build-options
valid-path? valid-path?
query-path-hash
add-text-to-store add-text-to-store
add-to-store add-to-store
build-derivations build-derivations
@ -217,7 +219,7 @@
(write-string ")" p)))) (write-string ")" p))))
(define-syntax write-arg (define-syntax write-arg
(syntax-rules (integer boolean file string string-list) (syntax-rules (integer boolean file string string-list base16)
((_ integer arg p) ((_ integer arg p)
(write-int arg p)) (write-int arg p))
((_ boolean arg p) ((_ boolean arg p)
@ -227,10 +229,12 @@
((_ string arg p) ((_ string arg p)
(write-string arg p)) (write-string arg p))
((_ string-list arg p) ((_ string-list arg p)
(write-string-list arg p)))) (write-string-list arg p))
((_ base16 arg p)
(write-string (bytevector->base16-string arg) p))))
(define-syntax read-arg (define-syntax read-arg
(syntax-rules (integer boolean string store-path) (syntax-rules (integer boolean string store-path base16)
((_ integer p) ((_ integer p)
(read-int p)) (read-int p))
((_ boolean p) ((_ boolean p)
@ -238,7 +242,9 @@
((_ string p) ((_ string p)
(read-string p)) (read-string p))
((_ store-path p) ((_ store-path p)
(read-store-path p)))) (read-store-path p))
((_ hash p)
(base16-string->bytevector (read-string p)))))
;; remote-store.cc ;; remote-store.cc
@ -391,6 +397,10 @@ again until #t is returned or an error is raised."
"Return #t when PATH is a valid store path." "Return #t when PATH is a valid store path."
boolean) boolean)
(define-operation (query-path-hash (string path))
"Return the SHA256 hash of PATH as a bytevector."
base16)
(define-operation (add-text-to-store (string name) (string text) (define-operation (add-text-to-store (string name) (string text)
(string-list references)) (string-list references))
"Add TEXT under file NAME in the store." "Add TEXT under file NAME in the store."

5
tests/derivations.scm
View File

@ -124,8 +124,9 @@
(succeeded? (build-derivations %store (list drv-path)))) (succeeded? (build-derivations %store (list drv-path))))
(and succeeded? (and succeeded?
(let ((p (derivation-path->output-path drv-path))) (let ((p (derivation-path->output-path drv-path)))
(equal? (string->utf8 "hello") (and (equal? (string->utf8 "hello")
(call-with-input-file p get-bytevector-all)))))) (call-with-input-file p get-bytevector-all))
(bytevector? (query-path-hash %store p)))))))
(test-assert "multiple-output derivation" (test-assert "multiple-output derivation"
(let* ((builder (add-text-to-store %store "my-fixed-builder.sh" (let* ((builder (add-text-to-store %store "my-fixed-builder.sh"