From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id qOUpNI+TfmPrcAAAbAwnHQ (envelope-from ) for ; Wed, 23 Nov 2022 22:41:35 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id cH8ENI+TfmO42AAAauVa8A (envelope-from ) for ; Wed, 23 Nov 2022 22:41:35 +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 6CF6A3DC81 for ; Wed, 23 Nov 2022 22:41:35 +0100 (CET) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oxxUW-0002H4-RQ; Wed, 23 Nov 2022 16:41:14 -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 1oxxUO-0002Go-Pj for guix-patches@gnu.org; Wed, 23 Nov 2022 16:41:05 -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 1oxxUN-0005na-D4 for guix-patches@gnu.org; Wed, 23 Nov 2022 16:41:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oxxUM-0000ZK-Bw for guix-patches@gnu.org; Wed, 23 Nov 2022 16:41: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. References: <20221123183733.3889-1-abhi@quic.us> In-Reply-To: <20221123183733.3889-1-abhi@quic.us> Resent-From: Tobias Geerinckx-Rice Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Nov 2022 21:41: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: 59520@debbugs.gnu.org Cc: Abhishek Cherath Received: via spool by 59520-submit@debbugs.gnu.org id=B59520.16692396212126 (code B ref 59520); Wed, 23 Nov 2022 21:41:02 +0000 Received: (at 59520) by debbugs.gnu.org; 23 Nov 2022 21:40:21 +0000 Received: from localhost ([127.0.0.1]:56450 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxxTg-0000YD-TW for submit@debbugs.gnu.org; Wed, 23 Nov 2022 16:40:21 -0500 Received: from tobias.gr ([80.241.217.52]:56934) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oxxTc-0000Xz-Kb for 59520@debbugs.gnu.org; Wed, 23 Nov 2022 16:40:19 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; s=2018; bh=lyL/miOoM53cg 9+9uAfWCuv/IbV8IKaGr0YUdaXP7SQ=; h=date:subject:cc:to:from; d=tobias.gr; b=XDVa3RfrMjgiQ4lg0D+J7n5+HvalpVXUf3g7O1zgfKKeCNC7UoMDd5j Mo4TEMClJ+fuSacyzIIuhcTOlNAOQlgzEK/MIxMB6psEGMnmDA4Uqdhdn1MD7nVCqaULRA sX4hHMpH2FR2zoq1QeTXv0JpSO+IL9nLEhWPqBimN35WVDdAGHJ1gnyY3ohCx8EiKXBvaV 9gbKvsS+L3rRTj/HVUYjwWS2h9ds7iSO5KjvYTR6P6tKBYZx0jsfWO3CEiS9ki3GkCL36v x/wjl8kkd1k/BKaUjOkSQYl1rcZlAvx7Y8PUI/1+mJEoGuAYdqsxaAB4QXJCCl9wddOaWK uO68XzA== Received: by submission.tobias.gr (OpenSMTPD) with ESMTPSA id dfa17977 (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO); Wed, 23 Nov 2022 21:40:12 +0000 (UTC) Date: Sun, 20 Nov 2022 01:05:40 +0100 Message-Id: <20221120000540.1918-1-me@tobias.gr> X-Mailer: git-send-email 2.38.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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: , Reply-to: Tobias Geerinckx-Rice X-ACL-Warn: , Tobias Geerinckx-Rice via Guix-patches From: Tobias Geerinckx-Rice via Guix-patches via 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=1669239695; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc: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=lyL/miOoM53cg9+9uAfWCuv/IbV8IKaGr0YUdaXP7SQ=; b=by/CEfC7S1TQmrf4moSQd9y7On8gEwS1RjF1d21Ufpr6VqogXLkMtH9If9HZ5ztpWVOosI xcfgUY6SODxr2hZHOOcFUCcd46J7yBlRnIGxuL2XSdHL1kJ6IiSEuG8KVIK7vV5T+JO9ag 9ffh6cIE9h626BBL6uJfePfwIu2L+2RlyONDcOdwYqKOEMbmnP8O2u2tiLW93tHQcuH3x9 bKWZmB9No7mLYgM/Z1MC8VFPDzQ3B+VE2PuVCMRoz5ssLCuduyoQOzechT+U0RkwqK2GXX vCZc99fxJ5+5abeHlWBtFiCP0g1DZ6i88tc5s6327YjfHmNnQwyCx8COSVQyaw== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1669239695; a=rsa-sha256; cv=none; b=D/LCMKzuNlHlvCj5CZWZ6FvhlROIf6mIJy1kzYufW3cXVZ8J3MFgp5EBv6qKr1PfW6+vSH EhKS7Xs8s6jFpwvKLnCNzMOB4h/mVooWHteH1pxlxR3qpJcEsssf9dvdrUART3WcPHokES rNvEQy8SHmDpOzwu4yzcgyer6+2k/ktvArZCwDw8v/GHElDLP9zJ3cpX3zmk81UbsEOgic HnkkC/qL16waWmkvRaw8XGC89Lr1joLh42hSw1Yje+RyawR09XlOwFr1L2zR58qDdCcXjg C4tf9/V77XRkQ7bz/kYYXuLfLhvRV1ISydkVZamfTHR18bC1wqjZ03dMTc/DZA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=XDVa3Rfr; dmarc=pass (policy=none) header.from=gnu.org; 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: -2.99 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=tobias.gr header.s=2018 header.b=XDVa3Rfr; dmarc=pass (policy=none) header.from=gnu.org; 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: 6CF6A3DC81 X-Spam-Score: -2.99 X-Migadu-Scanner: scn0.migadu.com X-TUID: STIzwOFD/4JT 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 -- 2.38.1