aboutsummaryrefslogtreecommitdiff
path: root/gnu/local.mk
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2019-07-07 01:18:18 +0200
committerMarius Bakke <mbakke@fastmail.com>2019-07-07 01:18:18 +0200
commit36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84 (patch)
tree7c2d8dd2267b2dc533d5f59acc137641e2325e52 /gnu/local.mk
parent42dcfca4cc424aa790d8fb62eb327782fd08aad7 (diff)
parentc72647fbae675654e32e17a6891980a7b9272a71 (diff)
downloadguix-36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84.tar.gz
guix-36175a3a9eb5bd4096de4e06e1f6b0e8cd895d84.zip
Merge branch 'master' into staging
Diffstat (limited to 'gnu/local.mk')
-rw-r--r--gnu/local.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index 6e90d88689..68a43330c4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -299,6 +299,7 @@ GNU_SYSTEM_MODULES = \
%D%/packages/llvm.scm \
%D%/packages/lout.scm \
%D%/packages/logging.scm \
+ %D%/packages/logo.scm \
%D%/packages/lolcode.scm \
%D%/packages/lsof.scm \
%D%/packages/lua.scm \
@@ -564,6 +565,9 @@ GNU_SYSTEM_MODULES = \
%D%/system/uuid.scm \
%D%/system/vm.scm \
\
+ %D%/machine.scm \
+ %D%/machine/ssh.scm \
+ \
%D%/build/accounts.scm \
%D%/build/activation.scm \
%D%/build/bootloader.scm \
@@ -629,7 +633,7 @@ INSTALLER_MODULES = \
%D%/installer/newt/user.scm \
%D%/installer/newt/utils.scm \
%D%/installer/newt/welcome.scm \
- %D%/installer/newt/wifi.scm
+ %D%/installer/newt/wifi.scm
# Always ship the installer modules but compile them only when
# ENABLE_INSTALLER is true.