diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-01-31 23:32:56 +0100 |
| commit | 0747328e317de4bf936fab50e795d1e1523adfc1 (patch) | |
| tree | 291d4f07a801b147d64faec31e4394c5cd46ce35 /gnu/services | |
| parent | df09e1d6e71f68a8fb44bcc9f13e625f9f9701a5 (diff) | |
| parent | ff75441fcf0ba1212b0342f933a8999bafe60f03 (diff) | |
| download | patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar patches-0747328e317de4bf936fab50e795d1e1523adfc1.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/mcron.scm | 2 | ||||
| -rw-r--r-- | gnu/services/xorg.scm | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/gnu/services/mcron.scm b/gnu/services/mcron.scm index e4b652b3d4..1b232b6cba 100644 --- a/gnu/services/mcron.scm +++ b/gnu/services/mcron.scm @@ -20,7 +20,7 @@ #:use-module (gnu services) #:use-module (gnu services base) #:use-module (gnu services shepherd) - #:autoload (gnu packages guile) (mcron) + #:autoload (gnu packages guile-xyz) (mcron) #:use-module (guix deprecation) #:use-module (guix records) #:use-module (guix gexp) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 2f91619219..d66254c03d 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -87,11 +87,11 @@ ;;; Code: (define %default-xorg-modules - ;; Default list of modules loaded by the server. Note that the order - ;; matters since it determines which driver is going to be used when there's - ;; a choice. + ;; Default list of modules loaded by the server. When multiple drivers + ;; match, the first one in the list is loaded. (list xf86-video-vesa xf86-video-fbdev + xf86-video-amdgpu xf86-video-ati xf86-video-cirrus xf86-video-intel |