02/02: gexp: Allow bytevector as content of `plain-file'.

[Jan Nieuwenhuizen]

janneke pushed a commit to branch master
in repository guix.

commit e8e1f295f15fa56660a2c460d422795b1a31bed8
Author: Jan Nieuwenhuizen <address@hidden>
Date:   Tue Jul 10 19:06:32 2018 +0200

    gexp: Allow bytevector as content of `plain-file'.
    
    This allows for using a package source directly from git, doing something 
like
    
        (define (command->bytevector command)
          (let ((port (apply open-pipe* OPEN_READ command)))
            (let ((output (get-bytevector-all port)))
              (close-port port)
              output)))
    
        (define-public hello-git
          (package
            (name "hello")
            (version "git")
            (source (let* ((commit "stable-2.0")
                           (content (command->bytevector
                                     `("git" "archive" "--format" "tar" 
"--prefix"
                                       ,(string-append commit "/") ,commit)))
                           (file-name (string-append "hello-" commit)))
                      (plain-file file-name content)))
            ...
            ))
    
    * guix/gexp.scm (<plain-file>): Also allow bytevector content.
    (plain-file-compiler): Handle bytevector content.
    * doc/guix.texi (G-Expressions): Describe plain-file now also taking
    bytevectors.
---
 doc/guix.texi |  2 +-
 guix/gexp.scm | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index 6900717..8b286e9 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -5355,7 +5355,7 @@ procedure (@pxref{The Store Monad, @code{interned-file}}).
 
 @deffn {Scheme Procedure} plain-file @var{name} @var{content}
 Return an object representing a text file called @var{name} with the given
address@hidden (a string) to be added to the store.
address@hidden (a string or a bytevector) to be added to the store.
 
 This is the declarative counterpart of @code{text-file}.
 @end deffn
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 153b29b..cc3613f 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <address@hidden>
 ;;; Copyright © 2018 Clément Lassieur <address@hidden>
+;;; Copyright © 2018 Jan Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -23,6 +24,7 @@
   #:use-module (guix derivations)
   #:use-module (guix grafts)
   #:use-module (guix utils)
+  #:use-module (rnrs bytevectors)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu)
@@ -334,7 +336,7 @@ appears."
   (%plain-file name content references)
   plain-file?
   (name        plain-file-name)                   ;string
-  (content     plain-file-content)                ;string
+  (content     plain-file-content)                ;string or bytevector
   (references  plain-file-references))            ;list (currently unused)
 
 (define (plain-file name content)
@@ -349,8 +351,10 @@ This is the declarative counterpart of 'text-file'."
 (define-gexp-compiler (plain-file-compiler (file <plain-file>) system target)
   ;; "Compile" FILE by adding it to the store.
   (match file
-    (($ <plain-file> name content references)
-     (text-file name content references))))
+    (($ <plain-file> name (and (? string?) content) references)
+     (text-file name content references))
+    (($ <plain-file> name (and (? bytevector?) content) references)
+     (binary-file name content references))))
 
 (define-record-type <computed-file>
   (%computed-file name gexp guile options)