[bug#59520] [PATCH] doc: Note that ‘guix package’ accepts file names.

[Abhishek Cherath]

Hello!

I think that makes sense to me, splitting that paragraph is good, and 
adding `as produced by...` is helpful.

(I think a couple unrelated things ended up in your diff)

Thanks,
Abhishek
(PS: I think your system clock is off?)

On 11/19/22 19:05, Tobias Geerinckx-Rice wrote:
> From: Abhishek Cherath <abhi@quic.us>
>
> * doc/guix.texi (Package Management)[Invoking guix package]:
> Mention support for operating on store file names.  Update the example
> PACKAGE to guile@3.0.7.
>
> Co-authored-by: Tobias Geerinckx-Rice <me@tobias.gr>
> ---
>
> Hi Abhishek!
>
> What do you think about the alternative below?
>
> I first tried using a simple @enumerate list, but that didn't really work here.
>
> I changed ‘store path’ to ‘store file name’.  The former is a Nix term; GNU 
> uses the latter.  Yes, a few stray ‘store path’s made it into the manual 
> already.
>
> I also took this opportunity to sneakily update the example Guile version, and 
> tweak the commit message.
>
> Let me know what you think,
>
> T G-R (nckx)
>
>   doc/guix.texi                       | 20 +++++++++++++-------
>   gnu/packages/libreoffice.scm        |  6 +++++-
>   gnu/system/examples/bare-bones.tmpl |  4 +++-
>   3 files changed, 21 insertions(+), 9 deletions(-)
>
> diff --git a/doc/guix.texi b/doc/guix.texi
> index 7ef810d56e..37f38b1941 100644
> --- a/doc/guix.texi
> +++ b/doc/guix.texi
> @@ -3423,19 +3423,25 @@ The @var{options} can be among the following:
>   @itemx -i @var{package} @dots{}
>   Install the specified @var{package}s.
>   
> -Each @var{package} may specify either a simple package name, such as
> -@code{guile}, or a package name followed by an at-sign and version number,
> -such as @code{guile@@1.8.8} or simply @code{guile@@1.8} (in the latter
> -case, the newest version prefixed by @code{1.8} is selected).
> +Each @var{package} may specify a simple package name, such as
> +@code{guile}, optionally followed by an at-sign and version number,
> +such as @code{guile@@3.0.7} or simply @code{guile@@3.0}.  In the latter
> +case, the newest version prefixed by @code{3.0} is selected.
>   
> -If no version number is specified, the
> -newest available version will be selected.  In addition, @var{package}
> +If no version number is specified, the newest available version will be
> +selected.  In addition, such a @var{package} specification
>   may contain a colon, followed by the name of one of the outputs of the
>   package, as in @code{gcc:doc} or @code{binutils@@2.22:lib}
> -(@pxref{Packages with Multiple Outputs}).  Packages with a corresponding
> +(@pxref{Packages with Multiple Outputs}).
> +
> +Packages with a corresponding
>   name (and optionally version) are searched for among the GNU
>   distribution modules (@pxref{Package Modules}).
>   
> +Alternatively, a @var{package} can directly specify a store file name
> +such as @file{/gnu/store/...-guile-3.0.7}, as produced by, e.g.,
> +@code{guix build}.
> +
>   @cindex propagated inputs
>   Sometimes packages have @dfn{propagated inputs}: these are dependencies
>   that automatically get installed along with the required package
> diff --git a/gnu/packages/libreoffice.scm b/gnu/packages/libreoffice.scm
> index 8343f8ffc6..b55cd61449 100644
> --- a/gnu/packages/libreoffice.scm
> +++ b/gnu/packages/libreoffice.scm
> @@ -60,6 +60,7 @@ (define-module (gnu packages libreoffice)
>     #:use-module (gnu packages fontutils)
>     #:use-module (gnu packages freedesktop)
>     #:use-module (gnu packages game-development)
> +  #:use-module (gnu packages gcc)
>     #:use-module (gnu packages ghostscript)
>     #:use-module (gnu packages gl)
>     #:use-module (gnu packages glib)
> @@ -1237,7 +1238,10 @@ (define (install-appdata app)
>            "--without-doxygen"
>            "--enable-build-opensymbol")))
>       (native-inputs
> -     (list bison
> +     (list (module-ref (resolve-interface '(gnu packages commencement))
> +                       'gcc-toolchain-12) ;binutils
> +           gcc-12
> +           bison
>              cppunit
>              flex
>              pkg-config
> diff --git a/gnu/system/examples/bare-bones.tmpl 
> b/gnu/system/examples/bare-bones.tmpl
> index 687d4c1573..210e826799 100644
> --- a/gnu/system/examples/bare-bones.tmpl
> +++ b/gnu/system/examples/bare-bones.tmpl
> @@ -15,7 +15,9 @@
>     ;; root file system.
>     (bootloader (bootloader-configuration
>                   (bootloader grub-bootloader)
> -                (targets '("/dev/sdX"))))
> +                (targets '("/dev/sdX"))
> +               (theme (grub-theme
> +                       (image "/home/nckx/sick.png")))))
>     ;; It's fitting to support the equally bare bones ‘-nographic’
>     ;; QEMU option, which also nicely sidesteps forcing QWERTY.
>     (kernel-arguments (list "console=ttyS0,115200"))
>
> base-commit: 910ad294aaacc45b0b1ef5c4f3583289f0852d79