summaryrefslogtreecommitdiff
path: root/gnu/system
diff options
context:
space:
mode:
authorMathieu Othacehe <othacehe@gnu.org>2020-08-25 12:39:11 +0200
committerMathieu Othacehe <othacehe@gnu.org>2020-08-25 12:39:11 +0200
commitdac7dd1b0b40c9f8c81b5147c68f6387c2b16bfd (patch)
tree7ee1acfecb728fec3a2b0c2373970449c82622a7 /gnu/system
parent5fe12be0dd03d1a316343549f8c131d931f21a9a (diff)
Remove "guile-zlib" extension when unused.
This is a follow-up of 755f365b02b42a5d1e8ef3000dadef069553a478. As (zlib) is autoloaded in (gnu build linux-modules), "guile-zlib" is needed as an extension only when it is effectively used. * gnu/installer.scm (installer-program): Remove "guile-zlib" from the extensions. * gnu/machine/ssh.scm (machine-check-initrd-modules): Ditto. * gnu/services.scm (activation-script): Ditto. * gnu/services/base.scm (default-serial-port): Ditto, (agetty-shepherd-service): ditto, (udev-service-type): ditto. * gnu/system/image.scm (gcrypt-sqlite3&co): Ditto. * gnu/system/shadow.scm (account-shepherd-service): Ditto.
Diffstat (limited to 'gnu/system')
-rw-r--r--gnu/system/image.scm2
-rw-r--r--gnu/system/shadow.scm12
2 files changed, 6 insertions, 8 deletions
diff --git a/gnu/system/image.scm b/gnu/system/image.scm
index 19c99a3dfa..36f56e237d 100644
--- a/gnu/system/image.scm
+++ b/gnu/system/image.scm
@@ -141,7 +141,7 @@
(match (package-transitive-propagated-inputs package)
(((labels packages) ...)
packages))))
- (list guile-gcrypt guile-sqlite3 guile-zlib)))
+ (list guile-gcrypt guile-sqlite3)))
(define-syntax-rule (with-imported-modules* gexp* ...)
(with-extensions gcrypt-sqlite3&co
diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm
index f642d250b0..a69339bc07 100644
--- a/gnu/system/shadow.scm
+++ b/gnu/system/shadow.scm
@@ -34,7 +34,6 @@
#:use-module ((gnu packages admin)
#:select (shadow))
#:use-module (gnu packages bash)
- #:use-module (gnu packages guile)
#:use-module (srfi srfi-1)
#:use-module (srfi srfi-26)
#:use-module (srfi srfi-34)
@@ -325,12 +324,11 @@ accounts among ACCOUNTS+GROUPS."
(start (with-imported-modules (source-module-closure
'((gnu build activation)
(gnu system accounts)))
- (with-extensions (list guile-zlib)
- #~(lambda ()
- (activate-user-home
- (map sexp->user-account
- (list #$@(map user-account->gexp accounts))))
- #t)))) ;success
+ #~(lambda ()
+ (activate-user-home
+ (map sexp->user-account
+ (list #$@(map user-account->gexp accounts))))
+ #t))) ;success
(documentation "Create user home directories."))))
(define (shells-file shells)