GNU bug report logs - #32116
Allow bytevector as content of plain-file for binary data.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 32116 in the body.
You can then email your comments to 32116 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Jan Nieuwenhuizen <janneke <at> gnu.org>
To: guix-patches <at> gnu.org
Subject: Allow bytevector as content of plain-file for binary data.
Date: Tue, 10 Jul 2018 19:41:26 +0200

Currently, plain-file does not handle binary content correctly.  As discussed
on IRC[0] I added bytevector support to plain-file.

This allows for using a package source directly from git, doing something like

--8<---------------cut here---------------start------------->8---
(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)))
    ...
    ))
--8<---------------cut here---------------end--------------->8---

Greetings,
janneke

[0] https://gnunet.org/bot/log/guix/2018-07-10#T1763807

Message #12 received at 32116 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jan Nieuwenhuizen <janneke <at> gnu.org>
Cc: 32116 <at> debbugs.gnu.org, 32117 <at> debbugs.gnu.org
Subject: Re: [bug#32117] [PATCH 1/2] store: Add `binary-file'.
Date: Thu, 12 Jul 2018 00:09:33 +0200

Hello,

Jan Nieuwenhuizen <janneke <at> gnu.org> skribis:

> * guix/store.scm (binary-file): New function.
> * doc/guix.texi (G-Expressions): Describe binary-file*.

[...]

> +@deffn {Monadic Procedure} binary-file* @var{name} @var{data} @dots{}

There’s no ‘*’ in the actual procedure name.

Also, could you move this @deffn to “The Store Monad”, right after
‘text-file’?

Apart from that it LGTM, thanks!

Ludo’.

Message #15 received at 32116 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jan Nieuwenhuizen <janneke <at> gnu.org>
Cc: 32116 <at> debbugs.gnu.org, 32117 <at> debbugs.gnu.org
Subject: Re: [bug#32117] [PATCH 1/2] store: Add `binary-file'.
Date: Thu, 12 Jul 2018 00:09:54 +0200

Hello,

Jan Nieuwenhuizen <janneke <at> gnu.org> skribis:

> * guix/store.scm (binary-file): New function.
> * doc/guix.texi (G-Expressions): Describe binary-file*.

[...]

> +@deffn {Monadic Procedure} binary-file* @var{name} @var{data} @dots{}

There’s no ‘*’ in the actual procedure name.

Also, could you move this @deffn to “The Store Monad”, right after
‘text-file’?

Apart from that it LGTM, thanks!

Ludo’.

Message #18 received at 32116 <at> debbugs.gnu.org (full text, mbox):

From: ludo <at> gnu.org (Ludovic Courtès)
To: Jan Nieuwenhuizen <janneke <at> gnu.org>
Cc: 32116 <at> debbugs.gnu.org, 32118 <at> debbugs.gnu.org
Subject: Re: [bug#32118] [PATCH 2/2] gexp: Allow bytevector as content of
 `plain-file'.
Date: Thu, 12 Jul 2018 00:11:31 +0200

Jan Nieuwenhuizen <janneke <at> gnu.org> skribis:

> 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.

LGTM, thanks!

Ludo'.

Message #23 received at 32116-done <at> debbugs.gnu.org (full text, mbox):

From: Jan Nieuwenhuizen <janneke <at> gnu.org>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 32116-done <at> debbugs.gnu.org, 32117-done <at> debbugs.gnu.org
Subject: Re: [bug#32117] [PATCH 1/2] store: Add `binary-file'.
Date: Thu, 12 Jul 2018 06:30:31 +0200

Ludovic Courtès writes:

>> +@deffn {Monadic Procedure} binary-file* @var{name} @var{data} @dots{}
>
> There’s no ‘*’ in the actual procedure name.
>
> Also, could you move this @deffn to “The Store Monad”, right after
> ‘text-file’?

Ah, I based this on the `text-file*' description!  Moved, and rewritten
as

@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

> Apart from that it LGTM, thanks!

Pushed to master as  f3a422511f793fb6c6cfeec2bb8735965a03294a

janneke

-- 
Jan Nieuwenhuizen <janneke <at> gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Message #36 received at 32116-done <at> debbugs.gnu.org (full text, mbox):

From: Jan Nieuwenhuizen <janneke <at> gnu.org>
To: ludo <at> gnu.org (Ludovic Courtès)
Cc: 32116-done <at> debbugs.gnu.org, 32118-done <at> debbugs.gnu.org
Subject: Re: [bug#32118] [PATCH 2/2] gexp: Allow bytevector as content of
 `plain-file'.
Date: Thu, 12 Jul 2018 06:31:38 +0200

Ludovic Courtès writes:

>> * 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.
>
> LGTM, thanks!

Pushed to master as e8e1f295f15fa56660a2c460d422795b1a31bed8

janneke

-- 
Jan Nieuwenhuizen <janneke <at> gnu.org> | GNU LilyPond http://lilypond.org
Freelance IT http://JoyofSource.com | Avatar® http://AvatarAcademy.com

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.