From bdf422176739b473add66eb8cac9fdd8c654f794 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 19 Jun 2022 15:28:19 +0200 Subject: refresh: Repurpose '-L' for '--load-path'. This incompatible change fixes an inconsistency with other commands where '-L' is short for '--load-path'. * guix/scripts/refresh.scm (%options): Add --load-path option from %STANDARD-BUILD-OPTIONS. Remove #\L shortcut for --list-updaters, and remove --load-path option that lacked the #\L shortcut. (show-help): Update accordingly. * doc/guix.texi (Invoking guix refresh): Update accordingly. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 43a5fc85bd..bbb7d0764d 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -13715,7 +13715,6 @@ gnu/packages/emacs.scm:856:13: emacs-auctex would be upgraded from 11.88.6 to 11 @end example @item --list-updaters -@itemx -L List available updaters and exit (see @option{--type} above). For each updater, display the fraction of packages it covers; at the @@ -13846,6 +13845,7 @@ the user whether to download it or not. This is the default behavior. Use @var{host} as the OpenPGP key server when importing a public key. @item --load-path=@var{directory} +@itemx -L @var{directory} Add @var{directory} to the front of the package module search path (@pxref{Package Modules}). -- cgit v1.2.3 From 054937f17d2de8c1e912113c32e4c1c071448dfc Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jun 2022 17:43:40 +0200 Subject: doc: Remove trailing #t in example. * doc/guix.texi (Build Phases): Remove trailing #t in example. --- doc/guix.texi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index bbb7d0764d..9f3f1e39a4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -9704,8 +9704,7 @@ phase before the @code{build} phase, called (substitute* "Makefile" (("PREFIX =.*") (string-append "PREFIX = " - out "\n"))) - #true)))))))) + out "\n"))))))))))) @end lisp The new phase that is inserted is written as an anonymous procedure, -- cgit v1.2.3 From 2327bf41d97fa92c078d0eeeec4f2729ade33105 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 23 Jun 2022 18:02:11 +0200 Subject: doc: Expound description of the 'arguments' field. * doc/guix.texi (package Reference): Augment description of the 'arguments' field. --- doc/guix.texi | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 9f3f1e39a4..874dab1597 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -7379,8 +7379,25 @@ The build system that should be used to build the package (@pxref{Build Systems}). @item @code{arguments} (default: @code{'()}) -The arguments that should be passed to the build system. This is a -list, typically containing sequential keyword-value pairs. +The arguments that should be passed to the build system (@pxref{Build +Systems}). This is a list, typically containing sequential +keyword-value pairs, as in this example: + +@lisp +(package + (name "example") + ;; several fields omitted + (arguments + (list #:tests? #f ;skip tests + #:make-flags #~'("VERBOSE=1") ;pass flags to 'make' + #:configure-flags #~'("--enable-frobbing")))) +@end lisp + +The exact set of supported keywords depends on the build system +(@pxref{Build Systems}), but you will find that almost all of them honor +@code{#:configure-flags}, @code{#:make-flags}, @code{#:tests?}, and +@code{#:phases}. The @code{#:phases} keyword in particular lets you +modify the set of build phases for your package (@pxref{Build Phases}). @item @code{inputs} (default: @code{'()}) @itemx @code{native-inputs} (default: @code{'()}) -- cgit v1.2.3 From 3cdfad5cd8c501de6357ef80704f1369533fbe56 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Thu, 23 Jun 2022 16:49:02 -0400 Subject: doc: Fix typo. * doc/guix.texi (Networking Setup): Fix typo. --- doc/guix.texi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 874dab1597..650072937a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -18706,7 +18706,7 @@ starting with static network configuration. This is the type for statically-configured network interfaces. Its value must be a list of @code{static-networking} records. Each of them declares a set of @dfn{addresses}, @dfn{routes}, and @dfn{links}, as -show below. +shown below. @cindex network interface controller (NIC) @cindex NIC, networking interface controller -- cgit v1.2.3 From 3e7b6dd149456f91b1b12e6da6812fcce2612b18 Mon Sep 17 00:00:00 2001 From: swedebugia Date: Sun, 11 Nov 2018 10:28:23 +0100 Subject: doc: Fix formatting of notes in multiple sections. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * doc/guix.texi (Instantiating the system): Add suggestion to keep config.scm under version control. (Printing Services, Messaging Services) (Telephony Services, Invoking guix system): Use "@quotation Note" for notes. Co-authored-by: Ludovic Courtès --- doc/guix.texi | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 650072937a..f3b026333e 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -15837,6 +15837,11 @@ file, the @command{guix system reconfigure my-system-config.scm} command instantiates that configuration, and makes it the default GRUB boot entry (@pxref{Invoking guix system}). +@quotation Note +We recommend that you keep this @file{my-system-config.scm} file safe +and under version control to easily track changes to your configuration. +@end quotation + The normal way to change the system configuration is by updating this file and re-running @command{guix system reconfigure}. One should never have to touch files in @file{/etc} or to run commands that modify the @@ -21112,9 +21117,11 @@ You can do that directly, like this (you need to use the (list cups-filters epson-inkjet-printer-escpr hplip-minimal)))) @end lisp -Note: If you wish to use the Qt5 based GUI which comes with the hplip +@quotation Note +If you wish to use the Qt5 based GUI which comes with the hplip package then it is suggested that you install the @code{hplip} package, either in your OS configuration file or as your user. +@end quotation The available configuration parameters follow. Each parameter definition is preceded by its type; for example, @samp{string-list foo} @@ -25595,13 +25602,15 @@ example if you want your users to have addresses like @samp{"john.smith@@example.com"} then you need to add a host @samp{"example.com"}. All options in this list will apply only to this host. -Note: the name @emph{virtual} host is used in configuration to avoid confusion with +@quotation Note +The name @emph{virtual} host is used in configuration to avoid confusion with the actual physical host that Prosody is installed on. A single Prosody instance can serve many domains, each one defined as a VirtualHost entry in Prosody's configuration. Conversely a server that hosts a single domain would have just one VirtualHost entry. See @url{https://prosody.im/doc/configure#virtual_host_settings}. +@end quotation Available @code{virtualhost-configuration} fields are: @@ -26202,8 +26211,10 @@ After setting this option, it is recommend that you inspect your Mumble server log to ensure that Mumble is using the cipher suites that you expected it to. -Note: Changing this option may impact the backwards compatibility of your +@quotation Note +Changing this option may impact the backwards compatibility of your Mumble-Server server, and can remove the ability for older Mumble clients to be able to connect to it. +@end quotation @item @code{public-registration} (default: @code{#f}) Must be a @code{} @@ -37578,6 +37589,10 @@ $ guix system extension-graph @var{file} | xdot - shows the extension relations among services. +@quotation Note +The @command{dot} program is provided by the @code{graphviz} package. +@end quotation + @anchor{system-shepherd-graph} @item shepherd-graph Emit to standard output the @dfn{dependency -- cgit v1.2.3 From 6505f727e1824391b888dd0c2c60cf64ec66955a Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sat, 18 Jun 2022 22:59:22 +0200 Subject: services: configuration: Remove 'validate-configuration'. Now that configuration records use the 'sanitize' property for each field, 'validate-configuration' has become useless because it's impossible to construct an invalid configuration record. * gnu/services/configuration.scm (validate-configuration): Remove. * gnu/services/mail.scm (dovecot-service): Remove call. * gnu/services/vpn.scm (openvpn-client-service) (openvpn-server-service): Likewise. * doc/guix.texi (Complex Configurations): Remove documentation. --- doc/guix.texi | 6 ------ gnu/services/configuration.scm | 9 --------- gnu/services/mail.scm | 4 ---- gnu/services/vpn.scm | 2 -- 4 files changed, 21 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index f3b026333e..794907ce3a 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -38917,12 +38917,6 @@ Return a G-expression that contains the values corresponding to the disk by using something like @code{mixed-text-file}. @end deffn -@deffn {Scheme Procedure} validate-configuration @var{configuration} -@var{fields} -Type-check @var{fields}, a list of field names of @var{configuration}, a -configuration record created by @code{define-configuration}. -@end deffn - @deffn {Scheme Procedure} empty-serializer @var{field-name} @var{value} A serializer that just returns an empty string. The @code{serialize-package} procedure is an alias for this. diff --git a/gnu/services/configuration.scm b/gnu/services/configuration.scm index c39ea5a02a..e3c101d042 100644 --- a/gnu/services/configuration.scm +++ b/gnu/services/configuration.scm @@ -57,7 +57,6 @@ (define-module (gnu services configuration) serialize-configuration define-maybe define-maybe/no-serialization - validate-configuration generate-documentation configuration->documentation empty-serializer @@ -125,14 +124,6 @@ (define (serialize-configuration config fields) ((configuration-field-getter field) config))) fields))) -(define (validate-configuration config fields) - (for-each (lambda (field) - (let ((val ((configuration-field-getter field) config))) - (unless ((configuration-field-predicate field) val) - (configuration-field-error - (configuration-field-name field) val)))) - fields)) - (define-syntax-rule (id ctx parts ...) "Assemble PARTS into a raw (unhygienic) identifier." (datum->syntax ctx (symbol-append (syntax->datum parts) ...))) diff --git a/gnu/services/mail.scm b/gnu/services/mail.scm index c2fd4d8670..10e6523861 100644 --- a/gnu/services/mail.scm +++ b/gnu/services/mail.scm @@ -1610,10 +1610,6 @@ (define* (dovecot-service #:key (config (dovecot-configuration))) by @code{dovecot-configuration}. @var{config} may also be created by @code{opaque-dovecot-configuration}, which allows specification of the @code{dovecot.conf} as a string." - (validate-configuration config - (if (opaque-dovecot-configuration? config) - opaque-dovecot-configuration-fields - dovecot-configuration-fields)) (service dovecot-service-type config)) ;; A little helper to make it easier to document all those fields. diff --git a/gnu/services/vpn.scm b/gnu/services/vpn.scm index 6a289d357a..82ff05b351 100644 --- a/gnu/services/vpn.scm +++ b/gnu/services/vpn.scm @@ -540,11 +540,9 @@ (define openvpn-client-service-type to an existing @acronym{VPN, virtual private network}."))) (define* (openvpn-client-service #:key (config (openvpn-client-configuration))) - (validate-configuration config openvpn-client-configuration-fields) (service openvpn-client-service-type config)) (define* (openvpn-server-service #:key (config (openvpn-server-configuration))) - (validate-configuration config openvpn-server-configuration-fields) (service openvpn-server-service-type config)) (define (generate-openvpn-server-documentation) -- cgit v1.2.3 From dc16ac2d8b63915daed85933c2a1e8a87c67a4cf Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Wed, 13 Oct 2021 22:18:35 +0200 Subject: doc: Mention installation via distro packages. * doc/guix.texi (Binary Installation): In quotation, mention Debian, Ubuntu, and openSUSE. --- doc/guix.texi | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index 794907ce3a..af8d6f17af 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -682,6 +682,20 @@ chmod +x guix-install.sh ./guix-install.sh @end example +If you're running Debian or a derivative such as Ubuntu, you can instead +install the package (it might be a version older than @value{VERSION} +but you can update it afterwards by running @samp{guix pull}): + +@example +sudo apt install guix +@end example + +Likewise on openSUSE: + +@example +sudo zypper install guix +@end example + When you're done, @pxref{Application Setup} for extra configuration you might need, and @ref{Getting Started} for your first steps! @end quotation -- cgit v1.2.3 From d9d77d947943d3d8e7cf56e4e2f26f3c390cdcb5 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Sun, 26 Jun 2022 15:35:46 +0200 Subject: doc: Update "updating substitutes" message. This is a followup to 2bf9351e311cce0004756890b93f50693f133bb6. * doc/guix.texi (Invoking guix challenge) (Invoking guix weather): Adjust "updating substitutes" message. --- doc/guix.texi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'doc') diff --git a/doc/guix.texi b/doc/guix.texi index af8d6f17af..b8c49099a4 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -14942,8 +14942,8 @@ The command output looks like this: @smallexample $ guix challenge --substitute-urls="https://@value{SUBSTITUTE-SERVER-1} https://guix.example.org" -updating list of substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0% -updating list of substitutes from 'https://guix.example.org'... 100.0% +updating substitutes from 'https://@value{SUBSTITUTE-SERVER-1}'... 100.0% +updating substitutes from 'https://guix.example.org'... 100.0% /gnu/store/@dots{}-openssl-1.0.2d contents differ: local hash: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q https://@value{SUBSTITUTE-SERVER-1}/nar/@dots{}-openssl-1.0.2d: 0725l22r5jnzazaacncwsvp9kgf42266ayyp814v7djxs7nk963q @@ -15230,7 +15230,7 @@ Here's a sample run: $ guix weather --substitute-urls=https://guix.example.org computing 5,872 package derivations for x86_64-linux... looking for 6,128 store items on https://guix.example.org.. -updating list of substitutes from 'https://guix.example.org'... 100.0% +updating substitutes from 'https://guix.example.org'... 100.0% https://guix.example.org 43.4% substitutes available (2,658 out of 6,128) 7,032.5 MiB of nars (compressed) -- cgit v1.2.3