Previously, '+' was supported only via special cases for deprecated
GNU identifiers like 'GPL-N+'. This commit adds support
for other uses of '+', such as 'AFL-2.0+' and 'LPPL-1.0+'.
Strictly speaking, '+' is an operator, not part of the SPDX license
identifier, but it is useful to handle it here.
* guix/import/utils.scm (spdx-string->license): Support '+' operator.
* tests/import-utils.scm ("spdx-string->license"): Test it.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
SPDX specifies that license identifiers (unlike the 'AND', 'OR', and
'WITH' operators) are matched case-insensitively.
* guix/import/utils.scm (%spdx-license-identifiers): New variable.
(spdx-string->license): Search in '%spdx-license-identifiers' using
'string-ci=?'.
* tests/import-utils.scm ("spdx-string->license"): New test.
Co-authored-by: Ludovic Courtès <ludo@gnu.org>
The result of 'spdx-string->license' is a symbol, not a license object.
* guix/import/utils.scm (spdx-string->license): Fix docstring.
(license->symbol): Mention 'license:' prefix in docstring.
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This is to validate that it works, when the login manager service type is
properly specified.
* gnu/tests/lightdm.scm (%lightdm-os): Use set-xorg-configuration.
Fixes a regression introduced in
44554e7133 whereby the wrong record fields
would be accessed, leading to a <location> record being spliced in the
result.
* gnu/services/getmail.scm (serialize-getmail-configuration-file): Use
'match-record' instead of 'match'.
(getmail-shepherd-services): Likewise.
The xterm binary must be provided to --with-xterm, not its installation
prefix.
* gnu/packages/ratpoison.scm (ratpoison) [configure-flags]: Adjust
--with-xterm flag value.
* gnu/packages/databases.scm (apache-arrow-0.16)[inputs]: Change from
GOOGLE-BROTLI to BROTLI.
* gnu/packages/image.scm (libjxl)[propagated-inputs]: Likewise.
* gnu/packages/python-xyz.scm (python-logbook)[native-inputs]: Change from
PYTHON-GOOGLE-BROTLI to PYTHON-BROTLI.
* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Remove obsolete
compiler flags.
[native-inputs]: Change from CLANG-14 and LLD-AS-LD-WRAPPER to CLANG-15 and
LLD-AS-LD-WRAPPER-15.
The default value for <gitolite-configuration> has "git" for both the values
of the user and the group, as costumary, which means that unless someone uses
a custom configuration and chooses different strings for user and group, this
wouldn't show up.
* gnu/services/version-control.scm (gitolite-accounts): Use the correct
variable for the name of a (user-group ...).
Signed-off-by: Christopher Baines <mail@cbaines.net>
* gnu/packages/shellutils.scm (trash-cli): Update to 0.22.10.20.
[native-inputs]: Add python-parameterized and python-flexmock.
Signed-off-by: Christopher Baines <mail@cbaines.net>
These were spot while working on a fix for commit 543d971ed2 ("services:
configuration: Re-order generated record fields").
* gnu/services/web.scm (php-fpm-accounts): Remove extraneous trailing dummy
catchall patterns.
(agate-accounts): Access the configuration fields directly since there are
only two, which is less error-prone.
Commit 543d971ed2 ("services: configuration: Re-order generated record
fields") introduced two regressions, one in guix home and another one in the
zabbix service.
* gnu/home/services/shells.scm (home-bash-extensions): Remove the first
pattern in the match, which used to be to ignore %location.
* gnu/services/monitoring.scm (zabbix-front-end-nginx-extension): Likewise.
This reverts commit 39e4e00f75, with fixes for
the guix home issues reported and another one found while reconfiguring berlin
in the subsequent commit.
* gnu/packages/emacs-xyz.scm (emacs-skempo)[propagated-inputs]:
Remove dependency on emacs-parent-mode.
As of a936f8d9fa0d42f17c64da9d2652a5f3e7c6546a commit skempo
drop dependency for parent-mode.
Signed-off-by: Nicolas Goaziou <mail@nicolasgoaziou.fr>
