From 749c6567554c1da258992173f66fb41d8511f4e3 Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
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.
---
 guix/derivations.scm | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'guix/derivations.scm')

diff --git a/guix/derivations.scm b/guix/derivations.scm
index 7bc14586ba..b7733e9a1a 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -74,7 +74,7 @@ (define-record-type <derivation-output>
   derivation-output?
   (path       derivation-output-path)             ; store path
   (hash-algo  derivation-output-hash-algo)        ; symbol | #f
-  (hash       derivation-output-hash))            ; symbol | #f
+  (hash       derivation-output-hash))            ; bytevector | #f
 
 (define-record-type <derivation-input>
   (make-derivation-input path sub-derivations)
@@ -112,7 +112,8 @@ (define (outputs->alist x)
                                  result))
                     ((name path hash-algo hash)
                      ;; fixed-output
-                     (let ((algo (string->symbol hash-algo)))
+                     (let ((algo (string->symbol hash-algo))
+                           (hash (base16-string->bytevector hash)))
                        (alist-cons name
                                    (make-derivation-output path algo hash)
                                    result)))))
@@ -170,8 +171,10 @@ (define (write-list lst)
      (write-list (map (match-lambda
                        ((name . ($ <derivation-output> path hash-algo hash))
                         (format #f "(~s,~s,~s,~s)"
-                                name path (or hash-algo "")
-                                (or hash ""))))
+                                name path
+                                (or (and=> hash-algo symbol->string) "")
+                                (or (and=> hash bytevector->base16-string)
+                                    ""))))
                       outputs))
      (display "," port)
      (write-list (map (match-lambda
@@ -222,12 +225,13 @@ (define derivation-hash            ; `hashDerivationModulo' in derivations.cc
     "Return the hash of DRV, modulo its fixed-output inputs, as a bytevector."
     (match drv
       (($ <derivation> ((_ . ($ <derivation-output> path
-                                (? symbol? hash-algo) (? string? hash)))))
+                                (? symbol? hash-algo) (? bytevector? hash)))))
        ;; A fixed-output derivation.
        (sha256
         (string->utf8
          (string-append "fixed:out:" (symbol->string hash-algo)
-                        ":" hash ":" path))))
+                        ":" (bytevector->base16-string hash)
+                        ":" path))))
       (($ <derivation> outputs inputs sources
           system builder args env-vars)
        ;; A regular derivation: replace the path of each input with that
-- 
cgit v1.2.3