From 9283c80e604324f5449b5a8daf94285cdc6a8604 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 5 Nov 2022 12:59:01 +0100 Subject: [PATCH] guix: modify-input: Recommend prepend instead of append. * doc/guix.texi (Defining Package Variants): Document the "prepend" clause of modify-inputs first. * guix/packages.scm (modify-inputs): use "prepend" in the docstring. Signed-off-by: Christopher Baines --- doc/guix.texi | 12 ++++++------ guix/packages.scm | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index eaecfd0daa..9155b605f2 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -8080,20 +8080,20 @@ following forms: @item (delete @var{name}@dots{}) Delete from the inputs packages with the given @var{name}s (strings). -@item (append @var{package}@dots{}) -Add @var{package}s to the end of the input list. - @item (prepend @var{package}@dots{}) Add @var{package}s to the front of the input list. + +@item (append @var{package}@dots{}) +Add @var{package}s to the end of the input list. @end table The example below removes the GMP and ACL inputs of Coreutils and adds -libcap to the back of the input list: +libcap to the front of the input list: @lisp (modify-inputs (package-inputs coreutils) (delete "gmp" "acl") - (append libcap)) + (prepend libcap)) @end lisp The example below replaces the @code{guile} package from the inputs of @@ -8104,7 +8104,7 @@ The example below replaces the @code{guile} package from the inputs of (replace "guile" guile-2.2)) @end lisp -The last type of clause is @code{prepend}, to add inputs to the front of +The last type of clause is @code{append}, to add inputs at the back of the list. @end deffn diff --git a/guix/packages.scm b/guix/packages.scm index 704b4ee710..502df7fdd1 100644 --- a/guix/packages.scm +++ b/guix/packages.scm @@ -1176,9 +1176,9 @@ (define-syntax modify-inputs (modify-inputs (package-inputs coreutils) (delete \"gmp\" \"acl\") - (append libcap)) + (prepend libcap)) -Other types of clauses include 'prepend' and 'replace'. +Other types of clauses include 'append' and 'replace'. The first argument must be a labeled input list; the result is also a labeled input list."