From a49d633c0c65975263270f5ac0050482ca6a5513 Mon Sep 17 00:00:00 2001
From: Mathieu Othacehe <m.othacehe@gmail.com>
Date: Sat, 24 Nov 2018 12:25:03 +0900
Subject: installer: Move everything to the build side.

* gnu/installer.scm: Rename to ...
* gnu/installer/record.scm: ... this.
* gnu/installer/build-installer.scm: Move everything to the build side and
rename to gnu/installer.scm.
* gnu/installer/newt.scm: Remove all the gexps and add depencies to newt
modules as this code will only be used on the build side by now.
* gnu/local.mk (GNU_SYSTEM_MODULES): Adapt it,
(dist_installer_DATA): New rule to install installer's aux-files.
* gnu/system/install.scm (%installation-services): Use only
'installer-program' from (gnu installer). The installer is now choosen on the
build side.
* guix/self.scm (*system-modules*): Restore previous behaviour and add all
installer files to #:extra-files field of the scheme-node.
* po/guix/POTFILES.in: Adapt it.
---
 gnu/installer/newt.scm | 94 ++++++++++++++++++++++++--------------------------
 1 file changed, 46 insertions(+), 48 deletions(-)

(limited to 'gnu/installer/newt.scm')

diff --git a/gnu/installer/newt.scm b/gnu/installer/newt.scm
index 23b737ddf0..db57c732d1 100644
--- a/gnu/installer/newt.scm
+++ b/gnu/installer/newt.scm
@@ -17,71 +17,69 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (gnu installer newt)
-  #:use-module (gnu installer)
+  #:use-module (gnu installer record)
+  #:use-module (gnu installer newt ethernet)
+  #:use-module (gnu installer newt hostname)
+  #:use-module (gnu installer newt keymap)
+  #:use-module (gnu installer newt locale)
+  #:use-module (gnu installer newt menu)
+  #:use-module (gnu installer newt network)
+  #:use-module (gnu installer newt timezone)
+  #:use-module (gnu installer newt user)
+  #:use-module (gnu installer newt utils)
+  #:use-module (gnu installer newt welcome)
+  #:use-module (gnu installer newt wifi)
   #:use-module (guix discovery)
-  #:use-module (guix gexp)
-  #:use-module (guix ui)
+  #:use-module (guix i18n)
+  #:use-module (srfi srfi-26)
+  #:use-module (newt)
   #:export (newt-installer))
 
-(define (modules)
-  (cons '(newt)
-        (scheme-modules*
-         (dirname (search-path %load-path "guix.scm"))
-         "gnu/installer/newt")))
+(define (init)
+  (newt-init)
+  (clear-screen)
+  (set-screen-size!))
 
-(define init
-  #~(begin
-      (newt-init)
-      (clear-screen)
-      (set-screen-size!)))
+(define (exit)
+  (newt-finish))
 
-(define exit
-  #~(begin
-      (newt-finish)))
+(define (exit-error key . args)
+  (newt-finish))
 
-(define exit-error
-  #~(lambda (key args)
-      (newt-finish)))
+(define* (locale-page #:key
+                      supported-locales
+                      iso639-languages
+                      iso3166-territories)
+  (run-locale-page
+   #:supported-locales supported-locales
+   #:iso639-languages iso639-languages
+   #:iso3166-territories iso3166-territories))
 
-(define locale-page
-  #~(lambda* (#:key
-              supported-locales
-              iso639-languages
-              iso3166-territories)
-      (run-locale-page
-       #:supported-locales supported-locales
-       #:iso639-languages iso639-languages
-       #:iso3166-territories iso3166-territories)))
+(define (timezone-page zonetab)
+  (run-timezone-page zonetab))
 
-(define timezone-page
-  #~(lambda* (zonetab)
-      (run-timezone-page zonetab)))
+(define (welcome-page logo)
+  (run-welcome-page logo))
 
-(define welcome-page
-  #~(run-welcome-page #$(local-file "aux-files/logo.txt")))
+(define (menu-page steps)
+  (run-menu-page steps))
 
-(define menu-page
-  #~(lambda (steps)
-      (run-menu-page steps)))
+(define* (keymap-page #:key models layouts)
+  (run-keymap-page #:models models
+                   #:layouts layouts))
 
-(define keymap-page
-  #~(lambda* (#:key models layouts)
-      (run-keymap-page #:models models
-                       #:layouts layouts)))
+(define (network-page)
+  (run-network-page))
 
-(define network-page
-  #~(run-network-page))
+(define (hostname-page)
+  (run-hostname-page))
 
-(define hostname-page
-  #~(run-hostname-page))
-
-(define user-page
-  #~(run-user-page))
+(define (user-page)
+  (run-user-page))
 
 (define newt-installer
   (installer
    (name 'newt)
-   (modules (modules))
    (init init)
    (exit exit)
    (exit-error exit-error)
-- 
cgit v1.2.3