services: %base-services: Use nscd-service-type.

[jackhill/guix/guix.git] / gnu / local.mk

diff --git a/gnu/local.mk b/gnu/local.mk
index 4fed451..750e67d 100644 (file)
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -46,6 +46,7 @@ GNU_SYSTEM_MODULES =                          \
   %D%/bootloader/grub.scm                       \
   %D%/bootloader/extlinux.scm                   \
   %D%/bootloader/u-boot.scm                     \
+  %D%/ci.scm                                   \
   %D%/packages.scm                             \
   %D%/packages/abduco.scm                      \
   %D%/packages/abiword.scm                     \
@@ -112,6 +113,7 @@ GNU_SYSTEM_MODULES =                                \
   %D%/packages/conky.scm                       \
   %D%/packages/connman.scm                     \
   %D%/packages/cook.scm                                \
+  %D%/packages/coq.scm                         \
   %D%/packages/cpio.scm                                \
   %D%/packages/cpp.scm                                 \
   %D%/packages/cppi.scm                                \
@@ -561,9 +563,47 @@ GNU_SYSTEM_MODULES =                               \
   %D%/tests/ssh.scm                            \
   %D%/tests/version-control.scm                        \
   %D%/tests/virtualization.scm                 \
-  %D%/tests/web.scm                            \
+  %D%/tests/web.scm
+
+if ENABLE_INSTALLER
+
+GNU_SYSTEM_MODULES +=                           \
+  %D%/installer.scm                            \
+  %D%/installer/connman.scm                    \
+  %D%/installer/final.scm                      \
+  %D%/installer/hostname.scm                   \
+  %D%/installer/keymap.scm                     \
+  %D%/installer/locale.scm                     \
+  %D%/installer/newt.scm                       \
+  %D%/installer/parted.scm                     \
+  %D%/installer/record.scm                     \
+  %D%/installer/services.scm                   \
+  %D%/installer/steps.scm                      \
+  %D%/installer/timezone.scm                   \
+  %D%/installer/user.scm                       \
+  %D%/installer/utils.scm                      \
                                                \
-  %D%/ci.scm
+  %D%/installer/newt/ethernet.scm              \
+  %D%/installer/newt/final.scm                 \
+  %D%/installer/newt/hostname.scm              \
+  %D%/installer/newt/keymap.scm                        \
+  %D%/installer/newt/locale.scm                        \
+  %D%/installer/newt/menu.scm                  \
+  %D%/installer/newt/network.scm               \
+  %D%/installer/newt/page.scm                  \
+  %D%/installer/newt/partition.scm             \
+  %D%/installer/newt/services.scm              \
+  %D%/installer/newt/timezone.scm              \
+  %D%/installer/newt/utils.scm                 \
+  %D%/installer/newt/welcome.scm               \
+  %D%/installer/newt/wifi.scm  
+
+installerdir = $(guilemoduledir)/%D%/installer
+dist_installer_DATA =                          \
+  %D%/installer/aux-files/logo.txt             \
+  %D%/installer/aux-files/SUPPORTED
+
+endif ENABLE_INSTALLER
 
 # Modules that do not need to be compiled.
 MODULES_NOT_COMPILED +=                                \
@@ -876,6 +916,7 @@ dist_patch_DATA =                                           \
   %D%/packages/patches/kinit-kdeinit-libpath.patch             \
   %D%/packages/patches/kio-search-smbd-on-PATH.patch           \
   %D%/packages/patches/kmod-module-directory.patch             \
+  %D%/packages/patches/kmscon-runtime-keymap-switch.patch      \
   %D%/packages/patches/kpackage-allow-external-paths.patch     \
   %D%/packages/patches/kobodeluxe-paths.patch                  \
   %D%/packages/patches/kobodeluxe-enemies-pipe-decl.patch      \
@@ -1049,6 +1090,7 @@ dist_patch_DATA =                                         \
   %D%/packages/patches/openldap-CVE-2017-9287.patch            \
   %D%/packages/patches/openocd-nrf52.patch                     \
   %D%/packages/patches/opensmtpd-fix-crash.patch               \
+  %D%/packages/patches/openssh-CVE-2018-20685.patch            \
   %D%/packages/patches/openssl-runpath.patch                   \
   %D%/packages/patches/openssl-1.1-c-rehash-in.patch           \
   %D%/packages/patches/openssl-c-rehash-in.patch               \