From 26b969dee0d1abb92b44998dc573dad79b76d4cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 9 Jun 2012 18:51:25 +0200
Subject: [PATCH] Add support for fixed-output derivations in
 `build-expression->derivation'.

* guix/derivations.scm (build-expression->derivation): Pass HASH and
  HASH-ALGO to `derivation'.

* tests/derivations.scm ("build-expression->derivation for fixed-output
  derivation"): New test.
---
 guix/derivations.scm  |  3 ++-
 tests/derivations.scm | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/guix/derivations.scm b/guix/derivations.scm
index b7733e9a1a..5897630205 100644
--- a/guix/derivations.scm
+++ b/guix/derivations.scm
@@ -396,4 +396,5 @@ (define %build-inputs
     (derivation store name system guile `("--no-auto-compile" ,builder)
                 '(("HOME" . "/homeless"))
                 `((,(%guile-for-build))
-                  (,builder)))))
+                  (,builder))
+                #:hash hash #:hash-algo hash-algo)))
diff --git a/tests/derivations.scm b/tests/derivations.scm
index 06001078c5..34098d79ca 100644
--- a/tests/derivations.scm
+++ b/tests/derivations.scm
@@ -141,6 +141,29 @@ (define %coreutils
          (let ((p (derivation-path->output-path drv-path)))
            (string-contains (call-with-input-file p read-line) "GNU")))))
 
+(test-skip (if (false-if-exception (getaddrinfo "ftp.gnu.org" "http"))
+               0
+               1))
+
+(test-assert "build-expression->derivation for fixed-output derivation"
+  (let* ((url         "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz")
+         (builder     `(begin
+                         (use-modules (web client) (web uri)
+                                      (rnrs io ports))
+                         (let ((bv (http-get (string->uri ,url)
+                                             #:decode-body? #f)))
+                           (call-with-output-file %output
+                             (lambda (p)
+                               (put-bytevector p bv))))))
+         (drv-path    (build-expression->derivation
+                       %store "hello-2.8.tar.gz" "x86_64-linux" builder '()
+                       #:hash (nix-base32-string->bytevector
+                               "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6")
+                       #:hash-algo 'sha256))
+         (succeeded?  (build-derivations %store (list drv-path))))
+    (and succeeded?
+         (file-exists? (derivation-path->output-path drv-path)))))
+
 (test-end)