Ian Eure 7d4db1a37c gnu: services: Fix xorg configuration merging. ...

A bug in #21 causes the default configuration to be omitted from the xorg
merging process.  This can cause users not using set-xorg-configuration or
service extensions to end up with a broken configuration.

Fixes #5267.

* tests/services/xorg.scm: Add a regression test.
* gnu/services/xorg.scm (handle-xorg-configuration): Include the
xorg-configuration record from config in merges.

Change-Id: I6bed8c109057cb9b5de36db68b78e3ccc88e6bcb
Signed-off-by: Efraim Flashner <efraim@flashner.co.il>

2026-01-01 13:26:02 +02:00

..

import

tests: Use ‘https’ for ‘home-page’ in ‘guix import pypi’ tests.

2025-12-13 23:14:27 +01:00

keys

tests: Ensure test OpenPGP keys never expire.

2022-05-18 23:20:21 +02:00

machine

machine: hetzner: Allow attaching existing public IPs.

2025-04-21 23:55:50 +02:00

services

gnu: services: Fix xorg configuration merging.

2026-01-01 13:26:02 +02:00

accounts.scm

system: Relax subordinate ID validation.

2025-12-11 15:43:16 +01:00

base16.scm

utils: Move base16 procedures to (guix base16).

2017-03-16 22:50:14 +01:00

base32.scm

build: Remove references to the 'nix-hash' program.

2020-08-29 16:24:17 +02:00

base64.scm

substitute-binary: Support the Signature field of a narinfo file.

2014-03-30 12:02:10 +02:00

boot-parameters.scm

tests: Add test for menu-entry roundtrips as sexps.

2022-08-28 23:37:28 +02:00

bournish.scm

bournish: Extend 'rm' command.

2017-01-26 13:49:56 +01:00

build-emacs-utils.scm

tests: build-emacs-utils: Allow test to pass on Emacs 27 too.

2022-07-13 10:49:40 -04:00

build-utils.scm

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

builders.scm

tests: don't use 'file://...' URIs for testing git downloads.

2025-10-12 22:22:01 +02:00

cache.scm

cache: Avoid cache cleanup storms from concurrent processes.

2024-08-21 00:52:39 +02:00

challenge.scm

guix: Move narinfo code from substitute script to module.

2021-01-16 11:51:03 +00:00

channels.scm

channels: Adjust tests for new #:verify-certificate? parameter.

2024-12-30 11:01:54 +01:00

combinators.scm

utils: Move combinators to (guix combinators).

2016-05-04 23:35:55 +02:00

containers.scm

Reinstate "linux-container: Remove #:lock-mounts? and related code."

2025-10-29 11:34:28 +09:00

cpio.scm

utils: Don’t re-export ‘call-with-temporary-output-file’.

2024-04-15 22:36:42 +02:00

cve-sample.json

cve: Upgrade to JSON 2.0 feeds.

2025-08-31 12:39:24 +02:00

cve.scm

cve: Upgrade to JSON 2.0 feeds.

2025-08-31 12:39:24 +02:00

debug-link.scm

Revert "Use mmap for the elf parser, reducing memory usage."

2025-10-30 16:19:50 +09:00

derivations.scm

tests: don't use 'file://...' URIs for testing git downloads.

2025-10-12 22:22:01 +02:00

discovery.scm

discovery: Recurse into directories pointed to by a symlink.

2017-07-03 23:51:23 +02:00

file-systems.scm

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

gexp.scm

gexp: Make 'local-file' follow symlinks.

2025-10-23 12:59:08 +02:00

git-authenticate.scm

tests: Assume ‘git’ is always available.

2023-09-26 17:36:59 +02:00

git.scm

git: Remove untracked files from cached checkouts.

2024-07-18 17:31:19 +02:00

glob.scm

Update Giacomo's email address.

2025-12-03 14:38:09 +09:00

gnu-maintenance.scm

gnu-maintenance: ‘generic-html’ recognizes ‘release-file-regexp’ property.

2025-11-18 13:05:49 +01:00

grafts.scm

grafts: Always depend on all the outputs of the original derivation.

2025-10-05 20:30:45 +02:00

graph.scm

tests: Adjust 'node-back-edges' test for 'bag' to system-dependent glibc.

2023-08-21 16:16:47 +02:00

gremlin.scm

Revert "Use mmap for the elf parser, reducing memory usage."

2025-10-30 16:19:50 +09:00

