From 749c6567554c1da258992173f66fb41d8511f4e3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 9 Jun 2012 18:49:19 +0200 Subject: Add support for fixed-output derivations. * guix/derivations.scm (read-derivation)[outputs->alist]: For fixed-outputs, convert HASH with `base16-string->bytevector'. (write-derivation): Likewise, convert HASH-ALGO to a string and HASH to a base16 string. (derivation-hash): Expect HASH to be a bytevector, not a string; convert HASH with `bytevector->base16-string'. * tests/derivations.scm ("fixed-output derivation"): New test. --- tests/derivations.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'tests') diff --git a/tests/derivations.scm b/tests/derivations.scm index ff766cf175..06001078c5 100644 --- a/tests/derivations.scm +++ b/tests/derivations.scm @@ -25,6 +25,7 @@ #:use-module (srfi srfi-26) #:use-module (srfi srfi-64) #:use-module (rnrs io ports) + #:use-module (rnrs bytevectors) #:use-module (ice-9 rdelim)) (define %store @@ -68,6 +69,20 @@ (string=? (call-with-input-file path read-line) "hello, world"))))) +(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-path (derivation %store "fixed" "x86_64-linux" + "/bin/sh" `(,builder) + '() `((,builder)) + #:hash hash #:hash-algo 'sha256)) + (succeeded? (build-derivations %store (list drv-path)))) + (and succeeded? + (let ((p (derivation-path->output-path drv-path))) + (equal? (string->utf8 "hello") + (call-with-input-file p get-bytevector-all)))))) + (define %coreutils (false-if-exception (nixpkgs-derivation "coreutils"))) -- cgit 1.4.1