diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2019-07-12 01:03:53 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2019-07-12 01:03:53 +0200 |
| commit | fb9a23a3f3ad3d7b5b7f03b2007baf27684d6bbd (patch) | |
| tree | afbd3f4f33771c61254b0c3d977092542fbe8009 /guix/self.scm | |
| parent | 1c4b72cb34640638e40c5190676e5c8c352d292d (diff) | |
| parent | 5a836ce38c9c29e9c2bd306007347486b90c5064 (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu/local.mk
gnu/packages/python-xyz.scm
gnu/packages/xml.scm
guix/gexp.scm
po/guix/POTFILES.in
Diffstat (limited to 'guix/self.scm')
| -rw-r--r-- | guix/self.scm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/self.scm b/guix/self.scm index 6a876bd822..249705fcee 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -770,7 +770,8 @@ Info manual." (gnu services) ,@(scheme-modules* source "gnu/bootloader") ,@(scheme-modules* source "gnu/system") - ,@(scheme-modules* source "gnu/services")) + ,@(scheme-modules* source "gnu/services") + ,@(scheme-modules* source "gnu/machine")) (list *core-package-modules* *package-modules* *extra-modules* *core-modules*) #:extensions dependencies |