From 71933f6586475b36c70ef325373fe6d50c7a034f Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Mon, 24 Jan 2022 11:13:54 +0000 Subject: [PATCH] meson: drop unused argument for i18n.merge_file() Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. data/appdata/meson.build:3:5: ERROR: Function does not take positional arguments. data/meson.build:6:5: ERROR: Function does not take positional arguments. data/meson.build:49:5: ERROR: Function does not take positional arguments. --- data/appdata/meson.build | 2 +- data/meson.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/appdata/meson.build b/data/appdata/meson.build index 1dc4ed7..e44a58e 100644 --- a/data/appdata/meson.build +++ b/data/appdata/meson.build @@ -1,6 +1,6 @@ appdata_conf = configuration_data() appdata_conf.set('application_id', application_id) -i18n.merge_file('appdata', +appdata_file = i18n.merge_file( input: configure_file( input: 'org.gnome.Dictionary.appdata.xml.in.in', output: 'org.gnome.Dictionary.appdata.xml.in', diff --git a/data/meson.build b/data/meson.build index 660e6b8..7ec7251 100644 --- a/data/meson.build +++ b/data/meson.build @@ -3,7 +3,7 @@ subdir('appdata') desktop_conf = configuration_data() desktop_conf.set('icon', application_id) desktop_conf.set('application_id', application_id) -i18n.merge_file('desktop', +desktop_file = i18n.merge_file( input: configure_file( input: 'org.gnome.Dictionary.desktop.in.in', output: 'org.gnome.Dictionary.desktop.in', @@ -45,7 +45,7 @@ sources = [ ] foreach s: sources - i18n.merge_file('sources', + i18n.merge_file( input: '@0@.in'.format(s), output: s, install: true, -- 2.41.0 value='author'>author
path: root/gnu.scm
AgeCommit message (Collapse)Author
2020-07-25Use 'formatted-message' instead of '&message' where appropriate.Ludovic Courtès
* gnu.scm (%try-use-modules): Use 'formatted-message' instead of '&message'. * gnu/machine/digital-ocean.scm (maybe-raise-unsupported-configuration-error): Likewise. * gnu/machine/ssh.scm (machine-check-file-system-availability): Likewise. (machine-check-building-for-appropriate-system): Likewise. (deploy-managed-host): Likewise. (maybe-raise-unsupported-configuration-error): Likewise. * gnu/packages.scm (search-patch): Likewise. * gnu/services.scm (%service-with-default-value): Likewise. (files->etc-directory): Likewise. (fold-services): Likewise. * gnu/system.scm (locale-name->definition*): Likewise. * gnu/system/mapped-devices.scm (check-device-initrd-modules): Likewise. (check-luks-device): Likewise. * guix/channels.scm (latest-channel-instance): Likewise. * guix/cve.scm (json->cve-items): Likewise. * guix/git-authenticate.scm (commit-signing-key): Likewise. (commit-authorized-keys): Likewise. (authenticate-commit): Likewise. (verify-introductory-commit): Likewise. * guix/remote.scm (remote-pipe-for-gexp): Likewise. * guix/scripts/graph.scm (assert-package): Likewise. * guix/scripts/offload.scm (private-key-from-file*): Likewise. * guix/ssh.scm (authenticate-server*): Likewise. (open-ssh-session): Likewise. (remote-inferior): Likewise. * guix/ui.scm (matching-generations): Likewise. * guix/upstream.scm (package-update): Likewise. * tests/channels.scm ("latest-channel-instances, missing introduction for 'guix'"): Catch 'formatted-message?'. ("authenticate-channel, wrong first commit signer"): Likewise. * tests/lint.scm ("patches: not found"): Adjust message string. * tests/packages.scm ("patch not found yields a run-time error"): Catch 'formatted-message?'. * guix/lint.scm (check-patch-file-names): Handle 'formatted-message?'. (check-derivation): Ditto.
2020-07-25utils: Move '&fix-hint' to (guix diagnostics).Ludovic Courtès
* guix/utils.scm (&fix-hint): Move to... * guix/diagnostics.scm (&fix-hint): ... here. * gnu.scm: Adjust imports accordingly. * gnu/system/mapped-devices.scm: Likewise. * guix/channels.scm: Likewise. * guix/profiles.scm: Likewise. * guix/scripts/system/reconfigure.scm: Likewise. * guix/ssh.scm: Likewise.
2020-07-25utils: Move <location> and '&error-location' to (guix diagnostics).Ludovic Courtès
* guix/utils.scm (<location>, source-properties->location) (location->source-properties, &error-location): Move to... * guix/diagnostics.scm: ... here. * gnu.scm: Adjust imports accordingly. * gnu/machine.scm: Likewise. * gnu/system.scm: Likewise. * gnu/tests.scm: Likewise. * guix/inferior.scm: Likewise. * tests/channels.scm: Likewise. * tests/packages.scm: Likewise.
2019-03-24Add (gnu system keyboard).Ludovic Courtès
* gnu/system/keyboard.scm: New file. * gnu/local.mk (GNU_SYSTEM_MODULES): Add it. * gnu.scm (%public-modules): Add it.
2017-11-08gnu: Improve error reporting of the use-.*modules macros.Ludovic Courtès
Suggested by Julien Lepiller and myglc2 at <https://lists.gnu.org/archive/html/guix-devel/2017-11/msg00106.html>. * gnu.scm (%try-use-modules): New procedure. (package-module-hint, service-module-hint): New procedures. (try-use-modules): New macro. (use-package-modules, use-service-modules, use-system-modules): Use it. * tests/guix-system.sh: Test it.