work around system build failure.

Julien LepillerThu Feb 20 16:46:52+0100 2020

7ee28ec

work around system build failure. * test failure in dovecot * failure to get u-boot-allwinner-bootloader * remove cat-avatar-generator which does not build yet since the change to guile 3.0.

systems/ene.scm

1717 
1818 
(use-modules (gnu))
1919 
(use-modules (gnu bootloader))
20+
(use-modules (gnu bootloader u-boot))
2021 
(use-modules (gnu packages bootloaders))
2122 
(use-modules (gnu services dns))
23+
(use-modules (gnu services mail))
2224 
(use-modules (gnu services networking))
2325 
(use-modules (gnu services web))
2426 
(use-modules (gnu system))
2527 
26-
(use-modules (config certbot) (config dns) (config mail) (config os))
28+
(use-modules (gnu packages mail))
29+
(use-modules (gnu packages web))
30+
(use-modules (guix packages))
31+
(use-modules (guix utils))
2732 
33+
(use-modules (config certbot) (config dns) (config mail) (config os))
2834 
29-
(define u-boot-allwinner-bootloader (@@ (gnu bootloader u-boot) u-boot-allwinner-bootloader))
35+
;; Copy from (gnu bootloader u-boot)
36+
(define install-allwinner-u-boot
37+
  #~(lambda (bootloader device mount-point)
38+
      (let ((u-boot (string-append bootloader
39+
                                   "/libexec/u-boot-sunxi-with-spl.bin")))
40+
        (write-file-on-device u-boot (stat:size (stat u-boot))
41+
                              device (* 8 1024)))))
3042 
3143 
(define u-boot-cubietruck-bootloader
3244 
  (bootloader
33-
    (inherit u-boot-allwinner-bootloader)
34-
    (package u-boot-cubietruck)))
45+
    (inherit u-boot-bootloader)
46+
    (package u-boot-cubietruck)
47+
    (installer install-allwinner-u-boot)))
3548 
3649 
(operating-system
3750 
  (inherit (tyreunom-os "ene"))
…
6982 
                           ("avatar.lepiller.eu")))
7083 
        (service php-fpm-service-type)
7184 
        (cat-avatar-generator-service
85+
	  #:package
86+
	  (package
87+
	    (inherit cat-avatar-generator)
88+
	    (arguments
89+
	      (substitute-keyword-arguments (package-arguments cat-avatar-generator)
90+
		((#:modules modules)
91+
		 `((guix build utils))))))
7292 
          #:configuration
7393 
          (nginx-server-configuration
7494 
            (server-name '("avatar.lepiller.eu"))
…
81101 
                  (ssl-certificate-key "/etc/letsencrypt/live/ene.lepiller.eu/privkey.pem")
82102 
                  (listen '("443 ssl http2" "[::]:443 ssl http2"))
83103 
                  (server-name '(default))(root "/srv/http/default")))))
84-
      (lepiller-mail-services
85-
        #:interface "eth0"
86-
        #:domain "courriel.lepiller.eu")
104+
      (modify-services
105+
        (lepiller-mail-services
106+
          #:interface "eth0"
107+
          #:domain "courriel.lepiller.eu")
108+
        (dovecot-service-type
109+
          config =>
110+
          (dovecot-configuration
111+
            (inherit config)
112+
            (dovecot
113+
              (package
114+
                (inherit dovecot)
115+
                (arguments
116+
                  (append
117+
                    `(#:tests? #f)
118+
                    (package-arguments dovecot))))))))
87119 
      (server-services "ene"))))