diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2017-03-21 21:55:20 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2017-03-21 22:33:07 +0100 |
| commit | 278d486b0c0e3ec0378f6a2ccf6946fb176d088b (patch) | |
| tree | 8bc8975dc235f698ea745758634d21a5f763a4fb /gnu/services | |
| parent | 4f7a9e0bffab0cf53992c33ed75ff5fb394eda7b (diff) | |
| download | patches-278d486b0c0e3ec0378f6a2ccf6946fb176d088b.tar patches-278d486b0c0e3ec0378f6a2ccf6946fb176d088b.tar.gz | |
file-systems: Do not use (gnu packages …).
Fixes a regression introduced in
7208995426714c9fc3ad59cadc3cc0f52df0f018 whereby (gnu system
file-systems) would pull in (gnu packages …) module, which in turn
breaks when importing things like (gnu build shepherd).
* gnu/system/file-systems.scm (file-system-type-predicate): Export.
(file-system-packages): Move to...
* gnu/system/linux-initrd.scm (file-system-packages): ... here. Add
docstring.
* gnu/services/base.scm: Use it.
* tests/file-systems.scm ("does not pull (gnu packages …)"): New test.
Diffstat (limited to 'gnu/services')
| -rw-r--r-- | gnu/services/base.scm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gnu/services/base.scm b/gnu/services/base.scm index dad1911d31..77efef15eb 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -31,6 +31,8 @@ #:use-module (gnu system shadow) ; 'user-account', etc. #:use-module (gnu system file-systems) ; 'file-system', etc. #:use-module (gnu system mapped-devices) + #:use-module ((gnu system linux-initrd) + #:select (file-system-packages)) #:use-module (gnu packages admin) #:use-module ((gnu packages linux) #:select (alsa-utils crda eudev e2fsprogs fuse gpm kbd lvm2 rng-tools)) |