Previously, using 'guix shell -CF coreutils' twice (such that the
profile is cache) would result in:
guix shell: error: '--profile' cannot be used with package options
This patch fixes it by moving argument handling to (guix scripts shell),
before 'options-with-caching' is called.
* guix/scripts/environment.scm (show-environment-options-help)
(%options): Remove '--emulate-fhs'.
(guix-environment*): Pass OPTS as-is to 'options/resolve-packages'.
* guix/scripts/shell.scm (show-help, %options): Add '--emulate-fhs'.
Add the (expression . ...) component to RESULT right from the argument
handler.
* tests/guix-environment-container.sh: Change '--emulate-fhs' tests to
use 'guix shell' instead of 'guix environment'.
* gnu/packages/security-token.scm (libfido2)[arguments]: Add a configure flag
specifying the installation directory of the udev rule.
Signed-off-by: Christopher Baines <mail@cbaines.net>
In a new "reload" shepherd-action, send a SIGHUP to the NGINX master process,
so that it can re-read the configuration file and start new worker processes.
* gnu/services/web.scm (nginx-shepherd-service): Add the "reload"
shepherd-action.
Signed-off-by: Christopher Baines <mail@cbaines.net>
This adds support for non x86_64 architectures.
* gnu/packages/gnome.scm (epiphany)[inputs]: Use
'librsvg-for-system' instead of 'librsvg'.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Signed-off-by: Christopher Baines <mail@cbaines.net>
To the generic kernel packages.
I noticed this was lacking because of a test failure when building the guix
package for powerpc64le-linux, but it should be a generally useful change.
* gnu/packages/linux.scm (linux-libre-5.19, linux-libre-5.15,
linux-libre-5.10, linux-libre-5.4, linux-libre-4.19, linux-libre-4.14,
linux-libre-4.9): Include powerpc64le-linux as a supported system.
* guix/scripts/environment.scm (show-environment-options-help, %options): Add
'--emulate-fhs'.
(setup-fhs): New procedure. Setup for the Filesystem Hierarchy Standard (FHS)
container. Defines and uses FHS-SYMLINKS and LINK-CONTENTS to create FHS
expected directories and creates /etc/ld.so.conf.
(launch-environment): Add 'emulate-fhs?' key and implement it to set $PATH and
generate /etc/ld.so.cache before calling COMMAND.
(launch-environment/container): Add 'emulate-fhs?' and 'setup-hook' keys and
implement them. Define and use FHS-MAPPINGS, to set up additional bind mounts
in the container to follow FHS expectations.
(guix-environment*): Add glibc-for-fhs to the container packages when
'emulate-fhs?' key is in OPTS.
* doc/guix.texi (Invoking guix shell): Document '--emulate-fhs'.
(Invoking guix environment): Document '--emulate-fhs'.
* tests/guix-environment-container.sh: Add tests for '--emulate-fhs'.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
* gnu/packages/base.scm (glibc-for-fhs): New variable. Hidden package for use
in forthcoming --emulate-fhs option for guix containers.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
* gnu/home/services/desktop.scm (home-dbus-service-type): New variable.
(home-dbus-configuration): New record type.
* doc/guix.texi: Document them.
Signed-off-by: Andrew Tropin <andrew@trop.in>
* gnu/packages/mpd.scm (mcg)[source]: Indent as with ‘guix style’.
[arguments]: Convert to list of G-Expressions.
[inputs, native-inputs]: Move below arguments.
* gnu/packages/mpd.scm (mcg): Update to 3.1.
[native-inputs]: Use the new inputs style.
Add desktop-file-utils, gettext-minimal and gtk+:bin.
[inputs]: Add python.
[build-system]: Change to meson-build-system.
[arguments]<#:imported-modules,#:modules>: Remove.
<#:glib-or-gtk?>: Set to #t.
<#:phases>: Delete ‘glib-or-gtk-wrap’.
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This addresses <https://issues.guix.gnu.org/58451>
* gnu/packages/terminals.scm (cool-retro-term)[source]: In snippet for font
handling, adjust regexp to account for possible presence of whitespace.
Commit 6a2e303d3a had modified prompt_yes_no to only read a single character,
aiming to ease the user experience. This was, in retrospect, a bad idea, as
it makes user input error more likely and introduces complexity.
This commit reverts to line-oriented input, while preserving the default yes
value so that a user can simply hit 'Enter' at the prompt in place of typing
"yes".
* etc/guix-install.sh (_flush): Delete function.
(prompt_yes_no): Restore line-oriented read. Remove loop. Make anything else
than yes means no. Use Bash features to streamline definition.
Reported-by: Lars-Dominik Braun <lars@6xq.net> and others.
* guix/git.scm (commit-id?): New procedure, copied from (guix swh).
(resolve-reference): Use it instead of inline code.
* guix/inferior.scm (channel-full-commit): Likewise.
Starting from commit 371a83b764, 'guix
import crate -r' (or similar) would no longer print a blank line in
between definitions. This patch fixes it.
Reported by jgart <jgart@dismail.de>.
* guix/scripts/import.scm (guix-import): Add second 'newline' call.
This is not done for gdm-service-type, so do not do it here either, for
consistency. Perhaps that change had been motivated by the fact that using
ratpoison without a default terminal makes for a poor user experience (one
cannot even view the help screen without a terminal); this was fixed with the
preceding commit.
* gnu/services/xorg.scm (slim-service-type)
[profile-service-type]: Remove extension.