guix-archive.sh

tests: Fix checks for expected failures.

2023-04-21 16:16:38 +02:00

guix-authenticate.sh

authenticate: Report failure to load keys to the daemon.

2025-12-22 15:10:52 +01:00

guix-build-branch.sh

tests: Fix checks for expected failures.

2023-04-21 16:16:38 +02:00

guix-build.sh

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

guix-daemon.sh

tests: guix-daemon.sh: Ignore guile locale warning.

2025-10-19 21:29:38 +02:00

guix-describe.sh

guix describe: Adjust test to latest changes.

2022-09-04 23:10:10 +02:00

guix-download.sh

tests: Remove interference from the user’s Git config.

2024-05-13 16:31:35 +02:00

guix-environment-container.sh

tests: Increase test timeout and honor ‘GUIX_TESTS_BUILD_TIMEOUT’.

2025-10-17 12:23:54 +02:00

guix-environment.sh

tests: Fix checks for expected failures.

2023-04-21 16:16:38 +02:00

guix-gc.sh

gnu: Remove lsh.

2025-11-21 14:38:44 +01:00

guix-git-authenticate.sh

git authenticate: Gracefully handle passing an annotated tag to ‘--end’.

2025-06-22 23:45:36 +02:00

guix-graph.sh

tests: Adjust ‘guix graph --path’ test to latest Emacs changes.

2023-09-26 17:36:57 +02:00

guix-hash.sh

tests: Fix checks for expected failures.

2023-04-21 16:16:38 +02:00

guix-home.sh

tests: Increase test timeout and honor ‘GUIX_TESTS_BUILD_TIMEOUT’.

2025-10-17 12:23:54 +02:00

guix-lint.sh

packages: 'package-field-location' handles 'search-path' returning #f.

2021-02-22 12:07:45 +01:00

guix-locate.sh

locate: Accept ‘--clear’ without additional arguments.

2023-11-15 18:29:37 +01:00

guix-pack-localstatedir.sh

tests: Increase test timeout and honor ‘GUIX_TESTS_BUILD_TIMEOUT’.

2025-10-17 12:23:54 +02:00

guix-pack-relocatable.sh

tests: Increase test timeout and honor ‘GUIX_TESTS_BUILD_TIMEOUT’.

2025-10-17 12:23:54 +02:00

guix-pack.sh

tests: Adjust to cope with glibc graft.

2023-10-28 01:30:37 +02:00

guix-package-aliases.sh

tests: Relax two tests that expected a non-zero error code.

2023-04-21 17:09:46 +02:00

guix-package-net.sh

tests: Fix checks for expected failures.

2023-04-21 16:16:38 +02:00

guix-package.sh

tests: guix-package: Fix guix package --search test.

2024-12-14 00:34:28 +01:00

guix-refresh.sh

refresh: Allow specifying a partial version via the version specification.

2025-05-19 10:07:24 +09:00

guix-repl.sh

repl: Look for script files in (getcwd).

2020-09-16 16:04:01 +02:00

guix-shell-export-manifest.sh

tests: guix-shell-export-manifest: Fix pyproject-build-system python test.

2024-12-14 01:28:49 +01:00

guix-shell.sh

shell: ‘--development’ honors ‘--system’.

2023-12-06 23:50:04 +01:00

guix-style.sh

scripts: style: Sort more kinds of package definitions.

2025-02-09 18:20:41 +01:00

guix-system.sh

tests: guix-system: Add test for 'guix system container'.

2025-10-11 21:57:59 +09:00

guix-time-machine.sh

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

home-import.scm

home: Define ‘%base-home-services’.

2025-01-16 22:32:11 +01:00

home-services.scm

home: services: Add 'lookup-home-service-types' procedure.

2022-06-04 12:04:24 +02:00

http-client.scm

tests: Add (guix http-client) tests.

2022-03-06 22:49:46 +01:00

inferior.scm

guix: inferior: Fix the behaviour of open-inferior #:error-port.

2022-07-08 13:51:34 +01:00

ipfs.scm

Add (guix ipfs).

2021-04-12 18:42:22 +02:00

ld-wrapper.scm

tests: New ld-wrapper test.

2025-10-29 11:51:24 +09:00

lint.scm

lint: Fix regressions in tests.

2025-11-14 16:42:16 +09:00

modules.scm

build-systems: gnu: Export %default-gnu-imported-modules and %default-gnu-modules.

