summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-21 21:55:20 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-21 22:33:07 +0100
commit278d486b0c0e3ec0378f6a2ccf6946fb176d088b (patch)
tree8bc8975dc235f698ea745758634d21a5f763a4fb /tests
parent4f7a9e0bffab0cf53992c33ed75ff5fb394eda7b (diff)
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 'tests')
-rw-r--r--tests/file-systems.scm12
1 files changed, 11 insertions, 1 deletions
diff --git a/tests/file-systems.scm b/tests/file-systems.scm
index 467ee8ca5d..12f4f09c57 100644
--- a/tests/file-systems.scm
+++ b/tests/file-systems.scm
@@ -20,8 +20,10 @@
#:use-module (guix store)
#:use-module (guix modules)
#:use-module (gnu system file-systems)
+ #:use-module (srfi srfi-1)
#:use-module (srfi srfi-64)
- #:use-module (rnrs bytevectors))
+ #:use-module (rnrs bytevectors)
+ #:use-module (ice-9 match))
;; Test the (gnu system file-systems) module.
@@ -80,4 +82,12 @@
(not (member '(guix config)
(source-module-closure '((gnu system file-systems))))))
+(test-equal "does not pull (gnu packages …)"
+ ;; Same story: (gnu packages …) should not be pulled.
+ #f
+ (find (match-lambda
+ (('gnu 'packages _ ..1) #t)
+ (_ #f))
+ (source-module-closure '((gnu system file-systems)))))
+
(test-end)