aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Nieuwenhuizen <janneke@gnu.org>2018-07-10 19:00:48 +0200
committerJan Nieuwenhuizen <janneke@gnu.org>2018-07-12 06:22:04 +0200
commitf3a422511f793fb6c6cfeec2bb8735965a03294a (patch)
tree118a6969c6b95b652e50d7c5f43b34743c729f04
parent66413378e8eb68ebcfeb1e2f4154a4443dfa21ca (diff)
downloadpatches-f3a422511f793fb6c6cfeec2bb8735965a03294a.tar
patches-f3a422511f793fb6c6cfeec2bb8735965a03294a.tar.gz
store: Add `binary-file'.
* guix/store.scm (binary-file): New function. * doc/guix.texi (The Store Monad): Describe binary-file.
-rw-r--r--doc/guix.texi8
-rw-r--r--guix/store.scm15
2 files changed, 21 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 8026bea356..6900717059 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -27,7 +27,7 @@ Copyright @copyright{} 2016, 2017, 2018 Chris Marusich@*
Copyright @copyright{} 2016, 2017, 2018 Efraim Flashner@*
Copyright @copyright{} 2016 John Darrington@*
Copyright @copyright{} 2016, 2017 Nils Gillmann@*
-Copyright @copyright{} 2016, 2017 Jan Nieuwenhuizen@*
+Copyright @copyright{} 2016, 2017, 2018 Jan Nieuwenhuizen@*
Copyright @copyright{} 2016 Julien Lepiller@*
Copyright @copyright{} 2016 Alex ter Weele@*
Copyright @copyright{} 2017, 2018 Clément Lassieur@*
@@ -4916,6 +4916,12 @@ containing @var{text}, a string. @var{references} is a list of store items that
resulting text file refers to; it defaults to the empty list.
@end deffn
+@deffn {Monadic Procedure} binary-file @var{name} @var{data} [@var{references}]
+Return as a monadic value the absolute file name in the store of the file
+containing @var{data}, a bytevector. @var{references} is a list of store
+items that the resulting binary file refers to; it defaults to the empty list.
+@end deffn
+
@deffn {Monadic Procedure} interned-file @var{file} [@var{name}] @
[#:recursive? #t] [#:select? (const #t)]
Return the name of @var{file} once interned in the store. Use
diff --git a/guix/store.scm b/guix/store.scm
index bac42f2738..cc5c24a77d 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 <ludo@gnu.org>
+;;; Copyright © 2018 Jan Nieuwenhuizen <janneke@gnu.org>
;;;
;;; 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