2024-08-31 10:42:16 +02:00

monads.scm

gexp: ‘with-parameters’ properly handles ‘%graft?’.

2025-03-05 00:28:49 +01:00

nar.scm

daemon: Do not deduplicate files smaller than 8 KiB.

2021-11-16 14:34:28 +01:00

networking.scm

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

offload.scm

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

openpgp.scm

tests: Move keys into ./tests/keys/ and add a third ed25519 key.

2021-12-22 10:53:19 +01:00

pack.scm

tests/pack: Fix rpm tests.

2025-09-30 16:52:07 +09:00

packages.scm

tests: Adjust ‘package-transitive-supported-systems’ test.

2025-09-23 14:53:36 +02:00

pki.scm

pki: 'public-keys->acl' deduplicates entries.

2022-12-12 15:03:05 +01:00

processes.scm

tests: Run in a chroot and unprivileged user namespaces.

2025-03-26 17:57:44 +01:00

profiles.scm

profiles: package->manifest-entry: Filter packages.

2025-11-03 20:06:14 +08:00

publish.scm

Revert "publish: Prevent publication of non-substitutable derivation outputs."

2025-09-21 18:47:23 +02:00

read-print.scm

read-print: Adjust test for keyword alignment.

2025-02-24 23:33:51 +01:00

records.scm

tests: records: Add test for ellipsis in body.

2023-06-04 10:59:28 +02:00

rpm.scm

Reapply "Update Maxim's email address."

2025-09-18 13:44:12 +09:00

scripts.scm

tests: Add missing import.

2019-03-24 00:13:53 +01:00

search-paths.scm

build: Remove 'gnu/packages/bootstrap' and its binaries.

2019-06-14 22:09:38 +02:00

services.scm

services: ‘shepherd-service-upgrade’ handles canonical name changes.

2025-03-05 00:28:49 +01:00

sets.scm

build: Add a Guile custom test driver using SRFI-64.

2016-04-03 14:19:09 +02:00

size.scm

tests: Add 'test-assertm' to (guix tests).

2018-11-12 23:37:13 +01:00

status.scm

status: Relay "updating substitutes" messages.

2022-06-26 23:19:14 +02:00

store-database.scm

utils: Don’t re-export ‘call-with-temporary-output-file’.

2024-04-15 22:36:42 +02:00

store-deadlock.scm

daemon: Explicitly unlock output path in the has-become-valid case.

2024-12-30 00:51:57 +01:00

store-deduplication.scm

tests: Fix ‘store-deduplication.scm’ on systems with large blocks.

2025-10-06 10:42:08 +02:00

store-roots.scm

tests: store-roots: Remove bogus test.

2023-08-18 16:10:08 +02:00

store.scm

daemon: Attempt to map the “kvm” group inside the build user namespace.

2025-10-16 15:14:37 +02:00

style.scm

tests: style: Fix insufficient number of lines read.

2025-11-15 15:53:15 +09:00

substitute.scm

substitute: Do not exit when failing to find a nar.

2023-12-04 22:26:36 +01:00

swh.scm

swh: ‘lookup-origin-revision’ handles branches pointing to directories.

2024-03-09 18:55:49 +01:00

syscalls.scm

Revert "syscalls: Add mmap support."

2025-10-30 16:19:51 +09:00

system.scm

Remove now unnecessary uses of (guix grafts).

2022-10-22 01:46:55 +02:00

test.drv

Add unit test for derivation parsing and output.

2012-04-19 23:09:55 +02:00

toml.scm

guix: toml: Fix keys with embedded escape codes.

2025-11-20 01:06:32 +00:00

transformations.scm

transformations: Git source transformations honour RECURSIVE?.

2025-05-05 12:15:47 +02:00

ui.scm

ui: Take package upstream name into account when searching.

2022-12-13 17:46:39 +01:00

union.scm

tests: Make builds less expensive.

2019-06-14 21:57:39 +02:00

upstream.scm

upstream: Define ‘preferred-upstream-source’.

2025-01-08 23:03:04 +01:00

utils.scm

utils: Don’t re-export ‘call-with-temporary-output-file’.

2024-04-15 22:36:42 +02:00

uuid.scm

uuid: 'fat-uuid->string' preserves leading zeros.

2019-05-07 12:18:44 +02:00

workers.scm

workers: Add test with exceptions.

2017-11-17 10:47:49 +01:00