guix-patches
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#32117] [PATCH 1/2] store: Add `binary-file'.


From: Jan Nieuwenhuizen
Subject: [bug#32117] [PATCH 1/2] store: Add `binary-file'.
Date: Tue, 10 Jul 2018 19:41:27 +0200

* guix/store.scm (binary-file): New function.
* doc/guix.texi (G-Expressions): Describe binary-file*.
---
 doc/guix.texi  |  7 ++++++-
 guix/store.scm | 15 ++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/doc/guix.texi b/doc/guix.texi
index a8e53a530..04d7a79ac 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27,7 +27,7 @@ Copyright @copyright{} 2016, 2017, 2018 Chris address@hidden
 Copyright @copyright{} 2016, 2017, 2018 Efraim address@hidden
 Copyright @copyright{} 2016 John address@hidden
 Copyright @copyright{} 2016, 2017 Nils address@hidden
-Copyright @copyright{} 2016, 2017 Jan address@hidden
+Copyright @copyright{} 2016, 2017, 2018 Jan address@hidden
 Copyright @copyright{} 2016 Julien address@hidden
 Copyright @copyright{} 2016 Alex ter address@hidden
 Copyright @copyright{} 2017, 2018 Clément address@hidden
@@ -5463,6 +5463,11 @@ as in:
 This is the declarative counterpart of @code{text-file*}.
 @end deffn
 
address@hidden {Monadic Procedure} binary-file* @var{name} @var{data} @dots{}
+Return as a monadic value a derivation that builds a text file
+containing @var{data}.  @var{data} is a bytevector.
address@hidden deffn
+
 @deffn {Scheme Procedure} file-union @var{name} @var{files}
 Return a @code{<computed-file>} that builds a directory containing all of 
@var{files}.
 Each item in @var{files} must be a two-element list where the first element is 
the
diff --git a/guix/store.scm b/guix/store.scm
index bac42f273..cc5c24a77 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2012, 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès 
<address@hidden>
+;;; Copyright © 2018 Jan Nieuwenhuizen <address@hidden>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -77,6 +78,7 @@
             add-data-to-store
             add-text-to-store
             add-to-store
+            binary-file
             build-things
             build
             query-failed-paths
@@ -1362,7 +1364,18 @@ taking the store as its first argument."
 ;; Store monad operators.
 ;;
 
-(define* (text-file name text
+(define* (binary-file name
+                      data ;bytevector
+                      #:optional (references '()))
+  "Return as a monadic value the absolute file name in the store of the file
+containing DATA, a bytevector.  REFERENCES is a list of store items that the
+resulting text file refers to; it defaults to the empty list."
+  (lambda (store)
+    (values (add-data-to-store store name data references)
+            store)))
+
+(define* (text-file name
+                    text ;string
                     #:optional (references '()))
   "Return as a monadic value the absolute file name in the store of the file
 containing TEXT, a string.  REFERENCES is a list of store items that the
-- 
2.18.0






reply via email to

[Prev in Thread] Current Thread [Next in Thread]