From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id oLr8LxeYfmMbfgAAbAwnHQ (envelope-from ) for ; Wed, 23 Nov 2022 23:00:55 +0100 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id CIHnLxeYfmNSYwEA9RJhRA (envelope-from ) for ; Wed, 23 Nov 2022 23:00:55 +0100 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 7993DA155 for ; Wed, 23 Nov 2022 23:00:55 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxxnO-00063W-AH; Wed, 23 Nov 2022 17:00:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oxxnK-00061q-Eg for guix-patches@gnu.org; Wed, 23 Nov 2022 17:00:40 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oxxmk-00025S-JR for guix-patches@gnu.org; Wed, 23 Nov 2022 17:00:37 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oxxmk-00014z-CM for guix-patches@gnu.org; Wed, 23 Nov 2022 17:00:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#59520] [PATCH] doc: Note that =?UTF-8?Q?=E2=80=98guix_?= =?UTF-8?Q?package=E2=80=99?= accepts file names. Resent-From: Abhishek Cherath Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Nov 2022 22:00:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 59520 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Tobias Geerinckx-Rice , 59520@debbugs.gnu.org Received: via spool by 59520-submit@debbugs.gnu.org id=B59520.16692407564067 (code B ref 59520); Wed, 23 Nov 2022 22:00:02 +0000 Received: (at 59520) by debbugs.gnu.org; 23 Nov 2022 21:59:16 +0000 Received: from localhost ([127.0.0.1]:56469 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxxlz-00013W-B4 for submit@debbugs.gnu.org; Wed, 23 Nov 2022 16:59:16 -0500 Received: from mta-13-3.privateemail.com ([198.54.118.204]:2930) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxxlv-00013C-8L for 59520@debbugs.gnu.org; Wed, 23 Nov 2022 16:59:12 -0500 Received: from mta-13.privateemail.com (localhost [127.0.0.1]) by mta-13.privateemail.com (Postfix) with ESMTP id 86F4C18000BB; Wed, 23 Nov 2022 16:59:01 -0500 (EST) Received: from [10.42.9.143] (unknown [208.252.28.138]) by mta-13.privateemail.com (Postfix) with ESMTPA id 274BD18000BA; Wed, 23 Nov 2022 16:59:00 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=quic.us; s=default; t=1669240741; bh=L6iHSiR0ez7/4WbF3MDbD1nQkYJjRK953pO73B2OdJg=; h=Date:Subject:To:References:From:In-Reply-To:From; b=edQ01xac/tzZ/aJgv0Q+LEN75f/kY0iiGm7h/yWFBu2tv24CysCdVTJzQzvYRgAKf ulFHnR3k1tb+oCheIB1mL6UAASTR9MN+LR0W2no8YmNnUwwe4fh29AgsGs2AlaZHbR vTRQjs0iEvPg5iGVt0jYUkQYt21i7QWMc28BUDe6UYA8Lv/oH4dwSZAVhq8m4GTZNF Kz1xS0Jeone/BGWOWNOC6hN95+543GNB1A2leUIZoDDffUVnF6Jqm4D5H1UQqwyJDX A/yjB1OQjGgwEfitduhGQdihkoOP+AjYKePORSw4HuLDQ0RA4k4Q1gXBNt5ZBXV7sg Gu9pgssWmuHrg== Message-ID: <0091e21d-d436-ea67-cf1f-3ced7a282f67@quic.us> Date: Wed, 23 Nov 2022 16:58:58 -0500 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.4.2 Content-Language: en-US References: <20221120000540.1918-1-me@tobias.gr> From: Abhishek Cherath In-Reply-To: <20221120000540.1918-1-me@tobias.gr> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Virus-Scanned: ClamAV using ClamSMTP X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1669240855; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=PfXKQ2qdDyF7CjpJwxC1n12fgmNbXOhLW1dzl2STByw=; b=mzBbZ6Taotdsa+ZA7fWS2PW3J3IEdWqv2lCN8HnhEbEnwoJejH0aGun24UwQnw7XNnZa1p QwUSeJz1HbM3QmOEAqnd6z0pWhytqhOlVD2QYNHi71vJB4PHQxtWGkjCmi84po3Chy5FBE bPqc6YH3QpdRJ0DvZ39BZPh3Q9uQTTuSDxhz2dSw8X7pp/TUf+VRMr90fMS+A51g09jzG8 6hfrYngV3ZUWzIWsjR5s0E9E5u84xvPA8vtH++Pxg//OLINRAwU1luOWDaHJS9rTz4Wixo ZjfkjDnbhs1I/P/YDJBs6rmCxqwp3gYKamb9s2wbKxNu+eHFenpqlytmqMDbFA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669240855; a=rsa-sha256; cv=none; b=lqhOIMC1dSAGzPdzVuEqnrARqkuSAeJth1pfLnbAQbCM80EyVQQCcq9CKjA593exsQfwwr MVfQjS1amkNF1WfKXpJC1M/p+xaK+werT2XAazuZoSlOdu5DBSSe2TXPlNPe7bYYwXsdBU dhvYqam1lr53g/0LN7bMVq37TL18WXWHteQktX2DbU2jl3NNkhHcoJ7kFGA+oCZMxqdCDS lY41E+o5gW7nlzyedUtwkaF6XWJ37RKq4JGFCmY8nuo7Hgac241c6PnFOwo9p3AOO1xtVq Q6u9ERqKvAytLpSdI/AVTQohkgjIWdQ3pkHCD2gWWJs2+Uv00Zwq3f18UuXRGA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=quic.us header.s=default header.b=edQ01xac; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 1.30 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=quic.us header.s=default header.b=edQ01xac; dmarc=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: 7993DA155 X-Spam-Score: 1.30 X-Migadu-Scanner: scn0.migadu.com X-TUID: Dw4V5lv9dySN 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 > > * 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 > --- > > 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